From 27aebe904199351f9818f18bcbb61952eaeaa5da Mon Sep 17 00:00:00 2001 From: Liang Ding Date: Thu, 14 Jul 2022 11:24:33 +0800 Subject: [PATCH] =?UTF-8?q?:art:=20=E6=94=B9=E8=BF=9B=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E4=BB=93=E5=BA=93=E5=AF=86=E9=92=A5=E5=AF=BC=E5=85=A5=E6=A0=A1?= =?UTF-8?q?=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- kernel/api/repo.go | 3 +++ kernel/model/repository.go | 5 +++++ 2 files changed, 8 insertions(+) diff --git a/kernel/api/repo.go b/kernel/api/repo.go index 41bcf21ab..c5f17bbaf 100644 --- a/kernel/api/repo.go +++ b/kernel/api/repo.go @@ -247,6 +247,7 @@ func importRepoKey(c *gin.Context) { if err := model.ImportRepoKey(base64Key); nil != err { ret.Code = -1 ret.Msg = fmt.Sprintf(model.Conf.Language(137), err) + ret.Data = map[string]interface{}{"closeTimeout": 5000} return } } @@ -258,6 +259,7 @@ func initRepoKey(c *gin.Context) { if err := model.InitRepoKey(); nil != err { ret.Code = -1 ret.Msg = fmt.Sprintf(model.Conf.Language(137), err) + ret.Data = map[string]interface{}{"closeTimeout": 5000} return } @@ -273,6 +275,7 @@ func resetRepo(c *gin.Context) { if err := model.ResetRepo(); nil != err { ret.Code = -1 ret.Msg = fmt.Sprintf(model.Conf.Language(146), err.Error()) + ret.Data = map[string]interface{}{"closeTimeout": 5000} return } } diff --git a/kernel/model/repository.go b/kernel/model/repository.go index 9db36b5d8..a9ac9211f 100644 --- a/kernel/model/repository.go +++ b/kernel/model/repository.go @@ -83,6 +83,10 @@ func ImportRepoKey(base64Key string) (err error) { util.LogErrorf("import data repo key failed: %s", err) return errors.New(Conf.Language(157)) } + if 32 != len(key) { + return errors.New(Conf.Language(157)) + } + Conf.Repo.Key = key Conf.Save() @@ -429,6 +433,7 @@ func syncRepo(boot, exit, byHand bool) { msg := Conf.Language(26) util.PushStatusBar(msg) util.PushErrMsg(msg, 0) + planSyncAfter(30 * time.Second) return }