diff --git a/kernel/api/lute.go b/kernel/api/lute.go index 08d81d1d5..e1b6baff8 100644 --- a/kernel/api/lute.go +++ b/kernel/api/lute.go @@ -82,7 +82,7 @@ func html2BlockDOM(c *gin.Context) { n.Unlink() } - if "std" == model.Conf.System.Container { + if util.ContainerStd == model.Conf.System.Container { // 处理本地资源文件复制 ast.Walk(tree.Root, func(n *ast.Node, entering bool) ast.WalkStatus { if !entering || ast.NodeLinkDest != n.Type { diff --git a/kernel/model/assets_watcher.go b/kernel/model/assets_watcher.go index b6666da43..5413e3517 100644 --- a/kernel/model/assets_watcher.go +++ b/kernel/model/assets_watcher.go @@ -31,7 +31,7 @@ import ( var assetsWatcher *fsnotify.Watcher func WatchAssets() { - if "android" == util.Container || "ios" == util.Container { + if util.ContainerAndroid == util.Container || util.ContainerIOS == util.Container { return } diff --git a/kernel/server/serve.go b/kernel/server/serve.go index 993780bf4..be4ab1711 100644 --- a/kernel/server/serve.go +++ b/kernel/server/serve.go @@ -70,7 +70,7 @@ func Serve(fastMode bool) { api.ServeAPI(ginServer) var addr string - if model.Conf.System.NetworkServe || "docker" == util.Container { + if model.Conf.System.NetworkServe || util.ContainerDocker == util.Container { addr = "0.0.0.0:" + util.ServerPort } else { addr = "127.0.0.1:" + util.ServerPort @@ -227,7 +227,7 @@ func serveDebug(ginServer *gin.Engine) { func serveWebSocket(ginServer *gin.Engine) { util.WebSocketServer.Config.MaxMessageSize = 1024 * 1024 * 8 - if "docker" == util.Container { // Docker 容器运行时启用 WebSocket 传输压缩 + if util.ContainerDocker == util.Container { // Docker 容器运行时启用 WebSocket 传输压缩 util.WebSocketServer.Config.EnableCompression = true util.WebSocketServer.Config.CompressionLevel = 4 } diff --git a/kernel/sql/block_query.go b/kernel/sql/block_query.go index 84fd3b829..50de73a61 100644 --- a/kernel/sql/block_query.go +++ b/kernel/sql/block_query.go @@ -125,7 +125,7 @@ func queryBlockIDByParentID(parentID string) (ret []string) { func QueryRecentUpdatedBlocks() (ret []*Block) { sqlStmt := "SELECT * FROM blocks WHERE type = 'p' AND length > 1 ORDER BY updated DESC LIMIT 16" - if "ios" == util.Container || "android" == util.Container { + if util.ContainerIOS == util.Container || util.ContainerAndroid == util.Container { sqlStmt = "SELECT * FROM blocks WHERE type = 'd' ORDER BY updated DESC LIMIT 16" } rows, err := query(sqlStmt) diff --git a/kernel/util/path.go b/kernel/util/path.go index 05b72b07f..b065c8890 100644 --- a/kernel/util/path.go +++ b/kernel/util/path.go @@ -87,7 +87,7 @@ func IsIDPattern(str string) bool { var LocalIPs []string func GetLocalIPs() (ret []string) { - if "android" == Container { + if ContainerAndroid == Container { // Android 上用不了 net.InterfaceAddrs() https://github.com/golang/go/issues/40569,所以前面使用启动内核传入的参数 localIPs LocalIPs = append(LocalIPs, "127.0.0.1") LocalIPs = gulu.Str.RemoveDuplicatedElem(LocalIPs) diff --git a/kernel/util/runtime.go b/kernel/util/runtime.go index 2b71bccfd..ceedb265c 100644 --- a/kernel/util/runtime.go +++ b/kernel/util/runtime.go @@ -67,7 +67,7 @@ func RandomSleep(minMills, maxMills int) { } func GetDeviceID() string { - if "std" == Container { + if ContainerStd == Container { machineID, err := machineid.ID() if nil != err { return gulu.Rand.String(12) diff --git a/kernel/util/working.go b/kernel/util/working.go index c6260029a..825dc1a05 100644 --- a/kernel/util/working.go +++ b/kernel/util/working.go @@ -77,9 +77,9 @@ func Boot() { Resident = *resident ReadOnly = *readOnly AccessAuthCode = *accessAuthCode - Container = "std" + Container = ContainerStd if isRunningInDockerContainer() { - Container = "docker" + Container = ContainerDocker } UserAgent = UserAgent + " " + Container @@ -177,7 +177,7 @@ func initWorkspaceDir(workspaceArg string) { userHomeConfDir := filepath.Join(HomeDir, ".config", "siyuan") workspaceConf := filepath.Join(userHomeConfDir, "workspace.json") if !gulu.File.IsExist(workspaceConf) { - IsNewbie = "std" == Container // 只有桌面端需要设置新手标识,前端自动挂载帮助文档 + IsNewbie = ContainerStd == Container // 只有桌面端需要设置新手标识,前端自动挂载帮助文档 if err := os.MkdirAll(userHomeConfDir, 0755); nil != err && !os.IsExist(err) { log.Printf("create user home conf folder [%s] failed: %s", userHomeConfDir, err) os.Exit(ExitCodeCreateConfDirErr) @@ -276,6 +276,13 @@ var ( Container string // docker, android, ios, std ) +const ( + ContainerStd = "std" // 桌面端 + ContainerDocker = "docker" // Docker 容器端 + ContainerAndroid = "android" // Android 端 + ContainerIOS = "ios" // iOS 端 +) + func initPathDir() { if err := os.MkdirAll(ConfDir, 0755); nil != err && !os.IsExist(err) { log.Fatalf("create conf folder [%s] failed: %s", ConfDir, err)