From 50c243ac69bae9b57878ef30d3b5a45b5f45188f Mon Sep 17 00:00:00 2001
From: Liang Ding <d@b3log.org>
Date: Mon, 13 Jun 2022 21:55:49 +0800
Subject: [PATCH] =?UTF-8?q?:art:=20=E6=95=B0=E6=8D=AE=E5=BF=AB=E7=85=A7=20?=
 =?UTF-8?q?https://github.com/siyuan-note/siyuan/issues/5159?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 kernel/api/repo.go   | 8 ++++----
 kernel/api/system.go | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/kernel/api/repo.go b/kernel/api/repo.go
index b9fa1abce..6fc40f858 100644
--- a/kernel/api/repo.go
+++ b/kernel/api/repo.go
@@ -74,7 +74,7 @@ func importRepoKey(c *gin.Context) {
 		return
 	}
 
-	util.PushMsg(model.Conf.Language(136), 1000*7)
+	msgId := util.PushMsg(model.Conf.Language(136), 1000*7)
 	hexKey := arg["key"].(string)
 	if err := model.ImportRepoKey(hexKey); nil != err {
 		ret.Code = -1
@@ -82,14 +82,14 @@ func importRepoKey(c *gin.Context) {
 		return
 	}
 	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) {
 	ret := gulu.Ret.NewResult()
 	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 {
 		ret.Code = -1
 		ret.Msg = model.Conf.Language(137)
@@ -97,7 +97,7 @@ func initRepoKey(c *gin.Context) {
 	}
 
 	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{}{
 		"key": hex.EncodeToString(model.Conf.Repo.Key),
diff --git a/kernel/api/system.go b/kernel/api/system.go
index 0c1af57e6..18602f1d8 100644
--- a/kernel/api/system.go
+++ b/kernel/api/system.go
@@ -326,7 +326,7 @@ func setE2EEPasswd(c *gin.Context) {
 		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 {
 		ret.Code = -1
 		ret.Msg = err.Error()
@@ -361,7 +361,7 @@ func setE2EEPasswd(c *gin.Context) {
 	model.Conf.E2EEPasswd = newPasswd
 	model.Conf.E2EEPasswdMode = mode
 	model.Conf.Save()
-	util.PushMsg(model.Conf.Language(92), 3000)
+	util.PushUpdateMsg(msgId, model.Conf.Language(92), 3000)
 	time.Sleep(1 * time.Second)
 	model.SyncData(false, false, true)
 }