Merge branch 'dev/1.3' into debug

controllers/business_conf.go

@@ -2,7 +2,9 @@ package controllers
 
 import (
 	"encoding/json"
+	"fmt"
 	"hongze/hz_eta_api/models"
+	"hongze/hz_eta_api/utils"
 	"html"
 	"strconv"
 	"strings"
@@ -193,3 +195,36 @@ func (this *BusinessConfController) Fetch() {
 	br.Success = true
 	br.Msg = "获取成功"
 }
+
+// CodeEncrypt
+// @Title 商家编码加密
+// @Description 商家编码加密
+// @Success 200 Ret=200 获取成功
+// @router /code_encrypt [get]
+func (this *BusinessConfController) CodeEncrypt() {
+	br := new(models.BaseResponse).Init()
+	defer func() {
+		if br.ErrMsg == "" {
+			br.IsSendEmail = false
+		}
+		this.Data["json"] = br
+		this.ServeJSON()
+	}()
+	sysUser := this.SysUser
+	if sysUser == nil {
+		br.Msg = "请登录"
+		br.ErrMsg = "请登录，SysUser Is Empty"
+		br.Ret = 408
+		return
+	}
+
+	res := ""
+	if utils.BusinessCode != "" {
+		res = utils.MD5(fmt.Sprintf("%s%s", utils.BusinessCode, utils.BusinessCodeSalt))
+	}
+
+	br.Data = res
+	br.Ret = 200
+	br.Success = true
+	br.Msg = "获取成功"
+}

routers/commentsRouter.go

@@ -4372,6 +4372,15 @@ func init() {
             Filters: nil,
             Params: nil})
 
+    beego.GlobalControllerRouter["hongze/hz_eta_api/controllers:BusinessConfController"] = append(beego.GlobalControllerRouter["hongze/hz_eta_api/controllers:BusinessConfController"],
+        beego.ControllerComments{
+            Method: "CodeEncrypt",
+            Router: `/code_encrypt`,
+            AllowHTTPMethods: []string{"get"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
     beego.GlobalControllerRouter["hongze/hz_eta_api/controllers:BusinessConfController"] = append(beego.GlobalControllerRouter["hongze/hz_eta_api/controllers:BusinessConfController"],
         beego.ControllerComments{
             Method: "Fetch",

utils/config.go

@@ -169,6 +169,9 @@ var LibreOfficePath string
 // CrmEtaServerUrl CRM-ETA服务地址
 var CrmEtaServerUrl string
 
+// BusinessCode 商家编码
+var BusinessCode string
+
 func init() {
 	tmpRunMode, err := web.AppConfig.String("run_mode")
 	if err != nil {
@@ -387,6 +390,9 @@ func init() {
 	CrmEtaServerUrl = config["crm_eta_server_url"]
 	LibreOfficePath = config["libre_office_path"]
 
+	// 商家编码
+	BusinessCode = config["business_code"]
+
 	// 初始化ES
 	initEs()
 }

utils/constants.go

@@ -296,3 +296,6 @@ const (
 	SOURCE_CRM_FLAG = 1
 	SOURCE_ETA_FLAG = 2
 )
+
+// BusinessCodeSalt 商家编码盐值
+const BusinessCodeSalt = "dr7WY0OZgGR7upw1"