Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
陈曦
sub2api
Commits
a60dbb55
Commit
a60dbb55
authored
Jan 05, 2026
by
shaw
Browse files
Merge branch 'fix/turnstile-secret-key-preserve'
parents
7cc7e151
411ebe4d
Changes
1
Hide whitespace changes
Inline
Side-by-side
backend/internal/handler/admin/setting_handler.go
View file @
a60dbb55
...
...
@@ -145,21 +145,18 @@ func (h *SettingHandler) UpdateSettings(c *gin.Context) {
response
.
BadRequest
(
c
,
"Turnstile Site Key is required when enabled"
)
return
}
// 如果未提供 secret key,使用已保存的值(留空保留当前值)
if
req
.
TurnstileSecretKey
==
""
{
response
.
BadRequest
(
c
,
"Turnstile Secret Key is required when enabled"
)
return
}
// 获取当前设置,检查参数是否有变化
currentSettings
,
err
:=
h
.
settingService
.
GetAllSettings
(
c
.
Request
.
Context
())
if
err
!=
nil
{
response
.
ErrorFrom
(
c
,
err
)
return
if
previousSettings
.
TurnstileSecretKey
==
""
{
response
.
BadRequest
(
c
,
"Turnstile Secret Key is required when enabled"
)
return
}
req
.
TurnstileSecretKey
=
previousSettings
.
TurnstileSecretKey
}
// 当 site_key 或 secret_key 任一变化时验证(避免配置错误导致无法登录)
siteKeyChanged
:=
current
Settings
.
TurnstileSiteKey
!=
req
.
TurnstileSiteKey
secretKeyChanged
:=
current
Settings
.
TurnstileSecretKey
!=
req
.
TurnstileSecretKey
siteKeyChanged
:=
previous
Settings
.
TurnstileSiteKey
!=
req
.
TurnstileSiteKey
secretKeyChanged
:=
previous
Settings
.
TurnstileSecretKey
!=
req
.
TurnstileSecretKey
if
siteKeyChanged
||
secretKeyChanged
{
if
err
:=
h
.
turnstileService
.
ValidateSecretKey
(
c
.
Request
.
Context
(),
req
.
TurnstileSecretKey
);
err
!=
nil
{
response
.
ErrorFrom
(
c
,
err
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment