支付，OSS 服务重构完成

2026-04-25 04:24:28 +08:00 · 2025-08-24 19:32:45 +08:00
parent 7fb0aad3c7
commit 536b4b8056
57 changed files with 1663 additions and 1358 deletions
--- a/api/core/app_server.go
+++ b/api/core/app_server.go
@@ -82,18 +82,21 @@ type AppServer struct {
 	Config    *types.AppConfig
 	Engine    *gin.Engine
 	SysConfig *types.SystemConfig // system config cache
+	Redis     *redis.Client
 }

-func NewServer(appConfig *types.AppConfig) *AppServer {
+func NewServer(appConfig *types.AppConfig, redis *redis.Client, sysConfig *types.SystemConfig) *AppServer {
 	gin.SetMode(gin.ReleaseMode)
 	gin.DefaultWriter = io.Discard
 	return &AppServer{
-		Config: appConfig,
-		Engine: gin.Default(),
+		Config:    appConfig,
+		Redis:     redis,
+		Engine:    gin.Default(),
+		SysConfig: sysConfig,
 	}
 }

-func (s *AppServer) Init(debug bool, client *redis.Client) {
+func (s *AppServer) Init(client *redis.Client) {
 	s.Engine.Use(corsMiddleware())
 	s.Engine.Use(staticResourceMiddleware())
 	s.Engine.Use(authorizeMiddleware(s, client))
@@ -104,21 +107,6 @@ func (s *AppServer) Init(debug bool, client *redis.Client) {
 }

 func (s *AppServer) Run(db *gorm.DB) error {
-
-	// 重命名 config 表字段
-	if db.Migrator().HasColumn(&model.Config{}, "config_json") {
-		db.Migrator().RenameColumn(&model.Config{}, "config_json", "value")
-	}
-	if db.Migrator().HasColumn(&model.Config{}, "marker") {
-		db.Migrator().RenameColumn(&model.Config{}, "marker", "name")
-	}
-	if db.Migrator().HasIndex(&model.Config{}, "idx_chatgpt_configs_key") {
-		db.Migrator().DropIndex(&model.Config{}, "idx_chatgpt_configs_key")
-	}
-	if db.Migrator().HasIndex(&model.Config{}, "marker") {
-		db.Migrator().DropIndex(&model.Config{}, "marker")
-	}
-
 	// load system configs
 	var sysConfig model.Config
 	err := db.Where("name", "system").First(&sysConfig).Error
@@ -130,57 +118,6 @@ func (s *AppServer) Run(db *gorm.DB) error {
 		return fmt.Errorf("failed to decode system config: %v", err)
 	}

-	// 迁移数据表
-	logger.Info("Migrating database tables...")
-	db.AutoMigrate(
-		&model.ChatItem{},
-		&model.ChatMessage{},
-		&model.ChatRole{},
-		&model.ChatModel{},
-		&model.InviteCode{},
-		&model.InviteLog{},
-		&model.Menu{},
-		&model.Order{},
-		&model.Product{},
-		&model.User{},
-		&model.Function{},
-		&model.File{},
-		&model.Redeem{},
-		&model.Config{},
-		&model.ApiKey{},
-		&model.AdminUser{},
-		&model.AppType{},
-		&model.SdJob{},
-		&model.SunoJob{},
-		&model.PowerLog{},
-		&model.VideoJob{},
-		&model.MidJourneyJob{},
-		&model.UserLoginLog{},
-		&model.DallJob{},
-		&model.JimengJob{},
-	)
-	// 手动删除字段
-	if db.Migrator().HasColumn(&model.Order{}, "deleted_at") {
-		db.Migrator().DropColumn(&model.Order{}, "deleted_at")
-	}
-	if db.Migrator().HasColumn(&model.ChatItem{}, "deleted_at") {
-		db.Migrator().DropColumn(&model.ChatItem{}, "deleted_at")
-	}
-	if db.Migrator().HasColumn(&model.ChatMessage{}, "deleted_at") {
-		db.Migrator().DropColumn(&model.ChatMessage{}, "deleted_at")
-	}
-	if db.Migrator().HasColumn(&model.User{}, "chat_config") {
-		db.Migrator().DropColumn(&model.User{}, "chat_config")
-	}
-	if db.Migrator().HasColumn(&model.ChatModel{}, "category") {
-		db.Migrator().DropColumn(&model.ChatModel{}, "category")
-	}
-	if db.Migrator().HasColumn(&model.ChatModel{}, "description") {
-		db.Migrator().DropColumn(&model.ChatModel{}, "description")
-	}
-
-	logger.Info("Database tables migrated successfully")
-
 	// 统计安装信息
 	go func() {
 		info, err := host.Info()
--- a/api/core/config.go
+++ b/api/core/config.go
@@ -11,10 +11,12 @@ import (
 	"bytes"
 	"geekai/core/types"
 	logger2 "geekai/logger"
+	"geekai/store/model"
 	"geekai/utils"
 	"os"

 	"github.com/BurntSushi/toml"
+	"gorm.io/gorm"
 )

 var logger = logger2.GetLogger()
@@ -72,3 +74,78 @@ func SaveConfig(config *types.AppConfig) error {

 	return os.WriteFile(config.Path, buf.Bytes(), 0644)
 }
+
+func LoadSystemConfig(db *gorm.DB) *types.SystemConfig {
+	// 加载系统配置
+	var sysConfig model.Config
+	var baseConfig types.BaseConfig
+	db.Where("name", "system").First(&sysConfig)
+	err := utils.JsonDecode(sysConfig.Value, &baseConfig)
+	if err != nil {
+		logger.Error("load system config error: ", err)
+	}
+
+	// 加载许可证配置
+	var license types.License
+	sysConfig.Id = 0
+	db.Where("name", types.ConfigKeyLicense).First(&sysConfig)
+	err = utils.JsonDecode(sysConfig.Value, &license)
+	if err != nil {
+		logger.Error("load license config error: ", err)
+	}
+
+	// 加载 GeekAPI 配置
+	var geekAPIConfig types.GeekAPIConfig
+	sysConfig.Id = 0
+	db.Where("name", types.ConfigKeyGeekAPI).First(&sysConfig)
+	err = utils.JsonDecode(sysConfig.Value, &geekAPIConfig)
+	if err != nil {
+		logger.Error("load geek service config error: ", err)
+	}
+
+	// 加载短信配置
+	var smsConfig types.SMSConfig
+	sysConfig.Id = 0
+	db.Where("name", types.ConfigKeySms).First(&sysConfig)
+	err = utils.JsonDecode(sysConfig.Value, &smsConfig)
+	if err != nil {
+		logger.Error("load sms config error: ", err)
+	}
+
+	// 加载 OSS 配置
+	var ossConfig types.OSSConfig
+	sysConfig.Id = 0
+	db.Where("name", types.ConfigKeyOss).First(&sysConfig)
+	err = utils.JsonDecode(sysConfig.Value, &ossConfig)
+	if err != nil {
+		logger.Error("load oss config error: ", err)
+	}
+
+	// 加载 SMTP 配置
+	var smtpConfig types.SmtpConfig
+	sysConfig.Id = 0
+	db.Where("name", types.ConfigKeySmtp).First(&sysConfig)
+	err = utils.JsonDecode(sysConfig.Value, &smtpConfig)
+	if err != nil {
+		logger.Error("load smtp config error: ", err)
+	}
+
+	// 加载支付配置
+	var paymentConfig types.PaymentConfig
+	sysConfig.Id = 0
+	db.Where("name", types.ConfigKeyPayment).First(&sysConfig)
+	err = utils.JsonDecode(sysConfig.Value, &paymentConfig)
+	if err != nil {
+		logger.Error("load payment config error: ", err)
+	}
+
+	return &types.SystemConfig{
+		Base:    baseConfig,
+		License: license,
+		SMS:     smsConfig,
+		OSS:     ossConfig,
+		SMTP:    smtpConfig,
+		Payment: paymentConfig,
+		GeekAPI: geekAPIConfig,
+	}
+}
--- a/api/core/midware/auth_midware.go
+++ b/api/core/midware/auth_midware.go
@@ -0,0 +1,107 @@
+package midware
+
+import (
+	"context"
+	"fmt"
+	"geekai/core/types"
+	"geekai/utils"
+	"geekai/utils/resp"
+	"time"
+
+	"github.com/gin-gonic/gin"
+	"github.com/go-redis/redis/v8"
+	"github.com/golang-jwt/jwt"
+)
+
+// 用户授权验证
+func UserAuthMiddleware(secretKey string, redis *redis.Client) gin.HandlerFunc {
+	return func(c *gin.Context) {
+		tokenString := c.GetHeader(types.UserAuthHeader)
+		if tokenString == "" {
+			resp.NotAuth(c, "无效的授权令牌")
+			c.Abort()
+			return
+		}
+
+		token, err := jwt.Parse(tokenString, func(token *jwt.Token) (interface{}, error) {
+			if _, ok := token.Method.(*jwt.SigningMethodHMAC); !ok {
+				return nil, fmt.Errorf("不支持的令牌签名方法: %v", token.Header["alg"])
+			}
+			return []byte(secretKey), nil
+		})
+
+		if err != nil {
+			resp.NotAuth(c, fmt.Sprintf("解析授权令牌失败: %v", err))
+			c.Abort()
+			return
+		}
+
+		claims, ok := token.Claims.(jwt.MapClaims)
+		if !ok || !token.Valid {
+			resp.NotAuth(c, "令牌无效")
+			c.Abort()
+			return
+		}
+
+		expr := utils.IntValue(utils.InterfaceToString(claims["expired"]), 0)
+		if expr > 0 && int64(expr) < time.Now().Unix() {
+			resp.NotAuth(c, "令牌过期")
+			c.Abort()
+			return
+		}
+
+		key := fmt.Sprintf("users/%v", claims["user_id"])
+		if _, err := redis.Get(context.Background(), key).Result(); err != nil {
+			resp.NotAuth(c, "当前用户已退出登录")
+			c.Abort()
+			return
+		}
+		c.Set(types.LoginUserID, claims["user_id"])
+	}
+}
+
+func AdminAuthMiddleware(secretKey string, redis *redis.Client) gin.HandlerFunc {
+	return func(c *gin.Context) {
+		tokenString := c.GetHeader(types.AdminAuthHeader)
+		if tokenString == "" {
+			resp.NotAuth(c, "无效的授权令牌")
+			c.Abort()
+			return
+		}
+
+		token, err := jwt.Parse(tokenString, func(token *jwt.Token) (interface{}, error) {
+			if _, ok := token.Method.(*jwt.SigningMethodHMAC); !ok {
+				return nil, fmt.Errorf("不支持的令牌签名方法: %v", token.Header["alg"])
+			}
+			return []byte(secretKey), nil
+		})
+
+		if err != nil {
+			resp.NotAuth(c, fmt.Sprintf("解析授权令牌失败: %v", err))
+			c.Abort()
+			return
+		}
+
+		claims, ok := token.Claims.(jwt.MapClaims)
+		if !ok || !token.Valid {
+			resp.NotAuth(c, "令牌无效")
+			c.Abort()
+			return
+		}
+
+		expr := utils.IntValue(utils.InterfaceToString(claims["expired"]), 0)
+		if expr > 0 && int64(expr) < time.Now().Unix() {
+			resp.NotAuth(c, "令牌过期")
+			c.Abort()
+			return
+		}
+
+		key := fmt.Sprintf("admin/%v", claims["user_id"])
+		if _, err := redis.Get(context.Background(), key).Result(); err != nil {
+			resp.NotAuth(c, "当前用户已退出登录")
+			c.Abort()
+			return
+		}
+		c.Set(types.AdminUserID, claims["user_id"])
+	}
+}
--- a/api/core/midware/parameter_midware.go
+++ b/api/core/midware/parameter_midware.go
@@ -0,0 +1,80 @@
+package midware
+
+import (
+	"bytes"
+	"geekai/utils"
+	"io"
+	"strings"
+
+	"github.com/gin-gonic/gin"
+)
+
+// 统一参数处理
+func ParameterHandlerMiddleware() gin.HandlerFunc {
+	return func(c *gin.Context) {
+		// GET 参数处理
+		params := c.Request.URL.Query()
+		for key, values := range params {
+			for i, value := range values {
+				params[key][i] = strings.TrimSpace(value)
+			}
+		}
+		// update get parameters
+		c.Request.URL.RawQuery = params.Encode()
+		// skip file upload requests
+		contentType := c.Request.Header.Get("Content-Type")
+		if strings.Contains(contentType, "multipart/form-data") {
+			c.Next()
+			return
+		}
+
+		if strings.Contains(contentType, "application/json") {
+			// process POST JSON request body
+			bodyBytes, err := io.ReadAll(c.Request.Body)
+			if err != nil {
+				c.Next()
+				return
+			}
+
+			// 还原请求体
+			c.Request.Body = io.NopCloser(bytes.NewBuffer(bodyBytes))
+			// 将请求体解析为 JSON
+			var jsonData map[string]any
+			if err := c.ShouldBindJSON(&jsonData); err != nil {
+				c.Next()
+				return
+			}
+
+			// 对 JSON 数据中的字符串值去除两端空格
+			trimJSONStrings(jsonData)
+			// 更新请求体
+			c.Request.Body = io.NopCloser(bytes.NewBufferString(utils.JsonEncode(jsonData)))
+		}
+
+		c.Next()
+	}
+}
+
+// 递归对 JSON 数据中的字符串值去除两端空格
+func trimJSONStrings(data any) {
+	switch v := data.(type) {
+	case map[string]any:
+		for key, value := range v {
+			switch valueType := value.(type) {
+			case string:
+				v[key] = strings.TrimSpace(valueType)
+			case map[string]any, []any:
+				trimJSONStrings(value)
+			}
+		}
+	case []any:
+		for i, value := range v {
+			switch valueType := value.(type) {
+			case string:
+				v[i] = strings.TrimSpace(valueType)
+			case map[string]any, []any:
+				trimJSONStrings(value)
+			}
+		}
+	}
+}
--- a/api/core/midware/rate_limit_midware.go
+++ b/api/core/midware/rate_limit_midware.go
@@ -0,0 +1,43 @@
+package midware
+
+import (
+	"context"
+	"fmt"
+	"geekai/core/types"
+	"geekai/utils"
+	"net/http"
+	"time"
+
+	"github.com/gin-gonic/gin"
+	"github.com/go-redis/redis/v8"
+)
+
+// RateLimitEvery 使用 Redis 做固定间隔限流：在 interval 内仅允许一次请求
+// Key 优先使用登录用户ID，若没有则退化为 route + IP
+func RateLimitEvery(redisClient *redis.Client, interval time.Duration) gin.HandlerFunc {
+	return func(c *gin.Context) {
+		keyID := ""
+		if userID, ok := c.Get(types.LoginUserID); ok {
+			keyID = fmt.Sprintf("user:%s", utils.InterfaceToString(userID))
+		} else {
+			keyID = fmt.Sprintf("ip:%s", c.ClientIP())
+		}
+
+		fullPath := c.FullPath()
+		if fullPath == "" {
+			fullPath = c.Request.URL.Path
+		}
+		key := fmt.Sprintf("rl:%s:%s", fullPath, keyID)
+
+		okSet, err := redisClient.SetNX(context.Background(), key, 1, interval).Result()
+		if err != nil {
+			// Redis 异常时放行，避免误伤可用性
+			return
+		}
+		if !okSet {
+			c.JSON(http.StatusTooManyRequests, types.BizVo{Code: types.Failed, Message: "请求过于频繁，请稍后重试"})
+			c.Abort()
+			return
+		}
+	}
+}
--- a/api/core/types/config.go
+++ b/api/core/types/config.go
@@ -17,18 +17,17 @@ type AppConfig struct {
 	Session         Session
 	AdminSession    Session
 	ProxyURL        string
-	MysqlDns        string        // mysql 连接地址
-	StaticDir       string        // 静态资源目录
-	StaticUrl       string        // 静态资源 URL
-	Redis           RedisConfig   // redis 连接信息
-	SMS             SMSConfig     // send mobile message config
-	OSS             OSSConfig     // OSS config
-	SmtpConfig      SmtpConfig    // 邮件发送配置
-	AlipayConfig    AlipayConfig  // 支付宝支付渠道配置
-	HuPiPayConfig   HuPiPayConfig // 虎皮椒支付配置
-	GeekPayConfig   GeekPayConfig // GEEK 支付配置
-	WechatPayConfig WxPayConfig   // 微信支付渠道配置
-	TikaHost        string        // TiKa 服务器地址
+	MysqlDns        string       // mysql 连接地址
+	StaticDir       string       // 静态资源目录
+	StaticUrl       string       // 静态资源 URL
+	Redis           RedisConfig  // redis 连接信息
+	SMS             SMSConfig    // send mobile message config
+	OSS             OSSConfig    // OSS config
+	SmtpConfig      SmtpConfig   // 邮件发送配置
+	AlipayConfig    AlipayConfig // 支付宝支付渠道配置
+	GeekPayConfig   EpayConfig   // GEEK 支付配置
+	WechatPayConfig WxPayConfig  // 微信支付渠道配置
+	TikaHost        string       // TiKa 服务器地址
 }

 type RedisConfig struct {
@@ -58,7 +57,7 @@ func (c RedisConfig) Url() string {
 	return fmt.Sprintf("%s:%d", c.Host, c.Port)
 }

-type SystemConfig struct {
+type BaseConfig struct {
 	Title         string `json:"title,omitempty"`           // 网站标题
 	Slogan        string `json:"slogan,omitempty"`          // 网站 slogan
 	AdminTitle    string `json:"admin_title,omitempty"`     // 管理后台标题
@@ -103,18 +102,29 @@ type SystemConfig struct {
 	EmailWhiteList   []string `json:"email_white_list"`   // 邮箱白名单列表
 	AssistantModelId int      `json:"assistant_model_id"` // 用来做提示词,翻译的AI模型 id
 	MaxFileSize      int      `json:"max_file_size"`      // 最大文件大小,单位：MB
+}

+type SystemConfig struct {
+	Base    BaseConfig
+	Payment PaymentConfig
+	OSS     OSSConfig
+	SMS     SMSConfig
+	SMTP    SmtpConfig
+	GeekAPI GeekAPIConfig
+	Jimeng  JimengConfig
+	License License
 }

 // 配置键名常量
 const (
-	ConfigKeySystem      = "system"
-	ConfigKeyNotice      = "notice"
-	ConfigKeyAgreement   = "agreement"
-	ConfigKeyPrivacy     = "privacy"
-	ConfigKeyGeekService = "geekai"
-	ConfigKeySms         = "sms"
-	ConfigKeySmtp        = "smtp"
-	ConfigKeyOss         = "oss"
-	ConfigKeyPayment     = "payment"
+	ConfigKeySystem    = "system"
+	ConfigKeyNotice    = "notice"
+	ConfigKeyAgreement = "agreement"
+	ConfigKeyPrivacy   = "privacy"
+	ConfigKeyGeekAPI   = "geekapi"
+	ConfigKeyLicense   = "license"
+	ConfigKeySms       = "sms"
+	ConfigKeySmtp      = "smtp"
+	ConfigKeyOss       = "oss"
+	ConfigKeyPayment   = "payment"
 )
--- a/api/core/types/geekai.go
+++ b/api/core/types/geekai.go
@@ -23,3 +23,8 @@ type WxLoginConfig struct {
 	NotifyURL string `json:"notify_url"` // 登录成功回调 URL
 	Enabled   bool   `json:"enabled"`    // 是否启用微信登录
 }
+
+type GeekAPIConfig struct {
+	Captcha CaptchaConfig
+	WxLogin WxLoginConfig
+}
--- a/api/core/types/order.go
+++ b/api/core/types/order.go
@@ -13,27 +13,24 @@ const (
 	OrderNotPaid     = OrderStatus(0)
 	OrderScanned     = OrderStatus(1) // 已扫码
 	OrderPaidSuccess = OrderStatus(2)
+	OrderPaidFailed  = OrderStatus(3)
 )

 type OrderRemark struct {
-	Days     int     `json:"days"`  // 有效期
-	Power    int     `json:"power"` // 增加算力点数
-	Name     string  `json:"name"`  // 产品名称
-	Price    float64 `json:"price"`
-	Discount float64 `json:"discount"`
+	Days  int     `json:"days"`  // 有效期
+	Power int     `json:"power"` // 增加算力点数
+	Name  string  `json:"name"`  // 产品名称
+	Price float64 `json:"price"`
 }

-var PayMethods = map[string]string{
+// PayChannel 支付渠道
+var PayChannel = map[string]string{
 	"alipay": "支付宝商号",
-	"wechat": "微信商号",
-	"hupi":   "虎皮椒",
-	"geek":   "易支付",
+	"wxpay":  "微信商号",
+	"epay":   "易支付",
 }
-var PayNames = map[string]string{
+
+var PayWays = map[string]string{
 	"alipay": "支付宝",
 	"wxpay":  "微信支付",
-	"qqpay":  "QQ钱包",
-	"jdpay":  "京东支付",
-	"douyin": "抖音支付",
-	"paypal": "PayPal支付",
 }
--- a/api/core/types/payment.go
+++ b/api/core/types/payment.go
@@ -1,19 +1,9 @@
 package types

 type PaymentConfig struct {
-	AlipayConfig  AlipayConfig  `json:"alipay"`  // 支付宝支付渠道配置
-	GeekPayConfig GeekPayConfig `json:"geekpay"` // GEEK 支付配置
-	WxPayConfig   WxPayConfig   `json:"wxpay"`   // 微信支付渠道配置
-	HuPiPayConfig HuPiPayConfig `json:"hupi"`    // 虎皮椒支付渠道配置
-}
-
-type HuPiPayConfig struct { //虎皮椒第四方支付配置
-	Enabled   bool   // 是否启用该支付通道
-	AppId     string // App ID
-	AppSecret string // app 密钥
-	ApiURL    string // 支付网关
-	NotifyURL string // 异步通知地址
-	ReturnURL string // 同步通知地址
+	Alipay AlipayConfig `json:"alipay"` // 支付宝支付渠道配置
+	Epay   EpayConfig   `json:"epay"`   // GEEK 支付配置
+	WxPay  WxPayConfig  `json:"wxpay"`  // 微信支付渠道配置
 }

 // AlipayConfig 支付宝支付配置
@@ -53,8 +43,8 @@ func (c *WxPayConfig) Equal(other *WxPayConfig) bool {
 		c.Domain == other.Domain
 }

-// GeekPayConfig 易支付配置
-type GeekPayConfig struct {
+// EpayConfig 易支付配置
+type EpayConfig struct {
 	Enabled    bool   `json:"enabled"`     // 是否启用该支付通道
 	AppId      string `json:"app_id"`      // 商户 ID
 	PrivateKey string `json:"private_key"` // 私钥
@@ -62,7 +52,7 @@ type GeekPayConfig struct {
 	Domain     string `json:"domain"`      // 支付回调域名
 }

-func (c *GeekPayConfig) Equal(other *GeekPayConfig) bool {
+func (c *EpayConfig) Equal(other *EpayConfig) bool {
 	return c.AppId == other.AppId &&
 		c.PrivateKey == other.PrivateKey &&
 		c.ApiURL == other.ApiURL &&
--- a/api/core/types/session.go
+++ b/api/core/types/session.go
@@ -8,6 +8,7 @@ package types
 // * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

 const LoginUserID = "LOGIN_USER_ID"
+const AdminUserID = "ADMIN_USER_ID"
 const LoginUserCache = "LOGIN_USER_CACHE"

 const UserAuthHeader = "Authorization"
--- a/api/core/types/sms.go
+++ b/api/core/types/sms.go
@@ -17,8 +17,6 @@ type SMSConfig struct {
 type SmsConfigAli struct {
 	AccessKey    string
 	AccessSecret string
-	Product      string
-	Domain       string
 	Sign         string // 短信签名
 	CodeTempId   string // 验证码短信模板 ID
 }
@@ -27,7 +25,6 @@ type SmsConfigAli struct {
 type SmsConfigBao struct {
 	Username     string //短信宝平台注册的用户名
 	Password     string //短信宝平台注册的密码
-	Domain       string //域名
 	Sign         string // 短信签名
 	CodeTemplate string // 验证码短信模板 匹配
 }