feat: 1.4.0

1. 修改管理系统组配置

easy-retry-server/src/main/java/com/aizuda/easy/retry/server/service/impl/RetryServiceImpl.java

@@ -130,7 +130,7 @@ public class RetryServiceImpl implements RetryService {
         sceneConfig.setSceneStatus(StatusEnum.YES.getStatus());
         sceneConfig.setBackOff(WaitStrategyEnum.DELAY_LEVEL.getBackOff());
         sceneConfig.setMaxRetryCount(26);
-        sceneConfig.setDescription("注解配置开启默认初始化场景");
+        sceneConfig.setDescription("自动初始化场景");
         Assert.isTrue(1 == sceneConfigMapper.insert(sceneConfig), () -> new EasyRetryServerException("init scene error"));
     }
 

easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/schedule/AlarmNotifyThreadSchedule.java

@@ -60,8 +60,8 @@ public class AlarmNotifyThreadSchedule {
     /**
      * 监控重试表中数据总量是否到达阈值
      */
-    @Scheduled(cron = "0 0/1 * * * ?")
-    @SchedulerLock(name = "retryTaskMoreThreshold", lockAtMostFor = "PT1M", lockAtLeastFor = "PT1M")
+    @Scheduled(cron = "0 0/10 * * * ?")
+    @SchedulerLock(name = "retryTaskMoreThreshold", lockAtMostFor = "PT10M", lockAtLeastFor = "PT10M")
     public void retryTaskMoreThreshold() {
         LogUtils.info(log, "retryTaskMoreThreshold time[{}] ip:[{}]", LocalDateTime.now(), HostUtils.getIp());
 

example/src/main/java/com/example/demo/RetryRegisterService.java

@@ -18,7 +18,7 @@ public class RetryRegisterService {
     /**
      * 测试简单的异常情况
      */
-    @Retryable(scene = "errorMethod1")
+    @Retryable(scene = "errorMethod11231")
     public String errorMethod1(List<Cat> name) {
 
         double i = 1 / 0;

frontend/src/views/config/GroupList.vue

@@ -37,6 +37,7 @@
       :data="loadData"
       :alert="options.alert"
       :rowSelection="options.rowSelection"
+      :scroll="{ x: 1600 }"
     >
       <span slot="serial" slot-scope="text, record, index">
         {{ index + 1 }}
@@ -134,6 +135,7 @@ export default {
           title: '操作',
           dataIndex: 'action',
           width: '150px',
+          fixed: 'right',
           scopedSlots: { customRender: 'action' }
         }
       ],

frontend/src/views/config/basicConfigForm/GroupForm.vue

@@ -78,10 +78,10 @@
           <a-select
             placeholder="请选择Id生成模式"
             v-decorator="[
-              'initScene',
+              'idGeneratorMode',
               {rules: [{ required: true, message: '请选择Id生成模式'}]}
             ]" >
-            <a-select-option :value="key" v-for="(value, key) in initScene" :key="key">{{ value }}</a-select-option>
+            <a-select-option :value="key" v-for="(value, key) in idGenMode" :key="key">{{ value }}</a-select-option>
           </a-select>
         </a-form-item>
       </a-col>
@@ -91,10 +91,10 @@
           <a-select
             placeholder="请选择是否初始化场景"
             v-decorator="[
-              'idGeneratorMode',
-              {rules: [{ required: true, message: '请选择Id生成模式'}]}
+              'initScene',
+              {rules: [{ required: true, message: '请选择是否初始化场景'}]}
             ]" >
-            <a-select-option :value="key" v-for="(value, key) in idGenMode" :key="key">{{ value }}</a-select-option>
+            <a-select-option :value="key" v-for="(value, key) in initScene" :key="key">{{ value }}</a-select-option>
           </a-select>
         </a-form-item>
       </a-col>