From bb90e72eee58df7043a639f3b808f9f541a2d56c Mon Sep 17 00:00:00 2001
From: Liang Ding <d@b3log.org>
Date: Tue, 25 Oct 2022 10:21:14 +0800
Subject: [PATCH] =?UTF-8?q?:art:=20=E6=A1=8C=E9=9D=A2=E7=AB=AF=E5=86=85?=
 =?UTF-8?q?=E6=A0=B8=E8=BF=9B=E7=A8=8B=E4=BD=BF=E7=94=A8=E9=9A=8F=E6=9C=BA?=
 =?UTF-8?q?=E7=AB=AF=E5=8F=A3=20https://github.com/siyuan-note/siyuan/issu?=
 =?UTF-8?q?es/4952?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/appearance/langs/en_US.json  |  2 ++
 app/appearance/langs/es_ES.json  |  2 ++
 app/appearance/langs/fr_FR.json  |  2 ++
 app/appearance/langs/zh_CHT.json |  2 ++
 app/appearance/langs/zh_CN.json  |  2 ++
 app/src/config/about.ts          | 16 ++++++++++++++++
 app/src/types/index.d.ts         |  1 +
 kernel/api/router.go             |  1 +
 kernel/api/system.go             | 17 +++++++++++++++++
 kernel/model/conf.go             |  5 +++++
 10 files changed, 50 insertions(+)

