From de314e5285536ac0cdc7e8a1c94658e1390c8821 Mon Sep 17 00:00:00 2001 From: byteblogs168 <598092184@qq.com> Date: Sat, 14 Jan 2023 19:57:52 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=BB=B6=E8=BF=9F=E7=AD=89?= =?UTF-8?q?=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/x/retry/common/core/enums/DelayLevelEnum.java | 9 +++++++-- .../main/java/com/x/retry/common/core/log/LogUtils.java | 5 ++--- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/x-retry-common/x-retry-common-core/src/main/java/com/x/retry/common/core/enums/DelayLevelEnum.java b/x-retry-common/x-retry-common-core/src/main/java/com/x/retry/common/core/enums/DelayLevelEnum.java index f8958377e..7e4aa51f4 100644 --- a/x-retry-common/x-retry-common-core/src/main/java/com/x/retry/common/core/enums/DelayLevelEnum.java +++ b/x-retry-common/x-retry-common-core/src/main/java/com/x/retry/common/core/enums/DelayLevelEnum.java @@ -33,8 +33,13 @@ public enum DelayLevelEnum { _17(17, 3, ChronoUnit.HOURS), _18(18, 6, ChronoUnit.HOURS), _19(19, 12, ChronoUnit.HOURS), - _20(20, 24, ChronoUnit.HOURS), - _21(21, 48, ChronoUnit.HOURS), + _20(20, 18, ChronoUnit.HOURS), + _21(21, 24, ChronoUnit.HOURS), + _22(22, 30, ChronoUnit.HOURS), + _23(23, 34, ChronoUnit.HOURS), + _24(24, 40, ChronoUnit.HOURS), + _25(25, 46, ChronoUnit.HOURS), + _26(26, 50, ChronoUnit.HOURS), ; /** diff --git a/x-retry-common/x-retry-common-core/src/main/java/com/x/retry/common/core/log/LogUtils.java b/x-retry-common/x-retry-common-core/src/main/java/com/x/retry/common/core/log/LogUtils.java index 50db8f39c..ecbebc8b5 100644 --- a/x-retry-common/x-retry-common-core/src/main/java/com/x/retry/common/core/log/LogUtils.java +++ b/x-retry-common/x-retry-common-core/src/main/java/com/x/retry/common/core/log/LogUtils.java @@ -70,9 +70,8 @@ public class LogUtils { try { Environment environment = SpringContext.applicationContext.getBean(Environment.class); - return environment.getProperty("flaky.retry.log.status", Boolean.class, Boolean.TRUE); - } catch (Exception e) { -// log.error("获取配置失败", e); + return environment.getProperty("x.retry.log.status", Boolean.class, Boolean.TRUE); + } catch (Exception ignored) { } return Boolean.TRUE;