支付，OSS 服务重构完成

api/handler/admin/admin_handler.go

@@ -19,9 +19,10 @@ import (
 	"geekai/store/vo"
 	"geekai/utils"
 	"geekai/utils/resp"
+	"time"
+
 	"github.com/go-redis/redis/v8"
 	"github.com/golang-jwt/jwt/v5"
-	"time"
 
 	"github.com/gin-gonic/gin"
 	"gorm.io/gorm"
@@ -72,7 +73,7 @@ func (h *ManagerHandler) Login(c *gin.Context) {
 		return
 	}
 
-	if h.App.SysConfig.EnabledVerify {
+	if h.App.SysConfig.Base.EnabledVerify {
 		var check bool
 		if data.X != 0 {
 			check = h.captcha.SlideCheck(data)

api/handler/admin/config_handler.go

@@ -47,7 +47,6 @@ func (h *ConfigHandler) RegisterRoutes() {
 	group.GET("get", h.Get)
 	group.POST("active", h.Active)
 	group.POST("test", h.Test)
-	group.GET("fixData", h.FixData)
 	group.GET("license", h.GetLicense)
 }
 
@@ -70,7 +69,7 @@ func (h *ConfigHandler) Update(c *gin.Context) {
 			resp.ERROR(c, "系统配置解析失败: "+err.Error())
 			return
 		}
-		if (sys.Copyright != payload.ConfigBak.Copyright) && !h.licenseService.GetLicense().Configs.DeCopy {
+		if (sys.Base.Copyright != payload.ConfigBak.Base.Copyright) && !h.licenseService.GetLicense().Configs.DeCopy {
 			resp.ERROR(c, "您无权修改版权信息，请先联系作者获取授权")
 			return
 		}
@@ -162,69 +161,3 @@ func (h *ConfigHandler) GetLicense(c *gin.Context) {
 	license := h.licenseService.GetLicense()
 	resp.SUCCESS(c, license)
 }
-
-// FixData 修复数据
-func (h *ConfigHandler) FixData(c *gin.Context) {
-	resp.ERROR(c, "当前升级版本没有数据需要修正！")
-	//var fixed bool
-	//version := "data_fix_4.1.4"
-	//err := h.levelDB.Get(version, &fixed)
-	//if err == nil || fixed {
-	//	resp.ERROR(c, "当前版本数据修复已完成，请不要重复执行操作")
-	//	return
-	//}
-	//tx := h.DB.Begin()
-	//var users []model.User
-	//err = tx.Find(&users).Error
-	//if err != nil {
-	//	resp.ERROR(c, err.Error())
-	//	return
-	//}
-	//for _, user := range users {
-	//	if user.Email != "" || user.Mobile != "" {
-	//		continue
-	//	}
-	//	if utils.IsValidEmail(user.Username) {
-	//		user.Email = user.Username
-	//	} else if utils.IsValidMobile(user.Username) {
-	//		user.Mobile = user.Username
-	//	}
-	//	err = tx.Save(&user).Error
-	//	if err != nil {
-	//		resp.ERROR(c, err.Error())
-	//		tx.Rollback()
-	//		return
-	//	}
-	//}
-	//
-	//var orders []model.Order
-	//err = h.DB.Find(&orders).Error
-	//if err != nil {
-	//	resp.ERROR(c, err.Error())
-	//	return
-	//}
-	//for _, order := range orders {
-	//	if order.PayWay == "支付宝" {
-	//		order.PayWay = "alipay"
-	//		order.PayType = "alipay"
-	//	} else if order.PayWay == "微信支付" {
-	//		order.PayWay = "wechat"
-	//		order.PayType = "wxpay"
-	//	} else if order.PayWay == "hupi" {
-	//		order.PayType = "wxpay"
-	//	}
-	//	err = tx.Save(&order).Error
-	//	if err != nil {
-	//		resp.ERROR(c, err.Error())
-	//		tx.Rollback()
-	//		return
-	//	}
-	//}
-	//tx.Commit()
-	//err = h.levelDB.Put(version, true)
-	//if err != nil {
-	//	resp.ERROR(c, err.Error())
-	//	return
-	//}
-	//resp.SUCCESS(c)
-}

api/handler/admin/order_handler.go

@@ -76,16 +76,16 @@ func (h *OrderHandler) List(c *gin.Context) {
 				order.Id = item.Id
 				order.CreatedAt = item.CreatedAt.Unix()
 				order.UpdatedAt = item.UpdatedAt.Unix()
-				payMethod, ok := types.PayMethods[item.PayWay]
+				payChannel, ok := types.PayChannel[item.Channel]
 				if !ok {
-					payMethod = item.PayWay
+					payChannel = item.Channel
 				}
-				payName, ok := types.PayNames[item.PayType]
+				payWays, ok := types.PayWays[item.PayWay]
 				if !ok {
-					payName = item.PayWay
+					payWays = item.PayWay
 				}
-				order.PayMethod = payMethod
-				order.PayName = payName
+				order.ChannelName = payChannel
+				order.PayName = payWays
 				list = append(list, order)
 			} else {
 				logger.Error(err)

api/handler/admin/upload_handler.go

@@ -41,7 +41,7 @@ func (h *UploadHandler) Upload(c *gin.Context) {
 		return
 	}
 
-	if h.App.SysConfig.MaxFileSize > 0 && f.Size > int64(h.App.SysConfig.MaxFileSize)*1024*1024 {
+	if h.App.SysConfig.Base.MaxFileSize > 0 && f.Size > int64(h.App.SysConfig.Base.MaxFileSize)*1024*1024 {
 		resp.ERROR(c, "文件大小超过限制")
 		return
 	}