update 任务调度 独立 ruoyi-job 服务 统一远程处理任务 规范用法

config/dev/datasource.yml

@@ -9,7 +9,7 @@ datasource:
     url: jdbc:mysql://localhost:3306/ry-cloud?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&rewriteBatchedStatements=true
     username: root
     password: password
-  xxl-job-admin:
+  job:
     url: jdbc:mysql://localhost:3306/ry-job?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&rewriteBatchedStatements=true
     username: root
     password: password

config/dev/ruoyi-job.yml

@@ -0,0 +1,41 @@
+# dubbo 订阅配置
+dubbo:
+  cloud:
+    # 需要远程调用的服务 多个用逗号分割
+    subscribed-services: ruoyi-system
+
+spring:
+  datasource:
+    dynamic:
+      # 设置默认的数据源或者数据源组,默认值即为 master
+      primary: master
+      datasource:
+        # 主库数据源
+        master:
+          driver-class-name: com.mysql.cj.jdbc.Driver
+          url: ${datasource.job.url}
+          username: ${datasource.job.username}
+          password: ${datasource.job.password}
+
+xxl:
+  job:
+    # 执行器开关
+    enabled: true
+    # 调度中心地址：如调度中心集群部署存在多个地址则用逗号分隔。
+    admin-addresses: http://localhost:9900
+    # 执行器通讯TOKEN：非空时启用
+    access-token: xxl-job
+    # 执行器配置
+    executor:
+      # 执行器AppName：执行器心跳注册分组依据；为空则关闭自动注册
+      appname: ${spring.application.name}-executor
+      # 执行器端口号 执行器从19901开始往后写
+      port: 9901
+      # 执行器注册：默认IP:PORT
+      address:
+      # 执行器IP：默认自动获取IP
+      ip:
+      # 执行器运行日志文件存储磁盘路径
+      logpath: ./logs/${spring.application.name}/xxl-job
+      # 执行器日志文件保存天数：大于3生效
+      logretentiondays: 30

config/dev/ruoyi-system.yml

@@ -22,26 +22,3 @@ spring:
         #  url:
         #  username:
         #  password:
-
-xxl:
-  job:
-    # 执行器开关
-    enabled: true
-    # 调度中心地址：如调度中心集群部署存在多个地址则用逗号分隔。
-    admin-addresses: http://localhost:9900
-    # 执行器通讯TOKEN：非空时启用
-    access-token: xxl-job
-    # 执行器配置
-    executor:
-      # 执行器AppName：执行器心跳注册分组依据；为空则关闭自动注册
-      appname: ${spring.application.name}-executor
-      # 执行器端口号 执行器从19901开始往后写
-      port: 9901
-      # 执行器注册：默认IP:PORT
-      address:
-      # 执行器IP：默认自动获取IP
-      ip:
-      # 执行器运行日志文件存储磁盘路径
-      logpath: ./logs/${spring.application.name}/xxl-job
-      # 执行器日志文件保存天数：大于3生效
-      logretentiondays: 30

config/dev/ruoyi-xxl-job-admin.yml

@@ -3,9 +3,9 @@ spring:
   datasource:
     type: com.zaxxer.hikari.HikariDataSource
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: ${datasource.xxl-job-admin.url}
-    username: ${datasource.xxl-job-admin.username}
-    password: ${datasource.xxl-job-admin.password}
+    url: ${datasource.job.url}
+    username: ${datasource.job.username}
+    password: ${datasource.job.password}
     hikari:
       auto-commit: true
       connection-test-query: SELECT 1

config/dev/seata-server.properties

@@ -2,6 +2,7 @@ service.vgroupMapping.ruoyi-auth-group=default
 service.vgroupMapping.ruoyi-system-group=default
 service.vgroupMapping.ruoyi-resource-group=default
 service.vgroupMapping.ruoyi-gen-group=default
+service.vgroupMapping.ruoyi-job-group=default
 service.enableDegrade=false
 service.disableGlobalTransaction=false
 store.mode=db