Merge branch 'yb/1.1' of hongze/hongze_yb into master

controller/response/base.go

@@ -4,7 +4,6 @@ import (
 	"encoding/json"
 	"github.com/gin-gonic/gin"
 	"hongze/hongze_yb/global"
-	"hongze/hongze_yb/utils"
 )
 
 var (
@@ -26,12 +25,13 @@ func result(code int, resultData ResultData, c *gin.Context) {
 	global.LOG.Debug("resultData:", string(jsonByte))
 
 	//测试环境，数据不进行加密
-	if global.CONFIG.Serve.RunMode == "debug" {
+	/*if global.CONFIG.Serve.RunMode == "debug" {
 		c.JSON(code, resultData)
 	} else {
 		responseResult := utils.DesBase64Encrypt(jsonByte)
 		c.JSON(code, responseResult)
-	}
+	}*/
+	c.JSON(code, resultData)
 	c.Abort()
 }