From 4524e86391d2b3a1ec99a6a447216c278acf886d Mon Sep 17 00:00:00 2001 From: budou <1769794040@qq.com> Date: Fri, 3 Nov 2023 21:39:52 +0800 Subject: [PATCH] =?UTF-8?q?chore:=20=E6=9B=B4=E6=96=B0v1.5.0=E7=89=88?= =?UTF-8?q?=E6=9C=AC=20(#557)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/tangsengdaodao/{1.0.0 => 1.5.0}/data.yml | 12 ++++----- .../{1.0.0 => 1.5.0}/docker-compose.yml | 26 +++++++++---------- apps/tangsengdaodao/data.yml | 4 +-- 3 files changed, 21 insertions(+), 21 deletions(-) rename apps/tangsengdaodao/{1.0.0 => 1.5.0}/data.yml (93%) rename apps/tangsengdaodao/{1.0.0 => 1.5.0}/docker-compose.yml (77%) diff --git a/apps/tangsengdaodao/1.0.0/data.yml b/apps/tangsengdaodao/1.5.0/data.yml similarity index 93% rename from apps/tangsengdaodao/1.0.0/data.yml rename to apps/tangsengdaodao/1.5.0/data.yml index e31e05bf..f913d7bb 100644 --- a/apps/tangsengdaodao/1.0.0/data.yml +++ b/apps/tangsengdaodao/1.5.0/data.yml @@ -90,19 +90,19 @@ additionalProperties: rule: paramComplexity type: password - default: 5100 - envKey: WK_PORT_TCP + envKey: PANEL_APP_PORT_WK_TCP labelEn: WuKongIM tcp port labelZh: 悟空IM TCP端口 required: true type: number - default: 5200 - envKey: WK_PORT_WS + envKey: PANEL_APP_PORT_WK_WS labelEn: WuKongIM ws port labelZh: 悟空IM WS端口 required: true type: number - default: 5300 - envKey: WK_PORT_WEB_SERVER + envKey: PANEL_APP_PORT_WK_WEB_SERVER labelEn: WuKongIM web port labelZh: 悟空IM监控端口 required: true @@ -127,19 +127,19 @@ additionalProperties: required: true type: text - default: 8090 - envKey: TS_APP_PORT_HTTP + envKey: PANEL_APP_PORT_TS_APP_HTTP labelEn: TangSengDaoDao port labelZh: 唐僧叨叨端口 required: true type: number - default: 82 - envKey: TS_APP_PORT_WEB + envKey: PANEL_APP_PORT_TS_APP_WEB labelEn: TangSengDaoDao web port labelZh: 唐僧叨叨WEB端口 required: true type: number - default: 83 - envKey: TS_APP_PORT_MANAGER + envKey: PANEL_APP_PORT_TS_APP_MANAGER labelEn: TangSengDaoDao Management background port labelZh: 唐僧叨叨管理后台端口 required: true diff --git a/apps/tangsengdaodao/1.0.0/docker-compose.yml b/apps/tangsengdaodao/1.5.0/docker-compose.yml similarity index 77% rename from apps/tangsengdaodao/1.0.0/docker-compose.yml rename to apps/tangsengdaodao/1.5.0/docker-compose.yml index d94ab0ad..34f2eb02 100644 --- a/apps/tangsengdaodao/1.0.0/docker-compose.yml +++ b/apps/tangsengdaodao/1.5.0/docker-compose.yml @@ -1,12 +1,12 @@ -version: '1.0.0' +version: '1.5.0' services: tsddwukongim: # 唐僧叨叨通讯服务(悟空IM) - image: registry.cn-shanghai.aliyuncs.com/wukongim/wukongim:latest + image: registry.cn-shanghai.aliyuncs.com/wukongim/wukongim:v1.1.8 restart: always ports: - - "${WK_PORT_TCP}:5100" # tcp长连接端口(外网开放) - - "${WK_PORT_WS}:5200" # websocket端口(外网开放) - - "${WK_PORT_WEB_SERVER}:5300" # 监控端口 + - "${PANEL_APP_PORT_WK_TCP}:5100" # tcp长连接端口(外网开放) + - "${PANEL_APP_PORT_WK_WS}:5200" # websocket端口(外网开放) + - "${PANEL_APP_PORT_WK_WEB_SERVER}:5300" # 监控端口 volumes: - ./wukongim:/root/wukongim environment: @@ -20,7 +20,7 @@ services: networks: - 1panel-network tangsengdaodaoserver: # 唐僧叨叨的业务服务 - image: registry.cn-shanghai.aliyuncs.com/wukongim/tangsengdaodaoserver:latest + image: registry.cn-shanghai.aliyuncs.com/wukongim/tangsengdaodaoserver:v1.5.0 restart: always command: "api" healthcheck: @@ -31,7 +31,7 @@ services: depends_on: - tsddwukongim ports: - - "${TS_APP_PORT_HTTP}:8090" + - "${PANEL_APP_PORT_TS_APP_HTTP}:8090" volumes: - ./tsdd:/home/tsdddata # - ./tsdd/configs/tsdd.yaml:/home/configs/tsdd.yaml @@ -52,21 +52,21 @@ services: networks: - 1panel-network tangsengdaodaoweb: # 唐僧叨叨的web服务 - image: registry.cn-shanghai.aliyuncs.com/wukongim/tangsengdaodaoweb:latest + image: registry.cn-shanghai.aliyuncs.com/wukongim/tangsengdaodaoweb:v1.0.0 restart: always environment: - - API_URL=http://${EXTERNAL_IP}:${TS_APP_PORT_HTTP}/ + - API_URL=http://${EXTERNAL_IP}:${PANEL_APP_PORT_TS_APP_HTTP}/ ports: - - "${TS_APP_PORT_WEB}:80" + - "${PANEL_APP_PORT_TS_APP_WEB}:80" networks: - 1panel-network tangsengdaodaomanager: # 唐僧叨叨的后台管理系统 - image: registry.cn-shanghai.aliyuncs.com/wukongim/tangsengdaodaomanager:latest + image: registry.cn-shanghai.aliyuncs.com/wukongim/tangsengdaodaomanager:v1.0.0 restart: always environment: - - API_URL=http://${EXTERNAL_IP}:${TS_APP_PORT_HTTP}/ + - API_URL=http://${EXTERNAL_IP}:${PANEL_APP_PORT_TS_APP_HTTP}/ ports: - - "${TS_APP_PORT_MANAGER}:80" + - "${PANEL_APP_PORT_TS_APP_MANAGER}:80" networks: - 1panel-network networks: diff --git a/apps/tangsengdaodao/data.yml b/apps/tangsengdaodao/data.yml index df216ba7..6be1eec2 100644 --- a/apps/tangsengdaodao/data.yml +++ b/apps/tangsengdaodao/data.yml @@ -15,6 +15,6 @@ additionalProperties: crossVersionUpdate: true limit: 0 recommend: 0 - website: https://tangsengdaodao.com/ + website: https://tsdaodao.com/ github: https://github.com/TangSengDaoDao/TangSengDaoDaoServer - document: https://tangsengdaodao.com/ + document: https://tsdaodao.com/