Merge remote-tracking branch 'origin/debug' into debug

controllers/sys_admin.go

@@ -1152,6 +1152,12 @@ func (this *SysAdminController) ResetPass() {
 		return
 	}
 
+	// 同步用户缓存
+	var syncData system.SyncAdminData
+	syncData.Source = utils.SOURCE_ETA_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)

models/product.go

@@ -1,6 +0,0 @@
-package models
-
-type Product struct {
-	ProductId   int    `description:"产品id"`
-	ProductName string `description:"产品名称"`
-}

models/report.go

@@ -855,14 +855,14 @@ type YbPcSuncode struct {
 
 // GetYbPcSunCode 获取太阳码
 func GetYbPcSunCode(scene, page string) (item *YbPcSuncode, err error) {
-	o := orm.NewOrmUsingDB("default")
+	o := orm.NewOrmUsingDB("weekly")
 	sql := `SELECT * FROM yb_pc_suncode WHERE scene = ? AND code_page = ? `
 	err = o.Raw(sql, scene, page).QueryRow(&item)
 	return
 }
 
 func AddYbPcSunCode(item *YbPcSuncode) (err error) {
-	o := orm.NewOrmUsingDB("default")
+	o := orm.NewOrmUsingDB("weekly")
 	_, err = o.Insert(item)
 	return
 }
@@ -876,7 +876,7 @@ type YbSuncodePars struct {
 }
 
 func AddYbSuncodePars(item *YbSuncodePars) (err error) {
-	o := orm.NewOrmUsingDB("default")
+	o := orm.NewOrmUsingDB("weekly")
 	_, err = o.Insert(item)
 	return
 }

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 GetCrmTokenData, 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(GetCrmTokenDataResp)
 	if e = json.Unmarshal(b, &result); e != nil {