From ba58964238646e9b5a58aed2b1e9e5f1fa9a3cdb Mon Sep 17 00:00:00 2001 From: jhc Date: Fri, 6 Jun 2025 16:49:02 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20bundle=20=E8=B7=AF?= =?UTF-8?q?=E7=94=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- go.mod | 1 + pkg/router/bundle.go | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 8234332..9f1a0e8 100644 --- a/go.mod +++ b/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 ) // diff --git a/pkg/router/bundle.go b/pkg/router/bundle.go index 42ba7fe..9d33b00 100644 --- a/pkg/router/bundle.go +++ b/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) } From ccd0d8a1a2b990a9553a841bde819ca3c475d626 Mon Sep 17 00:00:00 2001 From: jhc Date: Fri, 6 Jun 2025 16:56:56 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E5=A2=9E=E5=80=BC?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1url?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkg/router/valueAddBundle.go | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkg/router/valueAddBundle.go b/pkg/router/valueAddBundle.go index 05a1ca2..aa4da05 100644 --- a/pkg/router/valueAddBundle.go +++ b/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") + valueAddBundleAppRoute.Use(middleware.CheckWebLogin(service.AccountProvider)) + // 增值套餐 { bundleClientRoute := valueAddBundleRoute.Group("system") @@ -21,6 +24,11 @@ func ValueAddBundleRouter(r *gin.RouterGroup) { bundleClientRoute.POST("detail", bundle.ValueAddBundleDetail) } + valueAddBundleAppRoute = valueAddBundleAppRoute.Group("common") + { + valueAddBundleAppRoute.POST("list", bundle.ValueAddBundleList) + } + } } From ad2e83104d9d6ce8a1489d3463f7b3bdb85153a6 Mon Sep 17 00:00:00 2001 From: jhc Date: Fri, 6 Jun 2025 16:57:31 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E5=A2=9E=E5=80=BC?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1url?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkg/router/valueAddBundle.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/router/valueAddBundle.go b/pkg/router/valueAddBundle.go index aa4da05..596d8c6 100644 --- a/pkg/router/valueAddBundle.go +++ b/pkg/router/valueAddBundle.go @@ -13,7 +13,7 @@ func ValueAddBundleRouter(r *gin.RouterGroup) { valueAddBundleRoute.Use(middleware.CheckWebLogin(service.AccountProvider)) valueAddBundleAppRoute := r.Group("valueAdd-bundle") - valueAddBundleAppRoute.Use(middleware.CheckWebLogin(service.AccountProvider)) + valueAddBundleAppRoute.Use(middleware.CheckWebLogin(service.AccountFieeProvider)) // 增值套餐 { From da05c054f34b3a3803f9ada668b0bfceea04bc74 Mon Sep 17 00:00:00 2001 From: jhc Date: Fri, 6 Jun 2025 16:59:18 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E5=A2=9E=E5=80=BC?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1url?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- go.mod | 4 ++-- pkg/router/valueAddBundle.go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 9f1a0e8..d644e9f 100644 --- a/go.mod +++ b/go.mod @@ -4,8 +4,8 @@ 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 + //github.com/fonchain_enterprise/utils/objstorage => ../utils/objstorage + github.com/fonchain_enterprise/utils/objstorage => ../../tyfon-新/utils/objstorage ) // diff --git a/pkg/router/valueAddBundle.go b/pkg/router/valueAddBundle.go index 596d8c6..85f5d4e 100644 --- a/pkg/router/valueAddBundle.go +++ b/pkg/router/valueAddBundle.go @@ -13,7 +13,7 @@ func ValueAddBundleRouter(r *gin.RouterGroup) { valueAddBundleRoute.Use(middleware.CheckWebLogin(service.AccountProvider)) valueAddBundleAppRoute := r.Group("valueAdd-bundle") - valueAddBundleAppRoute.Use(middleware.CheckWebLogin(service.AccountFieeProvider)) + valueAddBundleAppRoute.Use(middleware.CheckLogin(service.AccountFieeProvider)) // 增值套餐 { From 0e6a14f1903a256bedc4a4a8f70c240702ba23df Mon Sep 17 00:00:00 2001 From: jhc Date: Fri, 6 Jun 2025 17:00:43 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E5=A2=9E=E5=80=BC?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1url?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- go.mod | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/go.mod b/go.mod index d644e9f..9f1a0e8 100644 --- a/go.mod +++ b/go.mod @@ -4,8 +4,8 @@ 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 + github.com/fonchain_enterprise/utils/objstorage => ../utils/objstorage + //github.com/fonchain_enterprise/utils/objstorage => ../../tyfon-新/utils/objstorage ) // From ec08521aaff526b8f8dbd503b944fe403950f02d Mon Sep 17 00:00:00 2001 From: jhc Date: Fri, 6 Jun 2025 17:01:59 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E5=A2=9E=E5=80=BC?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1url?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkg/router/valueAddBundle.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/router/valueAddBundle.go b/pkg/router/valueAddBundle.go index 85f5d4e..768b497 100644 --- a/pkg/router/valueAddBundle.go +++ b/pkg/router/valueAddBundle.go @@ -24,7 +24,7 @@ func ValueAddBundleRouter(r *gin.RouterGroup) { bundleClientRoute.POST("detail", bundle.ValueAddBundleDetail) } - valueAddBundleAppRoute = valueAddBundleAppRoute.Group("common") + valueAddBundleAppRoute = valueAddBundleAppRoute.Group("system") { valueAddBundleAppRoute.POST("list", bundle.ValueAddBundleList) } From e890bb756b2e7e7761606c5d5f2865aa03efa951 Mon Sep 17 00:00:00 2001 From: jhc Date: Fri, 6 Jun 2025 17:26:37 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkg/router/valueAddBundle.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/router/valueAddBundle.go b/pkg/router/valueAddBundle.go index 768b497..38fc255 100644 --- a/pkg/router/valueAddBundle.go +++ b/pkg/router/valueAddBundle.go @@ -12,7 +12,7 @@ func ValueAddBundleRouter(r *gin.RouterGroup) { valueAddBundleRoute := r.Group("valueAdd-bundle") valueAddBundleRoute.Use(middleware.CheckWebLogin(service.AccountProvider)) - valueAddBundleAppRoute := r.Group("valueAdd-bundle") + valueAddBundleAppRoute := r.Group("valueAdd-bundle/app") valueAddBundleAppRoute.Use(middleware.CheckLogin(service.AccountFieeProvider)) // 增值套餐 From 3f401a304c9877e144fba54396bdda574a8fc3bb Mon Sep 17 00:00:00 2001 From: jhc Date: Fri, 6 Jun 2025 18:06:22 +0800 Subject: [PATCH 8/8] 11 --- pkg/router/bundleOrder.go | 10 +++++----- pkg/router/router.go | 3 ++- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/pkg/router/bundleOrder.go b/pkg/router/bundleOrder.go index 36cea28..459f923 100644 --- a/pkg/router/bundleOrder.go +++ b/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.Use(middleware.CheckWebLogin(service.AccountProvider)) + //bundleOrderWebRoute := r.Group("bundle-order") + //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) - bundleOrderWebRoute.POST("order-export", bundle.ExportOrderInfo) + bundleOrderRoute.POST("financial-confirm", bundle.UpdateFinancialConfirmationStatus) + bundleOrderRoute.POST("order-export", bundle.ExportOrderInfo) } bundleOrderAppRoute := bundleOrderRoute.Group("app") diff --git a/pkg/router/router.go b/pkg/router/router.go index 0a34e19..6fb0709 100644 --- a/pkg/router/router.go +++ b/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) //实名审核