From 7c3536cb18670368af9b92c6846e325fe745a09e Mon Sep 17 00:00:00 2001 From: Daniel <845765@qq.com> Date: Sun, 1 Mar 2026 10:13:48 +0800 Subject: [PATCH] :recycle: Clean code Signed-off-by: Daniel <845765@qq.com> --- kernel/model/session.go | 2 +- kernel/util/working.go | 23 ++++++++--------------- 2 files changed, 9 insertions(+), 16 deletions(-) diff --git a/kernel/model/session.go b/kernel/model/session.go index c82c67580..faced3407 100644 --- a/kernel/model/session.go +++ b/kernel/model/session.go @@ -250,7 +250,7 @@ func CheckAuth(c *gin.Context) { // 未设置访问授权码 if "" == Conf.AccessAuthCode { // Skip the empty access authorization code check https://github.com/siyuan-note/siyuan/issues/9709 - if util.SiyuanAccessAuthCodeBypass { + if util.SiYuanAccessAuthCodeBypass { c.Set(RoleContextKey, RoleAdministrator) c.Next() return diff --git a/kernel/util/working.go b/kernel/util/working.go index 577f02315..a9d78a8cd 100644 --- a/kernel/util/working.go +++ b/kernel/util/working.go @@ -48,26 +48,19 @@ var Mode = "prod" const ( Ver = "3.5.8" IsInsider = false - - // env vars as fallback for commandline parameters - SIYUAN_ACCESS_AUTH_CODE = "SIYUAN_ACCESS_AUTH_CODE" - SIYUAN_WORKSPACE = "SIYUAN_WORKSPACE_PATH" - SIYUAN_LANG = "SIYUAN_LANG" ) var ( - RunInContainer = false // 是否运行在容器中 - SiyuanAccessAuthCodeBypass = false // 是否跳过空访问授权码检查 - SiyuanAccessAuthCodeViaEnvvar = "" // Fallback auth code via env var (SIYUAN_ACCESS_AUTH_CODE) + RunInContainer = false // 是否运行在容器中 + SiYuanAccessAuthCodeBypass = false // 是否跳过空访问授权码检查 ) func initEnvVars() { RunInContainer = isRunningInDockerContainer() var err error - if SiyuanAccessAuthCodeBypass, err = strconv.ParseBool(os.Getenv("SIYUAN_ACCESS_AUTH_CODE_BYPASS")); err != nil { - SiyuanAccessAuthCodeBypass = false + if SiYuanAccessAuthCodeBypass, err = strconv.ParseBool(os.Getenv("SIYUAN_ACCESS_AUTH_CODE_BYPASS")); err != nil { + SiYuanAccessAuthCodeBypass = false } - SiyuanAccessAuthCodeViaEnvvar = os.Getenv("SIYUAN_ACCESS_AUTH_CODE") } var ( @@ -110,9 +103,9 @@ func Boot() { // Fallback to env vars if commandline args are not set // valid only for CLI args that default to "", as the // others have explicit (sane) defaults - workspacePath = coalesceToEnvVar(workspacePath, SIYUAN_WORKSPACE) - accessAuthCode = coalesceToEnvVar(accessAuthCode, SIYUAN_ACCESS_AUTH_CODE) - lang = coalesceToEnvVar(lang, SIYUAN_LANG) + workspacePath = coalesceToEnvVar(workspacePath, "SIYUAN_WORKSPACE_PATH") + accessAuthCode = coalesceToEnvVar(accessAuthCode, "SIYUAN_ACCESS_AUTH_CODE") + lang = coalesceToEnvVar(lang, "SIYUAN_LANG") if "" != *wdPath { WorkingDir = *wdPath @@ -133,7 +126,7 @@ func Boot() { interruptBoot := true // Set the env `SIYUAN_ACCESS_AUTH_CODE_BYPASS=true` to skip checking empty access auth code https://github.com/siyuan-note/siyuan/issues/9709 - if SiyuanAccessAuthCodeBypass { + if SiYuanAccessAuthCodeBypass { interruptBoot = false fmt.Println("bypass access auth code check since the env [SIYUAN_ACCESS_AUTH_CODE_BYPASS] is set to [true]") }