Merge branch 'feat-sso'

zhangqian

2023-10-13 88702f1d3db33a3ee166ba7615ae39b8a719143f

 router/index.go

@@ -5,6 +5,7 @@
   "aps_crm/conf"
   _ "aps_crm/docs"
   "aps_crm/middleware"
   "fmt"
   "github.com/gin-contrib/cors"
   "github.com/gin-gonic/gin"
   swaggerFiles "github.com/swaggo/files"
@@ -27,8 +28,8 @@
   IsVisitRouter
   SolveRateRouter
   TimelyRateRouter
   BaseRouter
   UserRouter
   //BaseRouter
   //UserRouter
   JwtRouter
   CountryRouter
   ProvinceRouter
@@ -87,6 +88,14 @@
   Router.Use(cors.Default())
   Router.GET("/swagger/*any", ginSwagger.WrapHandler(swaggerFiles.Handler))

   //获取所有路由 //todo
   Router.GET("getRouters", func(c *gin.Context) {
      routers := Router.Routes()
      for _, v := range routers {
         fmt.Printf("\"%v\" : 1,\n", v.Path)
      }
   })

   routerGroup := new(Group)
   PublicGroup := Router.Group("api")

@@ -96,18 +105,18 @@
         c.JSON(http.StatusOK, "ok")
      })
   }
   {
      routerGroup.InitBaseRouter(PublicGroup)  // 注册基础功能路由 不做鉴权
      routerGroup.InitImageRouter(PublicGroup) // 图像功能路由
   }
   //{
   //   routerGroup.InitBaseRouter(PublicGroup)  // 注册基础功能路由 不做鉴权
   //   routerGroup.InitImageRouter(PublicGroup) // 图像功能路由
   //}

   PrivateGroup := Router.Group("api")
   //PrivateGroup.Use(middleware.JWTAuth()).Use(middleware.CasbinHandler())
   PrivateGroup.Use(middleware.JWTAuth2())
   //PrivateGroup.Use(middleware.CasbinHandler())
   {
      routerGroup.InitJwtRouter(PrivateGroup)                  // jwt相关路由
      routerGroup.InitUserRouter(PrivateGroup)                 // 注册用户路由
      routerGroup.InitJwtRouter(PrivateGroup) // jwt相关路由
      //routerGroup.InitUserRouter(PrivateGroup)                 // 注册用户路由
      routerGroup.InitCountryRouter(PrivateGroup)              // 注册country路由
      routerGroup.InitProvinceRouter(PrivateGroup)             // 注册province路由
      routerGroup.InitCityRouter(PrivateGroup)                 // 注册city路由