sunpeng
/
docker
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: sunpeng:a756161d516c54e243403a6941068ffb599e034a
Branches Tags
sunpeng:main
sunpeng:3
sunpeng:2
sunpeng:1
sunpeng:1.2
..
compare: sunpeng:a02595db0fb088c7cd2a04a0a5f48cecdce07085
Branches Tags
sunpeng:3
sunpeng:2
sunpeng:1
sunpeng:main
sunpeng:1.2

No commits in common. "a756161d516c54e243403a6941068ffb599e034a" and "a02595db0fb088c7cd2a04a0a5f48cecdce07085" have entirely different histories.
a756161d51 ... a02595db0f

7 changed files with 7 additions and 21 deletions
Show Stats Expand all files Collapse all files

2
start/airport.sh
View File

@ -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=http://${XXLJOB_NAME}:8080/xxl-job-admin \
--env XXL_JOB_ADMIN_ADDRESSES=${XXLJOB_NAME}:8080 \
--env XXL_ENABLE=false \
--env SPRING_REDIS_HOST=${REDIS_NAME} \
--env SPRING_REDIS_PORT=6379 \

2
start/dspapi.sh
View File

@ -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=http://${XXLJOB_NAME}:8080/xxl-job-admin \
--env XXL_JOB_ADMIN_ADDRESSES=${XXLJOB_NAME}:${XXLJOB_PORT} \
--env XXL_ENABLE=false \
--env SPRING_REDIS_HOST=${REDIS_NAME} \
--env SPRING_REDIS_PORT=6379 \

2
start/hhzadmin.sh
View File

@ -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=http://${XXLJOB_NAME}:8080/xxl-job-admin \
--env XXL_JOB_ADMIN_ADDRESSES=${XXLJOB_NAME}:${XXLJOB_PORT} \
--env XXL_ENABLE=false \
--env SPRING_REDIS_HOST=${REDIS_NAME} \
--env SPRING_REDIS_PORT=6379 \

2
start/hhzapi.sh
View File

@ -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=http://${XXLJOB_NAME}:8080/xxl-job-admin \
--env XXL_JOB_ADMIN_ADDRESSES=${XXLJOB_NAME}:${XXLJOB_PORT} \
--env XXL_ENABLE=false \
--env SPRING_REDIS_HOST=${REDIS_NAME} \
--env SPRING_REDIS_PORT=6379 \

2
start/oidcadmin.sh
View File

@ -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=http://${XXLJOB_NAME}:8080/xxl-job-admin \
--env XXL_JOB_ADMIN_ADDRESSES=${XXLJOB_NAME}:${XXLJOB_PORT} \
--env XXL_ENABLE=false \
--env SPRING_REDIS_HOST=${REDIS_NAME} \
--env SPRING_REDIS_PORT=6379 \

2
start/oidcservice.sh
View File

@ -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=http://${XXLJOB_NAME}:8080/xxl-job-admin \
--env XXL_JOB_ADMIN_ADDRESSES=${XXLJOB_NAME}:${XXLJOB_PORT} \
--env XXL_ENABLE=false \
--env SPRING_REDIS_HOST=${REDIS_NAME} \
--env SPRING_REDIS_PORT=6379 \

16
tuohengdev.sh Executable file → Normal file
View File

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