diff --git a/cloud-rule-common/pom.xml b/cloud-rule-common/pom.xml index db7349d..1afedb3 100644 --- a/cloud-rule-common/pom.xml +++ b/cloud-rule-common/pom.xml @@ -24,12 +24,19 @@ com.muyu cloud-common-core - + com.aliyun.oss aliyun-sdk-oss 3.12.0 + + + org.springframework.boot + spring-boot-devtools + true + + diff --git a/cloud-rule-server/src/main/java/com/muyu/rule/server/Main.java b/cloud-rule-server/src/main/java/com/muyu/rule/server/Main.java index b4e7da8..c4b34fa 100644 --- a/cloud-rule-server/src/main/java/com/muyu/rule/server/Main.java +++ b/cloud-rule-server/src/main/java/com/muyu/rule/server/Main.java @@ -17,7 +17,6 @@ public class Main { static Map> engineMap = new ConcurrentHashMap<>(); - static { try { Class aClass = Class.forName("com.muyu.rule.server.basic.engine.value.ENGINE_VALUE_VFD1000_V1"); @@ -36,7 +35,6 @@ public class Main { } - public static void main(String[] args) { DataValue dataValue = DataValue.builder() .type("String") diff --git a/cloud-rule-server/src/main/java/com/muyu/rule/server/OSSClassLoaderExample.java b/cloud-rule-server/src/main/java/com/muyu/rule/server/OSSClassLoaderExample.java index 54bde23..92ad04d 100644 --- a/cloud-rule-server/src/main/java/com/muyu/rule/server/OSSClassLoaderExample.java +++ b/cloud-rule-server/src/main/java/com/muyu/rule/server/OSSClassLoaderExample.java @@ -20,16 +20,13 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; public class OSSClassLoaderExample { - static Map> engineMap = new ConcurrentHashMap<>(); public static void main(String[] args) throws Exception { - String filePath = "cloud-rule-server/src/main/java/com/muyu/rule/server/basic/engine/value/"; String pack = "com.muyu.rule.server.basic.engine.value."; - File file = new File(filePath+"ENGINE_phone_zzzzz_V9.java"); String ossFilePath = "ENGINE_phone_zzzzz_V9.java"; @@ -37,7 +34,6 @@ public class OSSClassLoaderExample { try { boolean newFile = file.createNewFile(); - String string = OssUtil.readFileContentFromOSS("zcz-vfd-1000",ossFilePath); System.out.println(string); try (FileWriter writer = new FileWriter(file)) { @@ -72,27 +68,10 @@ public class OSSClassLoaderExample { // // object.execution(); // -// // } catch (Exception e) { // throw new RuntimeException(e); // } - - - - - - - - - - - } - - - - - } diff --git a/cloud-rule-server/src/main/java/com/muyu/rule/server/basic/engine/row/ENGINE_ROW_HANG_R1.java b/cloud-rule-server/src/main/java/com/muyu/rule/server/basic/engine/row/ENGINE_ROW_HANG_R1.java index 751a343..6a9af66 100644 --- a/cloud-rule-server/src/main/java/com/muyu/rule/server/basic/engine/row/ENGINE_ROW_HANG_R1.java +++ b/cloud-rule-server/src/main/java/com/muyu/rule/server/basic/engine/row/ENGINE_ROW_HANG_R1.java @@ -19,13 +19,7 @@ public class ENGINE_ROW_HANG_R1 extends DataEngineRowActuator { DataValue[] dataValues = get(); - - - - - - - + } diff --git a/cloud-rule-server/src/main/java/com/muyu/rule/server/controller/EtlRuleController.java b/cloud-rule-server/src/main/java/com/muyu/rule/server/controller/EtlRuleController.java index c9171d7..5706120 100644 --- a/cloud-rule-server/src/main/java/com/muyu/rule/server/controller/EtlRuleController.java +++ b/cloud-rule-server/src/main/java/com/muyu/rule/server/controller/EtlRuleController.java @@ -49,8 +49,6 @@ public class EtlRuleController { RuleEngine etlRule = etlRuleService.queryById(id); return Result.success(etlRule); } - - @PostMapping("/list") @Operation(summary = "查看规则引擎", description = "根据规则引擎的名称,类型,是否激活,状态等可以进行对规则的筛选") public Result> selectList(@Validated @RequestBody EtlRuleListReq req){ @@ -109,10 +107,8 @@ public class EtlRuleController { @Operation(summary = "规则作用域列表", description = "查询所有作用域的信息") public Result> findAllRuleRegion(){ - List list = etlRuleService.findAllRuleRegion(); - return Result.success(list); } @@ -120,7 +116,6 @@ public class EtlRuleController { * 查看维护规则版本 */ - @PostMapping("/selectRuleAndVersionById/{id}") @Operation(summary = "规则引擎的维护", description = "通过Id查询规则引擎和规则引擎的版本") public Result selectRuleAndVersionById(@PathVariable("id") Long id){ diff --git a/cloud-rule-server/src/main/java/com/muyu/rule/server/controller/RuleEngineVersionController.java b/cloud-rule-server/src/main/java/com/muyu/rule/server/controller/RuleEngineVersionController.java index 0d0ffb6..f03b9f7 100644 --- a/cloud-rule-server/src/main/java/com/muyu/rule/server/controller/RuleEngineVersionController.java +++ b/cloud-rule-server/src/main/java/com/muyu/rule/server/controller/RuleEngineVersionController.java @@ -86,7 +86,6 @@ public class RuleEngineVersionController { return Result.success(); } - /** * 将源码写入到OSS中 * @param @@ -106,7 +105,6 @@ public class RuleEngineVersionController { return Result.success(); } - @PostMapping("/readByOss/{className}") public Result readByOss(@PathVariable String className){ @@ -115,7 +113,6 @@ Object o= versionService.readByOss(className); return Result.success(o); } - @PostMapping("/testvalue/{versionClazz}") public Result testValue(@PathVariable("versionClazz") String versionClazz,@RequestBody DataValue dataValue){ @@ -131,7 +128,6 @@ public Result test(){ String pack = "com.muyu.rule.server.basic.engine.value."; - File file = new File(filePath+"ENGINE_phone_zzzzz_V9.java"); String ossFilePath = "ENGINE_phone_zzzzz_V9.java"; @@ -139,7 +135,6 @@ public Result test(){ try { boolean newFile = file.createNewFile(); - String string = OssUtil.readFileContentFromOSS("zcz-vfd-1000",ossFilePath); System.out.println(string); try (FileWriter writer = new FileWriter(file)) { @@ -158,22 +153,18 @@ public Result test(){ throw new RuntimeException(e); } - - // stringClassMap.forEach(EngineContainer::loadEngineInstance); - return Result.success(); } @PostMapping("/look") public Result look (){ - String ossFilePath = "ENGINE_phone_zzzzz_V9.java"; String filePath ="home/"+ossFilePath; - OssUtil.downloadFileForBucket("zcz-vfd-1000",ossFilePath,filePath); + OssUtil.downloadFileForBucket("zcz-vfd-1000",ossFilePath,filePath); EngineConfig engineConfig = new EngineConfig(); @@ -182,13 +173,11 @@ public Result look (){ //对class文件进行自定义类加载规则引擎 Map> stringClassMap = JavaBinaryClassLoader.loadClassesByLocation(engineConfig.getPack(),engineConfig.getLocation()); - - - return Result.success(); } - - } + + + diff --git a/cloud-rule-server/src/main/java/com/muyu/rule/server/engine/custom/DataModelEngine.java b/cloud-rule-server/src/main/java/com/muyu/rule/server/engine/custom/DataModelEngine.java deleted file mode 100644 index e01536d..0000000 --- a/cloud-rule-server/src/main/java/com/muyu/rule/server/engine/custom/DataModelEngine.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.muyu.rule.server.engine.custom; - -import com.muyu.rule.server.exception.ActionDiscard; - -/** - * @Author：张承志 - * @Package：com.muyu.rule.server.engine - * @Project：cloud-etl-rule - * @name：DataModelEngine - * @Date：2024/8/26 22:00 - */ -public abstract class DataModelEngine { - - public abstract void execution(); - - - - - public Object getValue(){ - - - Class field; - - - return null; - } - - -} diff --git a/cloud-rule-server/src/main/java/com/muyu/rule/server/engine/custom/child/Engine_Reginx.java b/cloud-rule-server/src/main/java/com/muyu/rule/server/engine/custom/child/Engine_Reginx.java deleted file mode 100644 index b4ee466..0000000 --- a/cloud-rule-server/src/main/java/com/muyu/rule/server/engine/custom/child/Engine_Reginx.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.muyu.rule.server.engine.custom.child; - -import com.muyu.rule.common.utils.Desensitization; -import com.muyu.rule.server.engine.custom.DataModelEngine; - -/** - * @Author：张承志 - * @Package：com.muyu.rule.server.engine.custom.child - * @Project：cloud-etl-rule - * @name：Engine_Reginx - * @Date：2024/8/27 15:13 - */ -public class Engine_Reginx extends DataModelEngine { - - - @Override - public void execution() { - Object value = getValue(); - - String string = Desensitization.mobilePhoneDesensitization((String) value); - - - } - - -} diff --git a/cloud-rule-server/src/main/java/com/muyu/rule/server/engine/custom/child/Engine_not_null.java b/cloud-rule-server/src/main/java/com/muyu/rule/server/engine/custom/child/Engine_not_null.java deleted file mode 100644 index d1c04fb..0000000 --- a/cloud-rule-server/src/main/java/com/muyu/rule/server/engine/custom/child/Engine_not_null.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.muyu.rule.server.engine.custom.child; -import com.muyu.rule.server.engine.custom.DataModelEngine; -import com.muyu.rule.server.exception.ActionDiscard; - -/** - * @Author：张承志 - * @Package：com.muyu.rule.server.engine - * @Project：cloud-etl-rule - * @name：Engine_not_null - * @Date：2024/8/26 21:57 - */ -public class Engine_not_null extends DataModelEngine { - - @Override - public void execution() { - Object value = getValue(); - - if (value == null || "".equals(value) || "null".equals(value)) { - throw new ActionDiscard(); - } - } -} diff --git a/cloud-rule-server/src/main/java/com/muyu/rule/server/service/impl/RuleEngineServiceImpl.java b/cloud-rule-server/src/main/java/com/muyu/rule/server/service/impl/RuleEngineServiceImpl.java index 0e1cd33..b0cafad 100644 --- a/cloud-rule-server/src/main/java/com/muyu/rule/server/service/impl/RuleEngineServiceImpl.java +++ b/cloud-rule-server/src/main/java/com/muyu/rule/server/service/impl/RuleEngineServiceImpl.java @@ -10,7 +10,10 @@ import com.muyu.rule.common.domain.DataValue; import com.muyu.rule.common.domain.RuleEngine; import com.muyu.rule.common.domain.RuleEngineVersion; import com.muyu.rule.common.utils.OssUtil; +import com.muyu.rule.server.EngineConfig; import com.muyu.rule.server.basic.BasicEngine; +import com.muyu.rule.server.complie.SourceCodeComplier; +import com.muyu.rule.server.load.JavaBinaryClassLoader; import com.muyu.rule.server.mapper.RuleEngineVersionMapper; import com.muyu.rule.server.scan.JavaCodeScan; import com.muyu.rule.server.service.RuleEngineVersionService; @@ -111,6 +114,18 @@ public class RuleEngineServiceImpl extends ServiceImpl> stringClassMap = JavaBinaryClassLoader.loadClassesByLocation(engineConfig.getPack(),engineConfig.getLocation()); } static Map> engineMap = new ConcurrentHashMap<>();