From d20acf38c36c11ee4428c3e74a17f5870dc61b51 Mon Sep 17 00:00:00 2001 From: liujiandao <274878379@qq.com> Date: 星期四, 16 十一月 2023 09:51:00 +0800 Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/aps/SRM --- initialize/router.go | 55 +++++++++++++------------------------------------------ 1 files changed, 13 insertions(+), 42 deletions(-) diff --git a/initialize/router.go b/initialize/router.go index 1890b45..4b390f7 100644 --- a/initialize/router.go +++ b/initialize/router.go @@ -2,36 +2,24 @@ import ( "net/http" + "srm/router/purchase" - "github.com/flipped-aurora/gin-vue-admin/server/docs" - "github.com/flipped-aurora/gin-vue-admin/server/global" - "github.com/flipped-aurora/gin-vue-admin/server/router" "github.com/gin-gonic/gin" ginSwagger "github.com/swaggo/gin-swagger" "github.com/swaggo/gin-swagger/swaggerFiles" + "srm/docs" + "srm/global" + "srm/router" ) // 鍒濆鍖栨�昏矾鐢� func Routers() *gin.Engine { Router := gin.Default() - InstallPlugin(Router) // 瀹夎鎻掍欢 systemRouter := router.RouterGroupApp.System - exampleRouter := router.RouterGroupApp.Example - // 濡傛灉鎯宠涓嶄娇鐢╪ginx浠g悊鍓嶇缃戦〉锛屽彲浠ヤ慨鏀� web/.env.production 涓嬬殑 - // VUE_APP_BASE_API = / - // VUE_APP_BASE_PATH = http://localhost - // 鐒跺悗鎵ц鎵撳寘鍛戒护 npm run build銆傚湪鎵撳紑涓嬮潰3琛屾敞閲� - // Router.Static("/favicon.ico", "./dist/favicon.ico") - // Router.Static("/assets", "./dist/assets") // dist閲岄潰鐨勯潤鎬佽祫婧� - // Router.StaticFile("/", "./dist/index.html") // 鍓嶇缃戦〉鍏ュ彛椤甸潰 + //exampleRouter := router.RouterGroupApp.Example - Router.StaticFS(global.GVA_CONFIG.Local.StorePath, http.Dir(global.GVA_CONFIG.Local.StorePath)) // 涓虹敤鎴峰ご鍍忓拰鏂囦欢鎻愪緵闈欐�佸湴鍧� - // Router.Use(middleware.LoadTls()) // 濡傛灉闇�瑕佷娇鐢╤ttps 璇锋墦寮�姝や腑闂翠欢 鐒跺悗鍓嶅線 core/server.go 灏嗗惎鍔ㄦā寮� 鏇村彉涓� Router.RunTLS("绔彛","浣犵殑cre/pem鏂囦欢","浣犵殑key鏂囦欢") - // 璺ㄥ煙锛屽闇�璺ㄥ煙鍙互鎵撳紑涓嬮潰鐨勬敞閲� - // Router.Use(middleware.Cors()) // 鐩存帴鏀捐鍏ㄩ儴璺ㄥ煙璇锋眰 - // Router.Use(middleware.CorsByRules()) // 鎸夌収閰嶇疆鐨勮鍒欐斁琛岃法鍩熻姹� - //global.GVA_LOG.Info("use middleware cors") + //Router.StaticFS(global.GVA_CONFIG.Local.StorePath, http.Dir(global.GVA_CONFIG.Local.StorePath)) // 涓虹敤鎴峰ご鍍忓拰鏂囦欢鎻愪緵闈欐�佸湴鍧� docs.SwaggerInfo.BasePath = global.GVA_CONFIG.System.RouterPrefix Router.GET(global.GVA_CONFIG.System.RouterPrefix+"/swagger/*any", ginSwagger.WrapHandler(swaggerFiles.Handler)) global.GVA_LOG.Info("register swagger handler") @@ -43,33 +31,14 @@ PublicGroup.GET("/health", func(c *gin.Context) { c.JSON(http.StatusOK, "ok") }) + //systemRouter.InitInitRouter(PublicGroup) // 鑷姩鍒濆鍖栫浉鍏� } - { - systemRouter.InitBaseRouter(PublicGroup) // 娉ㄥ唽鍩虹鍔熻兘璺敱 涓嶅仛閴存潈 - systemRouter.InitInitRouter(PublicGroup) // 鑷姩鍒濆鍖栫浉鍏� - } + PrivateGroup := Router.Group(global.GVA_CONFIG.System.RouterPrefix) - //PrivateGroup.Use(middleware.JWTAuth()).Use(middleware.CasbinHandler()) - //PrivateGroup.Use(middleware.CasbinHandler()) { - systemRouter.InitApiRouter(PrivateGroup, PublicGroup) // 娉ㄥ唽鍔熻兘api璺敱 - systemRouter.InitJwtRouter(PrivateGroup) // jwt鐩稿叧璺敱 - systemRouter.InitUserRouter(PrivateGroup) // 娉ㄥ唽鐢ㄦ埛璺敱 - systemRouter.InitMenuRouter(PrivateGroup) // 娉ㄥ唽menu璺敱 - systemRouter.InitSystemRouter(PrivateGroup) // system鐩稿叧璺敱 - systemRouter.InitCasbinRouter(PrivateGroup) // 鏉冮檺鐩稿叧璺敱 - systemRouter.InitAutoCodeRouter(PrivateGroup) // 鍒涘缓鑷姩鍖栦唬鐮� - systemRouter.InitAuthorityRouter(PrivateGroup) // 娉ㄥ唽瑙掕壊璺敱 - systemRouter.InitSysDictionaryRouter(PrivateGroup) // 瀛楀吀绠$悊 - systemRouter.InitAutoCodeHistoryRouter(PrivateGroup) // 鑷姩鍖栦唬鐮佸巻鍙� - systemRouter.InitSysOperationRecordRouter(PrivateGroup) // 鎿嶄綔璁板綍 - systemRouter.InitSysDictionaryDetailRouter(PrivateGroup) // 瀛楀吀璇︽儏绠$悊 - systemRouter.InitAuthorityBtnRouterRouter(PrivateGroup) // 瀛楀吀璇︽儏绠$悊 - systemRouter.InitChatGptRouter(PrivateGroup) // chatGpt鎺ュ彛 - - exampleRouter.InitCustomerRouter(PrivateGroup) // 瀹㈡埛璺敱 - exampleRouter.InitFileUploadAndDownloadRouter(PrivateGroup) // 鏂囦欢涓婁紶涓嬭浇鍔熻兘璺敱 - + systemRouter.InitSystemRouter(PrivateGroup) // system鐩稿叧璺敱 + //exampleRouter.InitFileUploadAndDownloadRouter(PrivateGroup) // 鏂囦欢涓婁紶涓嬭浇鍔熻兘璺敱 + purchase.InitPurchaseRouter(PrivateGroup) //閲囪喘鍗曡矾鐢� } { testRouter := router.RouterGroupApp.Test @@ -77,6 +46,8 @@ testRouter.InitSupplierTypeRouter(PrivateGroup) testRouter.InitSupplierRouter(PrivateGroup) testRouter.InitContractRouter(PrivateGroup) + testRouter.InitProductRouter(PrivateGroup) + testRouter.InitMemberRouter(PrivateGroup) } global.GVA_LOG.Info("router register success") -- Gitblit v1.8.0