diff --git a/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/service/impl/RetryServiceImpl.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/service/impl/RetryServiceImpl.java index 76971df8..18504607 100644 --- a/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/service/impl/RetryServiceImpl.java +++ b/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")); } diff --git a/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/schedule/AlarmNotifyThreadSchedule.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/schedule/AlarmNotifyThreadSchedule.java index 61a76da7..b0a517e1 100644 --- a/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/schedule/AlarmNotifyThreadSchedule.java +++ b/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()); diff --git a/example/src/main/java/com/example/demo/RetryRegisterService.java b/example/src/main/java/com/example/demo/RetryRegisterService.java index b7766c4f..42b39284 100644 --- a/example/src/main/java/com/example/demo/RetryRegisterService.java +++ b/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 name) { double i = 1 / 0; diff --git a/frontend/src/views/config/GroupList.vue b/frontend/src/views/config/GroupList.vue index 7a2de29c..e12f91c0 100644 --- a/frontend/src/views/config/GroupList.vue +++ b/frontend/src/views/config/GroupList.vue @@ -37,6 +37,7 @@ :data="loadData" :alert="options.alert" :rowSelection="options.rowSelection" + :scroll="{ x: 1600 }" > {{ index + 1 }} @@ -134,6 +135,7 @@ export default { title: '操作', dataIndex: 'action', width: '150px', + fixed: 'right', scopedSlots: { customRender: 'action' } } ], diff --git a/frontend/src/views/config/basicConfigForm/GroupForm.vue b/frontend/src/views/config/basicConfigForm/GroupForm.vue index 2d3a9c52..337121ad 100644 --- a/frontend/src/views/config/basicConfigForm/GroupForm.vue +++ b/frontend/src/views/config/basicConfigForm/GroupForm.vue @@ -78,10 +78,10 @@ - {{ value }} + {{ value }} @@ -91,10 +91,10 @@ - {{ value }} + {{ value }}