Merge branch 'comein'

services/comein/comein.go

@@ -317,7 +317,7 @@ func InitAddWhiteList() (err error) {
 		//	Areacode: v.Areacode,
 		//}
 		request.Whitelist = append(request.Whitelist, v)
-		if count < 17000 && (len(whiteList)-i-1) > 0 {
+		if count < 10000 && (len(whiteList)-i-1) > 0 {
 			count++
 			continue
 		}
@@ -363,10 +363,10 @@ func InitAddWhiteList() (err error) {
 			return
 		}
 
-		utils.FileLog.Info(fmt.Sprint("comein addWhitelist Result", ";url:", postUrl, ";\nrequest:", request, ";\nresponse:", string(body)))
+		utils.FileLog.Info(fmt.Sprint("comein addWhitelist Result", ";url:", postUrl, ";\nrequest:", jsonData, ";\nresponse:", string(body)))
 		err = json.Unmarshal(body, &result)
 		if err != nil {
-			utils.FileLog.Info(fmt.Sprint("comein addWhitelist Result", ";url:", postUrl, ";\nrequest:", request, ";\nresponse:", string(body)))
+			utils.FileLog.Info(fmt.Sprint("comein addWhitelist Result", ";url:", postUrl, ";\nrequest:", jsonData, ";\nresponse:", string(body)))
 			err = errors.New("Unmarshal Err:" + err.Error())
 			return
 		}
@@ -633,7 +633,7 @@ func CheckComeinWhiteList() (err error) {
 		"appId":     utils.COMEIN_WHITELIST_APPID,
 		"signature": signature,
 		"timestamp": timestamp,
-		"phone":     "15906624664",
+		"phone":     "138108810525",
 	}
 
 	paramStr := ``
@@ -704,9 +704,9 @@ func AddWhiteList() (err error) {
 	postUrl := utils.COMEIN_URL
 
 	whiteUser := yb.Whitelist{}
-	whiteUser.Phone = "15906624664"
+	whiteUser.Phone = "188286375317"
 	whiteUser.Areacode = "+86"
-	whiteUser.Guid = utils.MD5(strconv.Itoa(0))
+	whiteUser.Guid = "26968fa5f8753ffdbaaab97fbe092f4f"
 
 	request := yb.SyncWhitelist{
 		Opt:   1,
@@ -787,7 +787,7 @@ func CheckComeinWhiteListByJobId() (err error) {
 	}
 
 	paramsMap := map[string]string{
-		"jobId": "cb121a9a-47a3-49ce-a1fd-445fede19e0f",
+		"jobId": "a180a8a4-a674-48ce-aa96-5a373c7dcc9c",
 	}
 
 	paramStr := ``