github
/
Cloudreve
mirror of https://github.com/cloudreve/Cloudreve
1
0
Fork 0
Code Issues Releases Wiki Activity

feat(captcha): update static asset source option (#2589) 

* feat(captcha): Add captcha_cap_asset_server configuration option to support static asset server settings (#2584)

* fix(captcha): Backend default: cdn → jsdelivr
pull/2603/head
WittF 2025-06-29 10:14:26 +08:00 committed by GitHub
parent f38f32f9f5
commit 6106b57bc7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
inventory/setting.go
View File

@ -395,6 +395,7 @@ var DefaultSettings = map[string]string{
"captcha_cap_instance_url": "", "captcha_cap_instance_url": "",
"captcha_cap_site_key": "", "captcha_cap_site_key": "",
"captcha_cap_secret_key": "", "captcha_cap_secret_key": "",
"captcha_cap_asset_server": "jsdelivr",
"thumb_width": "400", "thumb_width": "400",
"thumb_height": "300", "thumb_height": "300",
"thumb_entity_suffix": "._thumb", "thumb_entity_suffix": "._thumb",

1
pkg/setting/provider.go
View File

@ -671,6 +671,7 @@ func (s *settingProvider) CapCaptcha(ctx context.Context) *Cap {
InstanceURL: s.getString(ctx, "captcha_cap_instance_url", ""), InstanceURL: s.getString(ctx, "captcha_cap_instance_url", ""),
SiteKey: s.getString(ctx, "captcha_cap_site_key", ""), SiteKey: s.getString(ctx, "captcha_cap_site_key", ""),
SecretKey: s.getString(ctx, "captcha_cap_secret_key", ""), SecretKey: s.getString(ctx, "captcha_cap_secret_key", ""),
AssetServer: s.getString(ctx, "captcha_cap_asset_server", "jsdelivr"),
} }
} }

1
pkg/setting/types.go
View File

@ -52,6 +52,7 @@ type Cap struct {
InstanceURL string InstanceURL string
SiteKey string SiteKey string
SecretKey string SecretKey string
AssetServer string
} }
type SMTP struct { type SMTP struct {

2
service/basic/site.go
View File

@ -31,6 +31,7 @@ type SiteConfig struct {
TurnstileSiteID string `json:"turnstile_site_id,omitempty"` TurnstileSiteID string `json:"turnstile_site_id,omitempty"`
CapInstanceURL string `json:"captcha_cap_instance_url,omitempty"` CapInstanceURL string `json:"captcha_cap_instance_url,omitempty"`
CapSiteKey string `json:"captcha_cap_site_key,omitempty"` CapSiteKey string `json:"captcha_cap_site_key,omitempty"`
CapAssetServer string `json:"captcha_cap_asset_server,omitempty"`
RegisterEnabled bool `json:"register_enabled,omitempty"` RegisterEnabled bool `json:"register_enabled,omitempty"`
TosUrl string `json:"tos_url,omitempty"` TosUrl string `json:"tos_url,omitempty"`
PrivacyPolicyUrl string `json:"privacy_policy_url,omitempty"` PrivacyPolicyUrl string `json:"privacy_policy_url,omitempty"`
@ -138,6 +139,7 @@ func (s *GetSettingService) GetSiteConfig(c *gin.Context) (*SiteConfig, error) {
ReCaptchaKey: reCaptcha.Key, ReCaptchaKey: reCaptcha.Key,
CapInstanceURL: capCaptcha.InstanceURL, CapInstanceURL: capCaptcha.InstanceURL,
CapSiteKey: capCaptcha.SiteKey, CapSiteKey: capCaptcha.SiteKey,
CapAssetServer: capCaptcha.AssetServer,
AppPromotion: appSetting.Promotion, AppPromotion: appSetting.Promotion,
}, nil }, nil
} }