From cc0dab3cd078c544e5d2d57d47834af7462d349e Mon Sep 17 00:00:00 2001
From: wenjianzhang <zwj777@live.com>
Date: Fri, 11 Jun 2021 17:30:17 +0800
Subject: [PATCH] =?UTF-8?q?refactor=F0=9F=8E=A8:=20=E5=BC=80=E6=94=BE?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=97=A0=E9=9C=80=E8=AE=A4=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin/router/gen_router.go | 10 +++++++---
 app/admin/router/sys_config.go |  2 +-
 common/middleware/demo.go      |  7 +++----
 common/middleware/init.go      |  6 +++---
 common/middleware/logger.go    |  8 +++++++-
 5 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/app/admin/router/gen_router.go b/app/admin/router/gen_router.go
index 39a8a040..9f7e9526 100644
--- a/app/admin/router/gen_router.go
+++ b/app/admin/router/gen_router.go
@@ -12,10 +12,14 @@ func init() {
 }
 
 func sysNoCheckRoleRouter(v1 *gin.RouterGroup ,authMiddleware *jwt.GinJWTMiddleware) {
-	r := v1.Group("").Use(authMiddleware.MiddlewareFunc())
+	r1 := v1.Group("")
 	{
 		sys := apis.System{}
-		r.GET("/getCaptcha", sys.GenerateCaptchaHandler)
+		r1.GET("/getCaptcha", sys.GenerateCaptchaHandler)
+	}
+
+	r := v1.Group("").Use(authMiddleware.MiddlewareFunc())
+	{
 		gen := tools.Gen{}
 		r.GET("/gen/preview/:tableId", gen.Preview)
 		r.GET("/gen/toproject/:tableId", gen.GenCode)
@@ -49,4 +53,4 @@ func registerSysTableRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddl
 			tablesInfo.GET("", sysTable.GetSysTablesInfo)
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/app/admin/router/sys_config.go b/app/admin/router/sys_config.go
index ca6017d5..415082ff 100644
--- a/app/admin/router/sys_config.go
+++ b/app/admin/router/sys_config.go
@@ -28,7 +28,7 @@ func registerSysConfigRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMidd
 		r1.GET("/:configKey", api.GetSysConfigByKEYForService)
 	}
 
-	r2 := v1.Group("/app-config").Use(authMiddleware.MiddlewareFunc())
+	r2 := v1.Group("/app-config")
 	{
 		r2.GET("", api.GetSysConfigBySysApp)
 	}
diff --git a/common/middleware/demo.go b/common/middleware/demo.go
index 10d68b91..f2cc9533 100644
--- a/common/middleware/demo.go
+++ b/common/middleware/demo.go
@@ -3,7 +3,6 @@ package middleware
 import (
 	"github.com/gin-gonic/gin"
 	"net/http"
-	"strings"
 )
 
 func DemoEvn() gin.HandlerFunc {
@@ -11,8 +10,8 @@ func DemoEvn() gin.HandlerFunc {
 		method := c.Request.Method
 		if method == "GET" ||
 			method == "OPTIONS" ||
-			strings.Contains(c.Request.RequestURI, "/login") ||
-			strings.Contains(c.Request.RequestURI, "/logout") {
+			c.Request.RequestURI == "/api/v1/login" ||
+			c.Request.RequestURI == "/api/v1/logout" {
 			c.Next()
 		} else {
 			c.JSON(http.StatusOK, gin.H{
@@ -24,4 +23,4 @@ func DemoEvn() gin.HandlerFunc {
 		}
 
 	}
-}
+}
\ No newline at end of file
diff --git a/common/middleware/init.go b/common/middleware/init.go
index f60945bd..38bbb87e 100644
--- a/common/middleware/init.go
+++ b/common/middleware/init.go
@@ -17,7 +17,7 @@ func InitMiddleware(r *gin.Engine) {
 	// 数据库链接
 	r.Use(WithContextDb)
 	// 日志处理
-	//r.Use(LoggerToFile())
+	r.Use(LoggerToFile())
 	// 自定义错误处理
 	r.Use(CustomError)
 	// NoCache is a middleware function that appends headers
@@ -26,10 +26,10 @@ func InitMiddleware(r *gin.Engine) {
 	r.Use(Options)
 	// Secure is a middleware function that appends security
 	r.Use(Secure)
-	//r.Use(DemoEvn())
+	r.Use(DemoEvn())
 	// 链路追踪
 	//r.Use(middleware.Trace())
 	sdk.Runtime.SetMiddleware(JwtTokenCheck, (*jwt.GinJWTMiddleware).MiddlewareFunc)
 	sdk.Runtime.SetMiddleware(RoleCheck, AuthCheckRole())
 	sdk.Runtime.SetMiddleware(PermissionCheck, actions.PermissionAction())
-}
+}
\ No newline at end of file
diff --git a/common/middleware/logger.go b/common/middleware/logger.go
index 0b9f5701..bbf97680 100644
--- a/common/middleware/logger.go
+++ b/common/middleware/logger.go
@@ -4,6 +4,7 @@ import (
 	"bufio"
 	"bytes"
 	"encoding/json"
+	"fmt"
 	gaConfig "go-admin/config"
 	"io"
 	"io/ioutil"
@@ -80,6 +81,11 @@ func LoggerToFile() gin.HandlerFunc {
 		statusCode := c.Writer.Status()
 		// 请求IP
 		clientIP := c.ClientIP()
+
+
+		fmt.Println("Headers:", c.Request.Header.Get("X-Real-IP"))
+
+		fmt.Println("clientIP:", clientIP)
 		// 执行时间
 		latencyTime := endTime.Sub(startTime)
 		// 日志格式
@@ -129,4 +135,4 @@ func SetDBOperLog(c *gin.Context, clientIP string, statusCode int, reqUri string
 			log.Errorf("Append message error, %s", err.Error())
 		}
 	}
-}
+}
\ No newline at end of file