diff --git a/cloud-rule-common/pom.xml b/cloud-rule-common/pom.xml index 1afedb3..71b5e2a 100644 --- a/cloud-rule-common/pom.xml +++ b/cloud-rule-common/pom.xml @@ -20,6 +20,10 @@ + + com.muyu + cloud-datasources-common + com.muyu cloud-common-core diff --git a/cloud-rule-common/src/main/java/com/muyu/rule/common/basic/abstracts/DataEngineDataSetActuator.java b/cloud-rule-common/src/main/java/com/muyu/rule/common/basic/abstracts/DataEngineDataSetActuator.java index c438d6d..aa92989 100644 --- a/cloud-rule-common/src/main/java/com/muyu/rule/common/basic/abstracts/DataEngineDataSetActuator.java +++ b/cloud-rule-common/src/main/java/com/muyu/rule/common/basic/abstracts/DataEngineDataSetActuator.java @@ -1,7 +1,7 @@ package com.muyu.rule.common.basic.abstracts; +import com.muyu.common.domain.DataValue; import com.muyu.rule.common.basic.BasicEngine; -import com.muyu.rule.common.domain.DataValue; import com.muyu.rule.common.basic.handler.DataEngineDataSetHandler; /** diff --git a/cloud-rule-common/src/main/java/com/muyu/rule/common/basic/abstracts/DataEngineRowActuator.java b/cloud-rule-common/src/main/java/com/muyu/rule/common/basic/abstracts/DataEngineRowActuator.java index 64aca23..0fd2672 100644 --- a/cloud-rule-common/src/main/java/com/muyu/rule/common/basic/abstracts/DataEngineRowActuator.java +++ b/cloud-rule-common/src/main/java/com/muyu/rule/common/basic/abstracts/DataEngineRowActuator.java @@ -1,7 +1,7 @@ package com.muyu.rule.common.basic.abstracts; +import com.muyu.common.domain.DataValue; import com.muyu.rule.common.basic.BasicEngine; -import com.muyu.rule.common.domain.DataValue; import com.muyu.rule.common.basic.handler.DataEngineRowHandler; /** diff --git a/cloud-rule-common/src/main/java/com/muyu/rule/common/basic/abstracts/DataEngineValueActuator.java b/cloud-rule-common/src/main/java/com/muyu/rule/common/basic/abstracts/DataEngineValueActuator.java index 018fe48..4c27b43 100644 --- a/cloud-rule-common/src/main/java/com/muyu/rule/common/basic/abstracts/DataEngineValueActuator.java +++ b/cloud-rule-common/src/main/java/com/muyu/rule/common/basic/abstracts/DataEngineValueActuator.java @@ -1,7 +1,7 @@ package com.muyu.rule.common.basic.abstracts; +import com.muyu.common.domain.DataValue; import com.muyu.rule.common.basic.BasicEngine; -import com.muyu.rule.common.domain.DataValue; import com.muyu.rule.common.basic.handler.DataEngineValueHandler; /** diff --git a/cloud-rule-common/src/main/java/com/muyu/rule/common/basic/handler/DataEngineDataSetHandler.java b/cloud-rule-common/src/main/java/com/muyu/rule/common/basic/handler/DataEngineDataSetHandler.java index c4db393..5014718 100644 --- a/cloud-rule-common/src/main/java/com/muyu/rule/common/basic/handler/DataEngineDataSetHandler.java +++ b/cloud-rule-common/src/main/java/com/muyu/rule/common/basic/handler/DataEngineDataSetHandler.java @@ -1,6 +1,6 @@ package com.muyu.rule.common.basic.handler; -import com.muyu.rule.common.domain.DataValue; +import com.muyu.common.domain.DataValue; /** * @Author:张承志 @@ -8,7 +8,7 @@ import com.muyu.rule.common.domain.DataValue; * @Project:cloud-etl-rule * @name:DataEngineValueHandler * @Date:2024/8/29 14:35 - * @Description:数据值处理对象 + * @Description:数据集作用域 */ public class DataEngineDataSetHandler { diff --git a/cloud-rule-common/src/main/java/com/muyu/rule/common/basic/handler/DataEngineHandler.java b/cloud-rule-common/src/main/java/com/muyu/rule/common/basic/handler/DataEngineHandler.java index 545e1bc..df49518 100644 --- a/cloud-rule-common/src/main/java/com/muyu/rule/common/basic/handler/DataEngineHandler.java +++ b/cloud-rule-common/src/main/java/com/muyu/rule/common/basic/handler/DataEngineHandler.java @@ -4,7 +4,7 @@ package com.muyu.rule.common.basic.handler; * @Author:张承志 * @Package:com.muyu.rule.server.basic * @Project:cloud-etl-rule - * @name:DataEngineHandler + * @name:规则引擎作用域 * @Date:2024/8/29 14:21 */ public class DataEngineHandler { @@ -19,6 +19,7 @@ public class DataEngineHandler { public static T get(){ return (T) dataEngineHandler.get(); + } diff --git a/cloud-rule-common/src/main/java/com/muyu/rule/common/basic/handler/DataEngineRowHandler.java b/cloud-rule-common/src/main/java/com/muyu/rule/common/basic/handler/DataEngineRowHandler.java index b838026..4091e2b 100644 --- a/cloud-rule-common/src/main/java/com/muyu/rule/common/basic/handler/DataEngineRowHandler.java +++ b/cloud-rule-common/src/main/java/com/muyu/rule/common/basic/handler/DataEngineRowHandler.java @@ -1,14 +1,13 @@ package com.muyu.rule.common.basic.handler; -import com.muyu.rule.common.domain.DataValue; +import com.muyu.common.domain.DataValue; /** * @Author:张承志 * @Package:com.muyu.rule.server.basic.handler * @Project:cloud-etl-rule - * @name:DataEngineValueHandler + * @name:数据记录/行作用域 * @Date:2024/8/29 14:35 - * @Description:数据值处理对象 */ public class DataEngineRowHandler { diff --git a/cloud-rule-common/src/main/java/com/muyu/rule/common/basic/handler/DataEngineValueHandler.java b/cloud-rule-common/src/main/java/com/muyu/rule/common/basic/handler/DataEngineValueHandler.java index 691a946..c84b9cd 100644 --- a/cloud-rule-common/src/main/java/com/muyu/rule/common/basic/handler/DataEngineValueHandler.java +++ b/cloud-rule-common/src/main/java/com/muyu/rule/common/basic/handler/DataEngineValueHandler.java @@ -1,13 +1,13 @@ package com.muyu.rule.common.basic.handler; import com.muyu.common.core.text.Convert; -import com.muyu.rule.common.domain.DataValue; +import com.muyu.common.domain.DataValue; /** * @Author:张承志 * @Package:com.muyu.rule.server.basic.handler * @Project:cloud-etl-rule - * @name:DataEngineValueHandler + * @name:数据值作用域 * @Date:2024/8/29 14:35 */ public class DataEngineValueHandler { diff --git a/cloud-rule-common/src/main/java/com/muyu/rule/common/domain/DataValue.java b/cloud-rule-common/src/main/java/com/muyu/rule/common/domain/DataValue.java deleted file mode 100644 index ab67ae9..0000000 --- a/cloud-rule-common/src/main/java/com/muyu/rule/common/domain/DataValue.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.muyu.rule.common.domain; - -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -/** - * @Author:张承志 - * @Package:com.muyu.rule.common.domain - * @Project:cloud-etl-rule - * @name:Data - * @Date:2024/8/27 9:18 - */ -@Data -@Builder -@AllArgsConstructor -@NoArgsConstructor -public class DataValue { - - /** - * 键 - */ - public String key; - - /** - * 类型 - */ - -public String type; - - - /** - * 描述 - */ - -public String label; - - /** - * 值 - */ - -public Object value; - - - - - -} diff --git a/cloud-rule-common/src/main/java/com/muyu/rule/common/domain/req/VersionAddReq.java b/cloud-rule-common/src/main/java/com/muyu/rule/common/domain/req/VersionAddReq.java index 48b56ff..0f6af56 100644 --- a/cloud-rule-common/src/main/java/com/muyu/rule/common/domain/req/VersionAddReq.java +++ b/cloud-rule-common/src/main/java/com/muyu/rule/common/domain/req/VersionAddReq.java @@ -25,12 +25,11 @@ public class VersionAddReq { * 版本名称 */ private String versionName; + /** * 版本类名 */ - private String className; - /** * 版本编码 */ @@ -67,13 +66,4 @@ public class VersionAddReq { private String remark; - - - - - - - - - } diff --git a/cloud-rule-common/src/main/java/com/muyu/rule/common/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 index b7e0bd8..41db869 100644 --- a/cloud-rule-common/src/main/java/com/muyu/rule/common/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,8 +1,8 @@ package com.muyu.rule.common.engine.dataSet; +import com.muyu.common.domain.DataValue; import com.muyu.rule.common.basic.abstracts.DataEngineDataSetActuator; -import com.muyu.rule.common.domain.DataValue; -import com.muyu.rule.common.exception.ActionDiscard; +import com.muyu.rule.common.exception.DeliteException; /** @@ -20,7 +20,7 @@ public class ENGINE_DataSet_asdf_S1 extends DataEngineDataSetActuator { DataValue[][] dataValues = get(); if (dataValues == null || "".equals(dataValues) || "null".equals(dataValues)) { - throw new ActionDiscard(); + throw new DeliteException(); }else { System.out.println("数据检测无异常"); } diff --git a/cloud-rule-common/src/main/java/com/muyu/rule/common/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 index f039103..b160dcc 100644 --- a/cloud-rule-common/src/main/java/com/muyu/rule/common/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,7 +1,7 @@ package com.muyu.rule.common.engine.row; +import com.muyu.common.domain.DataValue; import com.muyu.rule.common.basic.abstracts.DataEngineRowActuator; -import com.muyu.rule.common.domain.DataValue; import java.util.Arrays; import java.util.HashSet; @@ -29,6 +29,8 @@ public class ENGINE_ROW_HANG_R1 extends DataEngineRowActuator { // 将 Set 转换回数组 DataValue[] uniqueArray = uniquePeople.toArray(new DataValue[0]); + + System.out.println(Arrays.toString(uniqueArray)); } diff --git a/cloud-rule-common/src/main/java/com/muyu/rule/common/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 index b848683..292175d 100644 --- a/cloud-rule-common/src/main/java/com/muyu/rule/common/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,13 +1,14 @@ package com.muyu.rule.common.engine.value; -import com.muyu.rule.common.domain.DataValue; +import com.muyu.common.domain.DataValue; import com.muyu.rule.common.basic.abstracts.DataEngineValueActuator; +import com.muyu.rule.common.exception.DeliteException; /** * @Author:张承志 * @Package:com.muyu.rule.server.basic.engine * @Project:cloud-etl-rule - * @name:ENGINE_VALUE_VFD1000_V1 + * @name:非空抛出异常 进行删除 * @Date:2024/8/29 15:51 */ public class ENGINE_VALUE_VFD1000_V1 extends DataEngineValueActuator { @@ -15,11 +16,9 @@ public class ENGINE_VALUE_VFD1000_V1 extends DataEngineValueActuator { public void run() { DataValue dataValue = get(); if (dataValue.getValue() == null){ - System.out.println("数据为空,需要丢弃"); + throw new DeliteException("数据为空,需要丢弃!"); }else{ System.out.println("数据非空:"+dataValue.getValue()); } } - - } diff --git a/cloud-rule-common/src/main/java/com/muyu/rule/common/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 index 386d6da..52f6a44 100644 --- a/cloud-rule-common/src/main/java/com/muyu/rule/common/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,8 +1,10 @@ package com.muyu.rule.common.engine.value; +import com.muyu.common.domain.DataValue; +import com.muyu.common.enums.DataType; import com.muyu.rule.common.basic.abstracts.DataEngineValueActuator; -import com.muyu.rule.common.domain.DataValue; -import com.muyu.rule.common.utils.Desensitization; + +import java.time.LocalDateTime; /** * @Author:张承志 @@ -14,9 +16,30 @@ import com.muyu.rule.common.utils.Desensitization; public class ENGINE_VALUE_VFD1000_V2 extends DataEngineValueActuator { @Override public void run() { + DataValue dataValue = get(); - String string = Desensitization.mobilePhoneDesensitization((String) dataValue.getValue()); - System.out.println("手机号脱敏的结果是====>"+string); + if (dataValue.getValue()==null){ + + DataType type = dataValue.getType(); + //如果为空,添加默认值 + //String string = DataType.convertTypeString((String) ); +//为整数 默认值为0 +// if ("Integer".equals(string)){ +// dataValue.setValue(0); +// } +// //为字符串 默认值为null +// if ("String".equals(string)){ +// dataValue.setValue(null); +// } +// //为时间 默认值为当前时间 +// if ("Date".equals(string)){ +// LocalDateTime dateTime = LocalDateTime.now(); +// dataValue.setValue(dateTime); +// } + } + + + } } diff --git a/cloud-rule-common/src/main/java/com/muyu/rule/common/engine/value/ENGINE_phone_zzzzz_V9.java b/cloud-rule-common/src/main/java/com/muyu/rule/common/engine/value/ENGINE_VALUE_VFD1000_V3.java similarity index 50% rename from cloud-rule-common/src/main/java/com/muyu/rule/common/engine/value/ENGINE_phone_zzzzz_V9.java rename to cloud-rule-common/src/main/java/com/muyu/rule/common/engine/value/ENGINE_VALUE_VFD1000_V3.java index d08fb9b..5115649 100644 --- a/cloud-rule-common/src/main/java/com/muyu/rule/common/engine/value/ENGINE_phone_zzzzz_V9.java +++ b/cloud-rule-common/src/main/java/com/muyu/rule/common/engine/value/ENGINE_VALUE_VFD1000_V3.java @@ -1,23 +1,26 @@ package com.muyu.rule.common.engine.value; -import com.muyu.rule.common.domain.DataValue; +import com.muyu.common.domain.DataValue; import com.muyu.rule.common.basic.abstracts.DataEngineValueActuator; /** * @Author:张承志 * @Package:com.muyu.rule.server.basic.engine * @Project:cloud-etl-rule - * @name:非空 + * @name:字典字段 转换 * @Date:2024/8/29 15:51 */ -public class ENGINE_phone_zzzzz_V9 extends DataEngineValueActuator { +public class ENGINE_VALUE_VFD1000_V3 extends DataEngineValueActuator { @Override public void run() { + DataValue dataValue = get(); - if (dataValue.getValue() == null){ - System.out.println("数据为空"); - }else { - System.out.println("数据非空:"+dataValue.getValue()); - } + + + + + + + } } diff --git a/cloud-rule-common/src/main/java/com/muyu/rule/common/exception/ActionDiscard.java b/cloud-rule-common/src/main/java/com/muyu/rule/common/exception/DeliteException.java similarity index 52% rename from cloud-rule-common/src/main/java/com/muyu/rule/common/exception/ActionDiscard.java rename to cloud-rule-common/src/main/java/com/muyu/rule/common/exception/DeliteException.java index 7ddb8a1..ff43847 100644 --- a/cloud-rule-common/src/main/java/com/muyu/rule/common/exception/ActionDiscard.java +++ b/cloud-rule-common/src/main/java/com/muyu/rule/common/exception/DeliteException.java @@ -7,24 +7,24 @@ package com.muyu.rule.common.exception; * @name:ActionDiscard * @Date:2024/8/26 22:08 */ -public class ActionDiscard extends RuntimeException { - public ActionDiscard() { +public class DeliteException extends RuntimeException { + public DeliteException() { super(); } - public ActionDiscard(String message) { + public DeliteException(String message) { super(message); } - public ActionDiscard(String message, Throwable cause) { + public DeliteException(String message, Throwable cause) { super(message, cause); } - public ActionDiscard(Throwable cause) { + public DeliteException(Throwable cause) { super(cause); } - protected ActionDiscard(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) { + protected DeliteException(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) { super(message, cause, enableSuppression, writableStackTrace); } } 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 1057482..63c74b3 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 @@ -1,6 +1,7 @@ package com.muyu.rule.server; -import com.muyu.rule.common.domain.DataValue; +import com.muyu.common.domain.DataValue; +import com.muyu.common.enums.DataType; import com.muyu.rule.common.basic.BasicEngine; import java.util.Map; @@ -47,7 +48,7 @@ public class Main { System.out.println("字段规则测试:"); DataValue dataValue = DataValue.builder() - .type("String") + .type(DataType.valueOf("String")) .label("姓名") .key("name") .value(null) @@ -77,10 +78,6 @@ public class Main { DataValue[][] dataValuesSet = new DataValue[3][3]; - dataValuesSet[0][0] = new DataValue("name","String","姓名","张三"); - dataValuesSet[0][1] = new DataValue("age","int","年龄",22); - dataValuesSet[0][2] = new DataValue("sex","String","性别","张三"); - dataValuesSet[1][0] = new DataValue("name","String",null,"张三"); BasicEngine engineDataSetAsdfS1 = engineDataSetMap.get("ENGINE_DataSet_asdf_S1"); 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 6160220..975bf5a 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 @@ -1,6 +1,7 @@ package com.muyu.rule.server; -import com.muyu.rule.common.domain.DataValue; +import com.muyu.common.domain.DataValue; +import com.muyu.common.enums.DataType; import com.muyu.rule.common.utils.OssUtil; import com.muyu.rule.common.basic.BasicEngine; import com.muyu.rule.server.complie.SourceCodeComplier; @@ -56,7 +57,7 @@ public class OSSClassLoaderExample { BasicEngine object =(BasicEngine)aClass.newInstance(); DataValue dataValue = DataValue.builder() - .type("String") + .type(DataType.valueOf("String")) .label("姓名") .key("name") .value(null) diff --git a/cloud-rule-server/src/main/java/com/muyu/rule/server/controller/DataSourceDisposeController.java b/cloud-rule-server/src/main/java/com/muyu/rule/server/controller/DataSourceDisposeController.java index d176594..9660b72 100644 --- a/cloud-rule-server/src/main/java/com/muyu/rule/server/controller/DataSourceDisposeController.java +++ b/cloud-rule-server/src/main/java/com/muyu/rule/server/controller/DataSourceDisposeController.java @@ -1,9 +1,7 @@ package com.muyu.rule.server.controller; import com.muyu.common.core.domain.Result; -import com.muyu.rule.common.domain.DataValue; import com.muyu.rule.server.service.SourceDisposeService; -import io.swagger.v3.oas.annotations.Operation; import lombok.extern.log4j.Log4j2; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PathVariable; 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 1fa8173..d114dc8 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 @@ -2,7 +2,7 @@ package com.muyu.rule.server.controller; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.muyu.common.core.domain.Result; -import com.muyu.rule.common.domain.DataValue; +import com.muyu.common.domain.DataValue; import com.muyu.rule.common.domain.RuleEngineVersion; import com.muyu.rule.common.domain.req.VersionAddReq; import com.muyu.rule.server.service.RuleEngineVersionService; @@ -106,15 +106,12 @@ public class RuleEngineVersionController { * @return */ - @PostMapping("/deposit") - public Result deposit(@RequestBody VersionAddReq ver ){ + @PostMapping("/deposit/{type}}") + public Result deposit(@PathVariable("type")Integer type){ - log.info("传入参数{}"+ver); + log.info("传入参数{}"+type); - String versionClazz = ver.getVersionClazz(); - String className = ver.getClassName(); - - // versionService.Upload(versionClazz,className); + String versionClass = versionService.deposit(type); return Result.success(); } diff --git a/cloud-rule-server/src/main/java/com/muyu/rule/server/service/RuleEngineVersionService.java b/cloud-rule-server/src/main/java/com/muyu/rule/server/service/RuleEngineVersionService.java index f0c7f13..7066f3f 100644 --- a/cloud-rule-server/src/main/java/com/muyu/rule/server/service/RuleEngineVersionService.java +++ b/cloud-rule-server/src/main/java/com/muyu/rule/server/service/RuleEngineVersionService.java @@ -1,7 +1,7 @@ package com.muyu.rule.server.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.muyu.rule.common.domain.DataValue; +import com.muyu.common.domain.DataValue; import com.muyu.rule.common.domain.RuleEngineVersion; import java.util.List; @@ -73,5 +73,7 @@ public interface RuleEngineVersionService extends IService { * @param dataValue ktvl数据 */ - void testEngine(String className,DataValue dataValue); + void testEngine(String className, DataValue dataValue); + + String deposit(Integer type); } 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 b4866b1..a835093 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 @@ -5,10 +5,9 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.muyu.common.core.enums.SystemYesNo; -import com.muyu.rule.common.domain.DataValue; +import com.muyu.common.domain.DataValue; import com.muyu.rule.common.domain.RuleEngineVersion; import com.muyu.rule.common.utils.OssUtil; -import com.muyu.rule.server.EngineConfig; import com.muyu.rule.common.basic.BasicEngine; import com.muyu.rule.server.load.ExternalClassLoader; import com.muyu.rule.server.mapper.RuleEngineVersionMapper; @@ -132,11 +131,6 @@ public static final String importClassAndPackPath="home/lib/"; public void complierClass(String className, String versionClazz) { log.info("======>"+versionClazz); String ossFilePath = className + Suffix_JAVA; - String ossFilePath2 = className + Suffix_CLASS; - EngineConfig engineConfig = new EngineConfig(); - - // String filePath ="home/"+ossFilePath; - String filePath = engineWorkSourcePath + ossFilePath; //创建服务器项目容器的java源码文件目录路径 File serverFile = new File(engineWorkSourcePath, ossFilePath); //如果目录不存在,则创建目录 @@ -166,6 +160,7 @@ public static final String importClassAndPackPath="home/lib/"; } else { System.out.println("错误"); } + OssUtil.ssss(className); @@ -248,6 +243,18 @@ public static final String importClassAndPackPath="home/lib/"; valueBasicEngine.execution(); } + @Override + public String deposit(Integer type) { + + + + + + + + return null; + } + /** * 修改激活 * diff --git a/lib/com/muyu/rule/common/basic/abstracts/DataEngineDataSetActuator.class b/lib/com/muyu/rule/common/basic/abstracts/DataEngineDataSetActuator.class index aede0f2..f14a67d 100644 Binary files a/lib/com/muyu/rule/common/basic/abstracts/DataEngineDataSetActuator.class and b/lib/com/muyu/rule/common/basic/abstracts/DataEngineDataSetActuator.class differ diff --git a/lib/com/muyu/rule/common/basic/abstracts/DataEngineRowActuator.class b/lib/com/muyu/rule/common/basic/abstracts/DataEngineRowActuator.class index 7e24515..1e43077 100644 Binary files a/lib/com/muyu/rule/common/basic/abstracts/DataEngineRowActuator.class and b/lib/com/muyu/rule/common/basic/abstracts/DataEngineRowActuator.class differ diff --git a/lib/com/muyu/rule/common/basic/abstracts/DataEngineValueActuator.class b/lib/com/muyu/rule/common/basic/abstracts/DataEngineValueActuator.class index 62a5a35..367d062 100644 Binary files a/lib/com/muyu/rule/common/basic/abstracts/DataEngineValueActuator.class and b/lib/com/muyu/rule/common/basic/abstracts/DataEngineValueActuator.class differ diff --git a/lib/com/muyu/rule/common/basic/handler/DataEngineDataSetHandler.class b/lib/com/muyu/rule/common/basic/handler/DataEngineDataSetHandler.class index cafc743..7337d3b 100644 Binary files a/lib/com/muyu/rule/common/basic/handler/DataEngineDataSetHandler.class and b/lib/com/muyu/rule/common/basic/handler/DataEngineDataSetHandler.class differ diff --git a/lib/com/muyu/rule/common/basic/handler/DataEngineHandler.class b/lib/com/muyu/rule/common/basic/handler/DataEngineHandler.class index 9aa4fd5..7ef02a5 100644 Binary files a/lib/com/muyu/rule/common/basic/handler/DataEngineHandler.class and b/lib/com/muyu/rule/common/basic/handler/DataEngineHandler.class differ diff --git a/lib/com/muyu/rule/common/basic/handler/DataEngineRowHandler.class b/lib/com/muyu/rule/common/basic/handler/DataEngineRowHandler.class index 5568af7..275fb7c 100644 Binary files a/lib/com/muyu/rule/common/basic/handler/DataEngineRowHandler.class and b/lib/com/muyu/rule/common/basic/handler/DataEngineRowHandler.class differ diff --git a/lib/com/muyu/rule/common/basic/handler/DataEngineValueHandler.class b/lib/com/muyu/rule/common/basic/handler/DataEngineValueHandler.class index 99ebb1d..48f0ef7 100644 Binary files a/lib/com/muyu/rule/common/basic/handler/DataEngineValueHandler.class and b/lib/com/muyu/rule/common/basic/handler/DataEngineValueHandler.class differ diff --git a/lib/com/muyu/rule/common/domain/DataValue.class b/lib/com/muyu/rule/common/domain/DataValue.class deleted file mode 100644 index e500fcd..0000000 Binary files a/lib/com/muyu/rule/common/domain/DataValue.class and /dev/null differ diff --git a/lib/com/muyu/rule/common/domain/req/VersionAddReq.class b/lib/com/muyu/rule/common/domain/req/VersionAddReq.class index bba1219..65e96fe 100644 Binary files a/lib/com/muyu/rule/common/domain/req/VersionAddReq.class and b/lib/com/muyu/rule/common/domain/req/VersionAddReq.class differ diff --git a/lib/com/muyu/rule/common/engine/dataSet/ENGINE_DataSet_asdf_S1.class b/lib/com/muyu/rule/common/engine/dataSet/ENGINE_DataSet_asdf_S1.class index 20bfa51..4099efd 100644 Binary files a/lib/com/muyu/rule/common/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/engine/row/ENGINE_ROW_HANG_R1.class b/lib/com/muyu/rule/common/engine/row/ENGINE_ROW_HANG_R1.class index ee6c586..1921f27 100644 Binary files a/lib/com/muyu/rule/common/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/engine/value/ENGINE_VALUE_VFD1000_V1.class b/lib/com/muyu/rule/common/engine/value/ENGINE_VALUE_VFD1000_V1.class index 8a0ec14..2bf3a07 100644 Binary files a/lib/com/muyu/rule/common/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/engine/value/ENGINE_VALUE_VFD1000_V2.class b/lib/com/muyu/rule/common/engine/value/ENGINE_VALUE_VFD1000_V2.class index 4d342b8..23bcfc4 100644 Binary files a/lib/com/muyu/rule/common/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_VALUE_VFD1000_V3.class b/lib/com/muyu/rule/common/engine/value/ENGINE_VALUE_VFD1000_V3.class new file mode 100644 index 0000000..f80dc65 Binary files /dev/null and b/lib/com/muyu/rule/common/engine/value/ENGINE_VALUE_VFD1000_V3.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 deleted file mode 100644 index ffefb05..0000000 Binary files a/lib/com/muyu/rule/common/engine/value/ENGINE_phone_zzzzz_V9.class and /dev/null differ diff --git a/lib/com/muyu/rule/common/exception/ActionDiscard.class b/lib/com/muyu/rule/common/exception/DeliteException.class similarity index 58% rename from lib/com/muyu/rule/common/exception/ActionDiscard.class rename to lib/com/muyu/rule/common/exception/DeliteException.class index 675df8f..7e05624 100644 Binary files a/lib/com/muyu/rule/common/exception/ActionDiscard.class and b/lib/com/muyu/rule/common/exception/DeliteException.class differ diff --git a/lib/com/muyu/rule/common/utils/OssUtil.class b/lib/com/muyu/rule/common/utils/OssUtil.class index 42cc1fd..b688fb7 100644 Binary files a/lib/com/muyu/rule/common/utils/OssUtil.class and b/lib/com/muyu/rule/common/utils/OssUtil.class differ diff --git a/pom.xml b/pom.xml index b3b91ae..d7cff34 100644 --- a/pom.xml +++ b/pom.xml @@ -26,6 +26,4 @@ UTF-8 - -