From 06b31d794fd796257f125436ee60575b845bcd08 Mon Sep 17 00:00:00 2001 From: "everywhere.z" Date: Wed, 4 Sep 2024 19:13:16 +0800 Subject: [PATCH] =?UTF-8?q?enhancement=20#IAOW43=20=E5=9C=A8solon=E4=BD=93?= =?UTF-8?q?=E7=B3=BB=E4=B8=AD=E6=94=AF=E6=8C=81=E5=A3=B0=E6=98=8E=E5=BC=8F?= =?UTF-8?q?=E7=9A=84=E7=BB=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/yomahub/liteflow/spi/solon/SolonCmpAroundAspect.java | 4 ++-- .../java/com/yomahub/liteflow/test/aop/aspect/CmpAspect.java | 2 ++ .../{ => test1}/ComplexELDeclMultiSpringbootTest1.java | 2 +- .../liteflow/test/complex/{cmp1 => test1/cmp}/CmpConfig1.java | 2 +- .../liteflow/test/complex/{cmp1 => test1/cmp}/ICmp.java | 2 +- .../{ => test2}/ComplexELDeclMultiSpringbootTest2.java | 2 +- .../liteflow/test/complex/{cmp2 => test2/cmp}/CmpConfig2.java | 2 +- .../liteflow/test/complex/{cmp2 => test2/cmp}/ICmp.java | 2 +- 8 files changed, 10 insertions(+), 8 deletions(-) rename liteflow-testcase-el/liteflow-testcase-el-declare-multi-solon/src/test/java/com/yomahub/liteflow/test/complex/{ => test1}/ComplexELDeclMultiSpringbootTest1.java (96%) rename liteflow-testcase-el/liteflow-testcase-el-declare-multi-solon/src/test/java/com/yomahub/liteflow/test/complex/{cmp1 => test1/cmp}/CmpConfig1.java (97%) rename liteflow-testcase-el/liteflow-testcase-el-declare-multi-solon/src/test/java/com/yomahub/liteflow/test/complex/{cmp1 => test1/cmp}/ICmp.java (87%) rename liteflow-testcase-el/liteflow-testcase-el-declare-multi-solon/src/test/java/com/yomahub/liteflow/test/complex/{ => test2}/ComplexELDeclMultiSpringbootTest2.java (96%) rename liteflow-testcase-el/liteflow-testcase-el-declare-multi-solon/src/test/java/com/yomahub/liteflow/test/complex/{cmp2 => test2/cmp}/CmpConfig2.java (97%) rename liteflow-testcase-el/liteflow-testcase-el-declare-multi-solon/src/test/java/com/yomahub/liteflow/test/complex/{cmp2 => test2/cmp}/ICmp.java (87%) diff --git a/liteflow-solon-plugin/src/main/java/com/yomahub/liteflow/spi/solon/SolonCmpAroundAspect.java b/liteflow-solon-plugin/src/main/java/com/yomahub/liteflow/spi/solon/SolonCmpAroundAspect.java index f4ec24eb6..3037c256b 100644 --- a/liteflow-solon-plugin/src/main/java/com/yomahub/liteflow/spi/solon/SolonCmpAroundAspect.java +++ b/liteflow-solon-plugin/src/main/java/com/yomahub/liteflow/spi/solon/SolonCmpAroundAspect.java @@ -15,9 +15,9 @@ import org.noear.solon.Solon; */ public class SolonCmpAroundAspect implements CmpAroundAspect { - public static ICmpAroundAspect cmpAroundAspect; + public ICmpAroundAspect cmpAroundAspect; - static { + public SolonCmpAroundAspect(){ Solon.context().getBeanAsync(ICmpAroundAspect.class, bean -> { cmpAroundAspect = bean; }); diff --git a/liteflow-testcase-el/liteflow-testcase-el-declare-multi-solon/src/test/java/com/yomahub/liteflow/test/aop/aspect/CmpAspect.java b/liteflow-testcase-el/liteflow-testcase-el-declare-multi-solon/src/test/java/com/yomahub/liteflow/test/aop/aspect/CmpAspect.java index faccdabee..cfe7f700b 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-declare-multi-solon/src/test/java/com/yomahub/liteflow/test/aop/aspect/CmpAspect.java +++ b/liteflow-testcase-el/liteflow-testcase-el-declare-multi-solon/src/test/java/com/yomahub/liteflow/test/aop/aspect/CmpAspect.java @@ -5,7 +5,9 @@ import com.yomahub.liteflow.aop.ICmpAroundAspect; import com.yomahub.liteflow.core.NodeComponent; import com.yomahub.liteflow.slot.DefaultContext; import com.yomahub.liteflow.slot.Slot; +import org.noear.solon.annotation.Component; +@Component public class CmpAspect implements ICmpAroundAspect { @Override diff --git a/liteflow-testcase-el/liteflow-testcase-el-declare-multi-solon/src/test/java/com/yomahub/liteflow/test/complex/ComplexELDeclMultiSpringbootTest1.java b/liteflow-testcase-el/liteflow-testcase-el-declare-multi-solon/src/test/java/com/yomahub/liteflow/test/complex/test1/ComplexELDeclMultiSpringbootTest1.java similarity index 96% rename from liteflow-testcase-el/liteflow-testcase-el-declare-multi-solon/src/test/java/com/yomahub/liteflow/test/complex/ComplexELDeclMultiSpringbootTest1.java rename to liteflow-testcase-el/liteflow-testcase-el-declare-multi-solon/src/test/java/com/yomahub/liteflow/test/complex/test1/ComplexELDeclMultiSpringbootTest1.java index d045c1fe9..4385d6b00 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-declare-multi-solon/src/test/java/com/yomahub/liteflow/test/complex/ComplexELDeclMultiSpringbootTest1.java +++ b/liteflow-testcase-el/liteflow-testcase-el-declare-multi-solon/src/test/java/com/yomahub/liteflow/test/complex/test1/ComplexELDeclMultiSpringbootTest1.java @@ -1,4 +1,4 @@ -package com.yomahub.liteflow.test.complex; +package com.yomahub.liteflow.test.complex.test1; import com.yomahub.liteflow.core.FlowExecutor; import com.yomahub.liteflow.flow.LiteflowResponse; diff --git a/liteflow-testcase-el/liteflow-testcase-el-declare-multi-solon/src/test/java/com/yomahub/liteflow/test/complex/cmp1/CmpConfig1.java b/liteflow-testcase-el/liteflow-testcase-el-declare-multi-solon/src/test/java/com/yomahub/liteflow/test/complex/test1/cmp/CmpConfig1.java similarity index 97% rename from liteflow-testcase-el/liteflow-testcase-el-declare-multi-solon/src/test/java/com/yomahub/liteflow/test/complex/cmp1/CmpConfig1.java rename to liteflow-testcase-el/liteflow-testcase-el-declare-multi-solon/src/test/java/com/yomahub/liteflow/test/complex/test1/cmp/CmpConfig1.java index df89ed125..a5f1bcf07 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-declare-multi-solon/src/test/java/com/yomahub/liteflow/test/complex/cmp1/CmpConfig1.java +++ b/liteflow-testcase-el/liteflow-testcase-el-declare-multi-solon/src/test/java/com/yomahub/liteflow/test/complex/test1/cmp/CmpConfig1.java @@ -1,4 +1,4 @@ -package com.yomahub.liteflow.test.complex.cmp1; +package com.yomahub.liteflow.test.complex.test1.cmp; import com.yomahub.liteflow.annotation.LiteflowComponent; import com.yomahub.liteflow.annotation.LiteflowMethod; diff --git a/liteflow-testcase-el/liteflow-testcase-el-declare-multi-solon/src/test/java/com/yomahub/liteflow/test/complex/cmp1/ICmp.java b/liteflow-testcase-el/liteflow-testcase-el-declare-multi-solon/src/test/java/com/yomahub/liteflow/test/complex/test1/cmp/ICmp.java similarity index 87% rename from liteflow-testcase-el/liteflow-testcase-el-declare-multi-solon/src/test/java/com/yomahub/liteflow/test/complex/cmp1/ICmp.java rename to liteflow-testcase-el/liteflow-testcase-el-declare-multi-solon/src/test/java/com/yomahub/liteflow/test/complex/test1/cmp/ICmp.java index 919d1e135..be4b15c0e 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-declare-multi-solon/src/test/java/com/yomahub/liteflow/test/complex/cmp1/ICmp.java +++ b/liteflow-testcase-el/liteflow-testcase-el-declare-multi-solon/src/test/java/com/yomahub/liteflow/test/complex/test1/cmp/ICmp.java @@ -5,7 +5,7 @@ * @email weenyc31@163.com * @Date 2020/4/1 */ -package com.yomahub.liteflow.test.complex.cmp1; +package com.yomahub.liteflow.test.complex.test1.cmp; import com.yomahub.liteflow.core.NodeComponent; import org.noear.solon.annotation.Component; diff --git a/liteflow-testcase-el/liteflow-testcase-el-declare-multi-solon/src/test/java/com/yomahub/liteflow/test/complex/ComplexELDeclMultiSpringbootTest2.java b/liteflow-testcase-el/liteflow-testcase-el-declare-multi-solon/src/test/java/com/yomahub/liteflow/test/complex/test2/ComplexELDeclMultiSpringbootTest2.java similarity index 96% rename from liteflow-testcase-el/liteflow-testcase-el-declare-multi-solon/src/test/java/com/yomahub/liteflow/test/complex/ComplexELDeclMultiSpringbootTest2.java rename to liteflow-testcase-el/liteflow-testcase-el-declare-multi-solon/src/test/java/com/yomahub/liteflow/test/complex/test2/ComplexELDeclMultiSpringbootTest2.java index 0762e2d21..eeacab57e 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-declare-multi-solon/src/test/java/com/yomahub/liteflow/test/complex/ComplexELDeclMultiSpringbootTest2.java +++ b/liteflow-testcase-el/liteflow-testcase-el-declare-multi-solon/src/test/java/com/yomahub/liteflow/test/complex/test2/ComplexELDeclMultiSpringbootTest2.java @@ -1,4 +1,4 @@ -package com.yomahub.liteflow.test.complex; +package com.yomahub.liteflow.test.complex.test2; import com.yomahub.liteflow.core.FlowExecutor; import com.yomahub.liteflow.flow.LiteflowResponse; diff --git a/liteflow-testcase-el/liteflow-testcase-el-declare-multi-solon/src/test/java/com/yomahub/liteflow/test/complex/cmp2/CmpConfig2.java b/liteflow-testcase-el/liteflow-testcase-el-declare-multi-solon/src/test/java/com/yomahub/liteflow/test/complex/test2/cmp/CmpConfig2.java similarity index 97% rename from liteflow-testcase-el/liteflow-testcase-el-declare-multi-solon/src/test/java/com/yomahub/liteflow/test/complex/cmp2/CmpConfig2.java rename to liteflow-testcase-el/liteflow-testcase-el-declare-multi-solon/src/test/java/com/yomahub/liteflow/test/complex/test2/cmp/CmpConfig2.java index 443f10e03..da8f87d8b 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-declare-multi-solon/src/test/java/com/yomahub/liteflow/test/complex/cmp2/CmpConfig2.java +++ b/liteflow-testcase-el/liteflow-testcase-el-declare-multi-solon/src/test/java/com/yomahub/liteflow/test/complex/test2/cmp/CmpConfig2.java @@ -1,4 +1,4 @@ -package com.yomahub.liteflow.test.complex.cmp2; +package com.yomahub.liteflow.test.complex.test2.cmp; import com.yomahub.liteflow.annotation.LiteflowComponent; import com.yomahub.liteflow.annotation.LiteflowMethod; diff --git a/liteflow-testcase-el/liteflow-testcase-el-declare-multi-solon/src/test/java/com/yomahub/liteflow/test/complex/cmp2/ICmp.java b/liteflow-testcase-el/liteflow-testcase-el-declare-multi-solon/src/test/java/com/yomahub/liteflow/test/complex/test2/cmp/ICmp.java similarity index 87% rename from liteflow-testcase-el/liteflow-testcase-el-declare-multi-solon/src/test/java/com/yomahub/liteflow/test/complex/cmp2/ICmp.java rename to liteflow-testcase-el/liteflow-testcase-el-declare-multi-solon/src/test/java/com/yomahub/liteflow/test/complex/test2/cmp/ICmp.java index 1c198badf..b24c6f691 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-declare-multi-solon/src/test/java/com/yomahub/liteflow/test/complex/cmp2/ICmp.java +++ b/liteflow-testcase-el/liteflow-testcase-el-declare-multi-solon/src/test/java/com/yomahub/liteflow/test/complex/test2/cmp/ICmp.java @@ -5,7 +5,7 @@ * @email weenyc31@163.com * @Date 2020/4/1 */ -package com.yomahub.liteflow.test.complex.cmp2; +package com.yomahub.liteflow.test.complex.test2.cmp; import com.yomahub.liteflow.core.NodeComponent; import org.noear.solon.annotation.Component;