From abe6b05c5c1322eb28185a8354d02c72247f26b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?= <15040126243@163.com> Date: Thu, 14 Mar 2024 01:13:29 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=20!pr493=20?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=BB=93=E6=9E=84=E4=B8=8E=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-dev.yml | 53 +++++++++++ .../src/main/resources/application-prod.yml | 53 +++++++++++ .../src/main/resources/application.yml | 53 +++-------- .../src/main/resources/banner.txt | 10 ++ .../src/main/resources/logback-boot.xml | 88 ------------------ .../src/main/resources/logback-plus.xml | 92 +++++++++++++++++++ .../job/easyretry/TestAnnoJobExecutor.java | 5 +- .../TestAnnoJobExecutorSleep10s.java | 27 ------ .../easyretry/TestAnnoJobExecutorSleep1s.java | 27 ------ .../TestAnnoJobExecutorSleep30s.java | 27 ------ .../easyretry/TestAnnoJobExecutorSleep5s.java | 30 ------ .../job/easyretry/TestClassJobExecutor.java | 1 - script/sql/easy_retry.sql | 15 +-- script/sql/postgres/easy_retry.sql | 16 ++-- 14 files changed, 236 insertions(+), 261 deletions(-) create mode 100644 ruoyi-extend/ruoyi-easyretry-server/src/main/resources/application-dev.yml create mode 100644 ruoyi-extend/ruoyi-easyretry-server/src/main/resources/application-prod.yml create mode 100644 ruoyi-extend/ruoyi-easyretry-server/src/main/resources/banner.txt delete mode 100644 ruoyi-extend/ruoyi-easyretry-server/src/main/resources/logback-boot.xml create mode 100644 ruoyi-extend/ruoyi-easyretry-server/src/main/resources/logback-plus.xml delete mode 100644 ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/easyretry/TestAnnoJobExecutorSleep10s.java delete mode 100644 ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/easyretry/TestAnnoJobExecutorSleep1s.java delete mode 100644 ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/easyretry/TestAnnoJobExecutorSleep30s.java delete mode 100644 ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/easyretry/TestAnnoJobExecutorSleep5s.java 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 000000000..afb27acdd --- /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 000000000..afb27acdd --- /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 e81386369..a26bfd37a 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 @@ server: 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 @@ mybatis-plus: 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 # 服务端netty端口 - 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 000000000..869a4209c --- /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 97ba0b02b..000000000 --- a/ruoyi-extend/ruoyi-easyretry-server/src/main/resources/logback-boot.xml +++ /dev/null @@ -1,88 +0,0 @@ - - - - - - - %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{256} - %msg%n - - - - - - ${log.base}/info.log - - ${log.base}/info.%d{yyyy-MM-dd}.log - 30 - - - %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{256} - %msg%n - - - INFO - ACCEPT - DENY - - - - - ${log.base}/warn.log - - ${log.base}/warn.%d{yyyy-MM-dd}.log - - 30 - - - %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{256} - %msg%n - - - WARN - ACCEPT - DENY - - - - - ${log.base}/error.log - - ${log.base}/error.%d{yyyy-MM-dd}.log - - 30 - - - %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{256} - %msg%n - - - ERROR - ACCEPT - DENY - - - - - 100 - 1024 - - - - - 100 - 1024 - - - - - 100 - 1024 - - - - - - - - - - - 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 000000000..5acaefaee --- /dev/null +++ b/ruoyi-extend/ruoyi-easyretry-server/src/main/resources/logback-plus.xml @@ -0,0 +1,92 @@ + + + + + + + + + + + ${console.log.pattern} + utf-8 + + + + + + ${log.path}/console.log + + + ${log.path}/console.%d{yyyy-MM-dd}.log + + 1 + + + ${log.pattern} + utf-8 + + + + INFO + + + + + ${log.path}/info.log + + ${log.base}/info.%d{yyyy-MM-dd}.log + 60 + + + ${log.pattern} + + + INFO + ACCEPT + DENY + + + + + ${log.base}/error.log + + ${log.base}/error.%d{yyyy-MM-dd}.log + + 60 + + + ${log.pattern} + + + ERROR + ACCEPT + DENY + + + + + 100 + 1024 + + + + + 100 + 1024 + + + + + + + + + + + + + + + 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 8126b3e78..05c4f2fb0 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 @@ 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 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 3d92bb3a0..000000000 --- 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 89726ad4f..000000000 --- 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 b7b35e4b9..000000000 --- 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 7e44db5b8..000000000 --- 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 3a988c5ad..d675cec73 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 @@ import org.springframework.stereotype.Component; /** * @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 4f933552b..23f5142c5 100644 --- a/script/sql/easy_retry.sql +++ b/script/sql/easy_retry.sql @@ -16,10 +16,8 @@ CREATE TABLE `namespace` ) 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 @@ CREATE TABLE `group_config` 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 @@ CREATE TABLE `system_user` 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 @@ CREATE TABLE `job` 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 9e5d072fd..fa0a07ede 100644 --- a/script/sql/postgres/easy_retry.sql +++ b/script/sql/postgres/easy_retry.sql @@ -22,8 +22,8 @@ COMMENT ON COLUMN namespace.update_dt IS '修改时间'; 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"."create_dt" IS '创建时间'; 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 COLUMN "system_user"."update_dt" IS '修改时间'; 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"."deleted" IS '逻辑删除 1、删除'; 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 (