Upgrade code generation supports drop-down box merging and dictionary usage

router/router.go

@@ -2,36 +2,39 @@ package router
 
 import (
 	"github.com/gin-gonic/gin"
-	"go-admin/middleware"
-	_ "go-admin/pkg/jwtauth"
-	"go-admin/tools"
+	_ "github.com/gin-gonic/gin"
+	"go-admin/pkg/jwtauth"
+	jwt "go-admin/pkg/jwtauth"
 )
 
-func InitRouter() *gin.Engine {
 
-	r := gin.New()
-	// 日志处理
-	r.Use(middleware.LoggerToFile())
-	// 自定义错误处理
-	r.Use(middleware.CustomError)
-	// NoCache is a middleware function that appends headers
-	r.Use(middleware.NoCache)
-	// 跨域处理
-	r.Use(middleware.Options)
-	// Secure is a middleware function that appends security
-	r.Use(middleware.Secure)
-	// Set X-Request-Id header
-	r.Use(middleware.RequestId())
-	// the jwt middleware
-	authMiddleware, err := middleware.AuthInit()
-	tools.HasError(err, "JWT Init Error", 500)
 
-	// 注册系统路由
-	InitSysRouter(r, authMiddleware)
+// 路由示例
+func InitExamplesRouter(r *gin.Engine, authMiddleware *jwt.GinJWTMiddleware) *gin.Engine {
 
-	// 注册业务路由
-	// TODO: 这里可存放业务路由，里边并无实际路由是有演示代码
-	InitExamplesRouter(r, authMiddleware)
+	// 无需认证的路由
+	examplesNoCheckRoleRouter(r)
+	// 需要认证的路由
+	examplesCheckRoleRouter(r, authMiddleware)
 
 	return r
 }
+
+// 无需认证的路由示例
+func examplesNoCheckRoleRouter(r *gin.Engine) {
+
+	//v1 := r.Group("/api/v1")
+	//v1.GET("/examples/list", examples.apis)
+
+}
+
+// 需要认证的路由示例
+func examplesCheckRoleRouter(r *gin.Engine, authMiddleware *jwtauth.GinJWTMiddleware) {
+	//v1 := r.Group("/api/v1")
+	//v1auth := v1.Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole())
+	//{
+	//	v1auth.GET("/examples/list", examples.apis)
+	//}
+}
+
+