fix

models/yb/comein_event.go

@@ -124,3 +124,9 @@ type SyncWhitelist struct {
 	Signature string      `json:"signature"`
 	Whitelist []Whitelist `json:"whitelist"`
 }
+
+type GetWhitelist struct {
+	Ts        string `json:"ts"`
+	AppID     string `json:"appId"`
+	Signature string `json:"signature"`
+}

services/comein/comein.go

@@ -291,7 +291,7 @@ func InitAddWhiteList() (err error) {
 		whiteUser := yb.Whitelist{}
 		if v.Mobile != "" {
 			whiteUser.Phone = v.Mobile
-			whiteUser.Areacode = "+" + v.CountryCode
+			whiteUser.Areacode = v.CountryCode
 			whiteUser.Guid = utils.MD5(strconv.Itoa(v.UserId))
 
 			whiteList = append(whiteList, whiteUser)
@@ -306,11 +306,17 @@ func InitAddWhiteList() (err error) {
 	fmt.Println("共" + strconv.Itoa(len(whiteList)) + "条数据")
 	// 分批发送请求
 	var count int
+	request := yb.SyncWhitelist{
+		Opt:   1,
+		AppID: utils.COMEIN_WHITELIST_APPID,
+	}
 	for i, v := range whiteList {
-		request := yb.SyncWhitelist{
-			Opt:   1,
-			AppID: utils.COMEIN_WHITELIST_APPID,
-		}
+		//whiteItem := yb.Whitelist{
+		//	Guid:     v.Guid,
+		//	Phone:    v.Phone,
+		//	Email:    v.Email,
+		//	Areacode: v.Areacode,
+		//}
 		request.Whitelist = append(request.Whitelist, v)
 		if count < 17000 && (len(whiteList)-i-1) > 0 {
 			count++
@@ -550,7 +556,7 @@ func syncWhiteList(list []*models.ComeinWhiteUser, opt int) (err error) {
 		whiteUser := yb.Whitelist{}
 		if v.Mobile != "" {
 			whiteUser.Phone = v.Mobile
-			whiteUser.Areacode = "+" + v.CountryCode
+			whiteUser.Areacode = v.CountryCode
 			whiteUser.Guid = utils.MD5(strconv.Itoa(v.UserId))
 
 			whiteList = append(whiteList, whiteUser)
@@ -626,7 +632,7 @@ func CheckComeinWhiteList() (err error) {
 		"appId":     utils.COMEIN_WHITELIST_APPID,
 		"signature": signature,
 		"timestamp": timestamp,
-		"phone":     "15906624664",
+		"phone":     "18602189392",
 	}
 
 	paramStr := ``
@@ -697,9 +703,9 @@ func AddWhiteList() (err error) {
 	postUrl := utils.COMEIN_URL
 
 	whiteUser := yb.Whitelist{}
-	whiteUser.Phone = "18602189391"
+	whiteUser.Phone = "18602189392"
 	whiteUser.Areacode = "+86"
-	whiteUser.Guid = utils.MD5(strconv.Itoa(999999))
+	whiteUser.Guid = utils.MD5(strconv.Itoa(45631))
 
 
 	request := yb.SyncWhitelist{
@@ -763,3 +769,148 @@ func AddWhiteList() (err error) {
 	request.Whitelist = nil
 	return
 }
+
+// CheckWhiteList
+func CheckComeinWhiteListByJobId() (err error) {
+	defer func() {
+		if err != nil {
+			go alarm_msg.SendAlarmMsg("InitAddWhiteList；ERR："+err.Error(), 3)
+		}
+	}()
+
+	logMsg := ``
+
+	headers := map[string]string{
+		"app": "json",        //模块名
+		"mod": "channelopen", //模块名
+		"act": "get-result", //处理方法名
+	}
+
+	paramsMap := map[string]string{
+		"jobId":     "52b7fcf4-304b-4061-8139-0ad1a3d1bde6",
+	}
+
+	paramStr := ``
+	for index, val := range paramsMap {
+		paramStr += index + `=` + val + `&`
+	}
+	paramStr = paramStr[:len(paramStr)-1]
+
+	getUrl := utils.COMEIN_URL + "?" + paramStr
+
+	// 创建一个新的请求
+	req, err := http.NewRequest("GET", getUrl, nil)
+	if err != nil {
+		fmt.Println("Error creating request:", err)
+		return
+	}
+	// 添加自定义的头部信息
+	for k, v := range headers {
+		req.Header.Add(k, v)
+	}
+
+	// 发送请求并获取响应
+	client := http.Client{}
+	resp, err := client.Do(req)
+	if err != nil {
+		fmt.Println("Error sending request:", err)
+		return
+	}
+	defer resp.Body.Close()
+
+	body, err := ioutil.ReadAll(resp.Body)
+	if err != nil {
+		logMsg = fmt.Sprint("获取参会人员列表 comein get err; request:", getUrl, "; errMsg:", err.Error())
+		utils.FileLog.Info(logMsg)
+		return
+	}
+
+	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 addWhitelist Result", ";\nresponse:", string(body)))
+	err = json.Unmarshal(body, &result)
+	if err != nil {
+		utils.FileLog.Info("comein addWhitelist Err:", err.Error(), ";response:", string(body))
+		err = errors.New("Unmarshal Err:" + err.Error())
+		return
+	}
+	if result.ErrorCode != "0" {
+		utils.FileLog.Info("comein addWhitelist Err:", err.Error(), ";response:", string(body))
+		err = errors.New(result.ErrorDesc)
+		return
+	}
+
+	return
+}
+
+func GetWhiteList() (err error) {
+	defer func() {
+		if err != nil {
+			go alarm_msg.SendAlarmMsg("InitAddWhiteList；ERR："+err.Error(), 3)
+		}
+	}()
+
+	postUrl := utils.COMEIN_URL
+	timestamp := fmt.Sprintf("%d", time.Now().UnixNano()/1e6)
+	signature := GetSignature("", timestamp)
+
+	request := yb.GetWhitelist{
+		Ts:        timestamp,
+		AppID:     utils.COMEIN_WHITELIST_APPID,
+		Signature: signature,
+	}
+
+	jsonData, e := json.Marshal(request)
+	if e != nil {
+		err = e
+		return
+	}
+
+	headers := map[string]string{
+		"app": "json",
+		"mod": "channelopen",
+		"act": "get-whitelist-v1",
+	}
+
+	// 发起POST请求
+	resp, e := utils.MakePostRequest(postUrl, jsonData, headers)
+	if e != nil {
+		err = e
+		utils.FileLog.Info("comein addWhitelist Err:", err.Error(), ";url:", postUrl)
+		return
+	}
+	defer resp.Body.Close()
+
+	body, e := ioutil.ReadAll(resp.Body)
+	if e != nil {
+		err = e
+		fmt.Println("reponse error", err)
+		return
+	}
+
+	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 addWhitelist Result", ";url:", postUrl, ";\nresponse:", string(body)))
+	err = json.Unmarshal(body, &result)
+	if err != nil {
+		utils.FileLog.Info("comein addWhitelist Err:", err.Error(), ";url:", postUrl, ";response:", string(body))
+		err = errors.New("Unmarshal Err:" + err.Error())
+		return
+	}
+	if result.ErrorCode != "0" {
+		utils.FileLog.Info("comein addWhitelist Err:", err.Error(), ";url:", postUrl, ";response:", string(body))
+		err = errors.New(result.ErrorDesc)
+		return
+	}
+	return
+}