diff --git a/doc/XXL-JOB官方文档.md b/doc/XXL-JOB官方文档.md index 8adc72d8..657c2780 100644 --- a/doc/XXL-JOB官方文档.md +++ b/doc/XXL-JOB官方文档.md @@ -1836,8 +1836,10 @@ cat .env - 第四步:启动 XXL-JOB ``` // 启动 -docker compose down docker compose up -d + +// 停止 +docker compose down ``` ### 5.25 优雅停机 diff --git a/docker/.env b/docker/.env index 5c9a5494..37d1605a 100644 --- a/docker/.env +++ b/docker/.env @@ -1,7 +1,9 @@ +# docker-compose env -# admin +# xxl-job, admin XXL_JOB_ADMIN_PORT=8080 +XXL_JOB_ADMIN_CONTEXT_PATH=/xxl-job-admin -# database +# xxl-job, database MYSQL_ROOT_PASSWORD=root_pwd -MYSQL_PATH=/Users/admin/program/docker/instance/mysql2 \ No newline at end of file +MYSQL_PATH=/Users/admin/program/docker/instance/mysql \ No newline at end of file diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index c9191628..d811bf45 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -43,8 +43,10 @@ services: --spring.datasource.url=jdbc:mysql://mysql:3306/xxl_job?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&serverTimezone=Asia/Shanghai --spring.datasource.username=root --spring.datasource.password=${MYSQL_ROOT_PASSWORD} + --server.port=${XXL_JOB_ADMIN_PORT} + --server.servlet.context-path=${XXL_JOB_ADMIN_CONTEXT_PATH} ports: - - "8080:${XXL_JOB_ADMIN_PORT}" + - "${XXL_JOB_ADMIN_PORT}:${XXL_JOB_ADMIN_PORT}" depends_on: mysql: condition: service_healthy @@ -59,7 +61,7 @@ services: container_name: xxl-job-executor-sample-springboot environment: PARAMS: >- - --xxl.job.admin.addresses=http://xxl-job-admin:${XXL_JOB_ADMIN_PORT}/xxl-job-admin + --xxl.job.admin.addresses=http://xxl-job-admin:${XXL_JOB_ADMIN_PORT}${XXL_JOB_ADMIN_CONTEXT_PATH:-/} ports: - "9999:9999" depends_on: