diff --git a/cloud-rule-common/src/main/java/com/muyu/rule/common/basic/engine/dataSet/ENGINE_DataSet_asdf_S1.java b/cloud-rule-common/src/main/java/com/muyu/rule/common/engine/dataSet/ENGINE_DataSet_asdf_S1.java similarity index 93% rename from cloud-rule-common/src/main/java/com/muyu/rule/common/basic/engine/dataSet/ENGINE_DataSet_asdf_S1.java rename to cloud-rule-common/src/main/java/com/muyu/rule/common/engine/dataSet/ENGINE_DataSet_asdf_S1.java index 5985d94..b7e0bd8 100644 --- a/cloud-rule-common/src/main/java/com/muyu/rule/common/basic/engine/dataSet/ENGINE_DataSet_asdf_S1.java +++ b/cloud-rule-common/src/main/java/com/muyu/rule/common/engine/dataSet/ENGINE_DataSet_asdf_S1.java @@ -1,4 +1,4 @@ -package com.muyu.rule.common.basic.engine.dataSet; +package com.muyu.rule.common.engine.dataSet; import com.muyu.rule.common.basic.abstracts.DataEngineDataSetActuator; import com.muyu.rule.common.domain.DataValue; diff --git a/cloud-rule-common/src/main/java/com/muyu/rule/common/basic/engine/row/ENGINE_ROW_HANG_R1.java b/cloud-rule-common/src/main/java/com/muyu/rule/common/engine/row/ENGINE_ROW_HANG_R1.java similarity index 94% rename from cloud-rule-common/src/main/java/com/muyu/rule/common/basic/engine/row/ENGINE_ROW_HANG_R1.java rename to cloud-rule-common/src/main/java/com/muyu/rule/common/engine/row/ENGINE_ROW_HANG_R1.java index a97958b..f039103 100644 --- a/cloud-rule-common/src/main/java/com/muyu/rule/common/basic/engine/row/ENGINE_ROW_HANG_R1.java +++ b/cloud-rule-common/src/main/java/com/muyu/rule/common/engine/row/ENGINE_ROW_HANG_R1.java @@ -1,4 +1,4 @@ -package com.muyu.rule.common.basic.engine.row; +package com.muyu.rule.common.engine.row; import com.muyu.rule.common.basic.abstracts.DataEngineRowActuator; import com.muyu.rule.common.domain.DataValue; diff --git a/cloud-rule-common/src/main/java/com/muyu/rule/common/basic/engine/value/ENGINE_VALUE_VFD1000_V1.java b/cloud-rule-common/src/main/java/com/muyu/rule/common/engine/value/ENGINE_VALUE_VFD1000_V1.java similarity index 91% rename from cloud-rule-common/src/main/java/com/muyu/rule/common/basic/engine/value/ENGINE_VALUE_VFD1000_V1.java rename to cloud-rule-common/src/main/java/com/muyu/rule/common/engine/value/ENGINE_VALUE_VFD1000_V1.java index 08f2a6f..9dcd8bb 100644 --- a/cloud-rule-common/src/main/java/com/muyu/rule/common/basic/engine/value/ENGINE_VALUE_VFD1000_V1.java +++ b/cloud-rule-common/src/main/java/com/muyu/rule/common/engine/value/ENGINE_VALUE_VFD1000_V1.java @@ -1,4 +1,4 @@ -package com.muyu.rule.common.basic.engine.value; +package com.muyu.rule.common.engine.value; import com.muyu.rule.common.domain.DataValue; import com.muyu.rule.common.basic.abstracts.DataEngineValueActuator; @@ -15,7 +15,9 @@ public class ENGINE_VALUE_VFD1000_V1 extends DataEngineValueActuator { public void run() { DataValue dataValue = get(); if (dataValue.getValue() == null){ + System.out.println("数据为空"); + } } diff --git a/cloud-rule-common/src/main/java/com/muyu/rule/common/basic/engine/value/ENGINE_VALUE_VFD1000_V2.java b/cloud-rule-common/src/main/java/com/muyu/rule/common/engine/value/ENGINE_VALUE_VFD1000_V2.java similarity index 93% rename from cloud-rule-common/src/main/java/com/muyu/rule/common/basic/engine/value/ENGINE_VALUE_VFD1000_V2.java rename to cloud-rule-common/src/main/java/com/muyu/rule/common/engine/value/ENGINE_VALUE_VFD1000_V2.java index e276c5d..386d6da 100644 --- a/cloud-rule-common/src/main/java/com/muyu/rule/common/basic/engine/value/ENGINE_VALUE_VFD1000_V2.java +++ b/cloud-rule-common/src/main/java/com/muyu/rule/common/engine/value/ENGINE_VALUE_VFD1000_V2.java @@ -1,4 +1,4 @@ -package com.muyu.rule.common.basic.engine.value; +package com.muyu.rule.common.engine.value; import com.muyu.rule.common.basic.abstracts.DataEngineValueActuator; import com.muyu.rule.common.domain.DataValue; diff --git a/cloud-rule-common/src/main/java/com/muyu/rule/common/basic/engine/value/ENGINE_phone_zzzzz_V9.java b/cloud-rule-common/src/main/java/com/muyu/rule/common/engine/value/ENGINE_phone_zzzzz_V9.java similarity index 92% rename from cloud-rule-common/src/main/java/com/muyu/rule/common/basic/engine/value/ENGINE_phone_zzzzz_V9.java rename to cloud-rule-common/src/main/java/com/muyu/rule/common/engine/value/ENGINE_phone_zzzzz_V9.java index 1305d5e..d08fb9b 100644 --- a/cloud-rule-common/src/main/java/com/muyu/rule/common/basic/engine/value/ENGINE_phone_zzzzz_V9.java +++ b/cloud-rule-common/src/main/java/com/muyu/rule/common/engine/value/ENGINE_phone_zzzzz_V9.java @@ -1,4 +1,4 @@ -package com.muyu.rule.common.basic.engine.value; +package com.muyu.rule.common.engine.value; import com.muyu.rule.common.domain.DataValue; import com.muyu.rule.common.basic.abstracts.DataEngineValueActuator; diff --git a/cloud-rule-common/src/main/java/com/muyu/rule/common/utils/OssUtil.java b/cloud-rule-common/src/main/java/com/muyu/rule/common/utils/OssUtil.java index 59d21de..404c2bf 100644 --- a/cloud-rule-common/src/main/java/com/muyu/rule/common/utils/OssUtil.java +++ b/cloud-rule-common/src/main/java/com/muyu/rule/common/utils/OssUtil.java @@ -1,7 +1,9 @@ package com.muyu.rule.common.utils; +import com.aliyun.oss.ClientException; import com.aliyun.oss.OSS; import com.aliyun.oss.OSSClientBuilder; +import com.aliyun.oss.OSSException; import com.aliyun.oss.model.GetObjectRequest; import com.aliyun.oss.model.OSSObject; import com.aliyun.oss.model.PutObjectRequest; @@ -198,6 +200,19 @@ public class OssUtil { } } +public static void ssss(String fileName){ + try { + // 假设这是你的.class文件路径 + String filePath = "/home/lib/com/muyu/rule/common/engine/value/"+fileName+".class"; + ossClient.putObject(bucketName, fileName+".class", new File(filePath)); + log.info("存储oss成功"+fileName+".class"); + } catch (OSSException oe) { + System.err.println("存储失败: " + oe.getErrorCode() + oe.getErrorMessage()); + } catch (ClientException ce) { + System.err.println("存储失败: " + ce.getErrorMessage()); + } } + +} diff --git a/cloud-rule-server/src/main/java/com/muyu/rule/server/DownloadOss.java b/cloud-rule-server/src/main/java/com/muyu/rule/server/DownloadOss.java index c5e210e..6b9dac5 100644 --- a/cloud-rule-server/src/main/java/com/muyu/rule/server/DownloadOss.java +++ b/cloud-rule-server/src/main/java/com/muyu/rule/server/DownloadOss.java @@ -27,7 +27,7 @@ import java.io.IOException; * 实现项目启动时,把文件下载到服务器里 */ @Log4j2 -//@Component +@Component public class DownloadOss implements ApplicationRunner { private static final String endPoint = "oss-cn-beijing.aliyuncs.com"; @@ -51,6 +51,11 @@ private static String serverPath ="home/source/"; String key = objectSummary.getKey(); downloadFile(ossClient, bucketName, key, serverPath); } + + + + + // 关闭OSSClient ossClient.shutdown(); } 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 7631c08..1057482 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 @@ -22,10 +22,10 @@ public class Main { static Map> engineDataSetMap = new ConcurrentHashMap<>(); static { try { - Class aClass = Class.forName("com.muyu.rule.common.basic.engine.value.ENGINE_VALUE_VFD1000_V1"); - Class aClass2 = Class.forName("com.muyu.rule.common.basic.engine.value.ENGINE_VALUE_VFD1000_V2"); - Class aClass3 = Class.forName("com.muyu.rule.common.basic.engine.row.ENGINE_ROW_HANG_R1"); - Class aClass4 = Class.forName("com.muyu.rule.common.basic.engine.dataSet.ENGINE_DataSet_asdf_S1"); + Class aClass = Class.forName("com.muyu.rule.common.engine.value.ENGINE_VALUE_VFD1000_V1"); + Class aClass2 = Class.forName("com.muyu.rule.common.engine.value.ENGINE_VALUE_VFD1000_V2"); + Class aClass3 = Class.forName("com.muyu.rule.common.engine.row.ENGINE_ROW_HANG_R1"); + Class aClass4 = Class.forName("com.muyu.rule.common.engine.dataSet.ENGINE_DataSet_asdf_S1"); try { engineMap.put("ENGINE_VALUE_VFD1000_V1", (BasicEngine) aClass.newInstance()); engineMap.put("ENGINE_VALUE_VFD1000_V2", (BasicEngine) aClass2.newInstance()); 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 c9b7b52..6160220 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 @@ -51,7 +51,7 @@ public class OSSClassLoaderExample { Class aClass = null; try { - aClass = Class.forName("com.muyu.rule.common.basic.engine.value.ENGINE_phone_zzzzz_V9"); + aClass = Class.forName("com.muyu.rule.common.engine.value.ENGINE_phone_zzzzz_V9"); BasicEngine object =(BasicEngine)aClass.newInstance(); 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 cb5a246..6d8125e 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 @@ -124,7 +124,7 @@ public class RuleEngineVersionController { String versionClazz = ver.getVersionClazz(); String className = ver.getClassName(); - versionService.Upload(versionClazz,className); + // versionService.Upload(versionClazz,className); return Result.success(); } diff --git a/cloud-rule-server/src/main/java/com/muyu/rule/server/engine/Engine_2024_8_23_2347.java b/cloud-rule-server/src/main/java/com/muyu/rule/server/engine/Engine_2024_8_23_2347.java deleted file mode 100644 index 93c77e3..0000000 --- a/cloud-rule-server/src/main/java/com/muyu/rule/server/engine/Engine_2024_8_23_2347.java +++ /dev/null @@ -1,57 +0,0 @@ - package com.muyu.rule.server.engine; - - -import com.muyu.rule.server.annotation.EngineParam; -import com.muyu.rule.server.pool.container.EngineContainer; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.time.LocalDate; -import java.time.Period; -import java.util.Date; -public class Engine_2024_8_23_2347 { - - - private static final Logger log = LoggerFactory.getLogger(Engine_2024_8_23_2347.class); - - public String execute( @EngineParam(name = "idcard") String idcard) { - - String msg = ""; - System.out.println(); - try { - // 提取年份 - String yearStr = idcard.substring(6, 10); - Integer year = Integer.parseInt(yearStr); - - // 获取当前年份 - LocalDate currentDate = LocalDate.now(); - // Integer currentYear = currentDate.getYear(); - - // 计算年龄 - Period age = Period.between(LocalDate.of(year, 1, 1), currentDate); - msg = "这个身份证的年龄是: " + age.getYears(); - - // 判断性别 - String genderStr = idcard.substring(16, 17); - Integer gender = Integer.parseInt(genderStr); - if (gender % 2 == 0) { - msg += ", 这个身份证是女生"; - } else { - msg += ", 这个身份证是男生"; - } - - // 获取规则引擎数量 - Integer sumEngine = EngineContainer.getSumEngine(); - log.info("项目中规则引擎数量为: {}", sumEngine); - - // 可选:获取 User 对象并打印信息 - // User user = Springutils.getBean(User.class); - // log.info("{} --- {}", user.getName(), user.getAge()); - - return msg; - } catch (Exception e) { - log.error("处理身份证号码时发生错误: {}", e.getMessage(), e); - return "处理身份证号码时发生错误: " + e.getMessage(); - } - } -} diff --git a/cloud-rule-server/src/main/java/com/muyu/rule/server/service/impl/RuleEngineVersionServiceImpl.java b/cloud-rule-server/src/main/java/com/muyu/rule/server/service/impl/RuleEngineVersionServiceImpl.java index 8032452..6b1948d 100644 --- a/cloud-rule-server/src/main/java/com/muyu/rule/server/service/impl/RuleEngineVersionServiceImpl.java +++ b/cloud-rule-server/src/main/java/com/muyu/rule/server/service/impl/RuleEngineVersionServiceImpl.java @@ -14,7 +14,6 @@ import com.muyu.rule.server.load.ExternalClassLoader; import com.muyu.rule.server.mapper.RuleEngineVersionMapper; import com.muyu.rule.server.service.RuleEngineVersionService; import lombok.extern.log4j.Log4j2; -import org.apache.poi.ss.formula.functions.T; import org.springframework.stereotype.Service; import javax.tools.JavaCompiler; @@ -99,12 +98,12 @@ public class RuleEngineVersionServiceImpl extends ServiceImpl> engineMap = new ConcurrentHashMap<>(); + public static Map> engineMap = new ConcurrentHashMap<>(); public static final String engineWorkSourcePath = "home/source/"; public static final String engineWorkClassPath = "home/class/"; // // - public static final String className_prefix = "com.muyu.rule.common.basic.engine.value."; + public static final String className_prefix = "com.muyu.rule.common.engine.value."; //todo @@ -149,9 +148,12 @@ public class RuleEngineVersionServiceImpl extends ServiceImpl valueBasicEngine = engineMap.get(versionClazz); valueBasicEngine.set(dataValue); diff --git a/lib/com/muyu/rule/common/basic/engine/value/ENGINE_phone_zzzzz_V9.class b/lib/com/muyu/rule/common/basic/engine/value/ENGINE_phone_zzzzz_V9.class deleted file mode 100644 index 1ed66dc..0000000 Binary files a/lib/com/muyu/rule/common/basic/engine/value/ENGINE_phone_zzzzz_V9.class and /dev/null differ diff --git a/lib/com/muyu/rule/common/basic/engine/dataSet/ENGINE_DataSet_asdf_S1.class b/lib/com/muyu/rule/common/engine/dataSet/ENGINE_DataSet_asdf_S1.class similarity index 72% rename from lib/com/muyu/rule/common/basic/engine/dataSet/ENGINE_DataSet_asdf_S1.class rename to lib/com/muyu/rule/common/engine/dataSet/ENGINE_DataSet_asdf_S1.class index 893572c..20bfa51 100644 Binary files a/lib/com/muyu/rule/common/basic/engine/dataSet/ENGINE_DataSet_asdf_S1.class and b/lib/com/muyu/rule/common/engine/dataSet/ENGINE_DataSet_asdf_S1.class differ diff --git a/lib/com/muyu/rule/common/basic/engine/row/ENGINE_ROW_HANG_R1.class b/lib/com/muyu/rule/common/engine/row/ENGINE_ROW_HANG_R1.class similarity index 77% rename from lib/com/muyu/rule/common/basic/engine/row/ENGINE_ROW_HANG_R1.class rename to lib/com/muyu/rule/common/engine/row/ENGINE_ROW_HANG_R1.class index 03b9a68..ee6c586 100644 Binary files a/lib/com/muyu/rule/common/basic/engine/row/ENGINE_ROW_HANG_R1.class and b/lib/com/muyu/rule/common/engine/row/ENGINE_ROW_HANG_R1.class differ diff --git a/lib/com/muyu/rule/common/basic/engine/value/ENGINE_VALUE_VFD1000_V1.class b/lib/com/muyu/rule/common/engine/value/ENGINE_VALUE_VFD1000_V1.class similarity index 51% rename from lib/com/muyu/rule/common/basic/engine/value/ENGINE_VALUE_VFD1000_V1.class rename to lib/com/muyu/rule/common/engine/value/ENGINE_VALUE_VFD1000_V1.class index 422de43..f027a12 100644 Binary files a/lib/com/muyu/rule/common/basic/engine/value/ENGINE_VALUE_VFD1000_V1.class and b/lib/com/muyu/rule/common/engine/value/ENGINE_VALUE_VFD1000_V1.class differ diff --git a/lib/com/muyu/rule/common/basic/engine/value/ENGINE_VALUE_VFD1000_V2.class b/lib/com/muyu/rule/common/engine/value/ENGINE_VALUE_VFD1000_V2.class similarity index 76% rename from lib/com/muyu/rule/common/basic/engine/value/ENGINE_VALUE_VFD1000_V2.class rename to lib/com/muyu/rule/common/engine/value/ENGINE_VALUE_VFD1000_V2.class index 4bccf45..4d342b8 100644 Binary files a/lib/com/muyu/rule/common/basic/engine/value/ENGINE_VALUE_VFD1000_V2.class and b/lib/com/muyu/rule/common/engine/value/ENGINE_VALUE_VFD1000_V2.class differ diff --git a/lib/com/muyu/rule/common/engine/value/ENGINE_phone_zzzzz_V9.class b/lib/com/muyu/rule/common/engine/value/ENGINE_phone_zzzzz_V9.class new file mode 100644 index 0000000..ffefb05 Binary files /dev/null and b/lib/com/muyu/rule/common/engine/value/ENGINE_phone_zzzzz_V9.class differ diff --git a/lib/com/muyu/rule/common/utils/OssUtil.class b/lib/com/muyu/rule/common/utils/OssUtil.class index e608019..42cc1fd 100644 Binary files a/lib/com/muyu/rule/common/utils/OssUtil.class and b/lib/com/muyu/rule/common/utils/OssUtil.class differ