diff --git a/app/appearance/langs/en_US.json b/app/appearance/langs/en_US.json index 80c1bf68e..cbf9af50c 100644 --- a/app/appearance/langs/en_US.json +++ b/app/appearance/langs/en_US.json @@ -809,7 +809,7 @@ "20": "Cannot be converted to heading when including sub-documents", "21": "Please enter the captcha", "22": "The captcha is incorrect", - "23": "The data repo is damaged due to external changes (such as using a third-party real-time synchronization disk), please reset the data repo", + "23": "The data repo is corrupted due to external changes (such as using a third-party real-time synchronization disk), please reset the data repo", "24": "Network timed out, please try again later", "25": "The attribute name only supports English letters and digits", "26": "Please initialize the data repo key first in [Settings - About - Data repo key]", diff --git a/app/electron/main.js b/app/electron/main.js index 47798d9e7..a158f8082 100644 --- a/app/electron/main.js +++ b/app/electron/main.js @@ -561,7 +561,7 @@ const initKernel = (initData) => { case 23: showErrorWindow( '⚠️ 无法读写块树文件 Failed to access blocktree file', - `
块树文件正在被其他程序锁定或者已经损坏,请删除 工作空间/temp/ 文件夹后重启
The block tree file is being locked by another program or is damaged, please delete the workspace/temp/ folder and restart.
`) + `
块树文件正在被其他程序锁定或者已经损坏,请删除 工作空间/temp/ 文件夹后重启
The block tree file is being locked by another program or is corrupted, please delete the workspace/temp/ folder and restart.
`) break case 0: case 1: // Fatal error diff --git a/app/guide/20210808180117-6v0mkxr/20200923234731-h3zkwm2.sy b/app/guide/20210808180117-6v0mkxr/20200923234731-h3zkwm2.sy index a513c464b..80a292793 100644 --- a/app/guide/20210808180117-6v0mkxr/20200923234731-h3zkwm2.sy +++ b/app/guide/20210808180117-6v0mkxr/20200923234731-h3zkwm2.sy @@ -1580,7 +1580,7 @@ "Children": [ { "Type": "NodeText", - "Data": "Data synchronization through third-party synchronization disks is not supported, otherwise data may be damaged. Consider manually exporting and importing Data for data synchronization:" + "Data": "Data synchronization through third-party synchronization disks is not supported, otherwise data may be corrupted. Consider manually exporting and importing Data for data synchronization:" } ] }, diff --git a/kernel/model/conf.go b/kernel/model/conf.go index ad9caec3c..92e2131f0 100644 --- a/kernel/model/conf.go +++ b/kernel/model/conf.go @@ -601,7 +601,9 @@ func GetMaskedConf() (ret *AppConf, err error) { } ret.UserData = MaskedUserData - ret.AccessAuthCode = MaskedAccessAuthCode + if "" != ret.AccessAuthCode { + ret.AccessAuthCode = MaskedAccessAuthCode + } return } diff --git a/kernel/model/session.go b/kernel/model/session.go index a32ceb41c..c66547821 100644 --- a/kernel/model/session.go +++ b/kernel/model/session.go @@ -156,6 +156,11 @@ func CheckReadonly(c *gin.Context) { func CheckAuth(c *gin.Context) { //logging.LogInfof("check auth for [%s]", c.Request.RequestURI) + if "" == Conf.AccessAuthCode { + c.Next() + return + } + // 放过 /appearance/ if strings.HasPrefix(c.Request.RequestURI, "/appearance/") || strings.HasPrefix(c.Request.RequestURI, "/stage/build/export/") ||