Compare commits

..

No commits in common. "main" and "main-out" have entirely different histories.

5 changed files with 7 additions and 20 deletions

1
go.mod
View File

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

View File

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

View File

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

View File

@ -62,8 +62,7 @@ func NewRouter() *gin.Engine {
acRoute.POST("update", account.UserUpdate) //用户更新 acRoute.POST("update", account.UserUpdate) //用户更新
} }
webAcRouter := privateGroup.Group("/user") 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("list", account.UserList) //用户列表
webAcRouter.POST("approval", account.UserApproval) //实名审核 webAcRouter.POST("approval", account.UserApproval) //实名审核

View File

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