添加版本的控制

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 \

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 \

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 \

start/hhzapi.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_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 \

start/oidcadmin.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=${OIDC_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 \

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 \

tuohengdev.sh

@@ -21,4 +21,18 @@ export MINIO_CONSOLE_PORT=9022
 # Consul 配置
 export CONSUL_PORT=8600
 # XXL-Job 配置
-export XXLJOB_PORT=8383
+export XXLJOB_PORT=8383
+
+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