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

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 @@ import org.springframework.scheduling.annotation.EnableScheduling;
  * @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 @@ import tech.powerjob.worker.PowerJobWorker;
  * @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('117',  'Admin监控',   '2',   '5',  'Admin',
 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 @@ insert into sys_menu values('118',  '文件管理',     '1',   '10', 'oss',
 -- 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, '操作日志菜单');