Merge remote-tracking branch 'origin/dev' into dev

2023-06-12 22:49:36 +08:00 · 2023-06-12 22:49:36 +08:00 · 4786cf6dfc
commit 4786cf6dfc
parent 0f15f23cad 7dd17dbbf8
3 changed files with 2 additions and 8 deletions
--- a/kernel/api/plugin.go
+++ b/kernel/api/plugin.go
--- a/kernel/api/sync.go
+++ b/kernel/api/sync.go
@ -209,13 +209,7 @@ func setSyncMode(c *gin.Context) {
 	}

 	mode := int(arg["mode"].(float64))
-	err := model.SetSyncMode(mode)
-	if nil != err {
-		ret.Code = -1
-		ret.Msg = err.Error()
-		ret.Data = map[string]interface{}{"closeTimeout": 5000}
-		return
-	}
+	model.SetSyncMode(mode)
 }

 func setSyncProvider(c *gin.Context) {
--- a/kernel/model/sync.go
+++ b/kernel/model/sync.go
@ -351,7 +351,7 @@ func SetSyncPerception(b bool) {
 	return
 }

-func SetSyncMode(mode int) (err error) {
+func SetSyncMode(mode int) {
 	Conf.Sync.Mode = mode
 	Conf.Save()
 	return