Merge branch 'master' into CRM12.0

controllers/base_auth.go

@@ -160,6 +160,8 @@ func (c *BaseAuthController) JSON(data interface{}, hasIndent bool, coding bool)
 	}
 
 	// 数据加密
-	content = utils.DesBase64Encrypt(content)
+	if services.CheckEncryption(c.Ctx.Request.URL.Path) {
+		content = utils.DesBase64Encrypt(content)
+	}
 	return c.Ctx.Output.Body(content)
 }

controllers/base_common.go

@@ -141,6 +141,9 @@ func (c *BaseCommonController) JSON(data interface{}, hasIndent bool, coding boo
 	}
 
 	// 数据加密
-	content = utils.DesBase64Encrypt(content)
+	if services.CheckEncryption(c.Ctx.Request.URL.Path) {
+		content = utils.DesBase64Encrypt(content)
+	}
+
 	return c.Ctx.Output.Body(content)
 }

controllers/base_not_auth.go

@@ -130,6 +130,8 @@ func (c *BaseNotAuthController) JSON(data interface{}, hasIndent bool, coding bo
 	}
 
 	// 数据加密
-	content = utils.DesBase64Encrypt(content)
+	if services.CheckEncryption(c.Ctx.Request.URL.Path) {
+		content = utils.DesBase64Encrypt(content)
+	}
 	return c.Ctx.Output.Body(content)
 }

controllers/base_pc_not_auth.go

@@ -144,6 +144,8 @@ func (c *BasePcNotAuthController) JSON(data interface{}, hasIndent bool, coding
 	}
 
 	// 数据加密
-	content = utils.DesBase64Encrypt(content)
+	if services.CheckEncryption(c.Ctx.Request.URL.Path) {
+		content = utils.DesBase64Encrypt(content)
+	}
 	return c.Ctx.Output.Body(content)
 }

services/verify.go

@@ -0,0 +1,17 @@
+package services
+
+import (
+	"fmt"
+	"hongze/hongze_api/utils"
+)
+
+// CheckEncryption 校验需要是否加密
+func CheckEncryption(urlPath string) (ok bool) {
+	fmt.Println(urlPath)
+	if urlPath != `/api/report/share/detail` {
+		if utils.RunMode == "release" {
+			ok = true
+		}
+	}
+	return
+}