github/siyuan
4
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-05-03 04:20:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

🎨 数据快照 https://github.com/siyuan-note/siyuan/issues/5159

Browse Source
This commit is contained in:
Liang Ding 2022-06-13 21:55:49 +08:00
parent 963eac374a
commit 50c243ac69
No known key found for this signature in database
GPG Key ID: 136F30F901A2231D
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
kernel/api/repo.go
View File

@ -74,7 +74,7 @@ func importRepoKey(c *gin.Context) {
return return
} }
util.PushMsg(model.Conf.Language(136), 1000*7) msgId := util.PushMsg(model.Conf.Language(136), 1000*7)
hexKey := arg["key"].(string) hexKey := arg["key"].(string)
if err := model.ImportRepoKey(hexKey); nil != err { if err := model.ImportRepoKey(hexKey); nil != err {
ret.Code = -1 ret.Code = -1
@ -82,14 +82,14 @@ func importRepoKey(c *gin.Context) {
return return
} }
time.Sleep(1 * time.Second) time.Sleep(1 * time.Second)
util.PushMsg(model.Conf.Language(138), 3000) util.PushUpdateMsg(msgId, model.Conf.Language(138), 3000)
} }
func initRepoKey(c *gin.Context) { func initRepoKey(c *gin.Context) {
ret := gulu.Ret.NewResult() ret := gulu.Ret.NewResult()
defer c.JSON(http.StatusOK, ret) defer c.JSON(http.StatusOK, ret)
util.PushMsg(model.Conf.Language(136), 1000*7) msgId := util.PushMsg(model.Conf.Language(136), 1000*7)
if err := model.InitRepoKey(); nil != err { if err := model.InitRepoKey(); nil != err {
ret.Code = -1 ret.Code = -1
ret.Msg = model.Conf.Language(137) ret.Msg = model.Conf.Language(137)
@ -97,7 +97,7 @@ func initRepoKey(c *gin.Context) {
} }
time.Sleep(1 * time.Second) time.Sleep(1 * time.Second)
util.PushMsg(model.Conf.Language(138), 3000) util.PushUpdateMsg(msgId, model.Conf.Language(138), 3000)
ret.Data = map[string]interface{}{ ret.Data = map[string]interface{}{
"key": hex.EncodeToString(model.Conf.Repo.Key), "key": hex.EncodeToString(model.Conf.Repo.Key),

4
kernel/api/system.go
View File

@ -326,7 +326,7 @@ func setE2EEPasswd(c *gin.Context) {
return return
} }
util.PushMsg(model.Conf.Language(102), 60*1000) msgId := util.PushMsg(model.Conf.Language(102), 1000*7)
if err := os.RemoveAll(model.Conf.Backup.GetSaveDir()); nil != err { if err := os.RemoveAll(model.Conf.Backup.GetSaveDir()); nil != err {
ret.Code = -1 ret.Code = -1
ret.Msg = err.Error() ret.Msg = err.Error()
@ -361,7 +361,7 @@ func setE2EEPasswd(c *gin.Context) {
model.Conf.E2EEPasswd = newPasswd model.Conf.E2EEPasswd = newPasswd
model.Conf.E2EEPasswdMode = mode model.Conf.E2EEPasswdMode = mode
model.Conf.Save() model.Conf.Save()
util.PushMsg(model.Conf.Language(92), 3000) util.PushUpdateMsg(msgId, model.Conf.Language(92), 3000)
time.Sleep(1 * time.Second) time.Sleep(1 * time.Second)
model.SyncData(false, false, true) model.SyncData(false, false, true)
} }