From 9a9392c5af8fe8df58e80c724444390cdc8d7af1 Mon Sep 17 00:00:00 2001 From: Daniel <845765@qq.com> Date: Sat, 20 Jan 2024 12:09:47 +0800 Subject: [PATCH 1/3] :art: Mobile App switch sync --- kernel/model/session.go | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/kernel/model/session.go b/kernel/model/session.go index 1a0f9fbc1..7acd82e6f 100644 --- a/kernel/model/session.go +++ b/kernel/model/session.go @@ -212,6 +212,12 @@ func CheckAuth(c *gin.Context) { c.Next() return } + if strings.HasPrefix(c.Request.RequestURI, "/api/sync/performSync") { + if util.ContainerIOS == util.Container || util.ContainerAndroid == util.Container { + c.Next() + return + } + } } // 通过 Cookie From 120a88db4cb6aaeb17450099e6782ddc0b39004c Mon Sep 17 00:00:00 2001 From: Daniel <845765@qq.com> Date: Sat, 20 Jan 2024 20:56:14 +0800 Subject: [PATCH 2/3] :bug: Fix npe --- kernel/model/index_fix.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/kernel/model/index_fix.go b/kernel/model/index_fix.go index 334684a90..4d1579fbd 100644 --- a/kernel/model/index_fix.go +++ b/kernel/model/index_fix.go @@ -154,6 +154,10 @@ func resetDuplicateBlocksOnFileSys() { boxPath := filepath.Join(util.DataDir, box.ID) var duplicatedTrees []*parse.Tree filepath.Walk(boxPath, func(path string, info os.FileInfo, err error) error { + if nil == info { + return nil + } + if info.IsDir() { if boxPath == path { // 跳过根路径(笔记本文件夹) From e6cfabe08ae727fc9e708694b89b13fe36023431 Mon Sep 17 00:00:00 2001 From: Daniel <845765@qq.com> Date: Sat, 20 Jan 2024 20:59:25 +0800 Subject: [PATCH 3/3] :bug: Fix npe --- kernel/model/index_fix.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/kernel/model/index_fix.go b/kernel/model/index_fix.go index 4d1579fbd..5eb2339e9 100644 --- a/kernel/model/index_fix.go +++ b/kernel/model/index_fix.go @@ -307,6 +307,10 @@ func fixBlockTreeByFileSys() { return nil } + if nil == info { + return nil + } + if info.IsDir() { if strings.HasPrefix(info.Name(), ".") { return filepath.SkipDir