From b927470e33bb75594f1546a4f06d48bc2281f5ab Mon Sep 17 00:00:00 2001 From: Charles7c Date: Thu, 31 Oct 2024 20:29:11 +0800 Subject: [PATCH] =?UTF-8?q?chore:=20=E4=BC=98=E5=8C=96=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E8=B0=83=E5=BA=A6=E9=85=8D=E7=BD=AE=E5=8F=8A=20docker=20?= =?UTF-8?q?=E9=83=A8=E7=BD=B2=E8=84=9A=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/config/application-dev.yml | 10 +++++----- .../src/main/resources/config/application-prod.yml | 10 +++++----- docker/docker-compose.yml | 4 ++++ 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/continew-webapi/src/main/resources/config/application-dev.yml b/continew-webapi/src/main/resources/config/application-dev.yml index 202d61cc..015f0aec 100644 --- a/continew-webapi/src/main/resources/config/application-dev.yml +++ b/continew-webapi/src/main/resources/config/application-dev.yml @@ -274,17 +274,17 @@ snail-job: # 客户端端口（默认：1789） port: 1789 # 命名空间 ID - namespace: 764d604ec6fc45f68cd92514c40e9e1a + namespace: ${SCHEDULE_NAMESPACE:764d604ec6fc45f68cd92514c40e9e1a} # 分组名 - group: continew-admin + group: ${SCHEDULE_GROUP:continew-admin} # 令牌 - token: SJ_Wyz3dmsdbDOkDujOTSSoBjGQP1BMsVnj + token: ${SCHEDULE_TOKEN:SJ_Wyz3dmsdbDOkDujOTSSoBjGQP1BMsVnj} ## 服务端配置（任务调度中心） server: # 服务端地址，若服务端集群部署则此处配置域名 - host: 127.0.0.1 + host: ${SCHEDULE_HOST:127.0.0.1} # Netty 端口号 - port: 1788 + port: ${SCHEDULE_PORT:1788} # API 配置 api: # URL diff --git a/continew-webapi/src/main/resources/config/application-prod.yml b/continew-webapi/src/main/resources/config/application-prod.yml index 147ab4ac..bac838de 100644 --- a/continew-webapi/src/main/resources/config/application-prod.yml +++ b/continew-webapi/src/main/resources/config/application-prod.yml @@ -271,17 +271,17 @@ snail-job: # 客户端端口（默认：1789） port: 1789 # 命名空间 ID - namespace: 764d604ec6fc45f68cd92514c40e9e1a + namespace: ${SCHEDULE_NAMESPACE:764d604ec6fc45f68cd92514c40e9e1a} # 分组名 - group: continew-admin + group: ${SCHEDULE_GROUP:continew-admin} # 令牌 - token: SJ_Wyz3dmsdbDOkDujOTSSoBjGQP1BMsVnj + token: ${SCHEDULE_TOKEN:SJ_Wyz3dmsdbDOkDujOTSSoBjGQP1BMsVnj} ## 服务端配置（任务调度中心） server: # 服务端地址，若服务端集群部署则此处配置域名 - host: 127.0.0.1 + host: ${SCHEDULE_HOST:127.0.0.1} # Netty 端口号 - port: 1788 + port: ${SCHEDULE_PORT:1788} # API 配置 api: # URL diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 29880845..d3d50767 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -54,6 +54,7 @@ services: container_name: continew-admin-server ports: - '18000:18000' + - '1789:1789' environment: TZ: Asia/Shanghai DB_HOST: 172.17.0.1 @@ -65,6 +66,9 @@ services: REDIS_PORT: 6379 REDIS_PWD: 你的 Redis 密码 REDIS_DB: 0 + SCHEDULE_HOST: 172.17.0.1 + SCHEDULE_PORT: 1788 + SCHEDULE_TOKEN: 任务调度服务端 Token volumes: - /docker/continew-admin/config/:/app/config/ - /docker/continew-admin/data/file/:/app/data/file/