diff --git a/continew-extension/continew-extension-schedule-server/src/main/resources/config/application-dev.yml b/continew-extension/continew-extension-schedule-server/src/main/resources/config/application-dev.yml index 7cc218c5..978d57f6 100644 --- a/continew-extension/continew-extension-schedule-server/src/main/resources/config/application-dev.yml +++ b/continew-extension/continew-extension-schedule-server/src/main/resources/config/application-dev.yml @@ -21,34 +21,24 @@ spring.liquibase: --- ### Snail Job 服务端配置 snail-job: - # Netty 端口 - netty-port: 1788 + # 服务端通讯端口(默认:17888) + server-port: 17888 # 合并日志默认保存天数 merge-Log-days: 1 # 合并日志默认的条数 merge-Log-num: 500 - # 配置日志保存时间(单位:天) - log-storage: 90 - # 配置每批次拉取重试数据的大小 - retry-pull-page-size: 100 - # 配置一个客户端每秒最多接收的重试数量指令 - limiter: 10 - # 配置号段模式下的步长 - step: 100 - # bucket 的总数量 + # 日志保存时间(单位:天) + log-storage: 7 + # bucket 总数量 bucket-total: 128 # Dashboard 任务容错天数 summary-day: 7 - # 配置负载均衡周期时间 + # 负载均衡周期时间 load-balance-cycle-time: 10 - ## 回调配置 - callback: - # 回调 uniqueId 前缀 - prefix: CB - # 配置回调的最大执行次数 - max-count: 288 - # 配置回调触发的间隔时间 - trigger-interval: 900 + # 每批次拉取重试数据的大小 + retry-pull-page-size: 100 + # 重试任务拉取的并行度 + retry-max-pull-parallel: 2 --- ### 日志配置 logging: diff --git a/continew-extension/continew-extension-schedule-server/src/main/resources/config/application-prod.yml b/continew-extension/continew-extension-schedule-server/src/main/resources/config/application-prod.yml index 7e7591d9..f30ff4df 100644 --- a/continew-extension/continew-extension-schedule-server/src/main/resources/config/application-prod.yml +++ b/continew-extension/continew-extension-schedule-server/src/main/resources/config/application-prod.yml @@ -21,34 +21,24 @@ spring.liquibase: --- ### Snail Job 服务端配置 snail-job: - # Netty 端口 - netty-port: 1788 + # 服务端通讯端口(默认:17888) + server-port: 17888 # 合并日志默认保存天数 merge-Log-days: 1 # 合并日志默认的条数 merge-Log-num: 500 - # 配置日志保存时间(单位:天) - log-storage: 90 - # 配置每批次拉取重试数据的大小 - retry-pull-page-size: 100 - # 配置一个客户端每秒最多接收的重试数量指令 - limiter: 10 - # 配置号段模式下的步长 - step: 100 - # bucket 的总数量 + # 日志保存时间(单位:天) + log-storage: 180 + # bucket 总数量 bucket-total: 128 # Dashboard 任务容错天数 summary-day: 7 - # 配置负载均衡周期时间 + # 负载均衡周期时间 load-balance-cycle-time: 10 - ## 回调配置 - callback: - # 回调 uniqueId 前缀 - prefix: CB - # 配置回调的最大执行次数 - max-count: 288 - # 配置回调触发的间隔时间 - trigger-interval: 900 + # 每批次拉取重试数据的大小 + retry-pull-page-size: 100 + # 重试任务拉取的并行度 + retry-max-pull-parallel: 2 --- ### 日志配置 logging: diff --git a/continew-server/src/main/resources/config/application-dev.yml b/continew-server/src/main/resources/config/application-dev.yml index 3a268aa7..4cadc903 100644 --- a/continew-server/src/main/resources/config/application-dev.yml +++ b/continew-server/src/main/resources/config/application-dev.yml @@ -257,22 +257,22 @@ sa-token.extension: --- ### Snail Job 配置 snail-job: enabled: false - # 客户端地址(默认自动获取本机 IP) + # 客户端地址(默认:自动推断。必须确保服务端可以访问到,在服务端无法调度客户端时需要手动配置) #host: 127.0.0.1 - # 客户端端口(默认:1789) - port: 1789 - # 命名空间 ID + # 客户端端口(默认:17889) + port: 17889 + # 命名空间 namespace: ${SCHEDULE_NAMESPACE:764d604ec6fc45f68cd92514c40e9e1a} - # 分组名 + # 接入组名 group: ${SCHEDULE_GROUP:continew-admin} - # 令牌 + # 接入组 token token: ${SCHEDULE_TOKEN:SJ_Wyz3dmsdbDOkDujOTSSoBjGQP1BMsVnj} ## 服务端配置(任务调度中心) server: - # 服务端地址,若服务端集群部署则此处配置域名 + # 服务端地址 host: ${SCHEDULE_HOST:127.0.0.1} - # Netty 端口号 - port: ${SCHEDULE_PORT:1788} + # 服务端通讯端口 + port: ${SCHEDULE_PORT:17888} # API 配置 api: # URL diff --git a/continew-server/src/main/resources/config/application-prod.yml b/continew-server/src/main/resources/config/application-prod.yml index 0abece84..bdcfd1a3 100644 --- a/continew-server/src/main/resources/config/application-prod.yml +++ b/continew-server/src/main/resources/config/application-prod.yml @@ -257,27 +257,28 @@ sa-token.extension: --- ### Snail Job 配置 snail-job: - # 客户端地址(默认自动获取本机 IP) + enabled: true + # 客户端地址(默认:自动推断。必须确保服务端可以访问到,在服务端无法调度客户端时需要手动配置) #host: 127.0.0.1 - # 客户端端口(默认:1789) - port: 1789 - # 命名空间 ID + # 客户端端口(默认:17889) + port: 17889 + # 命名空间 namespace: ${SCHEDULE_NAMESPACE:764d604ec6fc45f68cd92514c40e9e1a} - # 分组名 + # 接入组名 group: ${SCHEDULE_GROUP:continew-admin} - # 令牌 + # 接入组 token token: ${SCHEDULE_TOKEN:SJ_Wyz3dmsdbDOkDujOTSSoBjGQP1BMsVnj} ## 服务端配置(任务调度中心) server: - # 服务端地址,若服务端集群部署则此处配置域名 + # 服务端地址 host: ${SCHEDULE_HOST:127.0.0.1} - # Netty 端口号 - port: ${SCHEDULE_PORT:1788} + # 服务端通讯端口 + port: ${SCHEDULE_PORT:17888} # API 配置 api: # URL url: http://127.0.0.1:8001/snail-job # 用户名 - username: ${SCHEDULE_USERNAME:admin} + username: ${SCHEDULE_USERNAME:admin} # 密码 - password: ${SCHEDULE_PASSWORD:admin} \ No newline at end of file + password: ${SCHEDULE_PASSWORD:admin} \ No newline at end of file diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index c551850d..eb73f6ad 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -50,11 +50,12 @@ services: command: 'redis-server /usr/local/redis/config/redis.conf --appendonly yes' continew-server: build: ./continew-admin + image: continew-server:4.2.0-SNAPSHOT container_name: continew-server restart: always ports: - '18000:18000' - - '1789:1789' + - '17889:17889' volumes: - /docker/continew-admin/config/:/app/config/ - /docker/continew-admin/data/file/:/app/data/file/ @@ -94,11 +95,12 @@ services: TZ: Asia/Shanghai schedule-server: build: ./schedule-server + image: schedule-server:1.8.0 container_name: schedule-server restart: always ports: - '18001:18001' - - '1788:1788' + - '17888:17888' volumes: - /docker/schedule-server/logs/:/app/logs/ environment: