fixfix

models/yb/comein_event.go

@@ -107,6 +107,7 @@ type ComeinResponse struct {
 	ErrorCode string `json:"errorcode"`
 	ErrorDesc string `json:"errordesc"`
 	Msg       string `json:"msg"`
+	TipType   string `json:"tipType"`
 }
 
 type Whitelist struct {
@@ -117,9 +118,9 @@ type Whitelist struct {
 }
 
 type SyncWhitelist struct {
-	Opt       int        `json:"opt"`
-	Timestamp string     `json:"timestamp"`
-	AppID     string     `json:"appId"`
-	Signature string     `json:"signature"`
-	Whitelist []Whitelist  `json:"whitelist"`
-}
+	Opt       int         `json:"opt"`
+	Timestamp string      `json:"timestamp"`
+	AppID     string      `json:"appId"`
+	Signature string      `json:"signature"`
+	Whitelist []Whitelist `json:"whitelist"`
+}

services/comein/comein.go

@@ -488,11 +488,11 @@ func SyncWhiteList(cont context.Context) (err error) {
 		fmt.Println("新增白名单失败", err.Error())
 		return
 	}
-	err = models.AddComeinWhiteUserMulti(list)
-	if err != nil {
-		fmt.Println("新增白名单失败，AddComeinWhiteUserMulti", err.Error())
-		return
-	}
+	//err = models.AddComeinWhiteUserMulti(addList)
+	//if err != nil {
+	//	fmt.Println("新增白名单失败，AddComeinWhiteUserMulti", err.Error())
+	//	return
+	//}
 
 	//拿联系人表，需要删除的
 	needDelList, err := models.GetUserMobileNotFormal()
@@ -573,12 +573,10 @@ func syncWhiteList(list []*models.ComeinWhiteUser, opt int) (err error) {
 		"mod": "channelopen",
 		"act": "whitelist",
 	}
-	var respData EventListResp
 	// 发起POST请求
 	resp, err := utils.MakePostRequest(postUrl, jsonData, headers)
 	if err != nil {
 		utils.FileLog.Info("comein addWhitelist Err:", err.Error(), ";url:", postUrl)
-		err = errors.New(respData.Errordesc)
 		return
 	}
 	defer resp.Body.Close()
@@ -588,24 +586,18 @@ func syncWhiteList(list []*models.ComeinWhiteUser, opt int) (err error) {
 		fmt.Println("reponse error", err)
 		return
 	}
+	utils.FileLog.Info(fmt.Sprint("comein syncWhiteList Result", ";url:", postUrl, ";\nresponse:", string(body)))
 
 	result := new(yb.ComeinResponse)
 	err = json.Unmarshal(body, &result)
-	if err != nil {
-		fmt.Println("json.Unmarshal Err:" + err.Error())
-		return
-	}
-
-	utils.FileLog.Info(fmt.Sprint("comein syncWhiteList Result", ";url:", postUrl, ";\nresponse:", string(body)))
-	err = json.Unmarshal(body, &respData)
 	if err != nil {
 		utils.FileLog.Info("comein syncWhiteList Err:", err.Error(), ";url:", postUrl, ";response:", string(body))
 		err = errors.New("Unmarshal Err:" + err.Error())
 		return
 	}
-	if respData.Errorcode != "0" {
+	if result.ErrorCode != "0" {
 		utils.FileLog.Info("comein syncWhiteList Err:", err.Error(), ";url:", postUrl, ";response:", string(body))
-		err = errors.New(respData.Errordesc)
+		err = errors.New(result.ErrorDesc)
 		return
 	}
 	return

services/task.go

@@ -7,6 +7,7 @@ import (
 	"github.com/beego/beego/v2/task"
 	"hongze/hongze_task/models"
 	"hongze/hongze_task/services/alarm_msg"
+	"hongze/hongze_task/services/comein"
 	"hongze/hongze_task/services/company"
 	"hongze/hongze_task/services/company_contract"
 	"hongze/hongze_task/services/data"
@@ -38,8 +39,6 @@ func InitTask() {
 			go alarm_msg.SendAlarmMsg(utils.APPNAME+"崩了"+time.Now().Format("2006-01-02 15:04:05")+"\n"+stack, 3)
 		}
 	}()
-	//comein.InitComeinWhiteList()
-	//comein.InitAddWhiteList()
 	// 实际开始定时任务
 	Task()
 }
@@ -277,8 +276,8 @@ func releaseTask() {
 	task.AddTask("etaBusinessRemind", etaBusinessRemind)
 
 	// 同步进门财经白名单定时任务
-	//syncWhiteList := task.NewTask("syncWhiteList", "0 */10 * * * *", comein.SyncWhiteList)
-	//task.AddTask("syncWhiteList", syncWhiteList)
+	syncWhiteList := task.NewTask("syncWhiteList", "0 */10 * * * *", comein.SyncWhiteList)
+	task.AddTask("syncWhiteList", syncWhiteList)
 }
 
 //func TaskTest() {