diff --git a/pkg/setting/provider.go b/pkg/setting/provider.go index 1fdb03f..3d0b79a 100644 --- a/pkg/setting/provider.go +++ b/pkg/setting/provider.go @@ -669,8 +669,8 @@ func (s *settingProvider) TurnstileCaptcha(ctx context.Context) *Turnstile { func (s *settingProvider) CapCaptcha(ctx context.Context) *Cap { return &Cap{ InstanceURL: s.getString(ctx, "captcha_cap_instance_url", ""), - SiteKey: s.getString(ctx, "captcha_cap_key_id", ""), - SecretKey: s.getString(ctx, "captcha_cap_key_secret", ""), + SiteKey: s.getString(ctx, "captcha_cap_site_key", ""), + SecretKey: s.getString(ctx, "captcha_cap_secret_key", ""), } } diff --git a/service/basic/site.go b/service/basic/site.go index 779f374..1f1ffe9 100644 --- a/service/basic/site.go +++ b/service/basic/site.go @@ -30,7 +30,7 @@ type SiteConfig struct { CaptchaType setting.CaptchaType `json:"captcha_type,omitempty"` TurnstileSiteID string `json:"turnstile_site_id,omitempty"` CapInstanceURL string `json:"captcha_cap_instance_url,omitempty"` - CapKeyID string `json:"captcha_cap_key_id,omitempty"` + CapSiteKey string `json:"captcha_cap_site_key,omitempty"` RegisterEnabled bool `json:"register_enabled,omitempty"` TosUrl string `json:"tos_url,omitempty"` PrivacyPolicyUrl string `json:"privacy_policy_url,omitempty"` @@ -137,7 +137,7 @@ func (s *GetSettingService) GetSiteConfig(c *gin.Context) (*SiteConfig, error) { TurnstileSiteID: settings.TurnstileCaptcha(c).Key, ReCaptchaKey: reCaptcha.Key, CapInstanceURL: capCaptcha.InstanceURL, - CapKeyID: capCaptcha.SiteKey, + CapSiteKey: capCaptcha.SiteKey, AppPromotion: appSetting.Promotion, }, nil }