lbqms.git - Gitblit

疯狂的狮子Li

2024-03-14 a458c7056dabb98f8d594cb27d30a3b4d122e85d

update 优化 !pr493 代码结构与问题修复

已添加1个文件

已修改4个文件

	ruoyi-common/ruoyi-common-job/src/main/java/org/dromara/common/job/config/EasyRetryConfig.java	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-common/ruoyi-common-job/src/main/java/org/dromara/common/job/config/PowerJobConfig.java	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-common/ruoyi-common-job/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	script/sql/postgres/postgres_ry_vue_5.X.sql	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	script/sql/ry_vue_5.X.sql	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 ruoyi-common/ruoyi-common-job/src/main/java/org/dromara/common/job/config/EasyRetryConfig.java

@@ -1,8 +1,8 @@
package org.dromara.common.job.config;

import com.aizuda.easy.retry.client.starter.EnableEasyRetry;
import org.springframework.boot.autoconfigure.AutoConfiguration;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.context.annotation.Configuration;
import org.springframework.scheduling.annotation.EnableScheduling;

/**
@@ -11,7 +11,7 @@
 * @author dhb52
 * @since 2024/3/12
 */
@Configuration
@AutoConfiguration
@ConditionalOnProperty(prefix = "easy-retry", name = "enabled", havingValue = "true")
@EnableScheduling
@EnableEasyRetry(group = "${easy-retry.group-name}")

 ruoyi-common/ruoyi-common-job/src/main/java/org/dromara/common/job/config/PowerJobConfig.java

@@ -1,8 +1,8 @@
package org.dromara.common.job.config;

import org.springframework.boot.autoconfigure.AutoConfiguration;
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.context.annotation.Configuration;
import org.springframework.scheduling.annotation.EnableScheduling;
import tech.powerjob.worker.PowerJobWorker;

@@ -11,7 +11,7 @@
 * @author yhan219
 * @since 2023/6/2
 */
@Configuration
@AutoConfiguration
@ConditionalOnBean(PowerJobWorker.class)
@ConditionalOnProperty(prefix = "powerjob.worker", name = "enabled", havingValue = "true")
@EnableScheduling

 ruoyi-common/ruoyi-common-job/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

¶Ô±ÈÐÂÎÄ¼þ
@@ -0,0 +1,2 @@
org.dromara.common.job.config.PowerJobConfig
org.dromara.common.job.config.EasyRetryConfig

 script/sql/postgres/postgres_ry_vue_5.X.sql

@@ -456,6 +456,8 @@
insert into sys_menu values('118',  'æä»¶ç®¡ç',     '1',   '10', 'oss',              'system/oss/index',            '', '1', '0', 'C', '0', '0', 'system:oss:list',             'upload',        103, 1, now(), null, null, 'æä»¶ç®¡çèå');
-- powerjob serveræ§å¶å°
insert into sys_menu values('120',  'ä»»å¡è°åº¦ä¸å¿',  '2',   '5',  'powerjob',           'monitor/powerjob/index',        '', '1', '0', 'C', '0', '0', 'monitor:powerjob:list',         'job',           103, 1, now(), null, null, 'PowerJobæ§å¶å°èå');
-- retry serveræ§å¶å°
insert into sys_menu values('130',  'EasyRetryæ§å¶å°',  '2',   '6',  'easyretry',     'monitor/easyretry/index',    '', '1', '0', 'C', '0', '0', 'monitor:easyretry:list',          'job',           103, 1, now(), null, null, 'EasyRetryæ§å¶å°èå');

-- ä¸çº§èå
insert into sys_menu values('500',  'æä½æ¥å¿', '108', '1', 'operlog',    'monitor/operlog/index',    '', '1', '0', 'C', '0', '0', 'monitor:operlog:list',    'form',          103, 1, now(), null, null, 'æä½æ¥å¿èå');

 script/sql/ry_vue_5.X.sql

@@ -295,7 +295,7 @@
-- powerjob serveræ§å¶å°
insert into sys_menu values('120',  'ä»»å¡è°åº¦ä¸å¿',  '2',   '5',  'powerjob',           'monitor/powerjob/index',    '', 1, 0, 'C', '0', '0', 'monitor:powerjob:list',          'job',           103, 1, sysdate(), null, null, 'PowerJobæ§å¶å°èå');
-- retry serveræ§å¶å°
insert into sys_menu values('130',  'EasyRetryæå¡å¨',  '2',   '6',  'easyretry',     'monitor/easyretry/index',    '', 1, 0, 'C', '0', '0', 'monitor:easyretry:list',          'job',           103, 1, sysdate(), null, null, 'EasyRetryæ§å¶å°èå');
insert into sys_menu values('130',  'EasyRetryæ§å¶å°',  '2',   '6',  'easyretry',     'monitor/easyretry/index',    '', 1, 0, 'C', '0', '0', 'monitor:easyretry:list',          'job',           103, 1, sysdate(), null, null, 'EasyRetryæ§å¶å°èå');

