From abe6b05c5c1322eb28185a8354d02c72247f26b2 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期四, 14 三月 2024 01:13:29 +0800
Subject: [PATCH] update 优化 !pr493 代码结构与问题修复
---
/dev/null | 30 -----
ruoyi-extend/ruoyi-easyretry-server/src/main/resources/logback-plus.xml | 92 +++++++++++++++
script/sql/easy_retry.sql | 15 -
ruoyi-extend/ruoyi-easyretry-server/src/main/resources/banner.txt | 10 +
ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/easyretry/TestClassJobExecutor.java | 1
ruoyi-extend/ruoyi-easyretry-server/src/main/resources/application-dev.yml | 53 ++++++++
ruoyi-extend/ruoyi-easyretry-server/src/main/resources/application.yml | 53 ++------
script/sql/postgres/easy_retry.sql | 16 +-
ruoyi-extend/ruoyi-easyretry-server/src/main/resources/application-prod.yml | 53 ++++++++
ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/easyretry/TestAnnoJobExecutor.java | 5
10 files changed, 236 insertions(+), 92 deletions(-)
diff --git a/ruoyi-extend/ruoyi-easyretry-server/src/main/resources/application-dev.yml b/ruoyi-extend/ruoyi-easyretry-server/src/main/resources/application-dev.yml
new file mode 100644
index 0000000..afb27ac
--- /dev/null
+++ b/ruoyi-extend/ruoyi-easyretry-server/src/main/resources/application-dev.yml
@@ -0,0 +1,53 @@
+easy-retry:
+ # 褰撳墠浣跨敤鐨勬暟鎹簱绫诲瀷
+ db-type: mysql
+spring:
+ datasource:
+ type: com.zaxxer.hikari.HikariDataSource
+ driver-class-name: com.mysql.cj.jdbc.Driver
+ url: jdbc:mysql://localhost:3306/ry-vue?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
+ username: root
+ password: root
+ hikari:
+ connection-timeout: 30000
+ validation-timeout: 5000
+ minimum-idle: 10
+ maximum-pool-size: 20
+ idle-timeout: 600000
+ max-lifetime: 900000
+ keepaliveTime: 30000
+
+--- # easy-retry 鏈嶅姟绔厤缃�
+easy-retry:
+ # 鎷夊彇閲嶈瘯鏁版嵁鐨勬瘡鎵规鐨勫ぇ灏�
+ retry-pull-page-size: 1000
+ # 鎷夊彇閲嶈瘯鏁版嵁鐨勬瘡鎵规鐨勫ぇ灏�
+ job-pull-page-size: 1000
+ # 鏈嶅姟绔� netty 绔彛
+ netty-port: 1788
+ # 閲嶈瘯鍜屾淇¤〃鐨勫垎鍖烘�绘暟
+ total-partition: 2
+ # 涓�涓鎴风姣忕鏈�澶氭帴鏀剁殑閲嶈瘯鏁伴噺鎸囦护
+ limiter: 1000
+ # 鍙锋妯″紡涓嬫闀块厤缃�
+ step: 100
+ # 鏃ュ織淇濆瓨鏃堕棿(鍗曚綅: day)
+ log-storage: 90
+ # 鍥炶皟閰嶇疆
+ callback:
+ #鍥炶皟鏈�澶ф墽琛屾鏁�
+ max-count: 288
+ #闂撮殧鏃堕棿
+ trigger-interval: 900
+ mode: all
+ retry-max-pull-count: 10
+
+--- # 鐩戞帶涓績閰嶇疆
+spring.boot.admin.client:
+ # 澧炲姞瀹㈡埛绔紑鍏�
+ enabled: true
+ url: http://localhost:9090/admin
+ instance:
+ service-host-type: IP
+ username: ruoyi
+ password: 123456
diff --git a/ruoyi-extend/ruoyi-easyretry-server/src/main/resources/application-prod.yml b/ruoyi-extend/ruoyi-easyretry-server/src/main/resources/application-prod.yml
new file mode 100644
index 0000000..afb27ac
--- /dev/null
+++ b/ruoyi-extend/ruoyi-easyretry-server/src/main/resources/application-prod.yml
@@ -0,0 +1,53 @@
+easy-retry:
+ # 褰撳墠浣跨敤鐨勬暟鎹簱绫诲瀷
+ db-type: mysql
+spring:
+ datasource:
+ type: com.zaxxer.hikari.HikariDataSource
+ driver-class-name: com.mysql.cj.jdbc.Driver
+ url: jdbc:mysql://localhost:3306/ry-vue?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
+ username: root
+ password: root
+ hikari:
+ connection-timeout: 30000
+ validation-timeout: 5000
+ minimum-idle: 10
+ maximum-pool-size: 20
+ idle-timeout: 600000
+ max-lifetime: 900000
+ keepaliveTime: 30000
+
+--- # easy-retry 鏈嶅姟绔厤缃�
+easy-retry:
+ # 鎷夊彇閲嶈瘯鏁版嵁鐨勬瘡鎵规鐨勫ぇ灏�
+ retry-pull-page-size: 1000
+ # 鎷夊彇閲嶈瘯鏁版嵁鐨勬瘡鎵规鐨勫ぇ灏�
+ job-pull-page-size: 1000
+ # 鏈嶅姟绔� netty 绔彛
+ netty-port: 1788
+ # 閲嶈瘯鍜屾淇¤〃鐨勫垎鍖烘�绘暟
+ total-partition: 2
+ # 涓�涓鎴风姣忕鏈�澶氭帴鏀剁殑閲嶈瘯鏁伴噺鎸囦护
+ limiter: 1000
+ # 鍙锋妯″紡涓嬫闀块厤缃�
+ step: 100
+ # 鏃ュ織淇濆瓨鏃堕棿(鍗曚綅: day)
+ log-storage: 90
+ # 鍥炶皟閰嶇疆
+ callback:
+ #鍥炶皟鏈�澶ф墽琛屾鏁�
+ max-count: 288
+ #闂撮殧鏃堕棿
+ trigger-interval: 900
+ mode: all
+ retry-max-pull-count: 10
+
+--- # 鐩戞帶涓績閰嶇疆
+spring.boot.admin.client:
+ # 澧炲姞瀹㈡埛绔紑鍏�
+ enabled: true
+ url: http://localhost:9090/admin
+ instance:
+ service-host-type: IP
+ username: ruoyi
+ password: 123456
diff --git a/ruoyi-extend/ruoyi-easyretry-server/src/main/resources/application.yml b/ruoyi-extend/ruoyi-easyretry-server/src/main/resources/application.yml
index e813863..a26bfd3 100644
--- a/ruoyi-extend/ruoyi-easyretry-server/src/main/resources/application.yml
+++ b/ruoyi-extend/ruoyi-easyretry-server/src/main/resources/application.yml
@@ -2,26 +2,12 @@
port: 8800
servlet:
context-path: /easy-retry
+
spring:
application:
name: ruoyi-easyretry-server
profiles:
active: @profiles.active@
- datasource:
- name: ry-vue
- url: jdbc:mysql://localhost:3306/ry-vue?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
- username: root
- password: root
- type: com.zaxxer.hikari.HikariDataSource
- driver-class-name: com.mysql.cj.jdbc.Driver
- hikari:
- connection-timeout: 30000
- minimum-idle: 5
- maximum-pool-size: 20
- auto-commit: true
- idle-timeout: 30000
- pool-name: easy_retry
- max-lifetime: 1800000
web:
resources:
static-locations: classpath:admin/
@@ -37,30 +23,17 @@
configuration:
map-underscore-to-camel-case: true
cache-enabled: true
+
logging:
- config: classpath:logback-boot.xml
+ config: classpath:logback-plus.xml
-easy-retry:
- retry-pull-page-size: 1000 # 鎷夊彇閲嶈瘯鏁版嵁鐨勬瘡鎵规鐨勫ぇ灏�
- job-pull-page-size: 1000 # 鎷夊彇閲嶈瘯鏁版嵁鐨勬瘡鎵规鐨勫ぇ灏�
- netty-port: 1788 # 鏈嶅姟绔痭etty绔彛
- total-partition: 2 # 閲嶈瘯鍜屾淇¤〃鐨勫垎鍖烘�绘暟
- limiter: 1000 # 涓�涓鎴风姣忕鏈�澶氭帴鏀剁殑閲嶈瘯鏁伴噺鎸囦护
- step: 100 # 鍙锋妯″紡涓嬫闀块厤缃�
- log-storage: 90 # 鏃ュ織淇濆瓨鏃堕棿(鍗曚綅: day)
- callback: # 鍥炶皟閰嶇疆
- max-count: 288 #鍥炶皟鏈�澶ф墽琛屾鏁�
- trigger-interval: 900 #闂撮殧鏃堕棿
- db-type: mysql #褰撳墠浣跨敤鐨勬暟鎹簱
- mode: all
- retry-max-pull-count: 10
-
---- # 鐩戞帶涓績閰嶇疆
-spring.boot.admin.client:
- # 澧炲姞瀹㈡埛绔紑鍏�
- enabled: true
- url: http://localhost:9090/admin
- instance:
- service-host-type: IP
- username: ruoyi
- password: 123456
+management:
+ endpoints:
+ web:
+ exposure:
+ include: '*'
+ endpoint:
+ health:
+ show-details: ALWAYS
+ logfile:
+ external-file: ./logs/ruoyi-easyretry-server/console.log
diff --git a/ruoyi-extend/ruoyi-easyretry-server/src/main/resources/banner.txt b/ruoyi-extend/ruoyi-easyretry-server/src/main/resources/banner.txt
new file mode 100644
index 0000000..869a420
--- /dev/null
+++ b/ruoyi-extend/ruoyi-easyretry-server/src/main/resources/banner.txt
@@ -0,0 +1,10 @@
+Application Version: ${revision}
+Spring Boot Version: ${spring-boot.version}
+ _
+ | |
+ ___ __ _ ___ _ _ ______ _ __ ___| |_ _ __ _ _ ______ ___ ___ _ ____ _____ _ __
+ / _ \/ _` / __| | | |______| '__/ _ \ __| '__| | | |______/ __|/ _ \ '__\ \ / / _ \ '__|
+| __/ (_| \__ \ |_| | | | | __/ |_| | | |_| | \__ \ __/ | \ V / __/ |
+ \___|\__,_|___/\__, | |_| \___|\__|_| \__, | |___/\___|_| \_/ \___|_|
+ __/ | __/ |
+ |___/ |___/
diff --git a/ruoyi-extend/ruoyi-easyretry-server/src/main/resources/logback-boot.xml b/ruoyi-extend/ruoyi-easyretry-server/src/main/resources/logback-boot.xml
deleted file mode 100644
index 97ba0b0..0000000
--- a/ruoyi-extend/ruoyi-easyretry-server/src/main/resources/logback-boot.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<configuration>
-
- <property name="log.base" value="./logs/ruoyi-easyretry-server" />
-
- <appender name="stdout" class="ch.qos.logback.core.ConsoleAppender">
- <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
- <Pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{256} - %msg%n
- </Pattern>
- </encoder>
- </appender>
-
- <appender name="fileInfo"
- class="ch.qos.logback.core.rolling.RollingFileAppender">
- <file>${log.base}/info.log</file>
- <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
- <FileNamePattern>${log.base}/info.%d{yyyy-MM-dd}.log</FileNamePattern>
- <MaxHistory>30</MaxHistory>
- </rollingPolicy>
- <layout class="ch.qos.logback.classic.PatternLayout">
- <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{256} - %msg%n</pattern>
- </layout>
- <filter class="ch.qos.logback.classic.filter.LevelFilter">
- <level>INFO</level>
- <onMatch>ACCEPT</onMatch>
- <onMismatch>DENY</onMismatch>
- </filter>
- </appender>
-
- <appender name="fileWarn" class="ch.qos.logback.core.rolling.RollingFileAppender">
- <file>${log.base}/warn.log</file>
- <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
- <FileNamePattern>${log.base}/warn.%d{yyyy-MM-dd}.log
- </FileNamePattern>
- <MaxHistory>30</MaxHistory>
- </rollingPolicy>
- <layout class="ch.qos.logback.classic.PatternLayout">
- <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{256} - %msg%n</pattern>
- </layout>
- <filter class="ch.qos.logback.classic.filter.LevelFilter">
- <level>WARN</level>
- <onMatch>ACCEPT</onMatch>
- <onMismatch>DENY</onMismatch>
- </filter>
- </appender>
-
- <appender name="fileError" class="ch.qos.logback.core.rolling.RollingFileAppender">
- <file>${log.base}/error.log</file>
- <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
- <FileNamePattern>${log.base}/error.%d{yyyy-MM-dd}.log
- </FileNamePattern>
- <MaxHistory>30</MaxHistory>
- </rollingPolicy>
- <layout class="ch.qos.logback.classic.PatternLayout">
- <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{256} - %msg%n</pattern>
- </layout>
- <filter class="ch.qos.logback.classic.filter.LevelFilter">
- <level>ERROR</level>
- <onMatch>ACCEPT</onMatch>
- <onMismatch>DENY</onMismatch>
- </filter>
- </appender>
-
- <appender name ="asyncInfo" class= "ch.qos.logback.classic.AsyncAppender">
- <discardingThreshold >100</discardingThreshold>
- <queueSize>1024</queueSize>
- <appender-ref ref ="fileInfo"/>
- </appender>
-
- <appender name ="asyncWarn" class= "ch.qos.logback.classic.AsyncAppender">
- <discardingThreshold >100</discardingThreshold>
- <queueSize>1024</queueSize>
- <appender-ref ref ="fileWarn"/>
- </appender>
-
- <appender name ="asyncError" class= "ch.qos.logback.classic.AsyncAppender">
- <discardingThreshold >100</discardingThreshold>
- <queueSize>1024</queueSize>
- <appender-ref ref ="fileError"/>
- </appender>
-
- <!-- 鎺у埗鍙拌緭鍑烘棩蹇楃骇鍒� -->
- <root level="info">
- <appender-ref ref="stdout" />
- <appender-ref ref="asyncInfo" />
- <appender-ref ref="asyncWarn" />
- <appender-ref ref="asyncError" />
- </root>
-</configuration>
diff --git a/ruoyi-extend/ruoyi-easyretry-server/src/main/resources/logback-plus.xml b/ruoyi-extend/ruoyi-easyretry-server/src/main/resources/logback-plus.xml
new file mode 100644
index 0000000..5acaefa
--- /dev/null
+++ b/ruoyi-extend/ruoyi-easyretry-server/src/main/resources/logback-plus.xml
@@ -0,0 +1,92 @@
+<configuration>
+
+ <property name="log.path" value="./logs/ruoyi-easyretry-server" />
+ <property name="console.log.pattern"
+ value="%red(%d{yyyy-MM-dd HH:mm:ss}) %green([%thread]) %highlight(%-5level) %boldMagenta(%logger{36}%n) - %msg%n"/>
+ <property name="log.pattern" value="%d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n"/>
+
+
+ <!-- 鎺у埗鍙拌緭鍑� -->
+ <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
+ <encoder>
+ <pattern>${console.log.pattern}</pattern>
+ <charset>utf-8</charset>
+ </encoder>
+ </appender>
+
+ <!-- 鎺у埗鍙拌緭鍑� -->
+ <appender name="file_console" class="ch.qos.logback.core.rolling.RollingFileAppender">
+ <file>${log.path}/console.log</file>
+ <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+ <!-- 鏃ュ織鏂囦欢鍚嶆牸寮� -->
+ <fileNamePattern>${log.path}/console.%d{yyyy-MM-dd}.log</fileNamePattern>
+ <!-- 鏃ュ織鏈�澶� 1澶� -->
+ <maxHistory>1</maxHistory>
+ </rollingPolicy>
+ <encoder>
+ <pattern>${log.pattern}</pattern>
+ <charset>utf-8</charset>
+ </encoder>
+ <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+ <!-- 杩囨护鐨勭骇鍒� -->
+ <level>INFO</level>
+ </filter>
+ </appender>
+
+ <appender name="file_info" class="ch.qos.logback.core.rolling.RollingFileAppender">
+ <file>${log.path}/info.log</file>
+ <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+ <FileNamePattern>${log.base}/info.%d{yyyy-MM-dd}.log</FileNamePattern>
+ <MaxHistory>60</MaxHistory>
+ </rollingPolicy>
+ <encoder>
+ <pattern>${log.pattern}</pattern>
+ </encoder>
+ <filter class="ch.qos.logback.classic.filter.LevelFilter">
+ <level>INFO</level>
+ <onMatch>ACCEPT</onMatch>
+ <onMismatch>DENY</onMismatch>
+ </filter>
+ </appender>
+
+ <appender name="file_error" class="ch.qos.logback.core.rolling.RollingFileAppender">
+ <file>${log.base}/error.log</file>
+ <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+ <FileNamePattern>${log.base}/error.%d{yyyy-MM-dd}.log
+ </FileNamePattern>
+ <MaxHistory>60</MaxHistory>
+ </rollingPolicy>
+ <encoder>
+ <pattern>${log.pattern}</pattern>
+ </encoder>
+ <filter class="ch.qos.logback.classic.filter.LevelFilter">
+ <level>ERROR</level>
+ <onMatch>ACCEPT</onMatch>
+ <onMismatch>DENY</onMismatch>
+ </filter>
+ </appender>
+
+ <appender name ="async_info" class= "ch.qos.logback.classic.AsyncAppender">
+ <discardingThreshold >100</discardingThreshold>
+ <queueSize>1024</queueSize>
+ <appender-ref ref ="file_info"/>
+ </appender>
+
+ <appender name ="async_error" class= "ch.qos.logback.classic.AsyncAppender">
+ <discardingThreshold >100</discardingThreshold>
+ <queueSize>1024</queueSize>
+ <appender-ref ref ="file_error"/>
+ </appender>
+
+ <!-- EasyRetry appender -->
+ <appender name="easy_log_server_appender" class="com.aizuda.easy.retry.server.job.task.support.appender.EasyRetryServerLogbackAppender">
+ </appender>
+
+ <!-- 鎺у埗鍙拌緭鍑烘棩蹇楃骇鍒� -->
+ <root level="info">
+ <appender-ref ref="console" />
+ <appender-ref ref="async_info" />
+ <appender-ref ref="async_error" />
+ <appender-ref ref="easy_log_server_appender" />
+ </root>
+</configuration>
diff --git a/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/easyretry/TestAnnoJobExecutor.java b/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/easyretry/TestAnnoJobExecutor.java
index 8126b3e..05c4f2f 100644
--- a/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/easyretry/TestAnnoJobExecutor.java
+++ b/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/easyretry/TestAnnoJobExecutor.java
@@ -3,18 +3,21 @@
import com.aizuda.easy.retry.client.job.core.annotation.JobExecutor;
import com.aizuda.easy.retry.client.job.core.dto.JobArgs;
import com.aizuda.easy.retry.client.model.ExecuteResult;
+import com.aizuda.easy.retry.common.core.util.JsonUtil;
+import com.aizuda.easy.retry.common.log.EasyRetryLog;
import org.springframework.stereotype.Component;
/**
* @author www.byteblogs.com
* @date 2023-09-28 22:54:07
- * @since 2.4.0
*/
@Component
@JobExecutor(name = "testJobExecutor")
public class TestAnnoJobExecutor {
public ExecuteResult jobExecute(JobArgs jobArgs) {
+ EasyRetryLog.LOCAL.info("testJobExecutor. jobArgs:{}", JsonUtil.toJsonString(jobArgs));
+ EasyRetryLog.REMOTE.info("testJobExecutor. jobArgs:{}", JsonUtil.toJsonString(jobArgs));
return ExecuteResult.success("娴嬭瘯鎴愬姛");
}
}
diff --git a/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/easyretry/TestAnnoJobExecutorSleep10s.java b/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/easyretry/TestAnnoJobExecutorSleep10s.java
deleted file mode 100644
index 3d92bb3..0000000
--- a/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/easyretry/TestAnnoJobExecutorSleep10s.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package org.dromara.job.easyretry;
-
-import com.aizuda.easy.retry.client.job.core.annotation.JobExecutor;
-import com.aizuda.easy.retry.client.job.core.dto.JobArgs;
-import com.aizuda.easy.retry.client.model.ExecuteResult;
-import com.aizuda.easy.retry.common.core.util.JsonUtil;
-import org.springframework.stereotype.Component;
-
-/**
- * @author www.byteblogs.com
- * @date 2023-09-28 22:54:07
- * @since 2.4.0
- */
-@Component
-@JobExecutor(name = "testAnnoJobExecutorSleep10s")
-public class TestAnnoJobExecutorSleep10s {
-
- public ExecuteResult jobExecute(JobArgs jobArgs) {
- System.out.println(JsonUtil.toJsonString(jobArgs));
- try {
- Thread.sleep(10 * 1000);
- } catch (InterruptedException e) {
- throw new RuntimeException(e);
- }
- return ExecuteResult.success("娴嬭瘯鎴愬姛");
- }
-}
diff --git a/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/easyretry/TestAnnoJobExecutorSleep1s.java b/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/easyretry/TestAnnoJobExecutorSleep1s.java
deleted file mode 100644
index 89726ad..0000000
--- a/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/easyretry/TestAnnoJobExecutorSleep1s.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package org.dromara.job.easyretry;
-
-import com.aizuda.easy.retry.client.job.core.annotation.JobExecutor;
-import com.aizuda.easy.retry.client.job.core.dto.JobArgs;
-import com.aizuda.easy.retry.client.model.ExecuteResult;
-import com.aizuda.easy.retry.common.core.util.JsonUtil;
-import org.springframework.stereotype.Component;
-
-/**
- * @author www.byteblogs.com
- * @date 2023-09-28 22:54:07
- * @since 2.4.0
- */
-@Component
-@JobExecutor(name = "testAnnoJobExecutorSleep1s")
-public class TestAnnoJobExecutorSleep1s {
-
- public ExecuteResult jobExecute(JobArgs jobArgs) {
- System.out.println(JsonUtil.toJsonString(jobArgs));
- try {
- Thread.sleep(1000);
- } catch (InterruptedException e) {
- throw new RuntimeException(e);
- }
- return ExecuteResult.success("娴嬭瘯鎴愬姛");
- }
-}
diff --git a/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/easyretry/TestAnnoJobExecutorSleep30s.java b/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/easyretry/TestAnnoJobExecutorSleep30s.java
deleted file mode 100644
index b7b35e4..0000000
--- a/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/easyretry/TestAnnoJobExecutorSleep30s.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package org.dromara.job.easyretry;
-
-import com.aizuda.easy.retry.client.job.core.annotation.JobExecutor;
-import com.aizuda.easy.retry.client.job.core.dto.JobArgs;
-import com.aizuda.easy.retry.client.model.ExecuteResult;
-import com.aizuda.easy.retry.common.core.util.JsonUtil;
-import org.springframework.stereotype.Component;
-
-/**
- * @author www.byteblogs.com
- * @date 2023-09-28 22:54:07
- * @since 2.4.0
- */
-@Component
-@JobExecutor(name = "testAnnoJobExecutorSleep30s")
-public class TestAnnoJobExecutorSleep30s {
-
- public ExecuteResult jobExecute(JobArgs jobArgs) {
- System.out.println(JsonUtil.toJsonString(jobArgs));
- try {
- Thread.sleep(30 * 1000);
- } catch (InterruptedException e) {
- throw new RuntimeException(e);
- }
- return ExecuteResult.success("娴嬭瘯鎴愬姛");
- }
-}
diff --git a/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/easyretry/TestAnnoJobExecutorSleep5s.java b/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/easyretry/TestAnnoJobExecutorSleep5s.java
deleted file mode 100644
index 7e44db5..0000000
--- a/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/easyretry/TestAnnoJobExecutorSleep5s.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package org.dromara.job.easyretry;
-
-import com.aizuda.easy.retry.client.job.core.annotation.JobExecutor;
-import com.aizuda.easy.retry.client.job.core.dto.JobArgs;
-import com.aizuda.easy.retry.client.model.ExecuteResult;
-import com.aizuda.easy.retry.common.core.util.JsonUtil;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Component;
-
-/**
- * @author www.byteblogs.com
- * @date 2023-09-28 22:54:07
- * @since 2.4.0
- */
-@Component
-@Slf4j
-@JobExecutor(name = "testAnnoJobExecutorSleep5s")
-public class TestAnnoJobExecutorSleep5s {
-
- public ExecuteResult jobExecute(JobArgs jobArgs) {
- log.info("testAnnoJobExecutorSleep5s. jobArgs:{}", JsonUtil.toJsonString(jobArgs));
-
- try {
- Thread.sleep(5 * 1000);
- } catch (InterruptedException e) {
- throw new RuntimeException(e);
- }
- return ExecuteResult.success("娴嬭瘯鎴愬姛");
- }
-}
diff --git a/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/easyretry/TestClassJobExecutor.java b/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/easyretry/TestClassJobExecutor.java
index 3a988c5..d675cec 100644
--- a/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/easyretry/TestClassJobExecutor.java
+++ b/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/easyretry/TestClassJobExecutor.java
@@ -8,7 +8,6 @@
/**
* @author www.byteblogs.com
* @date 2023-09-28 22:54:07
- * @since 2.4.0
*/
@Component
public class TestClassJobExecutor extends AbstractJobExecutor {
diff --git a/script/sql/easy_retry.sql b/script/sql/easy_retry.sql
index 4f93355..23f5142 100644
--- a/script/sql/easy_retry.sql
+++ b/script/sql/easy_retry.sql
@@ -16,10 +16,8 @@
) ENGINE = InnoDB
DEFAULT CHARSET = utf8mb4 COMMENT ='鍛藉悕绌洪棿';
-INSERT INTO `namespace` (`id`, `name`, `unique_id`, `create_dt`, `update_dt`, `deleted`)
-VALUES (1, 'Development', 'dev', now(), now(), 0);
-INSERT INTO `namespace` (`id`, `name`, `unique_id`, `create_dt`, `update_dt`, `deleted`)
-VALUES (2, 'Production', 'prod', now(), now(), 0);
+INSERT INTO `namespace` VALUES (1, 'Development', 'dev', '', now(), now(), 0);
+INSERT INTO `namespace` VALUES (2, 'Production', 'prod', '', now(), now(), 0);
DROP TABLE IF EXISTS `group_config`;
CREATE TABLE `group_config`
@@ -43,8 +41,7 @@
DEFAULT CHARSET = utf8mb4 COMMENT ='缁勯厤缃�'
;
-INSERT INTO `ry-vue`.group_config (id, namespace_id, group_name, description, group_status, version, group_partition, id_generator_mode, init_scene, bucket_index, create_dt, update_dt)
-VALUES (1, 'dev', 'ruoyi_group', '', 1, 1, 0, 1, 1, 4, '2024-03-13 23:21:41', '2024-03-13 23:21:40');
+INSERT INTO `group_config` VALUES (1, 'dev', 'ruoyi_group', '', 1, 1, 0, 1, 1, 4, now(), now());
DROP TABLE IF EXISTS `notify_config`;
CREATE TABLE `notify_config`
@@ -254,8 +251,7 @@
DEFAULT CHARSET = utf8mb4 COMMENT ='绯荤粺鐢ㄦ埛琛�';
-- pwd: admin
-INSERT INTO system_user (username, password, role)
-VALUES ('admin', '465c194afb65670f38322df087f0a9bb225cc257e43eb4ac5a0c98ef5b3173ac', 2);
+INSERT INTO `system_user` VALUES (1, 'admin', '465c194afb65670f38322df087f0a9bb225cc257e43eb4ac5a0c98ef5b3173ac', 2, now(), now());
DROP TABLE IF EXISTS `system_user_permission`;
CREATE TABLE `system_user_permission`
@@ -323,8 +319,7 @@
AUTO_INCREMENT = 0
DEFAULT CHARSET = utf8mb4 COMMENT ='浠诲姟淇℃伅';
-INSERT INTO job (id, namespace_id, group_name, job_name, args_str, args_type, next_trigger_at, job_status, task_type, route_key, executor_type, executor_info, trigger_type, trigger_interval, block_strategy, executor_timeout, max_retry_times, parallel_num, retry_interval, bucket_index, resident, description, ext_attrs, create_dt, update_dt, deleted)
-VALUES (1, 'dev', 'ruoyi_group', 'demo-job', null, 1, 1710344035622, 1, 1, 4, 1, 'testJobExecutor', 2, '60', 1, 60, 3, 1, 1, 116, 0, '', '', '2024-03-13 22:59:39', '2024-03-13 23:32:52', 0);
+INSERT INTO `job` VALUES (1, 'dev', 'ruoyi_group', 'demo-job', null, 1, 1710344035622, 1, 1, 4, 1, 'testJobExecutor', 2, '60', 1, 60, 3, 1, 1, 116, 0, '', '', now(), now(), 0);
DROP TABLE IF EXISTS `job_log_message`;
CREATE TABLE `job_log_message`
diff --git a/script/sql/postgres/easy_retry.sql b/script/sql/postgres/easy_retry.sql
index 9e5d072..fa0a07e 100644
--- a/script/sql/postgres/easy_retry.sql
+++ b/script/sql/postgres/easy_retry.sql
@@ -22,8 +22,8 @@
COMMENT ON COLUMN namespace.deleted IS '閫昏緫鍒犻櫎 1銆佸垹闄�';
COMMENT ON TABLE namespace IS '鍛藉悕绌洪棿';
-INSERT INTO namespace (name, unique_id, create_dt, update_dt, deleted)
-VALUES ('Default', '764d604ec6fc45f68cd92514c40e9e1a', now(), now(), 0);
+INSERT INTO namespace VALUES (1, 'Development', 'dev', '', now(), now(), 0);
+INSERT INTO namespace VALUES (2, 'Production', 'prod', '', now(), now(), 0);
CREATE TABLE group_config
(
@@ -57,10 +57,7 @@
COMMENT ON COLUMN "group_config"."update_dt" IS '淇敼鏃堕棿';
COMMENT ON TABLE "group_config" IS '缁勯厤缃�';
-INSERT INTO `namespace` (`id`, `name`, `unique_id`, `create_dt`, `update_dt`, `deleted`)
-VALUES (1, 'Development', 'dev', now(), now(), 0);
-INSERT INTO `namespace` (`id`, `name`, `unique_id`, `create_dt`, `update_dt`, `deleted`)
-VALUES (2, 'Production', 'prod', now(), now(), 0);
+INSERT INTO group_config VALUES (1, 'dev', 'ruoyi_group', '', 1, 1, 0, 1, 1, 4, now(), now());
CREATE TABLE notify_config
(
@@ -353,8 +350,8 @@
COMMENT ON TABLE "system_user" IS '绯荤粺鐢ㄦ埛琛�';
-- pwd: admin
-INSERT INTO system_user (username, password, role)
-VALUES ('admin', '465c194afb65670f38322df087f0a9bb225cc257e43eb4ac5a0c98ef5b3173ac', 2);
+INSERT INTO system_user VALUES (1, 'admin', '465c194afb65670f38322df087f0a9bb225cc257e43eb4ac5a0c98ef5b3173ac', 2, now(), now());
+
CREATE TABLE system_user_permission
(
@@ -459,8 +456,7 @@
COMMENT ON COLUMN "job"."update_dt" IS '鏇存柊鏃堕棿';
COMMENT ON TABLE "job" IS '浠诲姟淇℃伅';
-INSERT INTO job (id, namespace_id, group_name, job_name, args_str, args_type, next_trigger_at, job_status, task_type, route_key, executor_type, executor_info, trigger_type, trigger_interval, block_strategy, executor_timeout, max_retry_times, parallel_num, retry_interval, bucket_index, resident, description, ext_attrs, create_dt, update_dt, deleted)
-VALUES (1, 'dev', 'ruoyi_group', 'demo-job', null, 1, 1710344035622, 1, 1, 4, 1, 'testJobExecutor', 2, '60', 1, 60, 3, 1, 1, 116, 0, '', '', '2024-03-13 22:59:39', '2024-03-13 23:32:52', 0);
+INSERT INTO job VALUES (1, 'dev', 'ruoyi_group', 'demo-job', null, 1, 1710344035622, 1, 1, 4, 1, 'testJobExecutor', 2, '60', 1, 60, 3, 1, 1, 116, 0, '', '', now(), now(), 0);
CREATE TABLE job_log_message
(
--
Gitblit v1.9.3