Kaynağa Gözat

feat: added http host config (#157)

Co-authored-by: 0xJacky <me@jackyu.cn>
superlollipop 1 yıl önce
ebeveyn
işleme
2cba64c989

+ 12 - 8
frontend/src/language/en/app.po

@@ -187,7 +187,7 @@ msgstr "Modify Config"
 msgid "Build with"
 msgstr "Build with"
 
-#: src/views/preference/BasicSettings.vue:38
+#: src/views/preference/BasicSettings.vue:41
 msgid "CADir"
 msgstr ""
 
@@ -251,7 +251,7 @@ msgstr ""
 msgid "Check again"
 msgstr ""
 
-#: src/views/preference/BasicSettings.vue:36
+#: src/views/preference/BasicSettings.vue:39
 msgid "Chinese user: https://ghproxy.com/"
 msgstr ""
 
@@ -716,7 +716,7 @@ msgstr "Base information"
 msgid "Getting the certificate, please wait..."
 msgstr "Getting the certificate, please wait..."
 
-#: src/views/preference/BasicSettings.vue:34
+#: src/views/preference/BasicSettings.vue:37
 msgid "Github Proxy"
 msgstr ""
 
@@ -739,11 +739,15 @@ msgstr ""
 msgid "Home"
 msgstr "Home"
 
-#: src/views/preference/BasicSettings.vue:31
+#: src/views/preference/BasicSettings.vue:34
 msgid "HTTP Challenge Port"
 msgstr ""
 
 #: src/views/preference/BasicSettings.vue:16
+msgid "HTTP Host"
+msgstr ""
+
+#: src/views/preference/BasicSettings.vue:19
 msgid "HTTP Port"
 msgstr ""
 
@@ -779,7 +783,7 @@ msgstr "Intermediate Certification Authorities: %{issuer}"
 msgid "Issued certificate successfully"
 msgstr "Enabled successfully"
 
-#: src/views/preference/BasicSettings.vue:22
+#: src/views/preference/BasicSettings.vue:25
 msgid "Jwt Secret"
 msgstr ""
 
@@ -972,7 +976,7 @@ msgstr "Saved successfully"
 msgid "No"
 msgstr "No"
 
-#: src/views/preference/BasicSettings.vue:25
+#: src/views/preference/BasicSettings.vue:28
 msgid "Node Secret"
 msgstr ""
 
@@ -1224,7 +1228,7 @@ msgstr ""
 msgid "Restarting"
 msgstr ""
 
-#: src/views/preference/BasicSettings.vue:19
+#: src/views/preference/BasicSettings.vue:22
 #, fuzzy
 msgid "Run Mode"
 msgstr "Advance Mode"
@@ -1403,7 +1407,7 @@ msgstr ""
 msgid "Terminal"
 msgstr "Terminal"
 
-#: src/views/preference/BasicSettings.vue:28
+#: src/views/preference/BasicSettings.vue:31
 msgid "Terminal Start Command"
 msgstr ""
 

+ 12 - 8
frontend/src/language/es/app.po

@@ -185,7 +185,7 @@ msgstr "Modificar por lotes"
 msgid "Build with"
 msgstr "Desarrollado con"
 
-#: src/views/preference/BasicSettings.vue:38
+#: src/views/preference/BasicSettings.vue:41
 msgid "CADir"
 msgstr "Directorio CA"
 
@@ -246,7 +246,7 @@ msgstr "Modelo de ChatGPT"
 msgid "Check again"
 msgstr "Intentar nuevamente"
 
-#: src/views/preference/BasicSettings.vue:36
+#: src/views/preference/BasicSettings.vue:39
 msgid "Chinese user: https://ghproxy.com/"
 msgstr "Usuario chino: https://ghproxy.com/"
 
@@ -697,7 +697,7 @@ msgstr "Obtener error de información de versión"
 msgid "Getting the certificate, please wait..."
 msgstr "Obteniendo el certificado, por favor espere..."
 
-#: src/views/preference/BasicSettings.vue:34
+#: src/views/preference/BasicSettings.vue:37
 msgid "Github Proxy"
 msgstr "Proxy Github"
 
@@ -720,11 +720,15 @@ msgstr "GPT-4-32K"
 msgid "Home"
 msgstr "Inicio"
 
-#: src/views/preference/BasicSettings.vue:31
+#: src/views/preference/BasicSettings.vue:34
 msgid "HTTP Challenge Port"
 msgstr "Puerto de desafío HTTP"
 
 #: src/views/preference/BasicSettings.vue:16
+msgid "HTTP Host"
+msgstr "Host HTTP"
+
+#: src/views/preference/BasicSettings.vue:19
 msgid "HTTP Port"
 msgstr "Puerto HTTP"
 
@@ -758,7 +762,7 @@ msgstr "Autoridades de certificación intermedias: %{issuer}"
 msgid "Issued certificate successfully"
 msgstr "Certificado emitido con éxito"
 
-#: src/views/preference/BasicSettings.vue:22
+#: src/views/preference/BasicSettings.vue:25
 msgid "Jwt Secret"
 msgstr "Secreto Jwt"
 
@@ -945,7 +949,7 @@ msgstr "Nginx reiniciado con éxito"
 msgid "No"
 msgstr "No"
 
-#: src/views/preference/BasicSettings.vue:25
+#: src/views/preference/BasicSettings.vue:28
 msgid "Node Secret"
 msgstr "Secreto del nodo"
 
@@ -1203,7 +1207,7 @@ msgstr "Reiniciar"
 msgid "Restarting"
 msgstr "Reiniciando"
 
-#: src/views/preference/BasicSettings.vue:19
+#: src/views/preference/BasicSettings.vue:22
 msgid "Run Mode"
 msgstr "Modo de ejecución"
 
@@ -1372,7 +1376,7 @@ msgstr "Objetivo"
 msgid "Terminal"
 msgstr "Terminal"
 
-#: src/views/preference/BasicSettings.vue:28
+#: src/views/preference/BasicSettings.vue:31
 msgid "Terminal Start Command"
 msgstr "Comando de inicio de terminal"
 

+ 12 - 8
frontend/src/language/fr_FR/app.po

@@ -189,7 +189,7 @@ msgstr "Batch Modify"
 msgid "Build with"
 msgstr "Build avec"
 
-#: src/views/preference/BasicSettings.vue:38
+#: src/views/preference/BasicSettings.vue:41
 msgid "CADir"
 msgstr ""
 
@@ -250,7 +250,7 @@ msgstr "Modèle ChatGPT"
 msgid "Check again"
 msgstr "Revérifier"
 
-#: src/views/preference/BasicSettings.vue:36
+#: src/views/preference/BasicSettings.vue:39
 msgid "Chinese user: https://ghproxy.com/"
 msgstr "Utilisateur chinois : https://ghproxy.com/"
 
@@ -710,7 +710,7 @@ msgstr "Erreur d'obtention des informations sur la version"
 msgid "Getting the certificate, please wait..."
 msgstr "Obtention du certificat, veuillez patienter..."
 
-#: src/views/preference/BasicSettings.vue:34
+#: src/views/preference/BasicSettings.vue:37
 msgid "Github Proxy"
 msgstr "Proxy Github"
 
@@ -733,11 +733,15 @@ msgstr "GPT-4-32K"
 msgid "Home"
 msgstr "Menu principal"
 
-#: src/views/preference/BasicSettings.vue:31
+#: src/views/preference/BasicSettings.vue:34
 msgid "HTTP Challenge Port"
 msgstr "Port de challenge HTTP"
 
 #: src/views/preference/BasicSettings.vue:16
+msgid "HTTP Host"
+msgstr "Host HTTP"
+
+#: src/views/preference/BasicSettings.vue:19
 msgid "HTTP Port"
 msgstr "Port HTTP"
 
@@ -771,7 +775,7 @@ msgstr "Autorités de certification intermédiaires : %{issuer}"
 msgid "Issued certificate successfully"
 msgstr "Certificat délivré avec succès"
 
-#: src/views/preference/BasicSettings.vue:22
+#: src/views/preference/BasicSettings.vue:25
 msgid "Jwt Secret"
 msgstr "Secret Jwt"
 
@@ -962,7 +966,7 @@ msgstr "Nginx a redémarré avec succès"
 msgid "No"
 msgstr "Non"
 
-#: src/views/preference/BasicSettings.vue:25
+#: src/views/preference/BasicSettings.vue:28
 #, fuzzy
 msgid "Node Secret"
 msgstr "Secret Jwt"
@@ -1226,7 +1230,7 @@ msgstr "Redémarrer"
 msgid "Restarting"
 msgstr "Redémarrage"
 
-#: src/views/preference/BasicSettings.vue:19
+#: src/views/preference/BasicSettings.vue:22
 msgid "Run Mode"
 msgstr "Mode d'exécution"
 
@@ -1397,7 +1401,7 @@ msgstr ""
 msgid "Terminal"
 msgstr "Terminal"
 
-#: src/views/preference/BasicSettings.vue:28
+#: src/views/preference/BasicSettings.vue:31
 msgid "Terminal Start Command"
 msgstr "Commande de démarrage du terminal"
 

+ 12 - 8
frontend/src/language/messages.pot

@@ -188,7 +188,7 @@ msgstr ""
 msgid "Build with"
 msgstr ""
 
-#: src/views/preference/BasicSettings.vue:38
+#: src/views/preference/BasicSettings.vue:41
 msgid "CADir"
 msgstr ""
 
@@ -255,7 +255,7 @@ msgstr ""
 msgid "Check again"
 msgstr ""
 
-#: src/views/preference/BasicSettings.vue:36
+#: src/views/preference/BasicSettings.vue:39
 msgid "Chinese user: https://ghproxy.com/"
 msgstr ""
 
@@ -731,7 +731,7 @@ msgstr ""
 msgid "Getting the certificate, please wait..."
 msgstr ""
 
-#: src/views/preference/BasicSettings.vue:34
+#: src/views/preference/BasicSettings.vue:37
 msgid "Github Proxy"
 msgstr ""
 
@@ -754,11 +754,15 @@ msgstr ""
 msgid "Home"
 msgstr ""
 
-#: src/views/preference/BasicSettings.vue:31
+#: src/views/preference/BasicSettings.vue:34
 msgid "HTTP Challenge Port"
 msgstr ""
 
 #: src/views/preference/BasicSettings.vue:16
+msgid "HTTP Host"
+msgstr ""
+
+#: src/views/preference/BasicSettings.vue:19
 msgid "HTTP Port"
 msgstr ""
 
@@ -793,7 +797,7 @@ msgstr ""
 msgid "Issued certificate successfully"
 msgstr ""
 
-#: src/views/preference/BasicSettings.vue:22
+#: src/views/preference/BasicSettings.vue:25
 msgid "Jwt Secret"
 msgstr ""
 
@@ -986,7 +990,7 @@ msgstr ""
 msgid "No"
 msgstr ""
 
-#: src/views/preference/BasicSettings.vue:25
+#: src/views/preference/BasicSettings.vue:28
 msgid "Node Secret"
 msgstr ""
 
@@ -1246,7 +1250,7 @@ msgstr ""
 msgid "Restarting"
 msgstr ""
 
-#: src/views/preference/BasicSettings.vue:19
+#: src/views/preference/BasicSettings.vue:22
 msgid "Run Mode"
 msgstr ""
 
@@ -1427,7 +1431,7 @@ msgstr ""
 msgid "Terminal"
 msgstr ""
 
-#: src/views/preference/BasicSettings.vue:28
+#: src/views/preference/BasicSettings.vue:31
 msgid "Terminal Start Command"
 msgstr ""
 

+ 13 - 9
frontend/src/language/ru_RU/app.po

@@ -187,7 +187,7 @@ msgstr "Изменение конфигурации"
 msgid "Build with"
 msgstr "Собрать с"
 
-#: src/views/preference/BasicSettings.vue:38
+#: src/views/preference/BasicSettings.vue:41
 msgid "CADir"
 msgstr ""
 
@@ -251,7 +251,7 @@ msgstr ""
 msgid "Check again"
 msgstr "Проверить повторно"
 
-#: src/views/preference/BasicSettings.vue:36
+#: src/views/preference/BasicSettings.vue:39
 msgid "Chinese user: https://ghproxy.com/"
 msgstr ""
 
@@ -717,7 +717,7 @@ msgstr "Ошибка получения информации о релизе"
 msgid "Getting the certificate, please wait..."
 msgstr "Получение сертификата, пожалуйста, подождите..."
 
-#: src/views/preference/BasicSettings.vue:34
+#: src/views/preference/BasicSettings.vue:37
 msgid "Github Proxy"
 msgstr ""
 
@@ -740,13 +740,17 @@ msgstr ""
 msgid "Home"
 msgstr "Главная"
 
-#: src/views/preference/BasicSettings.vue:31
+#: src/views/preference/BasicSettings.vue:34
 msgid "HTTP Challenge Port"
 msgstr ""
 
 #: src/views/preference/BasicSettings.vue:16
+msgid "HTTP Host"
+msgstr "Хостинг HTTP"
+
+#: src/views/preference/BasicSettings.vue:19
 msgid "HTTP Port"
-msgstr ""
+msgstr "Порт HTTP"
 
 #: src/views/domain/cert/components/AutoCertStepOne.vue:27
 #: src/views/domain/cert/components/AutoCertStepOne.vue:38
@@ -780,7 +784,7 @@ msgstr "Промежуточные центры сертификации: %{issu
 msgid "Issued certificate successfully"
 msgstr "Сертификат успешно выдан"
 
-#: src/views/preference/BasicSettings.vue:22
+#: src/views/preference/BasicSettings.vue:25
 msgid "Jwt Secret"
 msgstr ""
 
@@ -974,7 +978,7 @@ msgstr "Nginx успешно перезапущен"
 msgid "No"
 msgstr "Нет"
 
-#: src/views/preference/BasicSettings.vue:25
+#: src/views/preference/BasicSettings.vue:28
 msgid "Node Secret"
 msgstr ""
 
@@ -1228,7 +1232,7 @@ msgstr "Перезапуск"
 msgid "Restarting"
 msgstr "Перезапускается"
 
-#: src/views/preference/BasicSettings.vue:19
+#: src/views/preference/BasicSettings.vue:22
 #, fuzzy
 msgid "Run Mode"
 msgstr "Расширенный режим"
@@ -1407,7 +1411,7 @@ msgstr ""
 msgid "Terminal"
 msgstr "Терминал"
 
-#: src/views/preference/BasicSettings.vue:28
+#: src/views/preference/BasicSettings.vue:31
 msgid "Terminal Start Command"
 msgstr "Терминальная команда запуска"
 

Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 0
frontend/src/language/translations.json


+ 15 - 9
frontend/src/language/zh_CN/app.po

@@ -184,7 +184,7 @@ msgstr "批量修改"
 msgid "Build with"
 msgstr "构建基于"
 
-#: src/views/preference/BasicSettings.vue:38
+#: src/views/preference/BasicSettings.vue:41
 msgid "CADir"
 msgstr "CADir"
 
@@ -245,7 +245,7 @@ msgstr "ChatGPT 模型"
 msgid "Check again"
 msgstr "重新检查"
 
-#: src/views/preference/BasicSettings.vue:36
+#: src/views/preference/BasicSettings.vue:39
 msgid "Chinese user: https://ghproxy.com/"
 msgstr "中国用户:https://ghproxy.com/"
 
@@ -692,7 +692,7 @@ msgstr "获取发布信息错误"
 msgid "Getting the certificate, please wait..."
 msgstr "正在获取证书,请稍等..."
 
-#: src/views/preference/BasicSettings.vue:34
+#: src/views/preference/BasicSettings.vue:37
 msgid "Github Proxy"
 msgstr "Github代理"
 
@@ -715,11 +715,15 @@ msgstr "GPT-4-32K"
 msgid "Home"
 msgstr "首页"
 
-#: src/views/preference/BasicSettings.vue:31
+#: src/views/preference/BasicSettings.vue:34
 msgid "HTTP Challenge Port"
 msgstr "HTTP Challenge 监听端口"
 
 #: src/views/preference/BasicSettings.vue:16
+msgid "HTTP Host"
+msgstr "HTTP 监听主机"
+
+#: src/views/preference/BasicSettings.vue:19
 msgid "HTTP Port"
 msgstr "HTTP 监听端口"
 
@@ -753,7 +757,7 @@ msgstr "中级证书颁发机构: %{issuer}"
 msgid "Issued certificate successfully"
 msgstr "证书申请成功"
 
-#: src/views/preference/BasicSettings.vue:22
+#: src/views/preference/BasicSettings.vue:25
 msgid "Jwt Secret"
 msgstr "Jwt 密钥"
 
@@ -940,7 +944,7 @@ msgstr "Nginx 重启成功"
 msgid "No"
 msgstr "取消"
 
-#: src/views/preference/BasicSettings.vue:25
+#: src/views/preference/BasicSettings.vue:28
 #, fuzzy
 msgid "Node Secret"
 msgstr "Jwt 密钥"
@@ -1194,7 +1198,7 @@ msgstr "重启"
 msgid "Restarting"
 msgstr "重启中"
 
-#: src/views/preference/BasicSettings.vue:19
+#: src/views/preference/BasicSettings.vue:22
 msgid "Run Mode"
 msgstr "运行模式"
 
@@ -1337,7 +1341,9 @@ msgstr "主体名称: %{name}"
 msgid ""
 "Such as Reload and Configs, regex can configure as `/api/nginx/reload|/api/"
 "nginx/test|/api/config/.+`, please see system api"
-msgstr "`重载`和`配置管理`的操作同步正则可以配置为`/api/nginx/reload|/api/nginx/test|/api/config/.+`,详细请查看系统API"
+msgstr ""
+"`重载`和`配置管理`的操作同步正则可以配置为`/api/nginx/reload|/api/nginx/"
+"test|/api/config/.+`,详细请查看系统API"
 
 #: src/views/dashboard/ServerAnalytic.vue:40
 msgid "Swap"
@@ -1363,7 +1369,7 @@ msgstr "目标"
 msgid "Terminal"
 msgstr "终端"
 
-#: src/views/preference/BasicSettings.vue:28
+#: src/views/preference/BasicSettings.vue:31
 msgid "Terminal Start Command"
 msgstr "终端启动命令"
 

+ 12 - 8
frontend/src/language/zh_TW/app.po

@@ -184,7 +184,7 @@ msgstr "批次修改"
 msgid "Build with"
 msgstr "構建基於"
 
-#: src/views/preference/BasicSettings.vue:38
+#: src/views/preference/BasicSettings.vue:41
 msgid "CADir"
 msgstr ""
 
@@ -245,7 +245,7 @@ msgstr "ChatGPT 模型"
 msgid "Check again"
 msgstr "再次檢查"
 
-#: src/views/preference/BasicSettings.vue:36
+#: src/views/preference/BasicSettings.vue:39
 msgid "Chinese user: https://ghproxy.com/"
 msgstr "中國使用者:https://ghproxy.com/"
 
@@ -693,7 +693,7 @@ msgstr "取得發布資訊錯誤"
 msgid "Getting the certificate, please wait..."
 msgstr "正在取得憑證,請稍候..."
 
-#: src/views/preference/BasicSettings.vue:34
+#: src/views/preference/BasicSettings.vue:37
 msgid "Github Proxy"
 msgstr "Github 代理"
 
@@ -716,11 +716,15 @@ msgstr "GPT-4-32K"
 msgid "Home"
 msgstr "首頁"
 
-#: src/views/preference/BasicSettings.vue:31
+#: src/views/preference/BasicSettings.vue:34
 msgid "HTTP Challenge Port"
 msgstr "HTTP 挑戰埠"
 
 #: src/views/preference/BasicSettings.vue:16
+msgid "HTTP Host"
+msgstr "HTTP 監聽主機"
+
+#: src/views/preference/BasicSettings.vue:19
 msgid "HTTP Port"
 msgstr "HTTP 監聽埠"
 
@@ -754,7 +758,7 @@ msgstr "中級憑證頒發機構: %{issuer}"
 msgid "Issued certificate successfully"
 msgstr "成功頒發憑證"
 
-#: src/views/preference/BasicSettings.vue:22
+#: src/views/preference/BasicSettings.vue:25
 msgid "Jwt Secret"
 msgstr "Jwt Secret"
 
@@ -940,7 +944,7 @@ msgstr "Nginx 重啟成功"
 msgid "No"
 msgstr "取消"
 
-#: src/views/preference/BasicSettings.vue:25
+#: src/views/preference/BasicSettings.vue:28
 msgid "Node Secret"
 msgstr "Node Secret"
 
@@ -1193,7 +1197,7 @@ msgstr "重新啟動"
 msgid "Restarting"
 msgstr "正在重新啟動"
 
-#: src/views/preference/BasicSettings.vue:19
+#: src/views/preference/BasicSettings.vue:22
 msgid "Run Mode"
 msgstr "執行模式"
 
@@ -1362,7 +1366,7 @@ msgstr "目標"
 msgid "Terminal"
 msgstr "終端機"
 
-#: src/views/preference/BasicSettings.vue:28
+#: src/views/preference/BasicSettings.vue:31
 msgid "Terminal Start Command"
 msgstr "終端機啟動指令"
 

+ 3 - 0
frontend/src/views/preference/BasicSettings.vue

@@ -23,6 +23,9 @@ const theme = inject('theme')
                 </a-select-option>
             </a-select>
         </a-form-item>
+        <a-form-item :label="$gettext('HTTP Host')">
+            <p>{{ data.server.http_host }}</p>
+        </a-form-item>
         <a-form-item :label="$gettext('HTTP Port')">
             <p>{{ data.server.http_port }}</p>
         </a-form-item>

+ 1 - 0
frontend/src/views/preference/typedef.ts

@@ -1,5 +1,6 @@
 export interface IData {
     server: {
+        http_host: string
         http_port: string
         run_mode: string
         jwt_secret: string

+ 1 - 1
main.go

@@ -28,7 +28,7 @@ func main() {
 
 	overseer.Run(overseer.Config{
 		Program:          server.Program,
-		Address:          fmt.Sprintf(":%s", settings.ServerSettings.HttpPort),
+		Address:          fmt.Sprintf("%s:%s", settings.ServerSettings.HttpHost, settings.ServerSettings.HttpPort),
 		Fetcher:          &fetcher.File{Path: r.ExPath},
 		TerminateTimeout: 0,
 	})

+ 2 - 0
server/settings/settings.go

@@ -16,6 +16,7 @@ var (
 )
 
 type Server struct {
+	HttpHost          string `json:"http_host"`
 	HttpPort          string `json:"http_port"`
 	RunMode           string `json:"run_mode"`
 	JwtSecret         string `json:"jwt_secret"`
@@ -47,6 +48,7 @@ type OpenAI struct {
 }
 
 var ServerSettings = Server{
+	HttpHost:          "0.0.0.0",
 	HttpPort:          "9000",
 	RunMode:           "debug",
 	HTTPChallengePort: "9180",

Bu fark içinde çok fazla dosya değişikliği olduğu için bazı dosyalar gösterilmiyor