From 3e95cf122846f3e8f1883c367ef56339baf2d462 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E5=B0=8F=E4=BA=91?= Date: Fri, 23 May 2025 18:51:23 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=89=88=E6=9C=AC=E7=9A=84?= =?UTF-8?q?=E6=8E=A7=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- start/airport.sh | 2 +- start/dspapi.sh | 2 +- start/hhzadmin.sh | 2 +- start/oidcservice.sh | 2 +- tuohengdev.sh | 16 +++++++++++++++- 5 files changed, 19 insertions(+), 5 deletions(-) diff --git a/start/airport.sh b/start/airport.sh index b62a079..14275fb 100755 --- a/start/airport.sh +++ b/start/airport.sh @@ -14,7 +14,7 @@ docker run --pull always -d \ --env SPRING_CLOUD_CONSUL_HOST=${CONSUL_NAME} \ --env SPRING_CLOUD_CONSUL_PORT=8500 \ --env SPRING_CLOUD_CONSUL_DISCOVERY_HOSTNAME=${AIRPORT_NAME} \ ---env XXL_JOB_ADMIN_ADDRESSES=${XXLJOB_NAME}:8080 \ +--env XXL_JOB_ADMIN_ADDRESSES=http://${XXLJOB_NAME}:8080/xxl-job-admin \ --env XXL_ENABLE=false \ --env SPRING_REDIS_HOST=${REDIS_NAME} \ --env SPRING_REDIS_PORT=6379 \ diff --git a/start/dspapi.sh b/start/dspapi.sh index 75dd9fa..97c92aa 100755 --- a/start/dspapi.sh +++ b/start/dspapi.sh @@ -14,7 +14,7 @@ docker run --pull always -d \ --env SPRING_CLOUD_CONSUL_HOST=${CONSUL_NAME} \ --env SPRING_CLOUD_CONSUL_PORT=8500 \ --env SPRING_CLOUD_CONSUL_DISCOVERY_HOSTNAME=${DSP_API_NAME} \ ---env XXL_JOB_ADMIN_ADDRESSES=${XXLJOB_NAME}:${XXLJOB_PORT} \ +--env XXL_JOB_ADMIN_ADDRESSES=http://${XXLJOB_NAME}:8080/xxl-job-admin \ --env XXL_ENABLE=false \ --env SPRING_REDIS_HOST=${REDIS_NAME} \ --env SPRING_REDIS_PORT=6379 \ diff --git a/start/hhzadmin.sh b/start/hhzadmin.sh index 281ea54..b888e03 100755 --- a/start/hhzadmin.sh +++ b/start/hhzadmin.sh @@ -14,7 +14,7 @@ docker run --pull always -d \ --env SPRING_CLOUD_CONSUL_HOST=${CONSUL_NAME} \ --env SPRING_CLOUD_CONSUL_PORT=8500 \ --env SPRING_CLOUD_CONSUL_DISCOVERY_HOSTNAME=${HHZ_ADMIN_NAME} \ ---env XXL_JOB_ADMIN_ADDRESSES=${XXLJOB_NAME}:${XXLJOB_PORT} \ +--env XXL_JOB_ADMIN_ADDRESSES=http://${XXLJOB_NAME}:8080/xxl-job-admin \ --env XXL_ENABLE=false \ --env SPRING_REDIS_HOST=${REDIS_NAME} \ --env SPRING_REDIS_PORT=6379 \ diff --git a/start/oidcservice.sh b/start/oidcservice.sh index 9a0d247..07199c5 100755 --- a/start/oidcservice.sh +++ b/start/oidcservice.sh @@ -15,7 +15,7 @@ docker run --pull always -d \ --env SPRING_CLOUD_CONSUL_HOST=${CONSUL_NAME} \ --env SPRING_CLOUD_CONSUL_PORT=8500 \ --env SPRING_CLOUD_CONSUL_DISCOVERY_HOSTNAME=${OIDC_SERVER_NAME} \ ---env XXL_JOB_ADMIN_ADDRESSES=${XXLJOB_NAME}:${XXLJOB_PORT} \ +--env XXL_JOB_ADMIN_ADDRESSES=http://${XXLJOB_NAME}:8080/xxl-job-admin \ --env XXL_ENABLE=false \ --env SPRING_REDIS_HOST=${REDIS_NAME} \ --env SPRING_REDIS_PORT=6379 \ diff --git a/tuohengdev.sh b/tuohengdev.sh index aa58d8a..a5c012c 100644 --- a/tuohengdev.sh +++ b/tuohengdev.sh @@ -21,4 +21,18 @@ export MINIO_CONSOLE_PORT=9022 # Consul 配置 export CONSUL_PORT=8600 # XXL-Job 配置 -export XXLJOB_PORT=8383 \ No newline at end of file +export XXLJOB_PORT= + +export HHZ_ADMIN_WEB_DIST=/home/th/workspace/dockerbuilder/webs/dev/tuoheng_hhz_web/dist +export DSP_ADMIN_WEB_DIST=/home/th/workspace/dockerbuilder/webs/dev/dsp-admin/dist +export AIRPORT_WEB_DIST=/home/th/workspace/dockerbuilder/webs/dev/tuoheng_airport_web/dist + +#前端配置 +#export VUE_APP_API_BASE_URL = https://${HHZ_DOMAIN}:${NGINX_HTTPS_PORT}/ +#export VUE_APP_AUTHORITY = https://${OIDC_SERVER_DOMAIN}:${NGINX_HTTPS_PORT} +#export VUE_APP_OUT_AUTHORITY = https://${OIDC_SERVER_DOMAIN}:${NGINX_HTTPS_PORT} +#VUE_APP_API_BASE_URL=https://${AIRPORT_DOMAIN}:${NGINX_HTTPS_PORT}/airport +#https://airport-develop.t-aaron.com:3443 +#https://hhz-develop.t-aaron.com:3443 + +#https://oidc-develop.t-aaron.com:3443 \ No newline at end of file