From 40668581b8f5d805788f102ede0d2696a72d6821 Mon Sep 17 00:00:00 2001
From: zhangwenjian <zwj777@live.com>
Date: Fri, 11 Jun 2021 09:26:22 +0800
Subject: [PATCH] =?UTF-8?q?refactor=F0=9F=8E=A8:=20=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E7=99=BB=E9=99=86=E9=AA=8C=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin/router/gen_router.go | 17 +++++++++--------
 app/admin/router/sys_config.go |  4 ++--
 app/admin/router/sys_role.go   |  7 +++++--
 3 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/app/admin/router/gen_router.go b/app/admin/router/gen_router.go
index f65aab1f..39a8a040 100644
--- a/app/admin/router/gen_router.go
+++ b/app/admin/router/gen_router.go
@@ -2,16 +2,17 @@ package router
 
 import (
 	"github.com/gin-gonic/gin"
+	jwt "github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth"
 	"go-admin/app/admin/apis"
 	"go-admin/app/admin/apis/tools"
 )
 
 func init() {
-	routerNoCheckRole = append(routerNoCheckRole, sysNoCheckRoleRouter, registerDBRouter, registerSysTableRouter)
+	routerCheckRole = append(routerCheckRole, sysNoCheckRoleRouter, registerDBRouter, registerSysTableRouter)
 }
 
-func sysNoCheckRoleRouter(v1 *gin.RouterGroup) {
-	r := v1.Group("")
+func sysNoCheckRoleRouter(v1 *gin.RouterGroup ,authMiddleware *jwt.GinJWTMiddleware) {
+	r := v1.Group("").Use(authMiddleware.MiddlewareFunc())
 	{
 		sys := apis.System{}
 		r.GET("/getCaptcha", sys.GenerateCaptchaHandler)
@@ -25,8 +26,8 @@ func sysNoCheckRoleRouter(v1 *gin.RouterGroup) {
 	}
 }
 
-func registerDBRouter(v1 *gin.RouterGroup) {
-	db := v1.Group("/db")
+func registerDBRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) {
+	db := v1.Group("/db").Use(authMiddleware.MiddlewareFunc())
 	{
 		gen := tools.Gen{}
 		db.GET("/tables/page", gen.GetDBTableList)
@@ -34,12 +35,12 @@ func registerDBRouter(v1 *gin.RouterGroup) {
 	}
 }
 
-func registerSysTableRouter(v1 *gin.RouterGroup) {
+func registerSysTableRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) {
 	tables := v1.Group("/sys/tables")
 	{
 		sysTable := tools.SysTable{}
-		tables.GET("/page", sysTable.GetSysTableList)
-		tablesInfo := tables.Group("/info")
+		tables.Group("").Use(authMiddleware.MiddlewareFunc()).GET("/page", sysTable.GetSysTableList)
+		tablesInfo := tables.Group("/info").Use(authMiddleware.MiddlewareFunc())
 		{
 			tablesInfo.POST("", sysTable.InsertSysTable)
 			tablesInfo.PUT("", sysTable.UpdateSysTable)
diff --git a/app/admin/router/sys_config.go b/app/admin/router/sys_config.go
index f339b8d4..ca6017d5 100644
--- a/app/admin/router/sys_config.go
+++ b/app/admin/router/sys_config.go
@@ -28,12 +28,12 @@ func registerSysConfigRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMidd
 		r1.GET("/:configKey", api.GetSysConfigByKEYForService)
 	}
 
-	r2 := v1.Group("/app-config")
+	r2 := v1.Group("/app-config").Use(authMiddleware.MiddlewareFunc())
 	{
 		r2.GET("", api.GetSysConfigBySysApp)
 	}
 
-	r3 := v1.Group("/set-config")
+	r3 := v1.Group("/set-config").Use(authMiddleware.MiddlewareFunc())
 	{
 		r3.PUT("", api.Update2Set)
 		r3.GET("", api.Get2Set)
diff --git a/app/admin/router/sys_role.go b/app/admin/router/sys_role.go
index ca662c9f..5bfdd2aa 100644
--- a/app/admin/router/sys_role.go
+++ b/app/admin/router/sys_role.go
@@ -23,6 +23,9 @@ func registerSysRoleRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddle
 		r.PUT("/:id", api.Update)
 		r.DELETE("", api.Delete)
 	}
-	v1.PUT("/role-status", api.Update2Status)
-	v1.PUT("/roledatascope", api.Update2DataScope)
+	r1 := v1.Group("").Use(authMiddleware.MiddlewareFunc())
+	{
+		r1.PUT("/role-status", api.Update2Status)
+		r1.PUT("/roledatascope", api.Update2DataScope)
+	}
 }