11

go.mod

@@ -5,6 +5,7 @@ go 1.18
 replace (
 	github.com/fonchain_enterprise/utils/aes => ../utils/aes
 	github.com/fonchain_enterprise/utils/objstorage => ../utils/objstorage
+	//github.com/fonchain_enterprise/utils/objstorage => ../../tyfon-新/utils/objstorage
 )
 
 //

pkg/router/bundle.go

@@ -10,6 +10,8 @@ import (
 func BundleRouter(r *gin.RouterGroup) {
 	bundleRoute := r.Group("bundle")
 	bundleRoute.Use(middleware.CheckWebLogin(service.AccountProvider))
+	bundleAppRoute := r.Group("bundle")
+	bundleAppRoute.Use(middleware.CheckLogin(service.AccountFieeProvider))
 	// 套餐
 	{
 		bundleClientRoute := bundleRoute.Group("system")
@@ -17,9 +19,10 @@ func BundleRouter(r *gin.RouterGroup) {
 			bundleClientRoute.POST("create", bundle.CreateBundle)
 			bundleClientRoute.POST("update", bundle.UpdateBundle)
 			bundleClientRoute.POST("remove", bundle.DeleteBundle)
+			bundleClientRoute.POST("bundle-list", bundle.BundleList)
 		}
 
-		bundleAppRoute := bundleRoute.Group("common")
+		bundleAppRoute = bundleAppRoute.Group("common")
 		{
 			bundleAppRoute.POST("bundle-list", bundle.BundleList)
 		}

pkg/router/bundleOrder.go

@@ -15,12 +15,12 @@ func BundleOrderRouter(r *gin.RouterGroup) {
 
 	bundleOrderRoute := r.Group("bundle-order")
 	bundleOrderRoute.Use(middleware.CheckLogin(service.AccountFieeProvider))
-	bundleOrderWebRoute := r.Group("bundle-order")
+	//bundleOrderWebRoute := r.Group("bundle-order")
-	bundleOrderWebRoute.Use(middleware.CheckWebLogin(service.AccountProvider))
+	//bundleOrderWebRoute.Use(middleware.CheckWebLogin(service.AccountProvider))
 
 	// 套餐
 	{
-		bundleOrderClientWebRoute := bundleOrderWebRoute.Group("common/web")
+		bundleOrderClientWebRoute := bundleOrderRoute.Group("common/web")
 		{
 			bundleOrderClientWebRoute.POST("bundle-order-list", bundle.OrderRecordsList)
 		}
@@ -31,8 +31,8 @@ func BundleOrderRouter(r *gin.RouterGroup) {
 
 		//bundleOrderWebRoute := bundleOrderRoute.Group("web")
 		{
-			bundleOrderWebRoute.POST("financial-confirm", bundle.UpdateFinancialConfirmationStatus)
+			bundleOrderRoute.POST("financial-confirm", bundle.UpdateFinancialConfirmationStatus)
-			bundleOrderWebRoute.POST("order-export", bundle.ExportOrderInfo)
+			bundleOrderRoute.POST("order-export", bundle.ExportOrderInfo)
 		}
 
 		bundleOrderAppRoute := bundleOrderRoute.Group("app")

pkg/router/router.go

@@ -62,7 +62,8 @@ func NewRouter() *gin.Engine {
 			acRoute.POST("update", account.UserUpdate)  //用户更新
 		}
 		webAcRouter := privateGroup.Group("/user")
-		webAcRouter.Use(middleware.CheckWebLogin(service.AccountProvider))
+		//webAcRouter.Use(middleware.CheckWebLogin(service.AccountProvider))
+		webAcRouter.Use(middleware.CheckLogin(service.AccountFieeProvider))
 		{
 			webAcRouter.POST("list", account.UserList)         //用户列表
 			webAcRouter.POST("approval", account.UserApproval) //实名审核

pkg/router/valueAddBundle.go

@@ -12,6 +12,9 @@ func ValueAddBundleRouter(r *gin.RouterGroup) {
 	valueAddBundleRoute := r.Group("valueAdd-bundle")
 	valueAddBundleRoute.Use(middleware.CheckWebLogin(service.AccountProvider))
 
+	valueAddBundleAppRoute := r.Group("valueAdd-bundle/app")
+	valueAddBundleAppRoute.Use(middleware.CheckLogin(service.AccountFieeProvider))
+
 	// 增值套餐
 	{
 		bundleClientRoute := valueAddBundleRoute.Group("system")
@@ -21,6 +24,11 @@ func ValueAddBundleRouter(r *gin.RouterGroup) {
 			bundleClientRoute.POST("detail", bundle.ValueAddBundleDetail)
 		}
 
+		valueAddBundleAppRoute = valueAddBundleAppRoute.Group("system")
+		{
+			valueAddBundleAppRoute.POST("list", bundle.ValueAddBundleList)
+		}
+
 	}
 
 }