From 6cec4b330f45a2171f922050811da1d3c970f855 Mon Sep 17 00:00:00 2001 From: rouchen <3133657697@qq.com> Date: Wed, 8 May 2024 22:43:40 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E8=A7=84=E5=88=99=E5=BC=95=E6=93=8E?= =?UTF-8?q?=E7=89=88=E6=9C=AC=20=E6=8A=A5=E5=AD=98=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/constant/ServiceNameConstants.java | 2 + .../system/remote/RemoteUserService.java | 5 +- .../factory/RemoteUserFallbackFactory.java | 5 + muyu-modules/muyu-kvt/muyu-kvt-client/pom.xml | 8 ++ .../kvt/client/config/KvtClientConfig.java | 17 +++ .../kvt/client/config/KvtClientRunner.java | 31 +++++ ...ot.autoconfigure.AutoConfiguration.imports | 1 + muyu-modules/muyu-kvt/muyu-kvt-remote/pom.xml | 6 + .../kvt/remote/RemoteDataManagerService.java | 31 +++++ .../com/muyu/kvt/remote/RemoteUserSer.java | 32 ----- .../remote/factory/DataManagerFactory.java | 30 +++++ .../muyu/kvt/remote/factory/RemoteUser.java | 28 ---- ...ot.autoconfigure.AutoConfiguration.imports | 2 +- .../java/com/muyu/kvt/MuyuApplication.java | 3 +- .../muyu/kvt/controller/KvtController.java | 1 - .../muyu/kvt/service/impl/KvtServiceImpl.java | 5 +- .../muyu-rule-engine-clinet/pom.xml | 20 +++ .../engine/custom/engine_custom_email_ss.java | 22 ++++ .../impl/RuleEngineVersionServiceImpl.java | 59 ++++++++- muyu-modules/muyu-rule-engine/pom.xml | 1 + muyu-modules/muyu-unit/pom.xml | 124 ++++++++++++++++++ .../muyu/kvt/unit/DataUnitApplication.java | 27 ++++ .../src/main/resources/bootstrap.yml | 35 +++++ .../muyu-unit/src/main/resources/logback.xml | 74 +++++++++++ muyu-modules/pom.xml | 1 + 25 files changed, 501 insertions(+), 69 deletions(-) create mode 100644 muyu-modules/muyu-kvt/muyu-kvt-client/src/main/java/com/muyu/kvt/client/config/KvtClientConfig.java create mode 100644 muyu-modules/muyu-kvt/muyu-kvt-client/src/main/java/com/muyu/kvt/client/config/KvtClientRunner.java create mode 100644 muyu-modules/muyu-kvt/muyu-kvt-client/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports create mode 100644 muyu-modules/muyu-kvt/muyu-kvt-remote/src/main/java/com/muyu/kvt/remote/RemoteDataManagerService.java delete mode 100644 muyu-modules/muyu-kvt/muyu-kvt-remote/src/main/java/com/muyu/kvt/remote/RemoteUserSer.java create mode 100644 muyu-modules/muyu-kvt/muyu-kvt-remote/src/main/java/com/muyu/kvt/remote/factory/DataManagerFactory.java delete mode 100644 muyu-modules/muyu-kvt/muyu-kvt-remote/src/main/java/com/muyu/kvt/remote/factory/RemoteUser.java create mode 100644 muyu-modules/muyu-rule-engine/muyu-rule-engine-clinet/pom.xml create mode 100644 muyu-modules/muyu-rule-engine/muyu-rule-engine-common/src/main/java/com/muyu/engine/custom/engine_custom_email_ss.java create mode 100644 muyu-modules/muyu-unit/pom.xml create mode 100644 muyu-modules/muyu-unit/src/main/java/com/muyu/kvt/unit/DataUnitApplication.java create mode 100644 muyu-modules/muyu-unit/src/main/resources/bootstrap.yml create mode 100644 muyu-modules/muyu-unit/src/main/resources/logback.xml diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/constant/ServiceNameConstants.java b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/constant/ServiceNameConstants.java index 25c918e..39736f9 100644 --- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/constant/ServiceNameConstants.java +++ b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/constant/ServiceNameConstants.java @@ -16,8 +16,10 @@ public class ServiceNameConstants { */ public static final String SYSTEM_SERVICE = "muyu-system"; + /** * 文件服务的serviceid */ public static final String FILE_SERVICE = "muyu-file"; + public static final String MUYU_KVT = "muyu-kvt"; } diff --git a/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/remote/RemoteUserService.java b/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/remote/RemoteUserService.java index ed50484..9d5572f 100644 --- a/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/remote/RemoteUserService.java +++ b/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/remote/RemoteUserService.java @@ -38,4 +38,7 @@ public interface RemoteUserService { @PostMapping("/user/register") public Result registerUserInfo (@RequestBody SysUser sysUser, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); - } + @PostMapping("/selectUserId") + public Result selectUserId(@RequestParam("userId") Long userId); + + } diff --git a/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/remote/factory/RemoteUserFallbackFactory.java b/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/remote/factory/RemoteUserFallbackFactory.java index b7f4d60..4fe3d6b 100644 --- a/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/remote/factory/RemoteUserFallbackFactory.java +++ b/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/remote/factory/RemoteUserFallbackFactory.java @@ -31,6 +31,11 @@ public class RemoteUserFallbackFactory implements FallbackFactory registerUserInfo (SysUser sysUser, String source) { return Result.error("注册用户失败:" + throwable.getMessage()); } + + @Override + public Result selectUserId(Long userId) { + return Result.error("查询用户失败:" + throwable.getMessage()); + } }; } } diff --git a/muyu-modules/muyu-kvt/muyu-kvt-client/pom.xml b/muyu-modules/muyu-kvt/muyu-kvt-client/pom.xml index 3eddb03..4ca1683 100644 --- a/muyu-modules/muyu-kvt/muyu-kvt-client/pom.xml +++ b/muyu-modules/muyu-kvt/muyu-kvt-client/pom.xml @@ -16,5 +16,13 @@ 17 UTF-8 + + + com.muyu + muyu-kvt-remote + 3.6.3 + compile + + diff --git a/muyu-modules/muyu-kvt/muyu-kvt-client/src/main/java/com/muyu/kvt/client/config/KvtClientConfig.java b/muyu-modules/muyu-kvt/muyu-kvt-client/src/main/java/com/muyu/kvt/client/config/KvtClientConfig.java new file mode 100644 index 0000000..a826112 --- /dev/null +++ b/muyu-modules/muyu-kvt/muyu-kvt-client/src/main/java/com/muyu/kvt/client/config/KvtClientConfig.java @@ -0,0 +1,17 @@ +package com.muyu.kvt.client.config; + +import org.springframework.context.annotation.ComponentScan; +import org.springframework.context.annotation.Import; + + +/** + * 数据接入客服端配置类 KvtClientConfig + * + * @author LeYang + * on 2024/5/8 + */ +@ComponentScan +@Import(value = {KvtClientRunner.class}) +public class KvtClientConfig { + +} diff --git a/muyu-modules/muyu-kvt/muyu-kvt-client/src/main/java/com/muyu/kvt/client/config/KvtClientRunner.java b/muyu-modules/muyu-kvt/muyu-kvt-client/src/main/java/com/muyu/kvt/client/config/KvtClientRunner.java new file mode 100644 index 0000000..6a07af8 --- /dev/null +++ b/muyu-modules/muyu-kvt/muyu-kvt-client/src/main/java/com/muyu/kvt/client/config/KvtClientRunner.java @@ -0,0 +1,31 @@ +package com.muyu.kvt.client.config; + +import com.muyu.common.core.domain.Result; +import com.muyu.common.core.web.page.TableDataInfo; +import com.muyu.kvt.domain.Kvt; +import com.muyu.kvt.domain.req.KvtQueryReq; +import com.muyu.kvt.remote.RemoteDataManagerService; +import lombok.extern.log4j.Log4j2; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.ApplicationArguments; +import org.springframework.boot.ApplicationRunner; + +/** + * 初始化加载 KvtCilentRunner + * + * @author LeYang + * on 2024/5/8 + */ +@Log4j2 +public class KvtClientRunner implements ApplicationRunner { + + @Autowired + private RemoteDataManagerService remoteDataManagerService; + + + @Override + public void run(ApplicationArguments args) throws Exception { +// Result> list = remoteDataManagerService.list(null); + log.info("list"); + } +} diff --git a/muyu-modules/muyu-kvt/muyu-kvt-client/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/muyu-modules/muyu-kvt/muyu-kvt-client/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..6d2448c --- /dev/null +++ b/muyu-modules/muyu-kvt/muyu-kvt-client/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +com.muyu.kvt.client.config.KvtClientConfig diff --git a/muyu-modules/muyu-kvt/muyu-kvt-remote/pom.xml b/muyu-modules/muyu-kvt/muyu-kvt-remote/pom.xml index bf75af7..f9ae853 100644 --- a/muyu-modules/muyu-kvt/muyu-kvt-remote/pom.xml +++ b/muyu-modules/muyu-kvt/muyu-kvt-remote/pom.xml @@ -22,6 +22,12 @@ com.muyu muyu-common-system + + com.muyu + muyu-kvt-common + 3.6.3 + compile + diff --git a/muyu-modules/muyu-kvt/muyu-kvt-remote/src/main/java/com/muyu/kvt/remote/RemoteDataManagerService.java b/muyu-modules/muyu-kvt/muyu-kvt-remote/src/main/java/com/muyu/kvt/remote/RemoteDataManagerService.java new file mode 100644 index 0000000..26c8a89 --- /dev/null +++ b/muyu-modules/muyu-kvt/muyu-kvt-remote/src/main/java/com/muyu/kvt/remote/RemoteDataManagerService.java @@ -0,0 +1,31 @@ +package com.muyu.kvt.remote; + +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.kvt.domain.Kvt; +import com.muyu.kvt.domain.req.KvtQueryReq; + +import com.muyu.kvt.remote.factory.DataManagerFactory; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; + +/** + * RemoteUser + * + * @author LeYang + * on 2024/4/27 + */ +@FeignClient( + contextId = "RemoteDataManagerService", + value = ServiceNameConstants.MUYU_KVT, + fallbackFactory = DataManagerFactory.class, + path = "/kvt" +) +public interface RemoteDataManagerService { + + @GetMapping("/list") + public Result> list(KvtQueryReq kvtQueryReq) ; + +} diff --git a/muyu-modules/muyu-kvt/muyu-kvt-remote/src/main/java/com/muyu/kvt/remote/RemoteUserSer.java b/muyu-modules/muyu-kvt/muyu-kvt-remote/src/main/java/com/muyu/kvt/remote/RemoteUserSer.java deleted file mode 100644 index c2f4f9d..0000000 --- a/muyu-modules/muyu-kvt/muyu-kvt-remote/src/main/java/com/muyu/kvt/remote/RemoteUserSer.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.muyu.kvt.remote; - -import com.muyu.common.core.constant.ServiceNameConstants; -import com.muyu.common.core.domain.Result; -import com.muyu.common.system.domain.SysUser; -import com.muyu.kvt.remote.factory.RemoteUser; -import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestParam; - -/** - * RemoteUser - * - * @author LeYang - * on 2024/4/27 - */ -@FeignClient( - contextId = "RemoteUserSer", - value = ServiceNameConstants.SYSTEM_SERVICE, - fallbackFactory = RemoteUser.class, - path = "/user" -) -public interface RemoteUserSer { - /** - * 根据用户id查询用户信息 - * @return 结果 - */ - @PostMapping("/selectUserId") - public Result selectUserId(@RequestParam("userId") Long userId); - -} diff --git a/muyu-modules/muyu-kvt/muyu-kvt-remote/src/main/java/com/muyu/kvt/remote/factory/DataManagerFactory.java b/muyu-modules/muyu-kvt/muyu-kvt-remote/src/main/java/com/muyu/kvt/remote/factory/DataManagerFactory.java new file mode 100644 index 0000000..6f15643 --- /dev/null +++ b/muyu-modules/muyu-kvt/muyu-kvt-remote/src/main/java/com/muyu/kvt/remote/factory/DataManagerFactory.java @@ -0,0 +1,30 @@ +package com.muyu.kvt.remote.factory; + + +import com.muyu.common.core.domain.Result; +import com.muyu.common.core.web.page.TableDataInfo; +import com.muyu.kvt.domain.Kvt; +import com.muyu.kvt.domain.req.KvtQueryReq; +import com.muyu.kvt.remote.RemoteDataManagerService; + +import org.springframework.cloud.openfeign.FallbackFactory; +import org.springframework.stereotype.Component; + +/** + * 用户服务降级处理 + * + * @author muyu + */ +@Component +public class DataManagerFactory implements FallbackFactory { + + @Override + public RemoteDataManagerService create(Throwable cause) { + return new RemoteDataManagerService() { + @Override + public Result> list(KvtQueryReq kvtQueryReq) { + return Result.error("获取数据失败"); + } + }; + } +} diff --git a/muyu-modules/muyu-kvt/muyu-kvt-remote/src/main/java/com/muyu/kvt/remote/factory/RemoteUser.java b/muyu-modules/muyu-kvt/muyu-kvt-remote/src/main/java/com/muyu/kvt/remote/factory/RemoteUser.java deleted file mode 100644 index 4ba7b09..0000000 --- a/muyu-modules/muyu-kvt/muyu-kvt-remote/src/main/java/com/muyu/kvt/remote/factory/RemoteUser.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.muyu.kvt.remote.factory; - - -import com.muyu.common.core.domain.Result; -import com.muyu.common.system.domain.SysUser; -import com.muyu.kvt.remote.RemoteUserSer; -import org.springframework.cloud.openfeign.FallbackFactory; -import org.springframework.stereotype.Component; - -/** - * 用户服务降级处理 - * - * @author muyu - */ -@Component -public class RemoteUser implements FallbackFactory { - - @Override - public RemoteUserSer create(Throwable cause) { - - return new RemoteUserSer() { - @Override - public Result selectUserId(Long userId) { - return Result.error(cause.getMessage()); - } - }; - } -} diff --git a/muyu-modules/muyu-kvt/muyu-kvt-remote/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/muyu-modules/muyu-kvt/muyu-kvt-remote/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index db235cc..186b74d 100644 --- a/muyu-modules/muyu-kvt/muyu-kvt-remote/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/muyu-modules/muyu-kvt/muyu-kvt-remote/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1 +1 @@ -com.muyu.kvt.remote.factory.RemoteUser +com.muyu.kvt.remote.factory.DataManagerFactory diff --git a/muyu-modules/muyu-kvt/muyu-kvt-server/src/main/java/com/muyu/kvt/MuyuApplication.java b/muyu-modules/muyu-kvt/muyu-kvt-server/src/main/java/com/muyu/kvt/MuyuApplication.java index b2b6b18..4404a30 100644 --- a/muyu-modules/muyu-kvt/muyu-kvt-server/src/main/java/com/muyu/kvt/MuyuApplication.java +++ b/muyu-modules/muyu-kvt/muyu-kvt-server/src/main/java/com/muyu/kvt/MuyuApplication.java @@ -5,7 +5,8 @@ import com.muyu.common.security.annotation.EnableMyFeignClients; import com.muyu.common.swagger.annotation.EnableCustomSwagger2; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.cloud.openfeign.EnableFeignClients; + + import java.sql.*; diff --git a/muyu-modules/muyu-kvt/muyu-kvt-server/src/main/java/com/muyu/kvt/controller/KvtController.java b/muyu-modules/muyu-kvt/muyu-kvt-server/src/main/java/com/muyu/kvt/controller/KvtController.java index bf08e9f..3752dda 100644 --- a/muyu-modules/muyu-kvt/muyu-kvt-server/src/main/java/com/muyu/kvt/controller/KvtController.java +++ b/muyu-modules/muyu-kvt/muyu-kvt-server/src/main/java/com/muyu/kvt/controller/KvtController.java @@ -140,7 +140,6 @@ public class KvtController extends BaseController { public Result> dataTypeList(){ List dataTypeList=kvtService.dataTypeList(); return Result.success(dataTypeList); - } /** diff --git a/muyu-modules/muyu-kvt/muyu-kvt-server/src/main/java/com/muyu/kvt/service/impl/KvtServiceImpl.java b/muyu-modules/muyu-kvt/muyu-kvt-server/src/main/java/com/muyu/kvt/service/impl/KvtServiceImpl.java index 43b9741..9450bd9 100644 --- a/muyu-modules/muyu-kvt/muyu-kvt-server/src/main/java/com/muyu/kvt/service/impl/KvtServiceImpl.java +++ b/muyu-modules/muyu-kvt/muyu-kvt-server/src/main/java/com/muyu/kvt/service/impl/KvtServiceImpl.java @@ -15,6 +15,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.muyu.common.security.utils.SecurityUtils; import com.muyu.common.system.domain.SysDept; import com.muyu.common.system.domain.SysUser; +import com.muyu.common.system.remote.RemoteUserService; import com.muyu.kvt.dataStructure.OverallDataStructure; import com.muyu.kvt.datadisplay.DataDisplay; import com.muyu.kvt.dept.DeptUserKvt; @@ -24,8 +25,8 @@ import com.muyu.kvt.dictionary.Dictionaryy; import com.muyu.kvt.domain.*; import com.muyu.kvt.permissions.PermissionsUser; -import com.muyu.kvt.remote.RemoteUserSer; +import com.muyu.kvt.remote.RemoteDataManagerService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -263,7 +264,7 @@ public class KvtServiceImpl extends ServiceImpl implements KvtSe } @Autowired - private RemoteUserSer remoteUserSer; + private RemoteUserService remoteUserSer; public Result mysql(Kvt kvt) { diff --git a/muyu-modules/muyu-rule-engine/muyu-rule-engine-clinet/pom.xml b/muyu-modules/muyu-rule-engine/muyu-rule-engine-clinet/pom.xml new file mode 100644 index 0000000..61f2a1b --- /dev/null +++ b/muyu-modules/muyu-rule-engine/muyu-rule-engine-clinet/pom.xml @@ -0,0 +1,20 @@ + + + 4.0.0 + + com.muyu + muyu-rule-engine + 3.6.3 + + + muyu-rule-engine-clinet + + + 17 + 17 + UTF-8 + + + diff --git a/muyu-modules/muyu-rule-engine/muyu-rule-engine-common/src/main/java/com/muyu/engine/custom/engine_custom_email_ss.java b/muyu-modules/muyu-rule-engine/muyu-rule-engine-common/src/main/java/com/muyu/engine/custom/engine_custom_email_ss.java new file mode 100644 index 0000000..ecffe4a --- /dev/null +++ b/muyu-modules/muyu-rule-engine/muyu-rule-engine-common/src/main/java/com/muyu/engine/custom/engine_custom_email_ss.java @@ -0,0 +1,22 @@ +package com.muyu.engine.custom; + + +import com.muyu.engine.action.ActionDiscard; +import com.muyu.engine.scope.DataModelEngine; + +/** + * @Author: yl + * @date: 2024/5/6 + * @Description: ss-ss + * @Version: 1.0 + */ +public class engine_custom_email_ss extends DataModelEngine { + @Override + public void execution () { + Object value = getValue(); + + if (value == null || "".equals(value) || "null".equals(value)) { + throw new ActionDiscard(); + } + } +} \ No newline at end of file diff --git a/muyu-modules/muyu-rule-engine/muyu-rule-engine-server/src/main/java/com/muyu/engine/service/impl/RuleEngineVersionServiceImpl.java b/muyu-modules/muyu-rule-engine/muyu-rule-engine-server/src/main/java/com/muyu/engine/service/impl/RuleEngineVersionServiceImpl.java index 1c90b70..6bbe9f8 100644 --- a/muyu-modules/muyu-rule-engine/muyu-rule-engine-server/src/main/java/com/muyu/engine/service/impl/RuleEngineVersionServiceImpl.java +++ b/muyu-modules/muyu-rule-engine/muyu-rule-engine-server/src/main/java/com/muyu/engine/service/impl/RuleEngineVersionServiceImpl.java @@ -14,13 +14,16 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import javax.tools.*; import java.io.BufferedReader; import java.io.IOException; import java.io.InputStreamReader; +import java.net.URI; import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; +import java.util.Arrays; import java.util.List; import java.util.Objects; import java.util.stream.Collectors; @@ -100,7 +103,7 @@ private RuleEngineService ruleEngineService; } //全局变量 - public static String url="D:\\JavaTest\\"; + public static String url="D:\\work\\zglkh\\cloud-server\\muyu-modules\\muyu-rule-engine\\muyu-rule-engine-common\\src\\main\\java\\com\\muyu\\engine\\custom\\"; @Override public void RuleEngineVersionAdd(RuleEngineVersion ruleEngineVersion) { this.save(ruleEngineVersion); @@ -108,6 +111,7 @@ private RuleEngineService ruleEngineService; @Override public void updataEngineVersionStatus(RuleEngineVersion ruleEngineVersion) { + RuleEngineVersion build = RuleEngineVersion.builder() .status("1") .codeIng(ruleEngineVersion.getCodeIng()) @@ -122,7 +126,7 @@ private RuleEngineService ruleEngineService; public void writeCodeAdd(RuleEngineVersion ruleEngineVersion) { try{ //文件路径 - String fileName =ruleEngineVersion.getWriteCode()+".java"; + String fileName =ruleEngineVersion.getVersionCode()+".java"; String filePath = url+fileName; //编写java文件 @@ -166,9 +170,58 @@ private RuleEngineService ruleEngineService; System.out.println("运行失败"); } }catch (Exception e){ - + throw new RuntimeException(); } } +// private String url ="D:\\work\\zglkh\\cloud-server\\muyu-modules\\muyu-rule-engine\\muyu-rule-engine-common\\src\\main\\java\\com\\muyu\\engine\\java"; +// +// //生产源文件 +// public void writeCodeAdd(RuleEngineVersion ruleEngineVersion) { +// try { +// +// String className = ruleEngineVersion.getVersionCode(); +// String content = ruleEngineVersion.getCodeIng(); +// // 指定输出目录 +// JavaCompiler compiler = ToolProvider.getSystemJavaCompiler(); +// +// try (StandardJavaFileManager fileManager = compiler.getStandardFileManager(null, null, null)) { +// // 创建一个内存中的源文件 +// JavaFileObject sourceFileObject = new JavaSourceFromString(className, content); +// +// // 编译选项 +// Iterable options = Arrays.asList("-d", url); +// // 编译源代码 +// JavaCompiler.CompilationTask task = compiler.getTask(null, fileManager, null, options, null, Arrays.asList(sourceFileObject)); +// boolean success = task.call(); +// +// if (success) { +// System.out.println("编译成功"); +// } else { +// System.out.println("编译失败"); +// } +// +// +// } catch (Exception e) { +// e.printStackTrace(); +// } +// }catch (Exception e) { +// e.printStackTrace(); +// } +// +// } +// static class JavaSourceFromString extends SimpleJavaFileObject { +// final String code; +// +// +// JavaSourceFromString(String name, String code) { +// super(URI.create("string:///" + name.replace('.', '/') + Kind.SOURCE.extension), Kind.SOURCE); +// this.code = code; +// } +// @Override +// public CharSequence getCharContent(boolean ignoreEncodingErrors) { +// return code; +// } +// } } diff --git a/muyu-modules/muyu-rule-engine/pom.xml b/muyu-modules/muyu-rule-engine/pom.xml index b0bce1c..e340ecc 100644 --- a/muyu-modules/muyu-rule-engine/pom.xml +++ b/muyu-modules/muyu-rule-engine/pom.xml @@ -15,6 +15,7 @@ muyu-rule-engine-common muyu-rule-engine-remote muyu-rule-engine-server + muyu-rule-engine-clinet diff --git a/muyu-modules/muyu-unit/pom.xml b/muyu-modules/muyu-unit/pom.xml new file mode 100644 index 0000000..8feb23b --- /dev/null +++ b/muyu-modules/muyu-unit/pom.xml @@ -0,0 +1,124 @@ + + + 4.0.0 + + com.muyu + muyu-modules + 3.6.3 + + + muyu-unit + + + 17 + 17 + UTF-8 + + + + org.postgresql + postgresql + 42.2.18 + + + + 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 + + + + com.muyu + muyu-kvt-common + 3.6.3 + compile + + + com.muyu + muyu-kvt-remote + 3.6.3 + compile + + + + + ${project.artifactId} + + + org.springframework.boot + spring-boot-maven-plugin + + + + repackage + + + + + + + org.apache.maven.plugins + maven-deploy-plugin + + true + + + + + diff --git a/muyu-modules/muyu-unit/src/main/java/com/muyu/kvt/unit/DataUnitApplication.java b/muyu-modules/muyu-unit/src/main/java/com/muyu/kvt/unit/DataUnitApplication.java new file mode 100644 index 0000000..523651c --- /dev/null +++ b/muyu-modules/muyu-unit/src/main/java/com/muyu/kvt/unit/DataUnitApplication.java @@ -0,0 +1,27 @@ +package com.muyu.kvt.unit; + +import com.muyu.common.security.annotation.EnableCustomConfig; +import com.muyu.common.security.annotation.EnableMyFeignClients; +import com.muyu.common.swagger.annotation.EnableCustomSwagger2; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; +import org.springframework.scheduling.annotation.EnableAsync; + +/** + * 数据启动类 DataUnitApplication + * + * @author LeYang + * on 2024/5/8 + */ +@EnableCustomConfig +@EnableCustomSwagger2 +@EnableMyFeignClients +@EnableAsync +@SpringBootApplication(exclude = { DataSourceAutoConfiguration.class}) +public class DataUnitApplication { + public static void main(String[] args) { + SpringApplication.run(DataUnitApplication.class, args); + } +} diff --git a/muyu-modules/muyu-unit/src/main/resources/bootstrap.yml b/muyu-modules/muyu-unit/src/main/resources/bootstrap.yml new file mode 100644 index 0000000..e3a5624 --- /dev/null +++ b/muyu-modules/muyu-unit/src/main/resources/bootstrap.yml @@ -0,0 +1,35 @@ +# Tomcat +server: + port: 9666 + +# Spring +spring: + redis: + host: 115.159.211.196 + port: 6379 + password: yl030509 + main: + allow-circular-references: true + application: + # 应用名称 + name: muyu-unit + profiles: + # 环境配置 + active: dev + cloud: + nacos: + discovery: + # 服务注册地址 + server-addr: 115.159.211.196:8848 + config: + # 配置中心地址 + server-addr: 115.159.211.196:8848 + namespace: b8ace5a6-28a3-4126-b109-9b6623c58dc0 + # 配置文件格式 + file-extension: yml + # 共享配置 + shared-configs: + - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} +logging: + level: + com.muyu.kvt.mapper: DEBUG diff --git a/muyu-modules/muyu-unit/src/main/resources/logback.xml b/muyu-modules/muyu-unit/src/main/resources/logback.xml new file mode 100644 index 0000000..8711f72 --- /dev/null +++ b/muyu-modules/muyu-unit/src/main/resources/logback.xml @@ -0,0 +1,74 @@ + + + + + + + + + + + ${log.pattern} + + + + + + ${log.path}/info.log + + + + ${log.path}/info.%d{yyyy-MM-dd}.log + + 60 + + + ${log.pattern} + + + + INFO + + ACCEPT + + DENY + + + + + ${log.path}/error.log + + + + ${log.path}/error.%d{yyyy-MM-dd}.log + + 60 + + + ${log.pattern} + + + + ERROR + + ACCEPT + + DENY + + + + + + + + + + + + + + + + + + diff --git a/muyu-modules/pom.xml b/muyu-modules/pom.xml index 69d2c7e..6349d21 100644 --- a/muyu-modules/pom.xml +++ b/muyu-modules/pom.xml @@ -15,6 +15,7 @@ muyu-file muyu-kvt muyu-rule-engine + muyu-unit muyu-modules