-- ä¸çº§èå
insert into sys_menu values('500',  'æä½æ¥å¿', '108', '1', 'operlog',    'monitor/operlog/index',    '', 1, 0, 'C', '0', '0', 'monitor:operlog:list',    'form',          103, 1, sysdate(), null, null, 'æä½æ¥å¿èå');

			@@ -1,8 +1,8 @@
			package org.dromara.common.job.config;

			import com.aizuda.easy.retry.client.starter.EnableEasyRetry;
			import org.springframework.boot.autoconfigure.AutoConfiguration;
			import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
			import org.springframework.context.annotation.Configuration;
			import org.springframework.scheduling.annotation.EnableScheduling;

			/**
			@@ -11,7 +11,7 @@
			* @author dhb52
			* @since 2024/3/12
			*/
			@Configuration
			@AutoConfiguration
			@ConditionalOnProperty(prefix = "easy-retry", name = "enabled", havingValue = "true")
			@EnableScheduling
			@EnableEasyRetry(group = "${easy-retry.group-name}")

¶Ô±ÈÐÂÎÄ¼þ
			@@ -0,0 +1,2 @@
			org.dromara.common.job.config.PowerJobConfig
			org.dromara.common.job.config.EasyRetryConfig

			@@ -456,6 +456,8 @@
			insert into sys_menu values('118', 'æä»¶ç®¡ç', '1', '10', 'oss', 'system/oss/index', '', '1', '0', 'C', '0', '0', 'system:oss:list', 'upload', 103, 1, now(), null, null, 'æä»¶ç®¡çèå');
			-- powerjob serveræ§å¶å°
			insert into sys_menu values('120', 'ä»»å¡è°åº¦ä¸å¿', '2', '5', 'powerjob', 'monitor/powerjob/index', '', '1', '0', 'C', '0', '0', 'monitor:powerjob:list', 'job', 103, 1, now(), null, null, 'PowerJobæ§å¶å°èå');
			-- retry serveræ§å¶å°
			insert into sys_menu values('130', 'EasyRetryæ§å¶å°', '2', '6', 'easyretry', 'monitor/easyretry/index', '', '1', '0', 'C', '0', '0', 'monitor:easyretry:list', 'job', 103, 1, now(), null, null, 'EasyRetryæ§å¶å°èå');

			-- ä¸çº§èå
			insert into sys_menu values('500', 'æä½æ¥å¿', '108', '1', 'operlog', 'monitor/operlog/index', '', '1', '0', 'C', '0', '0', 'monitor:operlog:list', 'form', 103, 1, now(), null, null, 'æä½æ¥å¿èå');

			@@ -295,7 +295,7 @@
			-- powerjob serveræ§å¶å°
			insert into sys_menu values('120', 'ä»»å¡è°åº¦ä¸å¿', '2', '5', 'powerjob', 'monitor/powerjob/index', '', 1, 0, 'C', '0', '0', 'monitor:powerjob:list', 'job', 103, 1, sysdate(), null, null, 'PowerJobæ§å¶å°èå');
			-- retry serveræ§å¶å°
			insert into sys_menu values('130', 'EasyRetryæå¡å¨', '2', '6', 'easyretry', 'monitor/easyretry/index', '', 1, 0, 'C', '0', '0', 'monitor:easyretry:list', 'job', 103, 1, sysdate(), null, null, 'EasyRetryæ§å¶å°èå');
			insert into sys_menu values('130', 'EasyRetryæ§å¶å°', '2', '6', 'easyretry', 'monitor/easyretry/index', '', 1, 0, 'C', '0', '0', 'monitor:easyretry:list', 'job', 103, 1, sysdate(), null, null, 'EasyRetryæ§å¶å°èå');

			-- ä¸çº§èå
			insert into sys_menu values('500', 'æä½æ¥å¿', '108', '1', 'operlog', 'monitor/operlog/index', '', 1, 0, 'C', '0', '0', 'monitor:operlog:list', 'form', 103, 1, sysdate(), null, null, 'æä½æ¥å¿èå');