From 9c2489c0c360c8dda36d3cbe1dba79222096b2dd Mon Sep 17 00:00:00 2001
From: wangpengfei <274878379@qq.com>
Date: 星期一, 07 八月 2023 10:16:39 +0800
Subject: [PATCH] Merge branch 'master' into fly

---
 router/index.go |  338 +++++++++++++++++++++++++++++---------------------------
 1 files changed, 174 insertions(+), 164 deletions(-)

diff --git a/router/index.go b/router/index.go
index 7062b5a..e40f7c7 100644
--- a/router/index.go
+++ b/router/index.go
@@ -1,164 +1,174 @@
-package router
-
-import (
-	"aps_crm/conf"
-	_ "aps_crm/docs"
-	"github.com/gin-contrib/cors"
-	"github.com/gin-gonic/gin"
-	swaggerFiles "github.com/swaggo/files"
-	ginSwagger "github.com/swaggo/gin-swagger"
-	"net/http"
-)
-
-type Group struct {
-	CurrencyRouter
-	QuotationStatusRouter
-	RepositoryRouter
-	SalesReturnStatusRouter
-	AccountIdRouter
-	IsInvoiceRouter
-	RefundMethodRouter
-	ServiceContractTypeRouter
-	ServiceContractStatusRouter
-	OrderTypeRouter
-	ReportSourceRouter
-	IsVisitRouter
-	SolveRateRouter
-	TimelyRateRouter
-	BaseRouter
-	UserRouter
-	JwtRouter
-	CountryRouter
-	ProvinceRouter
-	CityRouter
-	RegionRouter
-	ContactRouter
-	ClientRouter
-	ClientStatusRouter
-	ClientTypeRouter
-	ClientOriginRouter
-	ClientLevelRouter
-	IndustryRouter
-	EnterpriseNatureRouter
-	RegisteredCapitalRouter
-	EnterpriseScaleRouter
-	SalesLeadsRouter
-	SalesSourcesRouter
-	FollowRecordRouter
-	SaleChanceRouter
-	SaleStageRouter
-	SaleTypeRouter
-	RegularCustomersRouter
-	PossibilityRouter
-	StatusRouter
-	QuotationRouter
-	MasterOrderRouter
-	SubOrderRouter
-	SalesDetailsRouter
-	SalesReturnRouter
-	SalesRefundRouter
-	ContractRouter
-	PlanRouter
-	ServiceContractRouter
-	OrderManageRouter
-	ServiceFollowupRouter
-	CustomerServiceSheetRouter
-	ServiceFeeManageRouter
-	AuthorityRouter
-	MenuRouter
-	DataRouter
-	DepartmentRouter
-	SatisfactionRouter
-	AssignRouter
-}
-
-func InitRouter() *gin.Engine {
-	gin.SetMode(gin.ReleaseMode)
-
-	Router := gin.Default()
-	Router.Use(gin.Recovery())
-	if conf.Conf.System.Env == "develop" {
-		Router.Use(gin.Logger())
-	}
-	Router.Use(cors.Default())
-	Router.GET("/swagger/*any", ginSwagger.WrapHandler(swaggerFiles.Handler))
-
-	routerGroup := new(Group)
-	PublicGroup := Router.Group("api")
-	{
-		// 鍋ュ悍鐩戞祴
-		PublicGroup.GET("/health", func(c *gin.Context) {
-			c.JSON(http.StatusOK, "ok")
-		})
-	}
-	{
-		routerGroup.InitBaseRouter(PublicGroup)  // 娉ㄥ唽鍩虹鍔熻兘璺敱 涓嶅仛閴存潈
-		routerGroup.InitImageRouter(PublicGroup) // 鍥惧儚鍔熻兘璺敱
-	}
-
-	PrivateGroup := Router.Group("api")
-	//PrivateGroup.Use(middleware.JWTAuth()).Use(middleware.CasbinHandler())
-	//PrivateGroup.Use(middleware.JWTAuth())
-	//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.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)
-	}
-	return Router
-}
+package router
+
+import (
+	"aps_crm/conf"
+	_ "aps_crm/docs"
+	"github.com/gin-contrib/cors"
+	"github.com/gin-gonic/gin"
+	swaggerFiles "github.com/swaggo/files"
+	ginSwagger "github.com/swaggo/gin-swagger"
+	"net/http"
+)
+
+type Group struct {
+	CurrencyRouter
+	QuotationStatusRouter
+	RepositoryRouter
+	SalesReturnStatusRouter
+	AccountIdRouter
+	IsInvoiceRouter
+	RefundMethodRouter
+	ServiceContractTypeRouter
+	ServiceContractStatusRouter
+	OrderTypeRouter
+	ReportSourceRouter
+	IsVisitRouter
+	SolveRateRouter
+	TimelyRateRouter
+	BaseRouter
+	UserRouter
+	JwtRouter
+	CountryRouter
+	ProvinceRouter
+	CityRouter
+	RegionRouter
+	ContactRouter
+	ClientRouter
+	ClientStatusRouter
+	ClientTypeRouter
+	ClientOriginRouter
+	ClientLevelRouter
+	IndustryRouter
+	EnterpriseNatureRouter
+	RegisteredCapitalRouter
+	EnterpriseScaleRouter
+	SalesLeadsRouter
+	SalesSourcesRouter
+	FollowRecordRouter
+	SaleChanceRouter
+	SaleStageRouter
+	SaleTypeRouter
+	RegularCustomersRouter
+	PossibilityRouter
+	StatusRouter
+	QuotationRouter
+	MasterOrderRouter
+	SubOrderRouter
+	SalesDetailsRouter
+	SalesReturnRouter
+	SalesRefundRouter
+	ContractRouter
+	PlanRouter
+	ServiceContractRouter
+	OrderManageRouter
+	ServiceFollowupRouter
+	CustomerServiceSheetRouter
+	ServiceFeeManageRouter
+	AuthorityRouter
+	MenuRouter
+	DataRouter
+	DepartmentRouter
+	SatisfactionRouter
+	AssignRouter
+}
+
+func InitRouter() *gin.Engine {
+	gin.SetMode(gin.ReleaseMode)
+
+	Router := gin.Default()
+	Router.Use(gin.Recovery())
+	if conf.Conf.System.Env == "develop" {
+		Router.Use(gin.Logger())
+	}
+	Router.Use(cors.Default())
+	Router.GET("/swagger/*any", ginSwagger.WrapHandler(swaggerFiles.Handler))
+
+	routerGroup := new(Group)
+	PublicGroup := Router.Group("api")
+	{
+		// 鍋ュ悍鐩戞祴
+		PublicGroup.GET("/health", func(c *gin.Context) {
+			c.JSON(http.StatusOK, "ok")
+		})
+	}
+	{
+		routerGroup.InitBaseRouter(PublicGroup)  // 娉ㄥ唽鍩虹鍔熻兘璺敱 涓嶅仛閴存潈
+		routerGroup.InitImageRouter(PublicGroup) // 鍥惧儚鍔熻兘璺敱
+	}
+
+	PrivateGroup := Router.Group("api")
+	//PrivateGroup.Use(middleware.JWTAuth()).Use(middleware.CasbinHandler())
+	//PrivateGroup.Use(middleware.JWTAuth())
+	//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.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)
+	}
+	return Router
+}

--
Gitblit v1.8.0