diff --git a/start/airport.sh b/start/airport.sh index da8b4be..fa8d3d4 100755 --- a/start/airport.sh +++ b/start/airport.sh @@ -16,7 +16,8 @@ if [ "$USEDAJIANG" = "true" ]; then --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_ENABLE=true \ + --env XXL_JOB_ACCESSTOKEN=${XXLJOB_ACCESS_TOKEN} \ + --env XXL_ENABLE=false \ --env SPRING_REDIS_HOST=${REDIS_NAME} \ --env SPRING_REDIS_PORT=6379 \ --env SPRING_DATASOURCE_URL="jdbc:mysql://${MYSQL_NAME}:3306/tuoheng_airport?useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2b8&useSSL=true&tinyInt1isBit=false" \ diff --git a/start/business.sh b/start/business.sh index 0d48b53..d2b2ac8 100755 --- a/start/business.sh +++ b/start/business.sh @@ -16,6 +16,7 @@ docker run --pull always -d \ --env SPRING_CLOUD_CONSUL_PORT=8500 \ --env SPRING_CLOUD_CONSUL_DISCOVERY_HOSTNAME=${BUSINESS_NAME} \ --env XXL_JOB_ADMIN_ADDRESSES=http://${XXLJOB_NAME}:8080/xxl-job-admin \ +--env XXL_JOB_ACCESSTOKEN=${XXLJOB_ACCESS_TOKEN} \ --env XXL_ENABLE=false \ --env SPRING_REDIS_HOST=${REDIS_NAME} \ --env SPRING_REDIS_PORT=6379 \ diff --git a/start/dspadmin.sh b/start/dspadmin.sh index 5653cad..6998cb8 100755 --- a/start/dspadmin.sh +++ b/start/dspadmin.sh @@ -15,6 +15,7 @@ docker run --pull always -d \ --env SPRING_CLOUD_CONSUL_PORT=8500 \ --env SPRING_CLOUD_CONSUL_DISCOVERY_HOSTNAME=${DSP_ADMIN_NAME} \ --env XXL_JOB_ADMIN_ADDRESSES=http://${XXLJOB_NAME}:8080/xxl-job-admin \ +--env XXL_JOB_ACCESSTOKEN=${XXLJOB_ACCESS_TOKEN} \ --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 d447cc1..a1521f7 100755 --- a/start/dspapi.sh +++ b/start/dspapi.sh @@ -15,6 +15,7 @@ docker run --pull always -d \ --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_ACCESSTOKEN=${XXLJOB_ACCESS_TOKEN} \ --env XXL_ENABLE=true \ --env SPRING_REDIS_HOST=${REDIS_NAME} \ --env SPRING_REDIS_PORT=6379 \ diff --git a/start/dspinspection.sh b/start/dspinspection.sh index ee59e24..5f9c3fe 100755 --- a/start/dspinspection.sh +++ b/start/dspinspection.sh @@ -15,6 +15,7 @@ docker run --pull always -d \ --env SPRING_CLOUD_CONSUL_PORT=8500 \ --env SPRING_CLOUD_CONSUL_DISCOVERY_HOSTNAME=${DSP_INSPECTION_NAME} \ --env XXL_JOB_ADMIN_ADDRESSES=http://${XXLJOB_NAME}:8080/xxl-job-admin \ +--env XXL_JOB_ACCESSTOKEN=${XXLJOB_ACCESS_TOKEN} \ --env XXL_ENABLE=false \ --env SPRING_REDIS_HOST=${REDIS_NAME} \ --env SPRING_REDIS_PORT=6379 \ diff --git a/start/dspmini.sh b/start/dspmini.sh index 473f5d0..93ac52c 100755 --- a/start/dspmini.sh +++ b/start/dspmini.sh @@ -15,6 +15,7 @@ docker run --pull always -d \ --env SPRING_CLOUD_CONSUL_PORT=8500 \ --env SPRING_CLOUD_CONSUL_DISCOVERY_HOSTNAME=${DSP_MINI_NAME} \ --env XXL_JOB_ADMIN_ADDRESSES=http://${XXLJOB_NAME}:8080/xxl-job-admin \ +--env XXL_JOB_ACCESSTOKEN=${XXLJOB_ACCESS_TOKEN} \ --env XXL_ENABLE=false \ --env SPRING_REDIS_HOST=${REDIS_NAME} \ --env SPRING_REDIS_PORT=6379 \ diff --git a/start/dspportal.sh b/start/dspportal.sh index 7703f78..832ecec 100755 --- a/start/dspportal.sh +++ b/start/dspportal.sh @@ -15,6 +15,7 @@ docker run --pull always -d \ --env SPRING_CLOUD_CONSUL_PORT=8500 \ --env SPRING_CLOUD_CONSUL_DISCOVERY_HOSTNAME=${DSP_PORTAL_NAME} \ --env XXL_JOB_ADMIN_ADDRESSES=http://${XXLJOB_NAME}:8080/xxl-job-admin \ +--env XXL_JOB_ACCESSTOKEN=${XXLJOB_ACCESS_TOKEN} \ --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 08d4a11..b0405a5 100755 --- a/start/hhzadmin.sh +++ b/start/hhzadmin.sh @@ -21,7 +21,8 @@ docker run --pull always -d \ --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_ENABLE=false \ +--env XXL_JOB_ACCESSTOKEN=${XXLJOB_ACCESS_TOKEN} \ +--env XXL_ENABLE=true \ --env SPRING_REDIS_HOST=${REDIS_NAME} \ --env SPRING_REDIS_PORT=6379 \ --env SPRING_DATASOURCE_URL="jdbc:mysql://${MYSQL_NAME}:3306/tuoheng_hhz?useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2b8&useSSL=true&tinyInt1isBit=false" \ diff --git a/start/hhzapi.sh b/start/hhzapi.sh index 8fc159b..40b069e 100755 --- a/start/hhzapi.sh +++ b/start/hhzapi.sh @@ -15,6 +15,7 @@ docker run --pull always -d \ --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_ACCESSTOKEN=${XXLJOB_ACCESS_TOKEN} \ --env XXL_ENABLE=false \ --env SPRING_REDIS_HOST=${REDIS_NAME} \ --env SPRING_REDIS_PORT=6379 \ diff --git a/start/oidcadmin.sh b/start/oidcadmin.sh index 73dc1e8..a639270 100755 --- a/start/oidcadmin.sh +++ b/start/oidcadmin.sh @@ -15,6 +15,7 @@ docker run --pull always -d \ --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_ACCESSTOKEN=${XXLJOB_ACCESS_TOKEN} \ --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 40ee40b..5d1fdaf 100755 --- a/start/oidcservice.sh +++ b/start/oidcservice.sh @@ -21,6 +21,7 @@ docker run --pull always -d \ --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_ACCESSTOKEN=${XXLJOB_ACCESS_TOKEN} \ --env XXL_ENABLE=false \ --env SPRING_REDIS_HOST=${REDIS_NAME} \ --env SPRING_REDIS_PORT=6379 \