更新配置代码

api/core/config.go

@@ -94,15 +94,24 @@ func LoadSystemConfig(db *gorm.DB) *types.SystemConfig {
 		logger.Error("load license config error: ", err)
 	}
 
-	// 加载 GeekAPI 配置
-	var geekAPIConfig types.GeekAPIConfig
+	// 加载验证码配置
+	var captchaConfig types.CaptchaConfig
 	sysConfig.Id = 0
-	db.Where("name", types.ConfigKeyGeekAPI).First(&sysConfig)
-	err = utils.JsonDecode(sysConfig.Value, &geekAPIConfig)
+	db.Where("name", types.ConfigKeyCaptcha).First(&sysConfig)
+	err = utils.JsonDecode(sysConfig.Value, &captchaConfig)
 	if err != nil {
 		logger.Error("load geek service config error: ", err)
 	}
 
+	// 加载微信登录配置
+	var wxLoginConfig types.WxLoginConfig
+	sysConfig.Id = 0
+	db.Where("name", types.ConfigKeyWxLogin).First(&sysConfig)
+	err = utils.JsonDecode(sysConfig.Value, &wxLoginConfig)
+	if err != nil {
+		logger.Error("load wx login config error: ", err)
+	}
+
 	// 加载短信配置
 	var smsConfig types.SMSConfig
 	sysConfig.Id = 0
@@ -146,6 +155,7 @@ func LoadSystemConfig(db *gorm.DB) *types.SystemConfig {
 		OSS:     ossConfig,
 		SMTP:    smtpConfig,
 		Payment: paymentConfig,
-		GeekAPI: geekAPIConfig,
+		Captcha: captchaConfig,
+		WxLogin: wxLoginConfig,
 	}
 }

api/core/types/config.go

@@ -110,7 +110,8 @@ type SystemConfig struct {
 	OSS     OSSConfig
 	SMS     SMSConfig
 	SMTP    SmtpConfig
-	GeekAPI GeekAPIConfig
+	Captcha CaptchaConfig
+	WxLogin WxLoginConfig
 	Jimeng  JimengConfig
 	License License
 }
@@ -121,7 +122,8 @@ const (
 	ConfigKeyNotice    = "notice"
 	ConfigKeyAgreement = "agreement"
 	ConfigKeyPrivacy   = "privacy"
-	ConfigKeyGeekAPI   = "geekapi"
+	ConfigKeyCaptcha   = "captcha"
+	ConfigKeyWxLogin   = "wx_login"
 	ConfigKeyLicense   = "license"
 	ConfigKeySms       = "sms"
 	ConfigKeySmtp      = "smtp"

api/core/types/geekai.go

@@ -31,8 +31,3 @@ type WxLoginConfig struct {
 	NotifyURL string `json:"notify_url"` // 登录成功回调 URL
 	Enabled   bool   `json:"enabled"`    // 是否启用微信登录
 }
-
-type GeekAPIConfig struct {
-	Captcha CaptchaConfig
-	WxLogin WxLoginConfig
-}

api/core/types/payment.go

@@ -2,7 +2,7 @@ package types
 
 type PaymentConfig struct {
 	Alipay AlipayConfig `json:"alipay"` // 支付宝支付渠道配置
-	Epay   EpayConfig   `json:"epay"`   // GEEK 支付配置
+	Epay   EpayConfig   `json:"epay"`   // 易支付配置
 	WxPay  WxPayConfig  `json:"wxpay"`  // 微信支付渠道配置
 }