From 7f1d1d325a11a744c082fa4de4ad6fa62f421952 Mon Sep 17 00:00:00 2001
From: hujiebin <iamhujiebin@users.noreply.github.com>
Date: Sun, 25 Jun 2023 16:03:29 +0800
Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E5=88=86=E9=A1=B5=E5=85=BC?=
 =?UTF-8?q?=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 resp/response.go      | 41 ++++++++++++++++++++++++++++++-----------
 route/middleHandle.go |  6 ++++--
 2 files changed, 34 insertions(+), 13 deletions(-)

diff --git a/resp/response.go b/resp/response.go
index 7a40d78..1f4966d 100644
--- a/resp/response.go
+++ b/resp/response.go
@@ -4,6 +4,7 @@ import (
 	"encoding/json"
 	"git.hilo.cn/hilo-common/mycontext"
 	"git.hilo.cn/hilo-common/mylogrus"
+	"git.hilo.cn/hilo-common/utils"
 	"github.com/gin-gonic/gin"
 	"hilo-group/myerr"
 	"net/http"
@@ -16,6 +17,7 @@ type Response struct {
 	MessageData      interface{} `json:"messageData"`      // 消息详情
 	OperationMessage interface{} `json:"operationMessage"` // 操作消息
 	Data             interface{} `json:"data"`             // 数据
+	Edata            interface{} `json:"edata"`            // 数据
 }
 
 /**
@@ -30,7 +32,12 @@ func ResponseOk(c *gin.Context, data interface{}) {
 		Code:             myerr.GetSuccessCode(),
 		Message:          myerr.GetSuccessMsg(),
 		OperationMessage: myerr.GetSuccessMsg(),
-		Data:             data,
+	}
+	if _, ok := c.Get(mycontext.InnerEncrypt); ok {
+		//response.Edata = utils.EncryptionData(data, []byte("484194d4d0f968a7"))
+		response.Edata = utils.EncryptionData(data, []byte("hilo!@#$%^&*()_+"))
+	} else {
+		response.Data = data
 	}
 	printResponseBody(c, &response)
 
@@ -116,15 +123,21 @@ type Page struct {
 
 func ResponsePageOk(c *gin.Context, data interface{}, total uint, index int) {
 	// always return http.StatusOK
+	pageData := Page{
+		Total: total,
+		Index: index,
+		Data:  data,
+	}
 	response := Response{
 		Code:             myerr.GetSuccessCode(),
 		Message:          myerr.GetSuccessMsg(),
 		OperationMessage: myerr.GetSuccessMsg(),
-		Data: Page{
-			Total: total,
-			Index: index,
-			Data:  data,
-		},
+	}
+	if _, ok := c.Get(mycontext.InnerEncrypt); ok {
+		//response.Edata = utils.EncryptionData(data, []byte("484194d4d0f968a7"))
+		response.Edata = utils.EncryptionData(pageData, []byte("hilo!@#$%^&*()_+"))
+	} else {
+		response.Data = pageData
 	}
 	printResponseBody(c, &response)
 
@@ -149,15 +162,21 @@ func ResponsePageBaseOk(c *gin.Context, data interface{}, nextPageIndex int, has
 	if data == nil {
 		data = make([]interface{}, 0)
 	}
+	pageData := PageRespBase{
+		NextPageIndex: nextPageIndex,
+		HasNextPage:   hasNextPage,
+		Data:          data,
+	}
 	response := Response{
 		Code:             myerr.GetSuccessCode(),
 		Message:          myerr.GetSuccessMsg(),
 		OperationMessage: myerr.GetSuccessMsg(),
-		Data: PageRespBase{
-			NextPageIndex: nextPageIndex,
-			HasNextPage:   hasNextPage,
-			Data:          data,
-		},
+	}
+	if _, ok := c.Get(mycontext.InnerEncrypt); ok {
+		//response.Edata = utils.EncryptionData(data, []byte("484194d4d0f968a7"))
+		response.Edata = utils.EncryptionData(pageData, []byte("hilo!@#$%^&*()_+"))
+	} else {
+		response.Data = pageData
 	}
 	c.JSON(http.StatusOK, response)
 }
diff --git a/route/middleHandle.go b/route/middleHandle.go
index 112da38..e16f1f9 100644
--- a/route/middleHandle.go
+++ b/route/middleHandle.go
@@ -137,8 +137,10 @@ func LoggerHandle(c *gin.Context) {
 
 // 加密Handle
 func EncryptHandle(c *gin.Context) {
-	if value, ok := c.Get(mycontext.APP_VERSION); ok {
-		if high, _ := utils.CompareVersion(value.(string), "> 3.9.0"); high {
+	header := c.Request.Header
+	appVersion := header.Get("Appversion")
+	if len(appVersion) > 0 {
+		if high, _ := utils.CompareVersion(appVersion, "> 3.9.0"); high {
 			c.Set(mycontext.InnerEncrypt, true)
 		}
 	}
-- 
2.22.0