diff --git a/isolated/.env.example b/isolated/.env.example index 2a51fc0..724f409 100644 --- a/isolated/.env.example +++ b/isolated/.env.example @@ -24,7 +24,7 @@ PDF_HOST_PORT=3100 NACOS_HOST_PORT=9008 NACOS_GRPC_HOST_PORT=10008 -# MySQL / Kafka / TDengine 需要开放到宿主机,便于 Navicat、Kafka 客户端、TDengine Web/REST 调试。 +# MySQL / Kafka / TDengine 需要开放到宿主机,便于 Navicat、Kafka 客户端、TDengine UI/REST 调试。 # 如果宿主机端口已被其他项目占用,改这里即可。 MYSQL_HOST_PORT=13306 KAFKA_HOST_PORT=19094 @@ -32,7 +32,7 @@ TDENGINE_HOST_PORT=6030 TDENGINE_REST_HOST_PORT=6041 TDENGINE_RPC_HOST_PORT=6043 TDENGINE_RPC_UDP_HOST_PORT=6044 -TDENGINE_KEEPER_HOST_PORT=6060 +TDENGINE_UI_HOST_PORT=6060 # Redis 默认只绑定本机,避免直接暴露公网;确实需要外部访问再改成 0.0.0.0。 REDIS_BIND_HOST=127.0.0.1 diff --git a/isolated/README.md b/isolated/README.md index 8130ffa..e9adeb2 100644 --- a/isolated/README.md +++ b/isolated/README.md @@ -121,12 +121,12 @@ DEPLOY_ENV=emp-uat bash install.sh `profiles/docker-compose.yml` 中网关、PDF、Nacos、Redis 默认只在 Docker 内网访问;前端 Nginx 容器会在 Docker 内网代理 `/api/` 和 `/socket.io/`。 -| 环境 | 部署目录 | Compose 项目名 | 前端 | WS | MySQL | 本地 Kafka 可选 | TDengine REST | +| 环境 | 部署目录 | Compose 项目名 | 前端 | WS | MySQL | 本地 Kafka 可选 | TDengine UI | | --- | --- | --- | --- | --- | --- | --- | --- | | emp-test | `/home/admin-x99/emp/emp-test` | `emp-test` | 4750 | 4751 | 4752 | 4753 | 4754 | | emp-uat | `/home/admin-x99/emp/emp-uat` | `emp-uat` | 4755 | 4756 | 4757 | 4758 | 4759 | -`4760` 预留备用。当前公共 compose 模板不对外暴露 Gateway、PDF、Nacos、Redis、TDengine RPC;如需额外暴露,再使用 `4760` 或向甲方申请新端口。 +`4754` 和 `4759` 映射到 TDengine 容器内的 `6060` UI 端口。当前公共 compose 模板不对外暴露 Gateway、PDF、Nacos、Redis、TDengine REST/RPC;如需额外暴露,再向甲方申请新端口。 甲方服务器系统重装后,`emp-test` 和 `emp-uat` 都按全量部署重新执行一次;不要只打增量包。 diff --git a/isolated/docker-compose.runtime.yml b/isolated/docker-compose.runtime.yml index 2b2be1e..0ea236e 100644 --- a/isolated/docker-compose.runtime.yml +++ b/isolated/docker-compose.runtime.yml @@ -111,7 +111,7 @@ services: - "0.0.0.0:${TDENGINE_REST_HOST_PORT:-6041}:6041" - "0.0.0.0:${TDENGINE_RPC_HOST_PORT:-6043}:6043" - "0.0.0.0:${TDENGINE_RPC_UDP_HOST_PORT:-6044}:6044/udp" - - "0.0.0.0:${TDENGINE_KEEPER_HOST_PORT:-6060}:6060" + - "0.0.0.0:${TDENGINE_UI_HOST_PORT:-${TDENGINE_KEEPER_HOST_PORT:-6060}}:6060" environment: TZ: Asia/Shanghai TAOS_FQDN: ${PUBLIC_HOST} diff --git a/isolated/profiles/docker-compose.yml b/isolated/profiles/docker-compose.yml index aed320c..3e583e3 100644 --- a/isolated/profiles/docker-compose.yml +++ b/isolated/profiles/docker-compose.yml @@ -118,7 +118,7 @@ services: privileged: true restart: unless-stopped ports: - - "0.0.0.0:${TDENGINE_REST_HOST_PORT:-37363}:6041" + - "0.0.0.0:${TDENGINE_UI_HOST_PORT:-${TDENGINE_REST_HOST_PORT:-37363}}:6060" environment: TZ: Asia/Shanghai TAOS_FQDN: tdengine diff --git a/isolated/profiles/emp-test/.env.example b/isolated/profiles/emp-test/.env.example index 95cc7eb..5788359 100644 --- a/isolated/profiles/emp-test/.env.example +++ b/isolated/profiles/emp-test/.env.example @@ -12,11 +12,11 @@ ADMIN_HOST_PORT=4750 WS_HOST_PORT=4751 MYSQL_HOST_PORT=4752 KAFKA_HOST_PORT=4753 -TDENGINE_REST_HOST_PORT=4754 +TDENGINE_UI_HOST_PORT=4754 REDIS_BIND_HOST=127.0.0.1 -# profiles/docker-compose.yml 不对外暴露 Gateway/PDF/Nacos/Redis/TDengine RPC。 +# profiles/docker-compose.yml 不对外暴露 Gateway/PDF/Nacos/Redis/TDengine REST/RPC。 # 4760 预留备用,确需额外暴露服务时再单独分配。 MYSQL_IMAGE=mysql:8.0 diff --git a/isolated/profiles/emp-uat/.env.example b/isolated/profiles/emp-uat/.env.example index 5122fde..2846540 100644 --- a/isolated/profiles/emp-uat/.env.example +++ b/isolated/profiles/emp-uat/.env.example @@ -12,11 +12,11 @@ ADMIN_HOST_PORT=4755 WS_HOST_PORT=4756 MYSQL_HOST_PORT=4757 KAFKA_HOST_PORT=4758 -TDENGINE_REST_HOST_PORT=4759 +TDENGINE_UI_HOST_PORT=4759 REDIS_BIND_HOST=127.0.0.1 -# profiles/docker-compose.yml 不对外暴露 Gateway/PDF/Nacos/Redis/TDengine RPC。 +# profiles/docker-compose.yml 不对外暴露 Gateway/PDF/Nacos/Redis/TDengine REST/RPC。 # 4760 预留备用,确需额外暴露服务时再单独分配。 MYSQL_IMAGE=mysql:8.0 diff --git a/isolated/test/docker-compose.yml b/isolated/test/docker-compose.yml index 3f82423..83de4d7 100644 --- a/isolated/test/docker-compose.yml +++ b/isolated/test/docker-compose.yml @@ -114,7 +114,7 @@ services: privileged: true restart: unless-stopped ports: - - "0.0.0.0:${TDENGINE_REST_HOST_PORT:-37363}:6041" + - "0.0.0.0:${TDENGINE_UI_HOST_PORT:-${TDENGINE_REST_HOST_PORT:-37363}}:6060" environment: TZ: Asia/Shanghai TAOS_FQDN: tdengine diff --git a/isolated/test/env.txt b/isolated/test/env.txt index ef51cb2..25ff370 100644 --- a/isolated/test/env.txt +++ b/isolated/test/env.txt @@ -29,7 +29,7 @@ NACOS_GRPC_HOST_PORT=10008 MYSQL_HOST_PORT=23306 KAFKA_HOST_PORT=29362 TDENGINE_HOST_PORT=6030 -TDENGINE_REST_HOST_PORT=37363 +TDENGINE_UI_HOST_PORT=37363 TDENGINE_RPC_HOST_PORT=6043 TDENGINE_RPC_UDP_HOST_PORT=6044 TDENGINE_KEEPER_HOST_PORT=6060