From 6b3f3014cebae365e2218f87b66eded14e9c2877 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Tue, 10 Oct 2023 15:16:56 +0800
Subject: [PATCH] 1

---
 README.md                                    |  4 ++++
 server/adminserver/middleware/auth.go        |  2 ++
 server/adminserver/router/routermgr.go       |  7 +++++--
 server/adminserver/router/system/sys_user.go | 10 ++++++----
 third_party/f5                               |  2 +-
 5 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index 6b80c151..845a5bb3 100644
--- a/README.md
+++ b/README.md
@@ -22,3 +22,7 @@ node ../../tools/pbtools/app.js
 # go代码风格
 
 main包里所有的函数、字段都小写开头
+
+# 参考
+
+https://gorm.io/zh_CN/docs/
diff --git a/server/adminserver/middleware/auth.go b/server/adminserver/middleware/auth.go
index 444b1a0b..c339412c 100644
--- a/server/adminserver/middleware/auth.go
+++ b/server/adminserver/middleware/auth.go
@@ -1,12 +1,14 @@
 package middleware
 
 import (
+	"f5"
 	"github.com/gin-gonic/gin"
 )
 
 func Auth() gin.HandlerFunc {
 	return func(c *gin.Context) {
 		token := c.Request.Header.Get("Authorization")
+		f5.GetSysLog().Info("auth")
 		if token == "" {
 			/*
 			response.FailWithDetailed(gin.H{"reload": true}, "未登录或非法访问", c)*/
diff --git a/server/adminserver/router/routermgr.go b/server/adminserver/router/routermgr.go
index 307b6bff..37e48b92 100644
--- a/server/adminserver/router/routermgr.go
+++ b/server/adminserver/router/routermgr.go
@@ -4,6 +4,7 @@ import (
 	"f5"
 	//. "main/global"
 	"main/router/system"
+	"main/middleware"
 )
 
 type routerMgr struct {
@@ -12,8 +13,10 @@ type routerMgr struct {
 
 
 func (this* routerMgr) Init() {
-	router := f5.GetApp().GetGinEngine().Group("api/v1")
-	this.system.InitUserRouter(router)
+	priGroup := f5.GetApp().GetGinEngine().Group("api/v1")
+	pubGroup := f5.GetApp().GetGinEngine().Group("api/v1")
+	priGroup.Use(middleware.Auth())
+	this.system.InitUserRouter(priGroup, pubGroup)
 	f5.GetSysLog().Info("routerMgr.init")
 }
 
diff --git a/server/adminserver/router/system/sys_user.go b/server/adminserver/router/system/sys_user.go
index 8bd215f3..1409f4d2 100644
--- a/server/adminserver/router/system/sys_user.go
+++ b/server/adminserver/router/system/sys_user.go
@@ -7,13 +7,15 @@ import (
 
 type UserRouter struct{}
 
-func (this *UserRouter) InitUserRouter(Router *gin.RouterGroup) {
-	userRouter := Router.Group("user")
+func (this *UserRouter) InitUserRouter(priRouter *gin.RouterGroup,
+	pubRouter *gin.RouterGroup) {
+	priUserRouter := priRouter.Group("user")
+	pubUserRouter := pubRouter.Group("user")
 	userApi := v1.ApiGroupApp.SystemApiGroup.UserApi
 	{
-		userRouter.POST("login", userApi.Login)
+		pubUserRouter.POST("login", userApi.Login)
 	}
 	{
-		userRouter.GET("info", userApi.Info)
+		priUserRouter.GET("info", userApi.Info)
 	}
 }
diff --git a/third_party/f5 b/third_party/f5
index d42efe49..6c73845a 160000
--- a/third_party/f5
+++ b/third_party/f5
@@ -1 +1 @@
-Subproject commit d42efe492e859605f238a5954be108742da2e6b2
+Subproject commit 6c73845a87c1d4c8dc9234abb4dd16e6b75b6582