Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2026-01-04 15:58:49 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

🔥 移除旧版云端同步和备份功能入口 https://github.com/siyuan-note/siyuan/issues/5405

Browse source
This commit is contained in:
Liang Ding 2022-07-13 17:14:54 +08:00
parent bc046e7339
commit 8581f83e61
No known key found for this signature in database
GPG key ID: 136F30F901A2231D
12 changed files with 54 additions and 312 deletions
Download patch file Download diff file Expand all files Collapse all files

2
kernel/api/router.go
View file

@ -44,7 +44,6 @@ func ServeAPI(ginServer *gin.Engine) {
ginServer.Handle("POST", "/api/system/listWorkspaceDirs", model.CheckAuth, listWorkspaceDirs)
ginServer.Handle("POST", "/api/system/setAppearanceMode", model.CheckAuth, setAppearanceMode)
ginServer.Handle("POST", "/api/system/getSysFonts", model.CheckAuth, getSysFonts)
ginServer.Handle("POST", "/api/system/setE2EEPasswd", model.CheckAuth, setE2EEPasswd)
ginServer.Handle("POST", "/api/system/exit", model.CheckAuth, exit)
ginServer.Handle("POST", "/api/system/setUILayout", model.CheckAuth, setUILayout)
ginServer.Handle("POST", "/api/system/getConf", model.CheckAuth, getConf)
@ -167,7 +166,6 @@ func ServeAPI(ginServer *gin.Engine) {
ginServer.Handle("POST", "/api/backup/removeCloudBackup", model.CheckAuth, model.CheckReadonly, removeCloudBackup)
ginServer.Handle("POST", "/api/sync/setSyncEnable", model.CheckAuth, setSyncEnable)
ginServer.Handle("POST", "/api/sync/setSyncUseDataRepo", model.CheckAuth, setSyncUseDataRepo)
ginServer.Handle("POST", "/api/sync/setSyncMode", model.CheckAuth, setSyncMode)
ginServer.Handle("POST", "/api/sync/setCloudSyncDir", model.CheckAuth, setCloudSyncDir)
ginServer.Handle("POST", "/api/sync/createCloudSyncDir", model.CheckAuth, model.CheckReadonly, createCloudSyncDir)

19
kernel/api/sync.go
View file

@ -121,25 +121,6 @@ func createCloudSyncDir(c *gin.Context) {
}
}
func setSyncUseDataRepo(c *gin.Context) {
ret := gulu.Ret.NewResult()
defer c.JSON(http.StatusOK, ret)
arg, ok := util.JsonArg(c, ret)
if !ok {
return
}
enabled := arg["enabled"].(bool)
err := model.SetSyncUseDataRepo(enabled)
if nil != err {
ret.Code = 1
ret.Msg = err.Error()
ret.Data = map[string]interface{}{"closeTimeout": 5000}
return
}
}
func setSyncEnable(c *gin.Context) {
ret := gulu.Ret.NewResult()
defer c.JSON(http.StatusOK, ret)

71
kernel/api/system.go
View file

@ -295,77 +295,6 @@ func setNetworkProxy(c *gin.Context) {
time.Sleep(time.Second * 3)
}
func setE2EEPasswd(c *gin.Context) {
ret := gulu.Ret.NewResult()
defer c.JSON(http.StatusOK, ret)
arg, ok := util.JsonArg(c, ret)
if !ok {
return
}
var passwd string
mode := int(arg["mode"].(float64))
if 0 == mode { // 使用内建的密码生成
passwd = model.GetBuiltInE2EEPasswd()
} else { // 使用自定义密码
passwd = arg["e2eePasswd"].(string)
passwd = strings.TrimSpace(passwd)
}
if "" == passwd {
ret.Code = -1
ret.Msg = model.Conf.Language(39)
ret.Data = map[string]interface{}{"closeTimeout": 5000}
return
}
newPasswd := util.AESEncrypt(passwd)
if model.Conf.E2EEPasswd == newPasswd {
util.PushMsg(model.Conf.Language(92), 3000)
return
}
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()
return
}
if err := os.MkdirAll(model.Conf.Backup.GetSaveDir(), 0755); nil != err {
ret.Code = -1
ret.Msg = err.Error()
return
}
if err := os.RemoveAll(model.Conf.Sync.GetSaveDir()); nil != err {
ret.Code = -1
ret.Msg = err.Error()
return
}
if err := os.MkdirAll(model.Conf.Sync.GetSaveDir(), 0755); nil != err {
ret.Code = -1
ret.Msg = err.Error()
return
}
if err := os.RemoveAll(filepath.Join(util.TempDir, "incremental")); nil != err {
ret.Code = -1
ret.Msg = err.Error()
return
}
if err := os.MkdirAll(filepath.Join(util.TempDir, "incremental"), 0755); nil != err {
ret.Code = -1
ret.Msg = err.Error()
return
}
time.Sleep(1 * time.Second)
model.Conf.E2EEPasswd = newPasswd
model.Conf.E2EEPasswdMode = mode
model.Conf.Save()
util.PushUpdateMsg(msgId, model.Conf.Language(92), 3000)
time.Sleep(1 * time.Second)
model.SyncData(false, false, true)
}
func addUIProcess(c *gin.Context) {
pid := c.Query("pid")
util.UIProcessIDs.Store(pid, true)