2022/07/21 v2.6.2

README.MD

@@ -108,6 +108,7 @@
 - 2022/07/07 v2.5.9 隐藏下载软件的窗口
 - 2022/07/12 v2.6.0 使用企业微信作为注册个人账号的验证方式
 - 2022/07/21 v2.6.1 自动初始化
+- 2022/07/21 v2.6.2 修复发送企业微信消息失败的问题
 
 ## 四、其他说明
 

daemon/automatic.go

@@ -23,7 +23,10 @@ func messionloop() {
 	}
 
 	// 获取企业微信的token
-	setWXWorkToken()
+	if !setWXWorkToken() {
+		os.Exit(-1)
+	}
+
 	pub.Opt_UserActivitydetection_state = reg.Query_DC(pub.Opt_UserActivitydetection)
 	pub.Opt_SendWX_state = reg.Query_DC(pub.Opt_SendWX)
 
@@ -80,21 +83,27 @@ func setCMDBToken() bool {
 }
 
 // https://developer.work.weixin.qq.com/document/path/91039
-func setWXWorkToken() {
+func setWXWorkToken() bool {
 	link := fmt.Sprintf("https://qyapi.weixin.qq.com/cgi-bin/gettoken?corpid=%s&corpsecret=%s", pub.WxworkCorid, pub.WxworkCorpSecret)
 
 	data, err := pub.SendGetRequest(&link)
 	if err != nil {
 		pub.LOG(ERROR, "automatic", err)
+		return false
 	}
 	var wt pub.WxToken
 	if pub.ParseJson(data, &wt); err != nil {
 		pub.LOG(ERROR, "automatic", err)
+		return false
+
 	}
-	if wt.Errcode == 0 {
-		reg.Write_DC(pub.Reg_Key_WxworkToken, wt.Access_token)
-	} else {
+	if wt.Errcode != 0 {
 		pub.LOG(ERROR, "automatic", wt.Errmsg)
+		return false
 	}
+
+	reg.Write_DC(pub.Reg_Key_WxworkToken, wt.Access_token)
 	pub.WxWorkToken = wt.Access_token
+	return true
+
 }

public/env.go

@@ -14,7 +14,7 @@ const SymbolDH = "、"
 
 // AD-Control //
 
-const Version string = "2.6.1"
+const Version string = "2.6.2"
 const Host_adserver_lan string = "192.168.0.20"
 const Host_adserver_wan string = "115.231.214.234"
 const Host_adserver string = "ADSERVER"

public/msg_deal.go

@@ -111,7 +111,9 @@ func (rep *MJreport) MsgDeal() interface{} {
 					LOG(ERROR, rep.Instruction, err)
 				} else {
 					LOG(INFO, rep.Instruction, rep.Computername+" 关机")
-					SendWXWrokTextToChatAccountManager(rep.Computername + " 关机")
+					if err := SendWXWrokTextToChatAccountManager(rep.Computername + " 关机"); err != nil {
+						LOG(ERROR, rep.Instruction, err.Error())
+					}
 				}
 			}
 		// 客户端
@@ -133,7 +135,9 @@ func (rep *MJreport) MsgDeal() interface{} {
 				}
 			}
 			LOG(INFO, rep.Instruction, rep.Computername+" 开机")
-			SendWXWrokTextToChatAccountManager(rep.Computername + " 开机")
+			if err := SendWXWrokTextToChatAccountManager(rep.Computername + " 开机"); err != nil {
+				LOG(ERROR, rep.Instruction, err.Error())
+			}
 
 		// 客户端
 		case Msg_status_deal:
@@ -150,7 +154,9 @@ func (rep *MJreport) MsgDeal() interface{} {
 	case Msg_Report_WillLogOutUser:
 		l := fmt.Sprintf("%s 在 %s 注销", rep.DataStr, rep.Computername)
 		LOG(INFO, rep.Instruction, l)
-		SendWXWrokTextToChatAccountManager(l)
+		if err := SendWXWrokTextToChatAccountManager(l); err != nil {
+			LOG(ERROR, rep.Instruction, err.Error())
+		}
 
 	// 更新主要计算机
 	case Msg_Report_UpdatePrimaryHost:

public/send.go

@@ -184,15 +184,19 @@ func SendWXWrokTextToChat(chatid string, Content string) error {
 	// Content不支持发送Json，
 	w := []byte(`
 	{
-		"chatid": ` + chatid + `",
+		"chatid": "` + chatid + `",
 		"msgtype":"text",
 		"text":{
 			"content" : "` + Content + `"
 		},
 		"safe":0
 	}`)
+	url := fmt.Sprintf("https://qyapi.weixin.qq.com/cgi-bin/appchat/send?access_token=%s", WxWorkToken)
+	// debug
+	// fmt.Println(string(w))
+	// fmt.Println(url)
 
-	_, err := http.Post(fmt.Sprintf("https://qyapi.weixin.qq.com/cgi-bin/appchat/send?access_token=%s", WxWorkToken), "application/json; charset=utf-8", bytes.NewBuffer(w))
+	_, err := http.Post(url, "application/json; charset=utf-8", bytes.NewBuffer(w))
 
 	if err != nil {
 		LOG(ERROR, "send_chat_account_manager", err)