From b962f822c5b1db58054a4837c7bfae4358a2d4a6 Mon Sep 17 00:00:00 2001 From: zhouhao Date: Wed, 21 May 2025 20:05:43 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E4=BC=98=E5=8C=96=E9=85=8D?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker/run-all/docker-compose.yml | 2 ++ jetlinks-standalone/src/main/resources/application.yml | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/docker/run-all/docker-compose.yml b/docker/run-all/docker-compose.yml index 5b79cf1b..370e5b1e 100644 --- a/docker/run-all/docker-compose.yml +++ b/docker/run-all/docker-compose.yml @@ -45,6 +45,8 @@ services: environment: - "JAVA_OPTS=-Duser.language=zh" - "TZ=Asia/Shanghai" + - "EXTERNAL_HOST=local-host.cn" # 对外提供访问的域名或者ip地址 + - "EXTERNAL_PORT=8848" # 对外提供访问的端口,修改了端口映射同时也需要修改这里. - "ADMIN_USER_PASSWORD=JetLinks.C0mmVn1ty" # admin用户的初始密码 - "spring.r2dbc.url=r2dbc:postgresql://postgres:5432/jetlinks" #数据库连接地址 - "spring.r2dbc.username=postgres" diff --git a/jetlinks-standalone/src/main/resources/application.yml b/jetlinks-standalone/src/main/resources/application.yml index 2ffe4c83..40520f5a 100644 --- a/jetlinks-standalone/src/main/resources/application.yml +++ b/jetlinks-standalone/src/main/resources/application.yml @@ -128,7 +128,7 @@ file: storage-base-path: ./data/files api: # 访问api接口的根地址 - base-path: http://127.0.0.1:${server.port} + base-path: http://${EXTERNAL_HOST:127.0.0.1}:${EXTERNAL_HOST:${server.port}} jetlinks: server-id: ${spring.application.name}:${server.port} #设备服务网关服务ID,不同服务请设置不同的ID @@ -209,7 +209,7 @@ system: properties: - key: base-path name: 接口根路径 - default-value: http://127.0.0.1:9000/api + default-value: ${api.base-path} - id: amap name: 高德地图配置 public-access: false