From 0b785160190dd5746a26a8508eeda3ae18a10871 Mon Sep 17 00:00:00 2001 From: wangpengfei <274878379@qq.com> Date: 星期三, 30 八月 2023 11:43:32 +0800 Subject: [PATCH] fix --- router/index.go | 143 +++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 117 insertions(+), 26 deletions(-) diff --git a/router/index.go b/router/index.go index d9f823d..ea98b63 100644 --- a/router/index.go +++ b/router/index.go @@ -3,6 +3,7 @@ import ( "aps_crm/conf" _ "aps_crm/docs" + "aps_crm/middleware" "github.com/gin-contrib/cors" "github.com/gin-gonic/gin" swaggerFiles "github.com/swaggo/files" @@ -11,6 +12,20 @@ ) type Group struct { + CurrencyRouter + QuotationStatusRouter + RepositoryRouter + SalesReturnStatusRouter + AccountIdRouter + IsInvoiceRouter + RefundMethodRouter + ServiceContractTypeRouter + ServiceContractStatusRouter + OrderTypeRouter + ReportSourceRouter + IsVisitRouter + SolveRateRouter + TimelyRateRouter BaseRouter UserRouter JwtRouter @@ -37,6 +52,27 @@ RegularCustomersRouter PossibilityRouter StatusRouter + QuotationRouter + MasterOrderRouter + SubOrderRouter + SalesDetailsRouter + SalesReturnRouter + SalesRefundRouter + ContractRouter + PlanRouter + ServiceContractRouter + OrderManageRouter + ServiceFollowupRouter + CustomerServiceSheetRouter + ServiceFeeManageRouter + AuthorityRouter + MenuRouter + DataRouter + DepartmentRouter + SatisfactionRouter + AssignRouter + CollectionProjectionRouter + ContactInformationRouter } func InitRouter() *gin.Engine { @@ -52,6 +88,7 @@ routerGroup := new(Group) PublicGroup := Router.Group("api") + { // 鍋ュ悍鐩戞祴 PublicGroup.GET("/health", func(c *gin.Context) { @@ -64,33 +101,87 @@ } PrivateGroup := Router.Group("api") - //PrivateGroup.Use(middleware.JWTAuth()) + //PrivateGroup.Use(middleware.JWTAuth()).Use(middleware.CasbinHandler()) + PrivateGroup.Use(middleware.JWTAuth2()) + //PrivateGroup.Use(middleware.CasbinHandler()) { - routerGroup.InitJwtRouter(PrivateGroup) // jwt鐩稿叧璺敱 - routerGroup.InitUserRouter(PrivateGroup) // 娉ㄥ唽鐢ㄦ埛璺敱 - routerGroup.InitCountryRouter(PrivateGroup) // 娉ㄥ唽country璺敱 - routerGroup.InitProvinceRouter(PrivateGroup) // 娉ㄥ唽province璺敱 - routerGroup.InitCityRouter(PrivateGroup) // 娉ㄥ唽city璺敱 - routerGroup.InitRegionRouter(PrivateGroup) // 娉ㄥ唽region璺敱 - routerGroup.InitContactRouter(PrivateGroup) // 娉ㄥ唽contact璺敱 - routerGroup.InitClientRouter(PrivateGroup) // 娉ㄥ唽client璺敱 - routerGroup.InitClientStatusRouter(PrivateGroup) // 娉ㄥ唽clientStatus璺敱 - routerGroup.InitClientTypeRouter(PrivateGroup) // 娉ㄥ唽clientType璺敱 - routerGroup.InitClientOriginRouter(PrivateGroup) // 娉ㄥ唽clientOrigin璺敱 - routerGroup.InitClientLevelRouter(PrivateGroup) // 娉ㄥ唽clientLevel璺敱 - routerGroup.InitIndustryRouter(PrivateGroup) // 娉ㄥ唽industry璺敱 - routerGroup.InitEnterpriseNatureRouter(PrivateGroup) // 娉ㄥ唽enterpriseNature璺敱 - routerGroup.InitRegisteredCapitalRouter(PrivateGroup) // 娉ㄥ唽registeredCapital璺敱 - routerGroup.InitEnterpriseScaleRouter(PrivateGroup) // 娉ㄥ唽enterpriseScale璺敱 - routerGroup.InitSalesLeadsRouter(PrivateGroup) // 娉ㄥ唽salesLeads璺敱 - routerGroup.InitSalesSourcesRouter(PrivateGroup) // 娉ㄥ唽salesSources璺敱 - routerGroup.InitFollowRecordRouter(PrivateGroup) // 娉ㄥ唽followRecord璺敱 - routerGroup.InitSaleChanceRouter(PrivateGroup) // 娉ㄥ唽saleChance璺敱 - routerGroup.InitSaleStageRouter(PrivateGroup) // 娉ㄥ唽saleStage璺敱 - routerGroup.InitSaleTypeRouter(PrivateGroup) // 娉ㄥ唽saleType璺敱 - routerGroup.InitRegularCustomersRouter(PrivateGroup) // 娉ㄥ唽regularCustomers璺敱 - routerGroup.InitPossibilityRouter(PrivateGroup) // 娉ㄥ唽possibility璺敱 - routerGroup.InitStatusRouter(PrivateGroup) // 娉ㄥ唽status璺敱 + routerGroup.InitJwtRouter(PrivateGroup) // jwt鐩稿叧璺敱 + routerGroup.InitUserRouter(PrivateGroup) // 娉ㄥ唽鐢ㄦ埛璺敱 + routerGroup.InitCountryRouter(PrivateGroup) // 娉ㄥ唽country璺敱 + routerGroup.InitProvinceRouter(PrivateGroup) // 娉ㄥ唽province璺敱 + routerGroup.InitCityRouter(PrivateGroup) // 娉ㄥ唽city璺敱 + routerGroup.InitRegionRouter(PrivateGroup) // 娉ㄥ唽region璺敱 + routerGroup.InitContactRouter(PrivateGroup) // 娉ㄥ唽contact璺敱 + routerGroup.InitClientRouter(PrivateGroup) // 娉ㄥ唽client璺敱 + routerGroup.InitClientStatusRouter(PrivateGroup) // 娉ㄥ唽clientStatus璺敱 + routerGroup.InitClientTypeRouter(PrivateGroup) // 娉ㄥ唽clientType璺敱 + routerGroup.InitClientOriginRouter(PrivateGroup) // 娉ㄥ唽clientOrigin璺敱 + routerGroup.InitClientLevelRouter(PrivateGroup) // 娉ㄥ唽clientLevel璺敱 + routerGroup.InitIndustryRouter(PrivateGroup) // 娉ㄥ唽industry璺敱 + routerGroup.InitEnterpriseNatureRouter(PrivateGroup) // 娉ㄥ唽enterpriseNature璺敱 + routerGroup.InitRegisteredCapitalRouter(PrivateGroup) // 娉ㄥ唽registeredCapital璺敱 + routerGroup.InitEnterpriseScaleRouter(PrivateGroup) // 娉ㄥ唽enterpriseScale璺敱 + routerGroup.InitSalesLeadsRouter(PrivateGroup) // 娉ㄥ唽salesLeads璺敱 + routerGroup.InitSalesSourcesRouter(PrivateGroup) // 娉ㄥ唽salesSources璺敱 + routerGroup.InitFollowRecordRouter(PrivateGroup) // 娉ㄥ唽followRecord璺敱 + routerGroup.InitSaleChanceRouter(PrivateGroup) // 娉ㄥ唽saleChance璺敱 + routerGroup.InitSaleStageRouter(PrivateGroup) // 娉ㄥ唽saleStage璺敱 + routerGroup.InitSaleTypeRouter(PrivateGroup) // 娉ㄥ唽saleType璺敱 + routerGroup.InitRegularCustomersRouter(PrivateGroup) // 娉ㄥ唽regularCustomers璺敱 + routerGroup.InitPossibilityRouter(PrivateGroup) // 娉ㄥ唽possibility璺敱 + routerGroup.InitStatusRouter(PrivateGroup) // 娉ㄥ唽status璺敱 + routerGroup.InitQuotationRouter(PrivateGroup) // 娉ㄥ唽quotation璺敱 + routerGroup.InitMasterOrderRouter(PrivateGroup) // 娉ㄥ唽masterOrder璺敱 + routerGroup.InitSubOrderRouter(PrivateGroup) // 娉ㄥ唽subOrder璺敱 + routerGroup.InitSalesDetailsRouter(PrivateGroup) // 娉ㄥ唽salesDetails璺敱 + routerGroup.InitSalesReturnRouter(PrivateGroup) // 娉ㄥ唽salesReturn璺敱 + routerGroup.InitSalesRefundRouter(PrivateGroup) // 娉ㄥ唽salesRefund璺敱 + routerGroup.InitContractRouter(PrivateGroup) // 娉ㄥ唽contract璺敱 + routerGroup.InitPlanRouter(PrivateGroup) // 娉ㄥ唽plan璺敱 + routerGroup.InitServiceContractRouter(PrivateGroup) // 娉ㄥ唽serviceContract璺敱 + routerGroup.InitOrderManageRouter(PrivateGroup) // 娉ㄥ唽orderManage璺敱 + routerGroup.InitServiceFollowupRouter(PrivateGroup) // 娉ㄥ唽serviceFollowup璺敱 + routerGroup.InitCustomerServiceSheetRouter(PrivateGroup) // 娉ㄥ唽customerServiceSheet璺敱 + routerGroup.InitServiceFeeManageRouter(PrivateGroup) // 娉ㄥ唽serviceFeeManage璺敱 + routerGroup.InitAuthorityRouter(PrivateGroup) // 娉ㄥ唽authority璺敱 + routerGroup.InitMenuRouter(PrivateGroup) // 娉ㄥ唽menu璺敱 + routerGroup.InitDataRouter(PrivateGroup) // 娉ㄥ唽data璺敱 + routerGroup.InitDepartmentRouter(PrivateGroup) // 娉ㄥ唽department璺敱 + routerGroup.InitSatisfactionRouter(PrivateGroup) // 娉ㄥ唽satisfaction璺敱 + routerGroup.InitTimelyRateRouter(PrivateGroup) + routerGroup.InitSolveRateRouter(PrivateGroup) + routerGroup.InitIsVisitRouter(PrivateGroup) + routerGroup.InitReportSourceRouter(PrivateGroup) + routerGroup.InitOrderTypeRouter(PrivateGroup) + routerGroup.InitServiceContractStatusRouter(PrivateGroup) + routerGroup.InitServiceContractTypeRouter(PrivateGroup) + routerGroup.InitRefundMethodRouter(PrivateGroup) + routerGroup.InitIsInvoiceRouter(PrivateGroup) + routerGroup.InitAccountIdRouter(PrivateGroup) + routerGroup.InitSalesReturnStatusRouter(PrivateGroup) + routerGroup.InitRepositoryRouter(PrivateGroup) + routerGroup.InitQuotationStatusRouter(PrivateGroup) + routerGroup.InitCurrencyRouter(PrivateGroup) + routerGroup.InitAssignRouter(PrivateGroup) + InitServiceOrderRouter(PrivateGroup) + InitFaqRouter(PrivateGroup) + InitPriorityLevelRouter(PrivateGroup) + InitServiceTypeRouter(PrivateGroup) + InitSeverityRouter(PrivateGroup) + InitTimeSpentRouter(PrivateGroup) + InitFaultTypeRouter(PrivateGroup) + InitServiceCollectionPlanRouter(PrivateGroup) + InitReceiptRouter(PrivateGroup) + InitBankAccountRouter(PrivateGroup) + InitPaymentTypeRouter(PrivateGroup) + InitFileRouter(PrivateGroup) + InitInvoiceRouter(PrivateGroup) + InitInvoiceStatusRouter(PrivateGroup) + InitInvoiceTypeRouter(PrivateGroup) + InitCourierCompanyRouter(PrivateGroup) + InitProductRouter(PrivateGroup) + routerGroup.InitCollectionProjectionRouter(PrivateGroup) + routerGroup.InitContactInformationRouter(PrivateGroup) } return Router } -- Gitblit v1.8.0