Merge branch 'fix/log' into debug

controller/response/base.go

@@ -27,7 +27,7 @@ type ResultData struct {
 
 func result(code int, resultData ResultData, c *gin.Context) {
 	jsonByte, _ := json.Marshal(resultData)
-	logSlice := utils.GetBridgeLogListByClaims(c)
+	logSlice := utils.GetContextLogListByClaims(c)
 	logSlice = append(logSlice, fmt.Sprint("resultData:", string(jsonByte)))
 
 	//记录错误日志

middleware/common.go

@@ -10,6 +10,7 @@ import (
 	"strconv"
 )
 
+// Common 公共中间件
 type Common struct{}
 
 // RequestLog
@@ -28,9 +29,9 @@ func (common *Common) RequestLog(c *gin.Context) {
 	}
 
 	// 将请求地址添加到上下文的日志中
-	utils.SetBridgeLogListByClaims(c, fmt.Sprint("Url:", c.Request.RequestURI))
+	utils.SetContextLogListByClaims(c, fmt.Sprint("Url:", c.Request.RequestURI))
 	// 将请求参数添加到上下文的日志中
-	utils.SetBridgeLogListByClaims(c, fmt.Sprint("RequestBody:", string(body)))
+	utils.SetContextLogListByClaims(c, fmt.Sprint("RequestBody:", string(body)))
 
 	// 将请求体恢复到原始状态
 	c.Request.Body = io.NopCloser(bytes.NewBuffer(body))
@@ -61,24 +62,3 @@ func (common *Common) Page(c *gin.Context) {
 	c.Set("page_size", pageSize)
 	c.Next()
 }
-
-// Common2 公共中间件
-func Common2() gin.HandlerFunc {
-	return func(c *gin.Context) {
-		var currPage, pageSize int
-		reqPage := c.DefaultQuery("curr_page", "0")
-		currPage, _ = strconv.Atoi(reqPage)
-		if currPage <= 0 {
-			currPage = 1
-		}
-
-		reqPageSize := c.DefaultQuery("page_size", "0")
-		pageSize, _ = strconv.Atoi(reqPageSize)
-		if pageSize <= 0 {
-			pageSize = 20
-		}
-		c.Set("curr_page", currPage)
-		c.Set("page_size", pageSize)
-		c.Next()
-	}
-}

middleware/token.go

@@ -23,7 +23,7 @@ func Token() gin.HandlerFunc {
 			c.Abort()
 			return
 		}
-		utils.SetBridgeLogListByClaims(c, fmt.Sprint("Token:", token))
+		utils.SetContextLogListByClaims(c, fmt.Sprint("Token:", token))
 
 		sessionInfo, err := session.GetTokenByToken(token)
 		if err != nil {

utils/gin.go

@@ -2,29 +2,32 @@ package utils
 
 import "github.com/gin-gonic/gin"
 
-// SetBridgeLogListByClaims
-// @Description: 设置上下文中bridge日志
+// ContextLogName 上下文日志的名称
+const ContextLogName = `context_custom_log`
+
+// SetContextLogListByClaims
+// @Description: 设置上下文中日志
 // @author: Roc
 // @datetime 2024-10-31 10:55:15
 // @param c *gin.Context
 // @param logStr string
-func SetBridgeLogListByClaims(c *gin.Context, logStr string) {
-	bridgeLogList := GetBridgeLogListByClaims(c)
+func SetContextLogListByClaims(c *gin.Context, logStr string) {
+	bridgeLogList := GetContextLogListByClaims(c)
 	bridgeLogList = append(bridgeLogList, logStr)
-	c.Set("bridge_log", bridgeLogList)
+	c.Set(ContextLogName, bridgeLogList)
 
 	return
 }
 
-// GetBridgeLogListByClaims
+// GetContextLogListByClaims
 // @Description: 从Claims中获取当前日志
 // @author: Roc
 // @datetime 2024-10-31 10:35:04
 // @param c *gin.Context
 // @return bridgeLogList []string
-func GetBridgeLogListByClaims(c *gin.Context) (bridgeLogList []string) {
+func GetContextLogListByClaims(c *gin.Context) (bridgeLogList []string) {
 	//获取jwt数据失败
-	claims, exists := c.Get("bridge_log")
+	claims, exists := c.Get(ContextLogName)
 	// 如果不存在，那么就是空切片
 	if !exists {
 		bridgeLogList = []string{}