Merge branch 'dev/crm_eta' into debug

controllers/sys_admin.go

@@ -1242,6 +1242,12 @@ func (this *SysAdminController) ResetPass() {
 		return
 	}
 
+	// 同步用户缓存
+	var syncData system.SyncAdminData
+	syncData.Source = utils.SOURCE_CRM_FLAG
+	syncData.AdminName = adminInfo.AdminName
+	_ = utils.Rc.LPush(utils.CACHE_SYNC_ADMIN, syncData)
+
 	// 清除系统用户列表缓存key
 	_ = utils.Rc.Delete(utils.CACHE_KEY_ADMIN)
 	_ = utils.Rc.Delete(utils.CACHE_KEY_ADMIN_ID)

services/crm_eta.go

@@ -67,6 +67,12 @@ func GetAuthCodeFromMiddleServer(adminName string) (authCode string, err error)
 		err = fmt.Errorf("resp body is empty")
 		return
 	}
+	// 生产环境解密, 注意有个坑前后的双引号
+	if utils.RunMode == "release" {
+		str := string(b)
+		str = strings.Trim(str, `"`)
+		b = utils.DesBase64Decrypt([]byte(str))
+	}
 
 	result := new(MiddleServerResultData)
 	if e = json.Unmarshal(b, &result); e != nil {
@@ -151,6 +157,12 @@ func CodeLoginFromMiddleServer(authCode string) (tokenResp GetEtaTokenData, err
 		err = fmt.Errorf("resp body is empty")
 		return
 	}
+	// 生产环境解密, 注意有个坑前后的双引号
+	if utils.RunMode == "release" {
+		str := string(b)
+		str = strings.Trim(str, `"`)
+		b = utils.DesBase64Decrypt([]byte(str))
+	}
 
 	result := new(GetEtaTokenDataResp)
 	if e = json.Unmarshal(b, &result); e != nil {

utils/config.go

@@ -266,7 +266,7 @@ ZwIDAQAB
 		MayCurBaseUrl = "https://ng.maycur.com"
 
 		// CRM-ETA服务地址
-		CrmEtaServerUrl = "http://127.0.0.1:8702"
+		CrmEtaServerUrl = "http://127.0.0.1:8708"
 	} else {
 
 		TemplateRedirectUrl = "http://rddpweb.brilliantstart.cn/reportdtl?id="