From 0f399010c9dfb37663acb0027eb33fb5b3c2d385 Mon Sep 17 00:00:00 2001 From: Saisai Liu <1374434128@qq.com> Date: Fri, 10 May 2024 22:41:42 +0800 Subject: [PATCH] =?UTF-8?q?feat():=E5=88=86=E7=A6=BB=E5=AE=A2=E6=88=B7?= =?UTF-8?q?=E7=AB=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- muyu-common/muyu-common-cache/pom.xml | 30 ++++++++ .../java/com/muyu/cache/redis/RedisCache.java | 20 +++++ ...ot.autoconfigure.AutoConfiguration.imports | 0 .../core/constant/ServiceNameConstants.java | 6 +- muyu-common/pom.xml | 1 + .../java/com/muyu/etl/AssetClientRunner.java | 55 ++++++++++++++ .../src/main/java/com/muyu/etl/EtlRunner.java | 33 -------- .../muyu/etl/config/AssetClientConfig.java | 4 +- .../com/muyu/etl/uitl/DruidUtilsFactory.java | 76 +++++++++++++++++++ .../java/com/muyu/etl/uitl/JDBCUtils.java | 73 ++++++++++++++++++ .../uitl/service/ConnectionPoolFactory.java | 27 +++++++ ...ot.autoconfigure.AutoConfiguration.imports | 3 +- .../src/main/resources/bootstrap.yml | 29 +++++++ .../com/muyu/etl/domain/pool/BeanPool.java | 24 ++++++ .../main/java/com/etl/RemoteAssetService.java | 32 -------- .../main/java/com/muyu/etl/FeignConfig.java | 17 +++++ .../java/com/muyu/etl/RemoteAssetService.java | 36 +++++++++ .../factory/RemoteAssetFallbackFactory.java | 6 +- ...ot.autoconfigure.AutoConfiguration.imports | 2 +- .../muyu-etl/muyu-etl-service/pom.xml | 5 ++ .../controller/BasicConfigInfoController.java | 4 +- .../java/com/muyu/gen/util/VelocityUtils.java | 6 +- .../impl/RuleEngineVersionServiceImpl.java | 6 +- .../controller/AsNoticeUserController.java | 2 +- 24 files changed, 415 insertions(+), 82 deletions(-) create mode 100644 muyu-common/muyu-common-cache/pom.xml create mode 100644 muyu-common/muyu-common-cache/src/main/java/com/muyu/cache/redis/RedisCache.java create mode 100644 muyu-common/muyu-common-cache/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports create mode 100644 muyu-modules/muyu-etl/muyu-etl-client/src/main/java/com/muyu/etl/AssetClientRunner.java delete mode 100644 muyu-modules/muyu-etl/muyu-etl-client/src/main/java/com/muyu/etl/EtlRunner.java create mode 100644 muyu-modules/muyu-etl/muyu-etl-client/src/main/java/com/muyu/etl/uitl/DruidUtilsFactory.java create mode 100644 muyu-modules/muyu-etl/muyu-etl-client/src/main/java/com/muyu/etl/uitl/JDBCUtils.java create mode 100644 muyu-modules/muyu-etl/muyu-etl-client/src/main/java/com/muyu/etl/uitl/service/ConnectionPoolFactory.java create mode 100644 muyu-modules/muyu-etl/muyu-etl-client/src/main/resources/bootstrap.yml create mode 100644 muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/pool/BeanPool.java delete mode 100644 muyu-modules/muyu-etl/muyu-etl-remote/src/main/java/com/etl/RemoteAssetService.java create mode 100644 muyu-modules/muyu-etl/muyu-etl-remote/src/main/java/com/muyu/etl/FeignConfig.java create mode 100644 muyu-modules/muyu-etl/muyu-etl-remote/src/main/java/com/muyu/etl/RemoteAssetService.java rename muyu-modules/muyu-etl/muyu-etl-remote/src/main/java/com/{ => muyu}/etl/factory/RemoteAssetFallbackFactory.java (85%) diff --git a/muyu-common/muyu-common-cache/pom.xml b/muyu-common/muyu-common-cache/pom.xml new file mode 100644 index 0000000..b3bc591 --- /dev/null +++ b/muyu-common/muyu-common-cache/pom.xml @@ -0,0 +1,30 @@ + + + 4.0.0 + + com.muyu + muyu-common + 3.6.3 + + + muyu-common-cache + + + 17 + 17 + UTF-8 + + + + + + + com.muyu + muyu-common-security + + + + + diff --git a/muyu-common/muyu-common-cache/src/main/java/com/muyu/cache/redis/RedisCache.java b/muyu-common/muyu-common-cache/src/main/java/com/muyu/cache/redis/RedisCache.java new file mode 100644 index 0000000..953dbd7 --- /dev/null +++ b/muyu-common/muyu-common-cache/src/main/java/com/muyu/cache/redis/RedisCache.java @@ -0,0 +1,20 @@ +package com.muyu.cache.redis; + +/** + * @ClassName RedisCache + * @Description 描述 + * @Author SaiSai.Liu + * @Date 2024/5/10 19:01 + */ +public interface RedisCache { + K getKey(T t); + + V get(K key); + + void put(K k ,V v); + + void remove(K k); + + + +} diff --git a/muyu-common/muyu-common-cache/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/muyu-common/muyu-common-cache/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..e69de29 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 784fee7..d35b305 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 @@ -17,9 +17,13 @@ public class ServiceNameConstants { public static final String SYSTEM_SERVICE = "muyu-system"; /** - * 系统模块的serviceid + * 规则引擎模块的serviceid */ public static final String ENGINE_SERVICE = "muyu-engine"; + /** + * etl模块的serviceid + */ + public static final String ETL_SERVICE = "muyu-etl"; /** * 文件服务的serviceid diff --git a/muyu-common/pom.xml b/muyu-common/pom.xml index 5b58e93..ca042b2 100644 --- a/muyu-common/pom.xml +++ b/muyu-common/pom.xml @@ -18,6 +18,7 @@ muyu-common-datascope muyu-common-datasource muyu-common-system + muyu-common-cache muyu-common diff --git a/muyu-modules/muyu-etl/muyu-etl-client/src/main/java/com/muyu/etl/AssetClientRunner.java b/muyu-modules/muyu-etl/muyu-etl-client/src/main/java/com/muyu/etl/AssetClientRunner.java new file mode 100644 index 0000000..3c75425 --- /dev/null +++ b/muyu-modules/muyu-etl/muyu-etl-client/src/main/java/com/muyu/etl/AssetClientRunner.java @@ -0,0 +1,55 @@ +package com.muyu.etl; + +import com.alibaba.druid.pool.DruidPooledConnection; +import com.muyu.common.core.constant.SecurityConstants; +import com.muyu.common.core.domain.Result; +import com.muyu.common.core.web.page.TableDataInfo; +import com.muyu.etl.domain.BasicConfigInfo; +import com.muyu.etl.uitl.DruidUtilsFactory; +import com.muyu.etl.uitl.service.ConnectionPoolFactory; +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 javax.servlet.ServletException; +import java.sql.SQLException; +import java.util.List; + +/** + * @ClassName AssetClientRunner + * @Description 描述 + * @Author SaiSai.Liu + * @Date 2024/5/9 21:26 + */ +@Component +@Log4j2 +public class AssetClientRunner implements ApplicationRunner { + + @Autowired + private RemoteAssetService remoteAssetService; + @Autowired + private ConnectionPoolFactory connectionPoolFactory; + + @Override + public void run(ApplicationArguments args) throws ServletException { + Result> result = remoteAssetService.list(new BasicConfigInfo(), SecurityConstants.INNER); + log.info("初始话内容为{}",result); + if (result.getData().getRows().isEmpty()) throw new ServletException("初始化调用失败，无数据"); + result.getData().getRows().stream().map(basicConfigInfo -> { + DruidPooledConnection init = null; + try { + init = connectionPoolFactory.init(basicConfigInfo); + log.info("初始化结果：{}",init); + } catch (SQLException e) { + log.error("初始化异常：{}",e.getMessage()); + throw new RuntimeException(e); + } + return init; + }); + log.info("初始化完成"); + log.info("连接池：：{}",DruidUtilsFactory.map); + + } +} diff --git a/muyu-modules/muyu-etl/muyu-etl-client/src/main/java/com/muyu/etl/EtlRunner.java b/muyu-modules/muyu-etl/muyu-etl-client/src/main/java/com/muyu/etl/EtlRunner.java deleted file mode 100644 index 86a0f91..0000000 --- a/muyu-modules/muyu-etl/muyu-etl-client/src/main/java/com/muyu/etl/EtlRunner.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.muyu.etl; - -import com.etl.RemoteAssetService; -import com.muyu.common.core.constant.SecurityConstants; -import com.muyu.etl.domain.BasicConfigInfo; -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; - -/** - * @ClassName EtlRunner - * @Description 描述 - * @Author SaiSai.Liu - * @Date 2024/5/9 21:26 - */ -@Component -@Log4j2 -public class EtlRunner implements ApplicationRunner { - - @Autowired - private RemoteAssetService remoteAssetService; - - @Override - public void run(ApplicationArguments args) throws Exception { - List rows = remoteAssetService.list(null, SecurityConstants.INNER).getData().getRows(); - log.info(rows); - - } -} diff --git a/muyu-modules/muyu-etl/muyu-etl-client/src/main/java/com/muyu/etl/config/AssetClientConfig.java b/muyu-modules/muyu-etl/muyu-etl-client/src/main/java/com/muyu/etl/config/AssetClientConfig.java index cd8934a..6f3e1b2 100644 --- a/muyu-modules/muyu-etl/muyu-etl-client/src/main/java/com/muyu/etl/config/AssetClientConfig.java +++ b/muyu-modules/muyu-etl/muyu-etl-client/src/main/java/com/muyu/etl/config/AssetClientConfig.java @@ -1,6 +1,6 @@ package com.muyu.etl.config; -import com.muyu.etl.EtlRunner; +import com.muyu.etl.AssetClientRunner; import org.springframework.context.annotation.Import; import org.springframework.stereotype.Component; @@ -11,7 +11,7 @@ import org.springframework.stereotype.Component; * @Date 2024/5/9 21:45 */ @Component -@Import(value = {EtlRunner.class}) +@Import(value = {AssetClientRunner.class}) public class AssetClientConfig { } diff --git a/muyu-modules/muyu-etl/muyu-etl-client/src/main/java/com/muyu/etl/uitl/DruidUtilsFactory.java b/muyu-modules/muyu-etl/muyu-etl-client/src/main/java/com/muyu/etl/uitl/DruidUtilsFactory.java new file mode 100644 index 0000000..756b548 --- /dev/null +++ b/muyu-modules/muyu-etl/muyu-etl-client/src/main/java/com/muyu/etl/uitl/DruidUtilsFactory.java @@ -0,0 +1,76 @@ +package com.muyu.etl.uitl; + +import com.alibaba.druid.pool.DruidDataSource; +import com.alibaba.druid.pool.DruidPooledConnection; +import com.muyu.etl.domain.BasicConfigInfo; +import com.muyu.etl.uitl.service.ConnectionPoolFactory; + +import java.sql.Connection; +import java.sql.SQLException; +import java.util.HashMap; + +public class DruidUtilsFactory implements ConnectionPoolFactory { + // 连接池容器 + public static HashMap map = new HashMap<>(); + + /** + * 初始化连接池 + * @param basicConfigInfo + * @return + * @throws SQLException + */ + @Override + public DruidPooledConnection init(BasicConfigInfo basicConfigInfo) throws SQLException { + // 连接池对象 + DruidDataSource source = new DruidDataSource(); + // 定义下面需要的对象 + String host = basicConfigInfo.getHost(); + String port = basicConfigInfo.getPort(); + String databaseName = basicConfigInfo.getDatabaseName(); + String databaseType = basicConfigInfo.getDatabaseType(); + // 引擎配置 + source.setUrl("jdbc:" + databaseType + "://" + host + ":" + port + "/" + databaseName + "?" + basicConfigInfo.getConnectionParams()); + source.setUsername(basicConfigInfo.getUsername()); + source.setPassword(basicConfigInfo.getPassword()); + source.setInitialSize(Math.toIntExact(basicConfigInfo.getInitLinkNum())); + source.setMaxActive(Math.toIntExact(basicConfigInfo.getMaxLinkNum())); + source.setMaxWaitThreadCount(Math.toIntExact(basicConfigInfo.getMaxWaitTimes())); + source.setMaxEvictableIdleTimeMillis(basicConfigInfo.getMaxWaitTime()); + DruidPooledConnection pool = source.getConnection(); + map.put(host + ":" + port + "/" + databaseName, pool); + // 获取并返回连接池对象 + return pool; + } + + /** + * 根据接入取出一个连接对象 + * @param basicConfigInfo + * @return + */ + @Override + public Connection getConnection(BasicConfigInfo basicConfigInfo) { + String host = basicConfigInfo.getHost(); + String port = basicConfigInfo.getPort(); + String databaseName = basicConfigInfo.getDatabaseName(); + DruidPooledConnection druidPooledConnection = map.get(host + ":" + port + "/" + databaseName); + Connection connection = druidPooledConnection.getConnection(); + return connection; + } + + /** + * 将连接对象放回连接池 + * @param basicConfigInfo + * @param connection + */ + @Override + public void giveBack(BasicConfigInfo basicConfigInfo, Connection connection) throws SQLException { + String host = basicConfigInfo.getHost(); + String port = basicConfigInfo.getPort(); + String databaseName = basicConfigInfo.getDatabaseName(); + DruidPooledConnection druidPooledConnection = map.get(host + ":" + port + "/" + databaseName); + druidPooledConnection.close(); + } + + + +} diff --git a/muyu-modules/muyu-etl/muyu-etl-client/src/main/java/com/muyu/etl/uitl/JDBCUtils.java b/muyu-modules/muyu-etl/muyu-etl-client/src/main/java/com/muyu/etl/uitl/JDBCUtils.java new file mode 100644 index 0000000..ebe1126 --- /dev/null +++ b/muyu-modules/muyu-etl/muyu-etl-client/src/main/java/com/muyu/etl/uitl/JDBCUtils.java @@ -0,0 +1,73 @@ +package com.muyu.etl.uitl; + +import java.io.FileInputStream; +import java.io.IOException; +import java.sql.*; +import java.util.Properties; + +/** + * JdbcUtils 工具类 + * @author : Saisai.Liu + * @version : 21.0 + */ +public class JDBCUtils { + private static String driver; //Driver驱动 + private static String url; //Uniform Resource Locator，包含数据库信息 + private static String user; //用户名 + private static String password; //用户密码 + + static { + Properties properties = new Properties(); + try { + //Class.forName(driver); + + properties.load(new FileInputStream("src/api/connection/mysql.properties")); + driver = properties.getProperty("driver"); + url = properties.getProperty("url"); + user = properties.getProperty("user"); + password = properties.getProperty("password"); + } catch (IOException e) { + /* + 实际开发中，往往将捕获到的编译期异常转换为一个运行期异常抛出去; + 这时对于调用者来说， + 既可以选择捕获该异常，进行进一步的业务处理，也可以选择默认处理该异常，比较方便。 + */ + throw new RuntimeException(e); + } + } + + //获取连接 + public static Connection getConnection() { + try { + return DriverManager.getConnection(url, user, password); + } catch (SQLException e) { + throw new RuntimeException(e); + } + } + + //释放资源 + /** + * @param resultSet : 结果集（DQL产生） + * @param statement : Statement接口或PreparedStatement接口的实现类 + * @param connection : 即通过getConnection方法获取到的连接 + */ + public static void close(ResultSet resultSet, Statement statement, Connection connection) { + /* + DML的执行不产生ResultSet结果集，可以传入一个null; + 因此要先判断传入的对象是否为空，若非空则调用close方法关闭资源（动态绑定） + */ + try { + if (resultSet != null) { + resultSet.close(); + } + if (statement != null) { + statement.close(); + } + if (connection != null) { + connection.close(); + } + } catch (SQLException e) { + throw new RuntimeException(e); + } + } +} diff --git a/muyu-modules/muyu-etl/muyu-etl-client/src/main/java/com/muyu/etl/uitl/service/ConnectionPoolFactory.java b/muyu-modules/muyu-etl/muyu-etl-client/src/main/java/com/muyu/etl/uitl/service/ConnectionPoolFactory.java new file mode 100644 index 0000000..64e2294 --- /dev/null +++ b/muyu-modules/muyu-etl/muyu-etl-client/src/main/java/com/muyu/etl/uitl/service/ConnectionPoolFactory.java @@ -0,0 +1,27 @@ +package com.muyu.etl.uitl.service; + +import com.alibaba.druid.pool.DruidPooledConnection; + +import java.sql.Connection; +import java.sql.SQLException; + +/** + * @ClassName PoolFactory + * @Description 描述 + * @Author SaiSai.Liu + * @Date 2024/5/10 16:28 + */ +public interface ConnectionPoolFactory { + /** + * 根据所给信息构造连接池并存入大池 + * @param t + * @return + * @throws SQLException + */ + public DruidPooledConnection init(T t) throws SQLException; + + public Connection getConnection(T t); + + public void giveBack(T t, Connection connection) throws SQLException; + +} 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 index dde140c..c34ba1d 100644 --- 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 @@ -1 +1,2 @@ -com.etl.factory.RemoteRuleEngineFallbackFactory +com.muyu.etl.AssetClientRunner +com.muyu.etl.uitl.DruidUtilsFactory diff --git a/muyu-modules/muyu-etl/muyu-etl-client/src/main/resources/bootstrap.yml b/muyu-modules/muyu-etl/muyu-etl-client/src/main/resources/bootstrap.yml new file mode 100644 index 0000000..ff9286f --- /dev/null +++ b/muyu-modules/muyu-etl/muyu-etl-client/src/main/resources/bootstrap.yml @@ -0,0 +1,29 @@ +# Tomcat +server: + port: 9215 + +# Spring +spring: + application: + # 应用名称 + name: muyu-etl-client + profiles: + # 环境配置 + active: dev + cloud: + nacos: + discovery: + # 服务注册地址 + server-addr: 43.142.100.73:8848 + config: + # 配置中心地址 + server-addr: 43.142.100.73:8848 + # 配置文件格式 + file-extension: yml + # 共享配置 + shared-configs: + - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} +logging: + level: + com.muyu.etl.mapper: DEBUG + com.example.springmvctest.feign.api: DEBUG diff --git a/muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/pool/BeanPool.java b/muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/pool/BeanPool.java new file mode 100644 index 0000000..b7ed574 --- /dev/null +++ b/muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/pool/BeanPool.java @@ -0,0 +1,24 @@ +package com.muyu.etl.domain.pool; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; +import org.springframework.context.annotation.Bean; + +import javax.sql.PooledConnection; + +/** + * @ClassName BeanPool + * @Description 描述 + * @Author SaiSai.Liu + * @Date 2024/5/10 15:19 + */ +@Data +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +public class BeanPool { + private String key; + private PooledConnection druidPooledConnection; +} diff --git a/muyu-modules/muyu-etl/muyu-etl-remote/src/main/java/com/etl/RemoteAssetService.java b/muyu-modules/muyu-etl/muyu-etl-remote/src/main/java/com/etl/RemoteAssetService.java deleted file mode 100644 index 97b3693..0000000 --- a/muyu-modules/muyu-etl/muyu-etl-remote/src/main/java/com/etl/RemoteAssetService.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.etl; - -import com.etl.factory.RemoteAssetFallbackFactory; -import com.muyu.common.core.constant.SecurityConstants; -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.etl.domain.BasicConfigInfo; -import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestHeader; - -/** - * 用户服务 - * - * @author muyu - */ -@FeignClient(contextId = "remoteRuleEngineService", value = ServiceNameConstants.ENGINE_SERVICE, fallbackFactory = RemoteAssetFallbackFactory.class) -public interface RemoteAssetService { - /** - * 通过用户名查询用户信息 - * - * @param basicConfigInfo 用户名 - * @param source 请求来源 - * @return 结果 - */ - @GetMapping("/list") - public Result> list(BasicConfigInfo basicConfigInfo, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); - - - -} diff --git a/muyu-modules/muyu-etl/muyu-etl-remote/src/main/java/com/muyu/etl/FeignConfig.java b/muyu-modules/muyu-etl/muyu-etl-remote/src/main/java/com/muyu/etl/FeignConfig.java new file mode 100644 index 0000000..e556adf --- /dev/null +++ b/muyu-modules/muyu-etl/muyu-etl-remote/src/main/java/com/muyu/etl/FeignConfig.java @@ -0,0 +1,17 @@ +package com.muyu.etl; + +import feign.Logger; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +@Configuration +public class FeignConfig { + /** + * feignClient 配置日志级别 + */ + @Bean + public Logger.Level feignLoggerLevel() { + // 请求和响应的头信息,请求和响应的正文及元数据 + return Logger.Level.FULL; + } +} diff --git a/muyu-modules/muyu-etl/muyu-etl-remote/src/main/java/com/muyu/etl/RemoteAssetService.java b/muyu-modules/muyu-etl/muyu-etl-remote/src/main/java/com/muyu/etl/RemoteAssetService.java new file mode 100644 index 0000000..364d790 --- /dev/null +++ b/muyu-modules/muyu-etl/muyu-etl-remote/src/main/java/com/muyu/etl/RemoteAssetService.java @@ -0,0 +1,36 @@ +package com.muyu.etl; + +import com.muyu.etl.factory.RemoteAssetFallbackFactory; +import com.muyu.common.core.constant.SecurityConstants; +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.etl.domain.BasicConfigInfo; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.context.annotation.Bean; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestHeader; + +/** + * 用户服务 + * + * @author muyu + */ +@FeignClient(contextId = "remoteAssetService", + value = ServiceNameConstants.ETL_SERVICE, + fallbackFactory = RemoteAssetFallbackFactory.class) +public interface RemoteAssetService { + /** + * 获取所有接入信息信息 + * + * @param basicConfigInfo 请求参数 + * @param source 请求来源 + * @return 结果 + */ + @PostMapping("/info/list") + public Result> list(@RequestBody BasicConfigInfo basicConfigInfo, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); + + +} diff --git a/muyu-modules/muyu-etl/muyu-etl-remote/src/main/java/com/etl/factory/RemoteAssetFallbackFactory.java b/muyu-modules/muyu-etl/muyu-etl-remote/src/main/java/com/muyu/etl/factory/RemoteAssetFallbackFactory.java similarity index 85% rename from muyu-modules/muyu-etl/muyu-etl-remote/src/main/java/com/etl/factory/RemoteAssetFallbackFactory.java rename to muyu-modules/muyu-etl/muyu-etl-remote/src/main/java/com/muyu/etl/factory/RemoteAssetFallbackFactory.java index 855d5c0..693604e 100644 --- a/muyu-modules/muyu-etl/muyu-etl-remote/src/main/java/com/etl/factory/RemoteAssetFallbackFactory.java +++ b/muyu-modules/muyu-etl/muyu-etl-remote/src/main/java/com/muyu/etl/factory/RemoteAssetFallbackFactory.java @@ -1,6 +1,6 @@ -package com.etl.factory; +package com.muyu.etl.factory; -import com.etl.RemoteAssetService; +import com.muyu.etl.RemoteAssetService; import com.muyu.common.core.domain.Result; import com.muyu.common.core.web.page.TableDataInfo; import com.muyu.etl.domain.BasicConfigInfo; @@ -25,7 +25,7 @@ public class RemoteAssetFallbackFactory implements FallbackFactory> list(BasicConfigInfo basicConfigInfo, String source) { - return Result.error("查询接入信息失败"); + return Result.error("查询接入信息失败,"+throwable.getMessage()); } }; } diff --git a/muyu-modules/muyu-etl/muyu-etl-remote/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/muyu-modules/muyu-etl/muyu-etl-remote/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index dde140c..400bc8d 100644 --- a/muyu-modules/muyu-etl/muyu-etl-remote/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/muyu-modules/muyu-etl/muyu-etl-remote/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1 +1 @@ -com.etl.factory.RemoteRuleEngineFallbackFactory +com.muyu.etl.factory.RemoteAssetFallbackFactory diff --git a/muyu-modules/muyu-etl/muyu-etl-service/pom.xml b/muyu-modules/muyu-etl/muyu-etl-service/pom.xml index 7a85724..0db0198 100644 --- a/muyu-modules/muyu-etl/muyu-etl-service/pom.xml +++ b/muyu-modules/muyu-etl/muyu-etl-service/pom.xml @@ -89,6 +89,11 @@ com.muyu muyu-common-swagger + + com.alibaba + druid + 1.2.8 + diff --git a/muyu-modules/muyu-etl/muyu-etl-service/src/main/java/com/muyu/etl/controller/BasicConfigInfoController.java b/muyu-modules/muyu-etl/muyu-etl-service/src/main/java/com/muyu/etl/controller/BasicConfigInfoController.java index bda35f9..6abf457 100644 --- a/muyu-modules/muyu-etl/muyu-etl-service/src/main/java/com/muyu/etl/controller/BasicConfigInfoController.java +++ b/muyu-modules/muyu-etl/muyu-etl-service/src/main/java/com/muyu/etl/controller/BasicConfigInfoController.java @@ -43,8 +43,8 @@ public class BasicConfigInfoController extends BaseController { /** * 查询基础信息列表 */ - @RequiresPermissions("etl:info:list") - @GetMapping("/list") +// @RequiresPermissions("etl:info:list") + @PostMapping("/list") public Result> list(BasicConfigInfo basicConfigInfo) { startPage(); List list = basicConfigInfoService.selectBasicConfigInfoList(basicConfigInfo); diff --git a/muyu-modules/muyu-gen/src/main/java/com/muyu/gen/util/VelocityUtils.java b/muyu-modules/muyu-gen/src/main/java/com/muyu/gen/util/VelocityUtils.java index 1a83d49..021628a 100644 --- a/muyu-modules/muyu-gen/src/main/java/com/muyu/gen/util/VelocityUtils.java +++ b/muyu-modules/muyu-gen/src/main/java/com/muyu/gen/util/VelocityUtils.java @@ -171,10 +171,10 @@ public class VelocityUtils { fileName = StringUtils.format("{}/domain/{}.java", javaPath, genTable.getSubTable().getClassName()); } else if (template.contains("mapper.java.vm")) { fileName = StringUtils.format("{}/mapper/{}Mapper.java", javaPath, className); - } else if (template.contains("service.java.vm")) { - fileName = StringUtils.format("{}/service/I{}Service.java", javaPath, className); + } else if (template.contains("redis.java.vm")) { + fileName = StringUtils.format("{}/redis/I{}Service.java", javaPath, className); } else if (template.contains("serviceImpl.java.vm")) { - fileName = StringUtils.format("{}/service/impl/{}ServiceImpl.java", javaPath, className); + fileName = StringUtils.format("{}/redis/impl/{}ServiceImpl.java", javaPath, className); } else if (template.contains("controller.java.vm")) { fileName = StringUtils.format("{}/controller/{}Controller.java", javaPath, className); } else if (template.contains("mapper.xml.vm")) { diff --git a/muyu-modules/muyu-ruleEngine/muyu-ruleEngine-service/src/main/java/com/muyu/engine/service/impl/RuleEngineVersionServiceImpl.java b/muyu-modules/muyu-ruleEngine/muyu-ruleEngine-service/src/main/java/com/muyu/engine/service/impl/RuleEngineVersionServiceImpl.java index d4a3f4b..8bf8e7c 100644 --- a/muyu-modules/muyu-ruleEngine/muyu-ruleEngine-service/src/main/java/com/muyu/engine/service/impl/RuleEngineVersionServiceImpl.java +++ b/muyu-modules/muyu-ruleEngine/muyu-ruleEngine-service/src/main/java/com/muyu/engine/service/impl/RuleEngineVersionServiceImpl.java @@ -129,7 +129,7 @@ public class RuleEngineVersionServiceImpl extends ServiceImpl