diff --git a/config/deploy.template-cn.yaml b/config/deploy.template-cn.yaml index 6f79910..c36ca93 100644 --- a/config/deploy.template-cn.yaml +++ b/config/deploy.template-cn.yaml @@ -128,8 +128,8 @@ Deploy: WebuiHost: 0.0.0.0 # --port. Port to listen # You will be able to access webui via `http://{host}:{port}` - # [In most cases] Default to 22367 - WebuiPort: 22367 + # [In most cases] Default to 23467 + WebuiPort: 23467 # Language to use on web ui # 'zh-CN' for Chinese simplified # 'en-US' for English diff --git a/config/deploy.template.yaml b/config/deploy.template.yaml index f124e51..ad137cb 100644 --- a/config/deploy.template.yaml +++ b/config/deploy.template.yaml @@ -128,8 +128,8 @@ Deploy: WebuiHost: 0.0.0.0 # --port. Port to listen # You will be able to access webui via `http://{host}:{port}` - # [In most cases] Default to 22367 - WebuiPort: 22367 + # [In most cases] Default to 23467 + WebuiPort: 23467 # Language to use on web ui # 'zh-CN' for Chinese simplified # 'en-US' for English diff --git a/deploy/Windows/config.py b/deploy/Windows/config.py index 8ab28c2..b6b528e 100644 --- a/deploy/Windows/config.py +++ b/deploy/Windows/config.py @@ -55,7 +55,7 @@ class ConfigModel: # Webui WebuiHost: str = "0.0.0.0" - WebuiPort: int = 22367 + WebuiPort: int = 23467 Language: str = "en-US" Theme: str = "default" DpiScaling: bool = True diff --git a/deploy/Windows/template.yaml b/deploy/Windows/template.yaml index a245bff..2dab174 100644 --- a/deploy/Windows/template.yaml +++ b/deploy/Windows/template.yaml @@ -128,8 +128,8 @@ Deploy: WebuiHost: 0.0.0.0 # --port. Port to listen # You will be able to access webui via `http://{host}:{port}` - # [In most cases] Default to 22367 - WebuiPort: 22367 + # [In most cases] Default to 23467 + WebuiPort: 23467 # Language to use on web ui # 'zh-CN' for Chinese simplified # 'en-US' for English diff --git a/gui.py b/gui.py index 2ecc6b2..776ed9f 100644 --- a/gui.py +++ b/gui.py @@ -49,7 +49,7 @@ def func(ev: threading.Event): args, _ = parser.parse_known_args() host = args.host or State.deploy_config.WebuiHost or "0.0.0.0" - port = args.port or int(State.deploy_config.WebuiPort) or 22367 + port = args.port or int(State.deploy_config.WebuiPort) or 23467 State.electron = args.electron logger.hr("Launcher config") diff --git a/module/webui/remote_access.py b/module/webui/remote_access.py index 163cbd1..754af96 100644 --- a/module/webui/remote_access.py +++ b/module/webui/remote_access.py @@ -16,8 +16,8 @@ import time from subprocess import PIPE, Popen from typing import TYPE_CHECKING -from module.logger import logger from module.config.utils import random_id +from module.logger import logger from module.webui.setting import State if TYPE_CHECKING: @@ -41,7 +41,7 @@ def am_i_the_only_thread() -> bool: def remote_access_service( local_host="127.0.0.1", - local_port=22367, + local_port=23467, server="app.pywebio.online", server_port=1022, remote_port="/", diff --git a/webapp/packages/main/public/deploy.yaml.tpl b/webapp/packages/main/public/deploy.yaml.tpl index 945fdfd..0b823a6 100644 --- a/webapp/packages/main/public/deploy.yaml.tpl +++ b/webapp/packages/main/public/deploy.yaml.tpl @@ -128,8 +128,8 @@ Deploy: WebuiHost: 0.0.0.0 # --port. Port to listen # You will be able to access webui via `http://{host}:{port}` - # [In most cases] Default to 22367 - WebuiPort: 22367 + # [In most cases] Default to 23467 + WebuiPort: 23467 # Language to use on web ui # 'zh-CN' for Chinese simplified # 'en-US' for English diff --git a/webapp/packages/renderer/src/logics/initAppConfigStore.ts b/webapp/packages/renderer/src/logics/initAppConfigStore.ts index 61e6083..b4fd390 100644 --- a/webapp/packages/renderer/src/logics/initAppConfigStore.ts +++ b/webapp/packages/renderer/src/logics/initAppConfigStore.ts @@ -9,6 +9,6 @@ export async function initAppConfigStore() { appStore.setRepository( (repositoryValueMap[config?.repository] as 'global' | 'china') ?? 'global', ); - appStore.setWebuiUrl(config?.webuiUrl ?? '127.0.0.1:22367'); + appStore.setWebuiUrl(config?.webuiUrl ?? '127.0.0.1:23467'); appStore.setAlasPath(config?.alasPath ?? ''); }