diff --git a/app/appearance/langs/en_US.json b/app/appearance/langs/en_US.json
index a49d129cc..efa406804 100644
--- a/app/appearance/langs/en_US.json
+++ b/app/appearance/langs/en_US.json
@@ -1,4 +1,6 @@
 {
+  "useFixedPort": "Use Fixed Port",
+  "useFixedPortTip": "After enabling, the fixed port <code class='fn__code'>6806</code> will be used, and a random port will be used when it is disabled",
   "expandDown": "Expand Down",
   "expandUp": "Expand Up",
   "goForward": "Go forward",
diff --git a/app/appearance/langs/es_ES.json b/app/appearance/langs/es_ES.json
index 573dde822..c879752a9 100644
--- a/app/appearance/langs/es_ES.json
+++ b/app/appearance/langs/es_ES.json
@@ -1,4 +1,6 @@
 {
+  "useFixedPort": "Usar puerto fijo",
+  "useFixedPortTip": "Después de habilitar, se usará el puerto fijo <code class='fn__code'>6806</code>, y se usará un puerto aleatorio cuando esté deshabilitado",
   "expandDown": "Expandir hacia abajo",
   "expandUp": "Expandir hacia arriba",
   "goForward": "Ir hacia adelante",
diff --git a/app/appearance/langs/fr_FR.json b/app/appearance/langs/fr_FR.json
index 66122a1c3..5ecda0094 100644
--- a/app/appearance/langs/fr_FR.json
+++ b/app/appearance/langs/fr_FR.json
@@ -1,4 +1,6 @@
 {
+  "useFixedPort": "Utiliser un port fixe",
+  "useFixedPortTip": "Après l'activation, le port fixe <code class='fn__code'>6806</code> sera utilisé, et un port aléatoire sera utilisé lorsqu'il est désactivé",
   "expandDown": "Développer vers le bas",
   "expandUp": "Développer vers le haut",
   "goForward": "Suivant",
diff --git a/app/appearance/langs/zh_CHT.json b/app/appearance/langs/zh_CHT.json
index 320a6e04e..e72248d46 100644
--- a/app/appearance/langs/zh_CHT.json
+++ b/app/appearance/langs/zh_CHT.json
@@ -1,4 +1,6 @@
 {
+  "useFixedPort": "使用固定端口",
+  "useFixedPortTip": "開啟後將使用固定端口 <code class='fn__code'>6806</code>，關閉時使用隨機端口",
   "expandDown": "向下擴選",
   "expandUp": "向上擴選",
   "goForward": "前進",
diff --git a/app/appearance/langs/zh_CN.json b/app/appearance/langs/zh_CN.json
index 79ba28e52..e3e7e734b 100644
--- a/app/appearance/langs/zh_CN.json
+++ b/app/appearance/langs/zh_CN.json
@@ -1,4 +1,6 @@
 {
+  "useFixedPort": "使用固定端口",
+  "useFixedPortTip": "开启后将使用固定端口 <code class='fn__code'>6806</code>，关闭时使用随机端口",
   "expandDown": "向下扩选",
   "expandUp": "向上扩选",
   "goForward": "前进",
diff --git a/app/src/config/about.ts b/app/src/config/about.ts
index bf8350879..a14c887a6 100644
--- a/app/src/config/about.ts
+++ b/app/src/config/about.ts
@@ -40,6 +40,14 @@ export const about = {
     <div class="fn__space"></div>
     <input class="b3-switch fn__flex-center" id="networkServe" type="checkbox"${window.siyuan.config.system.networkServe ? " checked" : ""}>
 </label>
+<label class="b3-label fn__flex">
+    <div class="fn__flex-1">
+        ${window.siyuan.languages.useFixedPort}
+        <div class="b3-label__text">${window.siyuan.languages.useFixedPortTip}</div>
+    </div>
+    <div class="fn__space"></div>
+    <input class="b3-switch fn__flex-center" id="fixedPort" type="checkbox"${window.siyuan.config.system.fixedPort ? " checked" : ""}>
+</label>
 <label class="b3-label${isBrowser() ? " fn__none" : " fn__flex"}">
     <div class="fn__flex-1">
        ${window.siyuan.languages.about2}
@@ -348,6 +356,14 @@ export const about = {
                 });
             });
         });
+        const fixedPortElement = about.element.querySelector("#fixedPort") as HTMLInputElement;
+        fixedPortElement.addEventListener("change", () => {
+            fetchPost("/api/system/setFixedPort", {networkServe: fixedPortElement.checked}, () => {
+                exportLayout(false, () => {
+                    exitSiYuan();
+                });
+            });
+        });
         const uploadErrLogElement = about.element.querySelector("#uploadErrLog") as HTMLInputElement;
         uploadErrLogElement.addEventListener("change", () => {
             fetchPost("/api/system/setUploadErrLog", {uploadErrLog: uploadErrLogElement.checked}, () => {
diff --git a/app/src/types/index.d.ts b/app/src/types/index.d.ts
index 9504ceb84..766a5726d 100644
--- a/app/src/types/index.d.ts
+++ b/app/src/types/index.d.ts
@@ -341,6 +341,7 @@ declare interface IConfig {
         uploadErrLog: boolean
         downloadInstallPkg: boolean
         networkServe: boolean
+        fixedPort: boolean
         useExistingDB: boolean
     }
     localIPs: string[]
diff --git a/kernel/api/router.go b/kernel/api/router.go
index fff2d28cc..e978d3afb 100644
--- a/kernel/api/router.go
+++ b/kernel/api/router.go
@@ -39,6 +39,7 @@ func ServeAPI(ginServer *gin.Engine) {
 	ginServer.Handle("POST", "/api/system/getEmojiConf", model.CheckAuth, getEmojiConf)
 	ginServer.Handle("POST", "/api/system/setAccessAuthCode", model.CheckAuth, setAccessAuthCode)
 	ginServer.Handle("POST", "/api/system/setNetworkServe", model.CheckAuth, setNetworkServe)
+	ginServer.Handle("POST", "/api/system/setFixedPort", model.CheckAuth, setFixedPort)
 	ginServer.Handle("POST", "/api/system/setUploadErrLog", model.CheckAuth, setUploadErrLog)
 	ginServer.Handle("POST", "/api/system/setDownloadInstallPkg", model.CheckAuth, setDownloadInstallPkg)
 	ginServer.Handle("POST", "/api/system/setNetworkProxy", model.CheckAuth, setNetworkProxy)
diff --git a/kernel/api/system.go b/kernel/api/system.go
index 59426c573..d3035d6ca 100644
--- a/kernel/api/system.go
+++ b/kernel/api/system.go
@@ -285,6 +285,23 @@ func setNetworkServe(c *gin.Context) {
 	time.Sleep(time.Second * 3)
 }
 
+func setFixedPort(c *gin.Context) {
+	ret := gulu.Ret.NewResult()
+	defer c.JSON(http.StatusOK, ret)
+
+	arg, ok := util.JsonArg(c, ret)
+	if !ok {
+		return
+	}
+
+	fixedPort := arg["fixedPort"].(bool)
+	model.Conf.FixedPort = fixedPort
+	model.Conf.Save()
+
+	util.PushMsg(model.Conf.Language(42), 1000*15)
+	time.Sleep(time.Second * 3)
+}
+
 func setUploadErrLog(c *gin.Context) {
 	ret := gulu.Ret.NewResult()
 	defer c.JSON(http.StatusOK, ret)
diff --git a/kernel/model/conf.go b/kernel/model/conf.go
index b94bfa986..49109d524 100644
--- a/kernel/model/conf.go
+++ b/kernel/model/conf.go
@@ -60,6 +60,7 @@ type AppConf struct {
 	User           *conf.User       `json:"-"`              // 社区用户内存结构，不持久化
 	Account        *conf.Account    `json:"account"`        // 帐号配置
 	ReadOnly       bool             `json:"readonly"`       // 是否是以只读模式运行
+	FixedPort      bool             `json:"fixedPort"`      // 是否使用固定端口 6806
 	LocalIPs       []string         `json:"localIPs"`       // 本地 IP 列表
 	AccessAuthCode string           `json:"accessAuthCode"` // 访问授权码
 	System         *conf.System     `json:"system"`         // 系统配置
@@ -271,6 +272,10 @@ func InitConf() {
 		Conf.AccessAuthCode = util.AccessAuthCode
 	}
 
+	if util.ContainerStd != util.Container {
+		Conf.FixedPort = true
+	}
+
 	Conf.LocalIPs = util.GetLocalIPs()
 
 	Conf.Save()