diff --git a/muyu-modules/muyu-etl/muyu-etl-client/pom.xml b/muyu-modules/muyu-etl/muyu-etl-client/pom.xml index c3c7624..9320cd5 100644 --- a/muyu-modules/muyu-etl/muyu-etl-client/pom.xml +++ b/muyu-modules/muyu-etl/muyu-etl-client/pom.xml @@ -18,4 +18,12 @@ UTF-8 + + + com.zx + muyu-remote + 3.6.3 + + + diff --git a/muyu-modules/muyu-etl/muyu-etl-client/src/main/java/com/muyu/etl/config/DataAccessClientConfig.java b/muyu-modules/muyu-etl/muyu-etl-client/src/main/java/com/muyu/etl/config/DataAccessClientConfig.java new file mode 100644 index 0000000..bb66549 --- /dev/null +++ b/muyu-modules/muyu-etl/muyu-etl-client/src/main/java/com/muyu/etl/config/DataAccessClientConfig.java @@ -0,0 +1,15 @@ +package com.muyu.etl.config; + +import org.springframework.context.annotation.Import; +import org.springframework.stereotype.Component; + +/** + * @ClassDescription: + * @JdkVersion: 17 + * @Author: zhangxu + * @Created: 2024/5/15 9:35 + */ +@Component +@Import({DataAccessClientRunner.class}) +public class DataAccessClientConfig { +} diff --git a/muyu-modules/muyu-etl/muyu-etl-client/src/main/java/com/muyu/etl/config/DataAccessClientRunner.java b/muyu-modules/muyu-etl/muyu-etl-client/src/main/java/com/muyu/etl/config/DataAccessClientRunner.java new file mode 100644 index 0000000..a3907f8 --- /dev/null +++ b/muyu-modules/muyu-etl/muyu-etl-client/src/main/java/com/muyu/etl/config/DataAccessClientRunner.java @@ -0,0 +1,36 @@ +package com.muyu.etl.config; + +import com.muyu.common.core.domain.Result; +import com.muyu.common.core.web.page.TableDataInfo; +import com.muyu.etl.RemoteDataAccessService; +import com.muyu.etl.domain.DataSource; +import com.muyu.etl.domain.MyDataSource; +import lombok.extern.log4j.Log4j2; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.ApplicationArguments; +import org.springframework.boot.ApplicationRunner; + +import java.util.List; + +/** + * @ClassDescription: + * @JdkVersion: 17 + * @Author: zhangxu + * @Created: 2024/5/15 9:36 + */ + +@Log4j2 +public class DataAccessClientRunner implements ApplicationRunner { + + @Autowired + private RemoteDataAccessService remoteDataAccessService; + + + @Override + public void run(ApplicationArguments args) throws Exception { + Result> result = remoteDataAccessService.list(new DataSource()); + List rows = result.getData().getRows(); + MyDataSource.info(rows); + MyDataSource.size(rows.get(0).getDataSourceName()+"_"+rows.get(0).getId()); + } +} diff --git a/muyu-modules/muyu-etl/muyu-etl-client/src/main/resources/META-INF.spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/muyu-modules/muyu-etl/muyu-etl-client/src/main/resources/META-INF.spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..578ea1f --- /dev/null +++ b/muyu-modules/muyu-etl/muyu-etl-client/src/main/resources/META-INF.spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +com.muyu.etl.config.DataAccessClientConfig diff --git a/muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/zx/domain/AssetAccredit.java b/muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/AssetAccredit.java similarity index 98% rename from muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/zx/domain/AssetAccredit.java rename to muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/AssetAccredit.java index 16795d6..7666e4a 100644 --- a/muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/zx/domain/AssetAccredit.java +++ b/muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/AssetAccredit.java @@ -1,4 +1,4 @@ -package com.zx.domain; +package com.muyu.etl.domain; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/zx/domain/MyDataSource.java b/muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/MyDataSource.java similarity index 97% rename from muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/zx/domain/MyDataSource.java rename to muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/MyDataSource.java index 144c27c..01ed421 100644 --- a/muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/zx/domain/MyDataSource.java +++ b/muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/MyDataSource.java @@ -1,4 +1,4 @@ -package com.zx.domain; +package com.muyu.etl.domain; import com.alibaba.druid.pool.DruidDataSource; import lombok.extern.log4j.Log4j2; @@ -92,6 +92,10 @@ public class MyDataSource { * @param key 用于从连接池映射中获取特定DruidDataSource的键。 */ public static void size(String key){ + for (String s : pools.keySet()) { + log.info(s); + } + // 根据键从连接池映射中获取DruidDataSource实例 DruidDataSource druidDataSource = pools.get(key); // 获取当前正在使用的连接数量 diff --git a/muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/zx/domain/model/AccreditModel.java b/muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/model/AccreditModel.java similarity index 91% rename from muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/zx/domain/model/AccreditModel.java rename to muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/model/AccreditModel.java index d5522bb..9d070d3 100644 --- a/muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/zx/domain/model/AccreditModel.java +++ b/muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/model/AccreditModel.java @@ -1,4 +1,4 @@ -package com.zx.domain.model; +package com.muyu.etl.domain.model; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/muyu-modules/muyu-etl/muyu-etl-service/pom.xml b/muyu-modules/muyu-etl/muyu-etl-service/pom.xml index 08a6844..ec86c38 100644 --- a/muyu-modules/muyu-etl/muyu-etl-service/pom.xml +++ b/muyu-modules/muyu-etl/muyu-etl-service/pom.xml @@ -103,6 +103,12 @@ spring-cloud-starter-openfeign + + + com.muyu + muyu-common-system + + diff --git a/muyu-modules/muyu-etl/muyu-etl-service/src/main/java/com/zx/text/A.java b/muyu-modules/muyu-etl/muyu-etl-service/src/main/java/com/muyu/etl/text/A.java similarity index 93% rename from muyu-modules/muyu-etl/muyu-etl-service/src/main/java/com/zx/text/A.java rename to muyu-modules/muyu-etl/muyu-etl-service/src/main/java/com/muyu/etl/text/A.java index 1238d9a..a6a484c 100644 --- a/muyu-modules/muyu-etl/muyu-etl-service/src/main/java/com/zx/text/A.java +++ b/muyu-modules/muyu-etl/muyu-etl-service/src/main/java/com/muyu/etl/text/A.java @@ -1,4 +1,4 @@ -package com.zx.text; +package com.muyu.etl.text; /** * @ClassDescription: diff --git a/muyu-modules/muyu-etl/muyu-etl-service/src/main/java/com/zx/text/B.java b/muyu-modules/muyu-etl/muyu-etl-service/src/main/java/com/muyu/etl/text/B.java similarity index 93% rename from muyu-modules/muyu-etl/muyu-etl-service/src/main/java/com/zx/text/B.java rename to muyu-modules/muyu-etl/muyu-etl-service/src/main/java/com/muyu/etl/text/B.java index 3ef1628..eb68693 100644 --- a/muyu-modules/muyu-etl/muyu-etl-service/src/main/java/com/zx/text/B.java +++ b/muyu-modules/muyu-etl/muyu-etl-service/src/main/java/com/muyu/etl/text/B.java @@ -1,4 +1,4 @@ -package com.zx.text; +package com.muyu.etl.text; /** * @ClassDescription: diff --git a/muyu-modules/muyu-etl/muyu-etl-service/src/main/java/com/zx/text/Base.java b/muyu-modules/muyu-etl/muyu-etl-service/src/main/java/com/muyu/etl/text/Base.java similarity index 85% rename from muyu-modules/muyu-etl/muyu-etl-service/src/main/java/com/zx/text/Base.java rename to muyu-modules/muyu-etl/muyu-etl-service/src/main/java/com/muyu/etl/text/Base.java index 00a0661..f12c571 100644 --- a/muyu-modules/muyu-etl/muyu-etl-service/src/main/java/com/zx/text/Base.java +++ b/muyu-modules/muyu-etl/muyu-etl-service/src/main/java/com/muyu/etl/text/Base.java @@ -1,4 +1,4 @@ -package com.zx.text; +package com.muyu.etl.text; /** * @ClassDescription: diff --git a/muyu-modules/muyu-etl/muyu-etl-service/src/main/java/com/zx/text/C.java b/muyu-modules/muyu-etl/muyu-etl-service/src/main/java/com/muyu/etl/text/C.java similarity index 95% rename from muyu-modules/muyu-etl/muyu-etl-service/src/main/java/com/zx/text/C.java rename to muyu-modules/muyu-etl/muyu-etl-service/src/main/java/com/muyu/etl/text/C.java index b124212..4c1e62a 100644 --- a/muyu-modules/muyu-etl/muyu-etl-service/src/main/java/com/zx/text/C.java +++ b/muyu-modules/muyu-etl/muyu-etl-service/src/main/java/com/muyu/etl/text/C.java @@ -1,4 +1,4 @@ -package com.zx.text; +package com.muyu.etl.text; /** * @ClassDescription: diff --git a/muyu-modules/muyu-etl/muyu-etl-service/src/main/java/com/zx/text/DataModel.java b/muyu-modules/muyu-etl/muyu-etl-service/src/main/java/com/muyu/etl/text/DataModel.java similarity index 97% rename from muyu-modules/muyu-etl/muyu-etl-service/src/main/java/com/zx/text/DataModel.java rename to muyu-modules/muyu-etl/muyu-etl-service/src/main/java/com/muyu/etl/text/DataModel.java index 875b9ff..f0f7d4a 100644 --- a/muyu-modules/muyu-etl/muyu-etl-service/src/main/java/com/zx/text/DataModel.java +++ b/muyu-modules/muyu-etl/muyu-etl-service/src/main/java/com/muyu/etl/text/DataModel.java @@ -1,4 +1,4 @@ -package com.zx.text; +package com.muyu.etl.text; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/muyu-modules/muyu-etl/muyu-etl-service/src/main/java/com/zx/text/Main.java b/muyu-modules/muyu-etl/muyu-etl-service/src/main/java/com/muyu/etl/text/Main.java similarity index 97% rename from muyu-modules/muyu-etl/muyu-etl-service/src/main/java/com/zx/text/Main.java rename to muyu-modules/muyu-etl/muyu-etl-service/src/main/java/com/muyu/etl/text/Main.java index b4a66b3..dbe396e 100644 --- a/muyu-modules/muyu-etl/muyu-etl-service/src/main/java/com/zx/text/Main.java +++ b/muyu-modules/muyu-etl/muyu-etl-service/src/main/java/com/muyu/etl/text/Main.java @@ -1,4 +1,4 @@ -package com.zx.text; +package com.muyu.etl.text; import java.util.concurrent.ConcurrentHashMap; diff --git a/muyu-modules/muyu-etl/muyu-etl-service/src/main/java/com/zx/text/ThreadConstant.java b/muyu-modules/muyu-etl/muyu-etl-service/src/main/java/com/muyu/etl/text/ThreadConstant.java similarity index 94% rename from muyu-modules/muyu-etl/muyu-etl-service/src/main/java/com/zx/text/ThreadConstant.java rename to muyu-modules/muyu-etl/muyu-etl-service/src/main/java/com/muyu/etl/text/ThreadConstant.java index 8d8b98e..edbf415 100644 --- a/muyu-modules/muyu-etl/muyu-etl-service/src/main/java/com/zx/text/ThreadConstant.java +++ b/muyu-modules/muyu-etl/muyu-etl-service/src/main/java/com/muyu/etl/text/ThreadConstant.java @@ -1,4 +1,4 @@ -package com.zx.text; +package com.muyu.etl.text; /** * @ClassDescription: diff --git a/muyu-modules/muyu-etl/muyu-remote/pom.xml b/muyu-modules/muyu-etl/muyu-remote/pom.xml index 0665a77..a63c519 100644 --- a/muyu-modules/muyu-etl/muyu-remote/pom.xml +++ b/muyu-modules/muyu-etl/muyu-remote/pom.xml @@ -5,9 +5,8 @@ 4.0.0 com.muyu - muyu-modules + muyu-etl 3.6.3 - ../../pom.xml com.zx diff --git a/muyu-modules/muyu-etl/muyu-remote/src/main/java/com/zx/RemoteAssetModelService.java b/muyu-modules/muyu-etl/muyu-remote/src/main/java/com/muyu/etl/RemoteAssetModelService.java similarity index 63% rename from muyu-modules/muyu-etl/muyu-remote/src/main/java/com/zx/RemoteAssetModelService.java rename to muyu-modules/muyu-etl/muyu-remote/src/main/java/com/muyu/etl/RemoteAssetModelService.java index a06d9de..0d7eef0 100644 --- a/muyu-modules/muyu-etl/muyu-remote/src/main/java/com/zx/RemoteAssetModelService.java +++ b/muyu-modules/muyu-etl/muyu-remote/src/main/java/com/muyu/etl/RemoteAssetModelService.java @@ -1,10 +1,9 @@ -package com.zx; +package com.muyu.etl; -import com.muyu.common.core.constant.ServiceNameConstants; import com.muyu.common.core.domain.Result; import com.muyu.common.core.web.page.TableDataInfo; -import com.muyu.common.system.remote.factory.RemoteUserFallbackFactory; -import com.zx.domain.AssetModel; +import com.muyu.etl.domain.AssetModel; +import com.muyu.etl.factory.AssetModelFallbackFactory; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -13,15 +12,15 @@ import org.springframework.web.bind.annotation.RequestBody; * @ClassDescription: * @JdkVersion: 17 * @Author: zhangxu - * @Created: 2024/5/13 14:08 + * @Created: 2024/5/15 16:23 */ @FeignClient(contextId = "remoteAssetModelService", - value = ServiceNameConstants.SYSTEM_SERVICE, - fallbackFactory = RemoteUserFallbackFactory.class) + value = "muyu-etl", + fallbackFactory = AssetModelFallbackFactory.class) public interface RemoteAssetModelService { - @PostMapping("/model/list") public Result> list(@RequestBody AssetModel assetModel); + } diff --git a/muyu-modules/muyu-etl/muyu-remote/src/main/java/com/muyu/etl/RemoteDataAccessService.java b/muyu-modules/muyu-etl/muyu-remote/src/main/java/com/muyu/etl/RemoteDataAccessService.java new file mode 100644 index 0000000..319c8c9 --- /dev/null +++ b/muyu-modules/muyu-etl/muyu-remote/src/main/java/com/muyu/etl/RemoteDataAccessService.java @@ -0,0 +1,25 @@ +package com.muyu.etl; + +import com.muyu.common.core.domain.Result; +import com.muyu.common.core.web.page.TableDataInfo; +import com.muyu.etl.domain.DataSource; +import com.muyu.etl.factory.DataAccessFallbackFactory; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; + +/** + * @ClassDescription: + * @JdkVersion: 17 + * @Author: zhangxu + * @Created: 2024/5/13 14:08 + */ +@FeignClient(contextId = "remoteDataAccessService", + value = "muyu-etl", + fallbackFactory = DataAccessFallbackFactory.class) +public interface RemoteDataAccessService { + + @GetMapping("/source/list") + public Result> list(DataSource assetModel); + + +} diff --git a/muyu-modules/muyu-etl/muyu-remote/src/main/java/com/zx/factory/AssetModelFallbackFactory.java b/muyu-modules/muyu-etl/muyu-remote/src/main/java/com/muyu/etl/factory/AssetModelFallbackFactory.java similarity index 71% rename from muyu-modules/muyu-etl/muyu-remote/src/main/java/com/zx/factory/AssetModelFallbackFactory.java rename to muyu-modules/muyu-etl/muyu-remote/src/main/java/com/muyu/etl/factory/AssetModelFallbackFactory.java index 4a25f73..cbad2b2 100644 --- a/muyu-modules/muyu-etl/muyu-remote/src/main/java/com/zx/factory/AssetModelFallbackFactory.java +++ b/muyu-modules/muyu-etl/muyu-remote/src/main/java/com/muyu/etl/factory/AssetModelFallbackFactory.java @@ -1,10 +1,11 @@ -package com.zx.factory; +package com.muyu.etl.factory; import com.muyu.common.core.domain.Result; import com.muyu.common.core.web.page.TableDataInfo; -import com.zx.RemoteAssetModelService; -import com.zx.domain.AssetModel; +import com.muyu.etl.RemoteAssetModelService; +import com.muyu.etl.domain.AssetModel; import org.springframework.cloud.openfeign.FallbackFactory; +import org.springframework.stereotype.Component; /** * @ClassDescription: @@ -12,13 +13,15 @@ import org.springframework.cloud.openfeign.FallbackFactory; * @Author: zhangxu * @Created: 2024/5/13 14:14 */ +@Component public class AssetModelFallbackFactory implements FallbackFactory { @Override public RemoteAssetModelService create(Throwable cause) { return new RemoteAssetModelService() { @Override public Result> list(AssetModel assetModel) { - return Result.error("获取数据模型列表失败"); + + return Result.error("获取数据模型失败"); } }; } diff --git a/muyu-modules/muyu-etl/muyu-remote/src/main/java/com/muyu/etl/factory/DataAccessFallbackFactory.java b/muyu-modules/muyu-etl/muyu-remote/src/main/java/com/muyu/etl/factory/DataAccessFallbackFactory.java new file mode 100644 index 0000000..dac7f47 --- /dev/null +++ b/muyu-modules/muyu-etl/muyu-remote/src/main/java/com/muyu/etl/factory/DataAccessFallbackFactory.java @@ -0,0 +1,27 @@ +package com.muyu.etl.factory; + +import com.muyu.common.core.domain.Result; +import com.muyu.common.core.web.page.TableDataInfo; +import com.muyu.etl.RemoteDataAccessService; +import com.muyu.etl.domain.DataSource; +import org.springframework.cloud.openfeign.FallbackFactory; +import org.springframework.stereotype.Component; + +/** + * @ClassDescription: + * @JdkVersion: 17 + * @Author: zhangxu + * @Created: 2024/5/15 16:20 + */ +@Component +public class DataAccessFallbackFactory implements FallbackFactory { + @Override + public RemoteDataAccessService create(Throwable cause) { + return new RemoteDataAccessService() { + @Override + public Result> list(DataSource dataSource) { + return Result.error("获取数据源列表失败"); + } + }; + } +} diff --git a/muyu-modules/muyu-etl/muyu-remote/src/main/resources/META-INF.spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/muyu-modules/muyu-etl/muyu-remote/src/main/resources/META-INF.spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..0d74d7d --- /dev/null +++ b/muyu-modules/muyu-etl/muyu-remote/src/main/resources/META-INF.spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1,2 @@ +com.muyu.etl.factory.AssetModelFallbackFactory +com.muyu.etl.factory.DataAccessFallbackFactory diff --git a/muyu-modules/muyu-etl/pom.xml b/muyu-modules/muyu-etl/pom.xml index 2d558c3..069921e 100644 --- a/muyu-modules/muyu-etl/pom.xml +++ b/muyu-modules/muyu-etl/pom.xml @@ -15,6 +15,7 @@ muyu-etl-common muyu-etl-service muyu-etl-client + muyu-remote diff --git a/muyu-modules/muyu-rule-engine/muyu-rule-engine-client/pom.xml b/muyu-modules/muyu-rule-engine/muyu-rule-engine-client/pom.xml index ebe9c19..faa6e67 100644 --- a/muyu-modules/muyu-rule-engine/muyu-rule-engine-client/pom.xml +++ b/muyu-modules/muyu-rule-engine/muyu-rule-engine-client/pom.xml @@ -55,6 +55,12 @@ junit 4.12 + + rule.engine + muyu-rule-engine-remote + 3.6.3 + compile + diff --git a/muyu-modules/muyu-rule-engine/muyu-rule-engine-client/src/main/java/com/muyu/rule/engine/config/RuleEngineClientRunner.java b/muyu-modules/muyu-rule-engine/muyu-rule-engine-client/src/main/java/com/muyu/rule/engine/config/RuleEngineClientRunner.java new file mode 100644 index 0000000..24362ad --- /dev/null +++ b/muyu-modules/muyu-rule-engine/muyu-rule-engine-client/src/main/java/com/muyu/rule/engine/config/RuleEngineClientRunner.java @@ -0,0 +1,35 @@ +package com.muyu.rule.engine.config; + +import com.muyu.common.core.domain.Result; +import com.muyu.common.core.web.page.TableDataInfo; +import com.muyu.rule.engine.domain.EngineMaintenance; +import com.muyu.rule.engine.domain.resp.EngineMaintenanceResp; +import com.muyu.rule.engine.factory.RemoteRuleEngineService; +import lombok.extern.log4j.Log4j2; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.ApplicationArguments; +import org.springframework.boot.ApplicationRunner; +import org.springframework.stereotype.Component; + +import java.util.List; + +/** + * @ClassDescription: + * @JdkVersion: 17 + * @Author: zhangxu + * @Created: 2024/5/15 9:44 + */ +@Component +@Log4j2 +public class RuleEngineClientRunner implements ApplicationRunner { + @Autowired + private RemoteRuleEngineService remoteRuleEngineService; + + + @Override + public void run(ApplicationArguments args) throws Exception { + Result> list = remoteRuleEngineService.list(new EngineMaintenance()); + List rows = list.getData().getRows(); + log.info(rows); + } +} diff --git a/muyu-modules/muyu-rule-engine/muyu-rule-engine-client/src/main/java/com/muyu/rule/engine/config/RuleEngineClineConfig.java b/muyu-modules/muyu-rule-engine/muyu-rule-engine-client/src/main/java/com/muyu/rule/engine/config/RuleEngineClineConfig.java new file mode 100644 index 0000000..c45fb2d --- /dev/null +++ b/muyu-modules/muyu-rule-engine/muyu-rule-engine-client/src/main/java/com/muyu/rule/engine/config/RuleEngineClineConfig.java @@ -0,0 +1,15 @@ +package com.muyu.rule.engine.config; + +import org.springframework.context.annotation.Import; +import org.springframework.stereotype.Component; + +/** + * @ClassDescription: + * @JdkVersion: 17 + * @Author: zhangxu + * @Created: 2024/5/15 15:11 + */ +@Component +@Import({RuleEngineClientRunner.class}) +public class RuleEngineClineConfig { +} diff --git a/muyu-modules/muyu-rule-engine/muyu-rule-engine-client/src/main/java/rule/engine/domain/AsyncCompositionExample.java b/muyu-modules/muyu-rule-engine/muyu-rule-engine-client/src/main/java/com/muyu/rule/engine/domain/AsyncCompositionExample.java similarity index 97% rename from muyu-modules/muyu-rule-engine/muyu-rule-engine-client/src/main/java/rule/engine/domain/AsyncCompositionExample.java rename to muyu-modules/muyu-rule-engine/muyu-rule-engine-client/src/main/java/com/muyu/rule/engine/domain/AsyncCompositionExample.java index 7f015c8..4600cd9 100644 --- a/muyu-modules/muyu-rule-engine/muyu-rule-engine-client/src/main/java/rule/engine/domain/AsyncCompositionExample.java +++ b/muyu-modules/muyu-rule-engine/muyu-rule-engine-client/src/main/java/com/muyu/rule/engine/domain/AsyncCompositionExample.java @@ -1,4 +1,4 @@ -package rule.engine.domain; +package com.muyu.rule.engine.domain; import java.util.concurrent.CompletableFuture; import java.util.concurrent.ExecutorService; diff --git a/muyu-modules/muyu-rule-engine/muyu-rule-engine-client/src/main/java/rule/engine/domain/AsyncExample.java b/muyu-modules/muyu-rule-engine/muyu-rule-engine-client/src/main/java/com/muyu/rule/engine/domain/AsyncExample.java similarity index 97% rename from muyu-modules/muyu-rule-engine/muyu-rule-engine-client/src/main/java/rule/engine/domain/AsyncExample.java rename to muyu-modules/muyu-rule-engine/muyu-rule-engine-client/src/main/java/com/muyu/rule/engine/domain/AsyncExample.java index b786874..3bd075d 100644 --- a/muyu-modules/muyu-rule-engine/muyu-rule-engine-client/src/main/java/rule/engine/domain/AsyncExample.java +++ b/muyu-modules/muyu-rule-engine/muyu-rule-engine-client/src/main/java/com/muyu/rule/engine/domain/AsyncExample.java @@ -1,4 +1,4 @@ -package rule.engine.domain; +package com.muyu.rule.engine.domain; import lombok.extern.log4j.Log4j2; diff --git a/muyu-modules/muyu-rule-engine/muyu-rule-engine-client/src/main/java/rule/engine/domain/ConnectionFacory.java b/muyu-modules/muyu-rule-engine/muyu-rule-engine-client/src/main/java/com/muyu/rule/engine/domain/ConnectionFacory.java similarity index 93% rename from muyu-modules/muyu-rule-engine/muyu-rule-engine-client/src/main/java/rule/engine/domain/ConnectionFacory.java rename to muyu-modules/muyu-rule-engine/muyu-rule-engine-client/src/main/java/com/muyu/rule/engine/domain/ConnectionFacory.java index d2bceb9..d100882 100644 --- a/muyu-modules/muyu-rule-engine/muyu-rule-engine-client/src/main/java/rule/engine/domain/ConnectionFacory.java +++ b/muyu-modules/muyu-rule-engine/muyu-rule-engine-client/src/main/java/com/muyu/rule/engine/domain/ConnectionFacory.java @@ -1,6 +1,6 @@ -package rule.engine.domain; +package com.muyu.rule.engine.domain; -import com.zx.domain.DataSource; +import com.muyu.etl.domain.DataSource; import java.sql.Connection; import java.util.HashMap; diff --git a/muyu-modules/muyu-rule-engine/muyu-rule-engine-client/src/main/java/rule/engine/domain/ConnectionPoolImp.java b/muyu-modules/muyu-rule-engine/muyu-rule-engine-client/src/main/java/com/muyu/rule/engine/domain/ConnectionPoolImp.java similarity index 99% rename from muyu-modules/muyu-rule-engine/muyu-rule-engine-client/src/main/java/rule/engine/domain/ConnectionPoolImp.java rename to muyu-modules/muyu-rule-engine/muyu-rule-engine-client/src/main/java/com/muyu/rule/engine/domain/ConnectionPoolImp.java index 2bd6373..3da6765 100644 --- a/muyu-modules/muyu-rule-engine/muyu-rule-engine-client/src/main/java/rule/engine/domain/ConnectionPoolImp.java +++ b/muyu-modules/muyu-rule-engine/muyu-rule-engine-client/src/main/java/com/muyu/rule/engine/domain/ConnectionPoolImp.java @@ -1,4 +1,4 @@ -package rule.engine.domain; +package com.muyu.rule.engine.domain; import java.sql.DriverManager; import java.sql.SQLException; diff --git a/muyu-modules/muyu-rule-engine/muyu-rule-engine-common/src/main/java/rule/engine/domain/req/DataSourceAssetModelReq.java b/muyu-modules/muyu-rule-engine/muyu-rule-engine-common/src/main/java/com/muyu/rule/engine/domain/req/DataSourceAssetModelReq.java similarity index 74% rename from muyu-modules/muyu-rule-engine/muyu-rule-engine-common/src/main/java/rule/engine/domain/req/DataSourceAssetModelReq.java rename to muyu-modules/muyu-rule-engine/muyu-rule-engine-common/src/main/java/com/muyu/rule/engine/domain/req/DataSourceAssetModelReq.java index ce6a4eb..0e5f967 100644 --- a/muyu-modules/muyu-rule-engine/muyu-rule-engine-common/src/main/java/rule/engine/domain/req/DataSourceAssetModelReq.java +++ b/muyu-modules/muyu-rule-engine/muyu-rule-engine-common/src/main/java/com/muyu/rule/engine/domain/req/DataSourceAssetModelReq.java @@ -1,7 +1,7 @@ -package rule.engine.domain.req; +package com.muyu.rule.engine.domain.req; -import com.zx.domain.DataAsset; -import com.zx.domain.DataSource; +import com.muyu.etl.domain.DataAsset; +import com.muyu.etl.domain.DataSource; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/muyu-modules/muyu-rule-engine/muyu-rule-engine-remote/pom.xml b/muyu-modules/muyu-rule-engine/muyu-rule-engine-remote/pom.xml index 0d89682..65b4c24 100644 --- a/muyu-modules/muyu-rule-engine/muyu-rule-engine-remote/pom.xml +++ b/muyu-modules/muyu-rule-engine/muyu-rule-engine-remote/pom.xml @@ -18,91 +18,15 @@ UTF-8 + + com.muyu + muyu-common-core + rule.engine muyu-rule-engine-common 3.6.3 - - com.muyu - muyu-modules-system - 3.6.3 - - - - org.postgresql - postgresql - - - - - com.alibaba.cloud - spring-cloud-starter-alibaba-nacos-discovery - - - - - com.alibaba.cloud - spring-cloud-starter-alibaba-nacos-config - - - - - com.alibaba.cloud - spring-cloud-starter-alibaba-sentinel - - - - - org.springframework.boot - spring-boot-starter-actuator - - - - - io.springfox - springfox-swagger-ui - ${swagger.fox.version} - - - - - com.mysql - mysql-connector-j - - - - - com.muyu - muyu-common-datasource - - - - - com.muyu - muyu-common-datascope - - - - - com.muyu - muyu-common-log - - - - - com.muyu - muyu-common-swagger - - - - - - org.springframework.cloud - spring-cloud-starter-openfeign - - - diff --git a/muyu-modules/muyu-rule-engine/muyu-rule-engine-remote/src/main/resources/META-INF.spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/muyu-modules/muyu-rule-engine/muyu-rule-engine-remote/src/main/resources/META-INF.spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..a6728a7 --- /dev/null +++ b/muyu-modules/muyu-rule-engine/muyu-rule-engine-remote/src/main/resources/META-INF.spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +com.muyu.rule.engine.factory.RemoteRuleEngineFallbackFactory diff --git a/muyu-modules/muyu-rule-engine/muyu-rule-engine-service/pom.xml b/muyu-modules/muyu-rule-engine/muyu-rule-engine-service/pom.xml index 46491d3..32e4c8f 100644 --- a/muyu-modules/muyu-rule-engine/muyu-rule-engine-service/pom.xml +++ b/muyu-modules/muyu-rule-engine/muyu-rule-engine-service/pom.xml @@ -19,6 +19,12 @@ + + com.zx + muyu-etl-client + 3.6.3 + + rule.engine muyu-rule-engine-common diff --git a/muyu-modules/pom.xml b/muyu-modules/pom.xml index 80c9cd7..98b01f8 100644 --- a/muyu-modules/pom.xml +++ b/muyu-modules/pom.xml @@ -15,7 +15,6 @@ muyu-file muyu-etl muyu-rule-engine - muyu-etl/muyu-remote muyu-modules