diff --git a/data/config.toml b/data/config.toml index bb4a373..e01d1d4 100644 --- a/data/config.toml +++ b/data/config.toml @@ -1,6 +1,8 @@ [system] host = "127.0.0.1" -port = 13956 +port = 13955 +backend_host = "127.0.0.1" +backend_port = 13956 [basic] title = "Pap" diff --git a/index.html b/index.html index fafb88f..e0aa07b 100644 --- a/index.html +++ b/index.html @@ -10,10 +10,8 @@
diff --git a/package.json b/package.json index 21e22d0..4439178 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "pap", "private": true, - "version": "0.1.9", + "version": "0.2.0", "type": "module", "scripts": { "dev": "vite", diff --git a/src-python/backend.py b/src-python/backend.py index 0094db0..d0d8854 100644 --- a/src-python/backend.py +++ b/src-python/backend.py @@ -15,6 +15,8 @@ # system init host = system_config.host port = system_config.port +backend_host = system_config.backend_host +backend_port = system_config.backend_port # database ORM init Base.metadata.create_all(bind=engine) @@ -29,6 +31,7 @@ origins = [ f"http://{dev_config.dev_host}:{dev_config.dev_port}", f"http://{host}:{port}", + 'http://127.0.0.1:13956' "http://localhost:6174", ] @@ -95,4 +98,4 @@ def start_backend(is_dev: bool): """Start backend service """ logger.info("start backend") - run(app='backend:app', host=host, port=port, reload=is_dev) + run(app='backend:app', host=backend_host, port=backend_port, reload=is_dev) diff --git a/src-python/service/config.py b/src-python/service/config.py index c18c77f..6573eae 100644 --- a/src-python/service/config.py +++ b/src-python/service/config.py @@ -141,7 +141,7 @@ def __init__(self, config_manager: ConfigManager) -> None: @property def host(self) -> str: - """frontend 监听的 host 地址 + """服务运行的 host 地址 Returns: str: 主机地址 @@ -154,7 +154,7 @@ def host(self, value: str) -> None: @property def port(self) -> int: - """frontend 监听的 port 端口 + """服务运行的 port 端口 Returns: int: 端口 @@ -165,7 +165,35 @@ def port(self) -> int: def port(self, value: int) -> None: self.set_property("port", value) + @property + def backend_host(self) -> str: + """frontend 监听的 host 地址 + + Returns: + str: 主机地址 + """ + return self.get_property("backend_host") + + @backend_host.setter + def backend_host(self, value: str) -> None: + self.set_property("backend_host", value) + + @property + def backend_port(self) -> int: + """frontend 监听的 port 端口 + + Returns: + int: 端口 + """ + return self.get_property("backend_port") + + @backend_port.setter + def backend_port(self, value: int) -> None: + self.set_property("backend_port", value) + def _create_schema_instance(self, data_dict) -> SystemConfigSchema: + data_dict.pop("host") + data_dict.pop("port") return SystemConfigSchema(**data_dict)