From e649b5415cd7f45fb7e05bc75e915f7588cd4587 Mon Sep 17 00:00:00 2001 From: zendwang Date: Tue, 12 Jul 2022 00:38:57 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20=E9=AB=98=E5=B9=B6?= =?UTF-8?q?=E5=8F=91=E4=B8=8Bgenerate()=E6=96=B9=E6=B3=95=E6=8A=A5requestI?= =?UTF-8?q?dGenerator=E7=A9=BA=E6=8C=87=E9=92=88=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../liteflow/flow/id/IdGeneratorHelper.java | 21 +++++++------------ 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/liteflow-core/src/main/java/com/yomahub/liteflow/flow/id/IdGeneratorHelper.java b/liteflow-core/src/main/java/com/yomahub/liteflow/flow/id/IdGeneratorHelper.java index e6ead69fa..1354d0044 100644 --- a/liteflow-core/src/main/java/com/yomahub/liteflow/flow/id/IdGeneratorHelper.java +++ b/liteflow-core/src/main/java/com/yomahub/liteflow/flow/id/IdGeneratorHelper.java @@ -1,6 +1,5 @@ package com.yomahub.liteflow.flow.id; -import cn.hutool.core.util.StrUtil; import com.yomahub.liteflow.exception.RequestIdGeneratorException; import com.yomahub.liteflow.property.LiteflowConfig; import com.yomahub.liteflow.property.LiteflowConfigGetter; @@ -20,7 +19,14 @@ public class IdGeneratorHelper { private volatile static IdGeneratorHelper INSTANCE; private IdGeneratorHelper() { - + LiteflowConfig liteflowConfig = LiteflowConfigGetter.get(); + String requestIdGeneratorClass = liteflowConfig.getRequestIdGeneratorClass(); + try { + Class idGenerateClass = (Class) Class.forName(requestIdGeneratorClass); + requestIdGenerator = ContextAwareHolder.loadContextAware().registerBean(idGenerateClass); + } catch (Exception e) { + throw new RequestIdGeneratorException(e.getMessage()); + } } public static IdGeneratorHelper getInstance() { @@ -30,17 +36,6 @@ public class IdGeneratorHelper { synchronized (IdGeneratorHelper.class) { if (Objects.isNull(INSTANCE)) { INSTANCE = new IdGeneratorHelper(); - LiteflowConfig liteflowConfig = LiteflowConfigGetter.get(); - String requestIdGeneratorClass = liteflowConfig.getRequestIdGeneratorClass(); - if (StrUtil.isBlank(requestIdGeneratorClass)) { - requestIdGenerator = new DefaultRequestIdGenerator(); - } - try { - Class idGenerateClass = (Class) Class.forName(requestIdGeneratorClass); - requestIdGenerator = ContextAwareHolder.loadContextAware().registerBean(idGenerateClass); - } catch (Exception e) { - throw new RequestIdGeneratorException(e.getMessage()); - } } } } From 04a3c9352026739902f655bebe24fc8113ae24dc Mon Sep 17 00:00:00 2001 From: zendwang Date: Tue, 12 Jul 2022 16:13:08 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20=E9=AB=98=E5=B9=B6?= =?UTF-8?q?=E5=8F=91=E4=B8=8Bgenerate()=E6=96=B9=E6=B3=95=E6=8A=A5requestI?= =?UTF-8?q?dGenerator=E7=A9=BA=E6=8C=87=E9=92=88=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/yomahub/liteflow/flow/id/IdGeneratorHelper.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/liteflow-core/src/main/java/com/yomahub/liteflow/flow/id/IdGeneratorHelper.java b/liteflow-core/src/main/java/com/yomahub/liteflow/flow/id/IdGeneratorHelper.java index 1354d0044..1a548399e 100644 --- a/liteflow-core/src/main/java/com/yomahub/liteflow/flow/id/IdGeneratorHelper.java +++ b/liteflow-core/src/main/java/com/yomahub/liteflow/flow/id/IdGeneratorHelper.java @@ -14,7 +14,7 @@ import java.util.Objects; */ public class IdGeneratorHelper { - private static RequestIdGenerator requestIdGenerator; + private RequestIdGenerator requestIdGenerator; private volatile static IdGeneratorHelper INSTANCE; @@ -23,7 +23,7 @@ public class IdGeneratorHelper { String requestIdGeneratorClass = liteflowConfig.getRequestIdGeneratorClass(); try { Class idGenerateClass = (Class) Class.forName(requestIdGeneratorClass); - requestIdGenerator = ContextAwareHolder.loadContextAware().registerBean(idGenerateClass); + this.requestIdGenerator = ContextAwareHolder.loadContextAware().registerBean(idGenerateClass); } catch (Exception e) { throw new RequestIdGeneratorException(e.getMessage()); } @@ -44,7 +44,7 @@ public class IdGeneratorHelper { } public String generate() { - return requestIdGenerator.generate(); + return this.requestIdGenerator.generate(); } public void clear(){