From bf01b893c72445e806bbbd9dfdcad84babc34f03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E7=86=99=E6=9C=9D?= <13694051+wangxizhao123@user.noreply.gitee.com> Date: Sat, 11 May 2024 17:30:19 +0800 Subject: [PATCH] =?UTF-8?q?fase()=E8=BF=9C=E7=A8=8B=E8=B0=83=E7=94=A8?= =?UTF-8?q?=E5=90=AF=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../muyu-data-ranges-clinet/pom.xml | 51 +++++++ .../ranges/clinet/config/DataGoodsConfig.java | 10 ++ .../ranges/clinet/config/DataRangeConfig.java | 13 ++ .../config/runner/DataGoodsConfigRunner.java | 29 ++++ .../config/runner/DataRangeConfigRunner.java | 75 ++++++++++ ...ot.autoconfigure.AutoConfiguration.imports | 2 + .../src/main/resources/logback.xml | 74 ++++++++++ .../muyu-data-ranges-common/pom.xml | 30 ++++ .../domain/dataSoutce/DataSourceConfig.java | 101 +++++++++++++ .../src/main/resources/logback.xml | 74 ++++++++++ .../muyu-data-ranges-server/pom.xml | 135 ++++++++++++++++++ .../data/ranges/DataRangeApplication.java | 17 +++ .../src/main/resources/bootstrap.yml | 28 ++++ .../src/main/resources/logback.xml | 74 ++++++++++ .../pom.xml | 12 +- muyu-modules/muyu-data-test/pom.xml | 108 ++++++++++++++ .../MuyuGoodsTestApplication.java | 23 +++ .../MuyuGoodsUnitApplication.java | 23 +++ .../src/main/resources/bootstrap.yml | 28 ++++ .../src/main/resources/logback.xml | 74 ++++++++++ .../clinet/config/AccessConfigRunner.java | 31 +++- .../remote/RemoteDataManagerService.java | 1 - .../src/main/resources/bootstrap.yml | 2 +- .../remote/RemoteSystemManageService.java | 2 + pom.xml | 4 +- 25 files changed, 1012 insertions(+), 9 deletions(-) create mode 100644 muyu-modules/muyu-data-ranges/muyu-data-ranges-clinet/pom.xml create mode 100644 muyu-modules/muyu-data-ranges/muyu-data-ranges-clinet/src/main/java/com/data/ranges/clinet/config/DataGoodsConfig.java create mode 100644 muyu-modules/muyu-data-ranges/muyu-data-ranges-clinet/src/main/java/com/data/ranges/clinet/config/DataRangeConfig.java create mode 100644 muyu-modules/muyu-data-ranges/muyu-data-ranges-clinet/src/main/java/com/data/ranges/clinet/config/runner/DataGoodsConfigRunner.java create mode 100644 muyu-modules/muyu-data-ranges/muyu-data-ranges-clinet/src/main/java/com/data/ranges/clinet/config/runner/DataRangeConfigRunner.java create mode 100644 muyu-modules/muyu-data-ranges/muyu-data-ranges-clinet/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports create mode 100644 muyu-modules/muyu-data-ranges/muyu-data-ranges-clinet/src/main/resources/logback.xml create mode 100644 muyu-modules/muyu-data-ranges/muyu-data-ranges-common/pom.xml create mode 100644 muyu-modules/muyu-data-ranges/muyu-data-ranges-common/src/main/java/muyu/data/ranges/common/domain/dataSoutce/DataSourceConfig.java create mode 100644 muyu-modules/muyu-data-ranges/muyu-data-ranges-common/src/main/resources/logback.xml create mode 100644 muyu-modules/muyu-data-ranges/muyu-data-ranges-server/pom.xml create mode 100644 muyu-modules/muyu-data-ranges/muyu-data-ranges-server/src/main/java/com/muyu/data/ranges/DataRangeApplication.java create mode 100644 muyu-modules/muyu-data-ranges/muyu-data-ranges-server/src/main/resources/bootstrap.yml create mode 100644 muyu-modules/muyu-data-ranges/muyu-data-ranges-server/src/main/resources/logback.xml rename muyu-modules/{muyu-goods-users => muyu-data-ranges}/pom.xml (62%) create mode 100644 muyu-modules/muyu-data-test/pom.xml create mode 100644 muyu-modules/muyu-data-test/src/main/java/com.data.test/MuyuGoodsTestApplication.java create mode 100644 muyu-modules/muyu-data-test/src/main/java/com.data.test/MuyuGoodsUnitApplication.java create mode 100644 muyu-modules/muyu-data-test/src/main/resources/bootstrap.yml create mode 100644 muyu-modules/muyu-data-test/src/main/resources/logback.xml diff --git a/muyu-modules/muyu-data-ranges/muyu-data-ranges-clinet/pom.xml b/muyu-modules/muyu-data-ranges/muyu-data-ranges-clinet/pom.xml new file mode 100644 index 0000000..b3720f4 --- /dev/null +++ b/muyu-modules/muyu-data-ranges/muyu-data-ranges-clinet/pom.xml @@ -0,0 +1,51 @@ + + + 4.0.0 + + com.muyu + muyu-data-ranges + 3.6.3 + + + muyu-data-ranges-clinet + + + 17 + 17 + UTF-8 + + + + + com.muyu + muyu-modules-system + 3.6.3 + + + + com.muyu + muyu-goods-edition + 3.6.3 + + + + com.muyu + muyu-data-ranges-common + 3.6.3 + + + + com.muyu + muyu-goods-edition + 3.6.3 + + + com.muyu + muyu-goods-edition-remote + 3.6.3 + compile + + + diff --git a/muyu-modules/muyu-data-ranges/muyu-data-ranges-clinet/src/main/java/com/data/ranges/clinet/config/DataGoodsConfig.java b/muyu-modules/muyu-data-ranges/muyu-data-ranges-clinet/src/main/java/com/data/ranges/clinet/config/DataGoodsConfig.java new file mode 100644 index 0000000..77b4e2b --- /dev/null +++ b/muyu-modules/muyu-data-ranges/muyu-data-ranges-clinet/src/main/java/com/data/ranges/clinet/config/DataGoodsConfig.java @@ -0,0 +1,10 @@ +package com.data.ranges.clinet.config; + +import com.muyu.data.ranges.clinet.config.runner.DataGoodsConfigRunner; +import org.springframework.context.annotation.ComponentScan; +import org.springframework.context.annotation.Import; + +@ComponentScan +@Import(value = DataGoodsConfigRunner.class) +public class DataGoodsConfig { +} diff --git a/muyu-modules/muyu-data-ranges/muyu-data-ranges-clinet/src/main/java/com/data/ranges/clinet/config/DataRangeConfig.java b/muyu-modules/muyu-data-ranges/muyu-data-ranges-clinet/src/main/java/com/data/ranges/clinet/config/DataRangeConfig.java new file mode 100644 index 0000000..d373a16 --- /dev/null +++ b/muyu-modules/muyu-data-ranges/muyu-data-ranges-clinet/src/main/java/com/data/ranges/clinet/config/DataRangeConfig.java @@ -0,0 +1,13 @@ +package com.data.ranges.clinet.config; + +import com.muyu.data.ranges.clinet.config.runner.DataRangeConfigRunner; +import org.springframework.context.annotation.ComponentScan; +import org.springframework.context.annotation.Import; + +/** + * 规则引擎客户端配置类 + */ +@ComponentScan +@Import(value = DataRangeConfigRunner.class) +public class DataRangeConfig { +} diff --git a/muyu-modules/muyu-data-ranges/muyu-data-ranges-clinet/src/main/java/com/data/ranges/clinet/config/runner/DataGoodsConfigRunner.java b/muyu-modules/muyu-data-ranges/muyu-data-ranges-clinet/src/main/java/com/data/ranges/clinet/config/runner/DataGoodsConfigRunner.java new file mode 100644 index 0000000..5a1eee0 --- /dev/null +++ b/muyu-modules/muyu-data-ranges/muyu-data-ranges-clinet/src/main/java/com/data/ranges/clinet/config/runner/DataGoodsConfigRunner.java @@ -0,0 +1,29 @@ +package com.data.ranges.clinet.config.runner; + +import com.muyu.common.core.domain.Result; +import com.muyu.common.core.web.page.TableDataInfo; +import com.muyu.edition.domain.RuleEngine; +import com.muyu.goods.edition.remote.RemoteDataManagerService; +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.context.annotation.Configuration; +import org.springframework.stereotype.Component; + +import java.util.List; + +@Log4j2 +@Component +@Configuration +public class DataGoodsConfigRunner implements ApplicationRunner { + @Autowired + private RemoteDataManagerService remoteDataManagerService; + + @Override + public void run(ApplicationArguments args) throws Exception { + Result> list = remoteDataManagerService.list(null); + List rows = list.getData().getRows(); + log.info("远程调用成功：{}",rows); + } +} diff --git a/muyu-modules/muyu-data-ranges/muyu-data-ranges-clinet/src/main/java/com/data/ranges/clinet/config/runner/DataRangeConfigRunner.java b/muyu-modules/muyu-data-ranges/muyu-data-ranges-clinet/src/main/java/com/data/ranges/clinet/config/runner/DataRangeConfigRunner.java new file mode 100644 index 0000000..28b59e6 --- /dev/null +++ b/muyu-modules/muyu-data-ranges/muyu-data-ranges-clinet/src/main/java/com/data/ranges/clinet/config/runner/DataRangeConfigRunner.java @@ -0,0 +1,75 @@ +package com.data.ranges.clinet.config.runner; + +import com.muyu.common.core.domain.Result; +import com.muyu.common.core.web.page.TableDataInfo; +import com.muyu.system.domain.DataAccess; +import com.muyu.system.remote.RemoteSystemManageService; +import lombok.extern.log4j.Log4j2; +import muyu.data.range.common.domain.Unit; +import muyu.data.range.common.domain.dataSoutce.DataSourceConfig; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.ApplicationArguments; +import org.springframework.boot.ApplicationRunner; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.stereotype.Component; + +import java.sql.Connection; +import java.util.HashMap; +import java.util.List; + +/** + * 初始化加载 + */ +@Log4j2 +@Component +@Configuration +public class DataRangeConfigRunner implements ApplicationRunner { + @Autowired + private RemoteSystemManageService remoteSystemManageService;// 远程调用 + @Autowired + private DataSourceConfig dataSourceConfig; + @Override + public void run(ApplicationArguments args) throws Exception { + //远程调用 + Result> listed = remoteSystemManageService.list(null); + //判断非空 + if (listed.getData().getRows() == null || listed.getData().getRows().isEmpty()){ + log.error("数据为空"); + return; + } + //获取数据源集合 + List listResultData = listed.getData().getRows(); + //存入map + //创建map + HashMap frimaryVoHashMap = new HashMap<>(); + //遍历循环存入map + listResultData.forEach(res -> { + frimaryVoHashMap.put(res.getId(),res); + }); + //遍历添加到hashMap + for (DataAccess listResultDatum : listResultData) { + if (listResultDatum.getType() == "MySql"){ + //记录线程池 + dataSourceConfig.index(listResultDatum); + } + } + //连接上线程池 + DataAccess dataAccess = listResultData.get(0); + dataSourceConfig.verify(dataAccess.getId()); + //获取一个线程池 + Connection connection = dataSourceConfig.getConnection(dataAccess.getId()); + //归还线程池 + dataSourceConfig.returnConnection(connection); + //将对象传入Spring +// SpringHashMap(hashMap); + } + + @Bean + public HashMap SpringHashMap(HashMap hashMap) { + return hashMap; + } + + + +} diff --git a/muyu-modules/muyu-data-ranges/muyu-data-ranges-clinet/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/muyu-modules/muyu-data-ranges/muyu-data-ranges-clinet/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..3914880 --- /dev/null +++ b/muyu-modules/muyu-data-ranges/muyu-data-ranges-clinet/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1,2 @@ +com.data.ranges.clinet.config.DataGoodsConfig +com.data.ranges.clinet.config.DataRangeConfig diff --git a/muyu-modules/muyu-data-ranges/muyu-data-ranges-clinet/src/main/resources/logback.xml b/muyu-modules/muyu-data-ranges/muyu-data-ranges-clinet/src/main/resources/logback.xml new file mode 100644 index 0000000..66e0d25 --- /dev/null +++ b/muyu-modules/muyu-data-ranges/muyu-data-ranges-clinet/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/muyu-data-ranges/muyu-data-ranges-common/pom.xml b/muyu-modules/muyu-data-ranges/muyu-data-ranges-common/pom.xml new file mode 100644 index 0000000..7b71c3f --- /dev/null +++ b/muyu-modules/muyu-data-ranges/muyu-data-ranges-common/pom.xml @@ -0,0 +1,30 @@ + + + 4.0.0 + + com.muyu + muyu-data-ranges + 3.6.3 + + + muyu-data-ranges-common + + + 17 + 17 + UTF-8 + + + + com.muyu + muyu-common-core + + + com.muyu + muyu-modules-system + 3.6.3 + + + diff --git a/muyu-modules/muyu-data-ranges/muyu-data-ranges-common/src/main/java/muyu/data/ranges/common/domain/dataSoutce/DataSourceConfig.java b/muyu-modules/muyu-data-ranges/muyu-data-ranges-common/src/main/java/muyu/data/ranges/common/domain/dataSoutce/DataSourceConfig.java new file mode 100644 index 0000000..ede8087 --- /dev/null +++ b/muyu-modules/muyu-data-ranges/muyu-data-ranges-common/src/main/java/muyu/data/ranges/common/domain/dataSoutce/DataSourceConfig.java @@ -0,0 +1,101 @@ +package muyu.data.ranges.common.domain.dataSoutce; + +import com.alibaba.druid.pool.DruidDataSource; +import com.alibaba.druid.pool.DruidPooledConnection; +import com.muyu.system.domain.DataAccess; +import lombok.Data; +import lombok.extern.log4j.Log4j2; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.stereotype.Component; + +import java.sql.Connection; +import java.sql.SQLException; +import java.util.HashMap; + +/** + * 线程池配置 + */ +@Data +@Component +@Configuration +@Log4j2 +public class DataSourceConfig { + + private static HashMap hashMap = new HashMap<>(); + /** + * 添加线程池 + * 线程池初始化 + */ + public static void index(DataAccess dataAccess) throws SQLException { + //主机地址 + String host = dataAccess.getHost(); + //端口号 + String port = dataAccess.getPort(); + //数据库名 + String databaseName = dataAccess.getDatabaseName(); + // url + String url = String.format("jdbc:mysql://"+ host+":"+port+":"+databaseName); + log.info("集成化的url:{}",url); + DruidDataSource dataSource = new DruidDataSource(); + //初始化链接池数量 + dataSource.setInitialSize(dataAccess.getInitNum().intValue()); + //最大线程池 + dataSource.setMaxActive(dataAccess.getMaxNum().intValue()); + //最大等待时间 + dataSource.setMaxWait(dataAccess.getMaxWaitTime()); + //配置数据库的基本信息 + dataSource.setDriverClassName("com.mysql/jdbc.Driver"); + //数据库连接池 + dataSource.setUrl("jdbc:mysql://"+host+":"+port+":"+databaseName); + //数据库用户名 + dataSource.setUsername(dataAccess.getUsername()); + //数据库密码 + dataSource.setPassword(dataAccess.getPassword()); + try { + dataSource.init();// 初始化 + } catch (SQLException e) { + throw new RuntimeException(e); + } + hashMap.put(dataAccess.getId(),dataSource); + SpringHashMap(hashMap); + } + + /** + * 取出线程池 + */ + public static Connection getConnection(Long key){ + DruidDataSource dataSource = hashMap.get(key); + try { + DruidPooledConnection connection = dataSource.getConnection(); + return connection; + } catch (SQLException e) { + throw new RuntimeException(e); + } + } + /** + * 归还线程池 + */ + public static void returnConnection(Connection connection){ + try { + connection.close(); + } catch (SQLException e) { + throw new RuntimeException(e); + } + } + /** + * 连接线程池 + * 验证线程池 + */ + public static void verify(Long key) throws SQLException { + DruidDataSource dataSource = hashMap.get(key); + // 获取连接 + DruidPooledConnection connection = dataSource.getConnection(); + log.info("连接上线程池：{}",connection); + } + + @Bean + public static HashMap SpringHashMap(HashMap hashMap) { + return hashMap; + } +} diff --git a/muyu-modules/muyu-data-ranges/muyu-data-ranges-common/src/main/resources/logback.xml b/muyu-modules/muyu-data-ranges/muyu-data-ranges-common/src/main/resources/logback.xml new file mode 100644 index 0000000..66e0d25 --- /dev/null +++ b/muyu-modules/muyu-data-ranges/muyu-data-ranges-common/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/muyu-data-ranges/muyu-data-ranges-server/pom.xml b/muyu-modules/muyu-data-ranges/muyu-data-ranges-server/pom.xml new file mode 100644 index 0000000..9e07a09 --- /dev/null +++ b/muyu-modules/muyu-data-ranges/muyu-data-ranges-server/pom.xml @@ -0,0 +1,135 @@ + + + 4.0.0 + + com.muyu + muyu-data-ranges + 3.6.3 + + + muyu-data-ranges-server + + + 17 + 17 + UTF-8 + + + + com.muyu + muyu-data-ranges-common + 3.6.3 + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-discovery + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-config + + + + org.projectlombok + lombok + + + + + 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.microsoft.sqlserver + mssql-jdbc + 9.4.0.jre8 + + + com.muyu + muyu-data-range-clinet + 3.6.3 + compile + + + + + ${project.artifactId} + + + org.springframework.boot + spring-boot-maven-plugin + + + + repackage + + + + + + + org.apache.maven.plugins + maven-deploy-plugin + + true + + + + org.springframework.boot + spring-boot-maven-plugin + + com.muyu.ruleEngine.GtlRuleEngineApplication + + + + + diff --git a/muyu-modules/muyu-data-ranges/muyu-data-ranges-server/src/main/java/com/muyu/data/ranges/DataRangeApplication.java b/muyu-modules/muyu-data-ranges/muyu-data-ranges-server/src/main/java/com/muyu/data/ranges/DataRangeApplication.java new file mode 100644 index 0000000..e954fa4 --- /dev/null +++ b/muyu-modules/muyu-data-ranges/muyu-data-ranges-server/src/main/java/com/muyu/data/ranges/DataRangeApplication.java @@ -0,0 +1,17 @@ +package com.muyu.data.ranges; + +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; + +@EnableCustomConfig +@EnableCustomSwagger2 +@EnableMyFeignClients +@SpringBootApplication +public class DataRangeApplication { + public static void main(String[] args) { + SpringApplication.run(DataRangeApplication.class,args); + } +} diff --git a/muyu-modules/muyu-data-ranges/muyu-data-ranges-server/src/main/resources/bootstrap.yml b/muyu-modules/muyu-data-ranges/muyu-data-ranges-server/src/main/resources/bootstrap.yml new file mode 100644 index 0000000..ba47a3e --- /dev/null +++ b/muyu-modules/muyu-data-ranges/muyu-data-ranges-server/src/main/resources/bootstrap.yml @@ -0,0 +1,28 @@ +# Tomcat +server: + port: 9511 + +# Spring +spring: + application: + # 应用名称 + name: muyu-range + profiles: + # 环境配置 + active: dev + cloud: + nacos: + discovery: + # 服务注册地址 + server-addr: 129.211.23.219:8848 + config: + # 配置中心地址 + server-addr: 129.211.23.219:8848 + # 配置文件格式 + file-extension: yml + # 共享配置 + shared-configs: + - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} +logging: + level: + com.muyu.edition.mapper: DEBUG diff --git a/muyu-modules/muyu-data-ranges/muyu-data-ranges-server/src/main/resources/logback.xml b/muyu-modules/muyu-data-ranges/muyu-data-ranges-server/src/main/resources/logback.xml new file mode 100644 index 0000000..66e0d25 --- /dev/null +++ b/muyu-modules/muyu-data-ranges/muyu-data-ranges-server/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/muyu-goods-users/pom.xml b/muyu-modules/muyu-data-ranges/pom.xml similarity index 62% rename from muyu-modules/muyu-goods-users/pom.xml rename to muyu-modules/muyu-data-ranges/pom.xml index 92bd2e1..259c688 100644 --- a/muyu-modules/muyu-goods-users/pom.xml +++ b/muyu-modules/muyu-data-ranges/pom.xml @@ -1,6 +1,6 @@ - 4.0.0 @@ -10,7 +10,13 @@ ../../pom.xml - muyu-goods-users + muyu-data-ranges + pom + + muyu-data-ranges-clinet + muyu-data-ranges-common + muyu-data-ranges-server + 17 diff --git a/muyu-modules/muyu-data-test/pom.xml b/muyu-modules/muyu-data-test/pom.xml new file mode 100644 index 0000000..8516b4c --- /dev/null +++ b/muyu-modules/muyu-data-test/pom.xml @@ -0,0 +1,108 @@ + + + 4.0.0 + + com.muyu + muyu + 3.6.3 + ../../pom.xml + + + muyu-data-test + + + 17 + 17 + UTF-8 + + + + + 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 + + + + + + ${project.artifactId} + + + org.springframework.boot + spring-boot-maven-plugin + + + + repackage + + + + + + + org.apache.maven.plugins + maven-deploy-plugin + + true + + + + + diff --git a/muyu-modules/muyu-data-test/src/main/java/com.data.test/MuyuGoodsTestApplication.java b/muyu-modules/muyu-data-test/src/main/java/com.data.test/MuyuGoodsTestApplication.java new file mode 100644 index 0000000..9b9b318 --- /dev/null +++ b/muyu-modules/muyu-data-test/src/main/java/com.data.test/MuyuGoodsTestApplication.java @@ -0,0 +1,23 @@ +package com.data.test; + +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; + +/** + * 测试启动类 + */ +@SpringBootApplication(exclude = DataSourceAutoConfiguration.class) +@EnableCustomConfig +@EnableCustomSwagger2 +@EnableMyFeignClients +@EnableAsync +public class MuyuGoodsTestApplication { + public static void main(String[] args) { + SpringApplication.run(MuyuGoodsTestApplication.class); + } +} diff --git a/muyu-modules/muyu-data-test/src/main/java/com.data.test/MuyuGoodsUnitApplication.java b/muyu-modules/muyu-data-test/src/main/java/com.data.test/MuyuGoodsUnitApplication.java new file mode 100644 index 0000000..fc6d236 --- /dev/null +++ b/muyu-modules/muyu-data-test/src/main/java/com.data.test/MuyuGoodsUnitApplication.java @@ -0,0 +1,23 @@ +package com.data.test; + +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; + +/** + * 测试启动类 + */ +@SpringBootApplication(exclude = DataSourceAutoConfiguration.class) +@EnableCustomConfig +@EnableCustomSwagger2 +@EnableMyFeignClients +@EnableAsync +public class MuyuGoodsUnitApplication { + public static void main(String[] args) { + SpringApplication.run(MuyuGoodsUnitApplication.class); + } +} diff --git a/muyu-modules/muyu-data-test/src/main/resources/bootstrap.yml b/muyu-modules/muyu-data-test/src/main/resources/bootstrap.yml new file mode 100644 index 0000000..27cb197 --- /dev/null +++ b/muyu-modules/muyu-data-test/src/main/resources/bootstrap.yml @@ -0,0 +1,28 @@ +# Tomcat +server: + port: 9515 + +# Spring +spring: + application: + # 应用名称 + name: muyu-test + profiles: + # 环境配置 + active: dev + cloud: + nacos: + discovery: + # 服务注册地址 + server-addr: 129.211.23.219:8848 + config: + # 配置中心地址 + server-addr: 129.211.23.219:8848 + # 配置文件格式 + file-extension: yml + # 共享配置 + shared-configs: + - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} +logging: + level: + com.muyu.edition.mapper: DEBUG diff --git a/muyu-modules/muyu-data-test/src/main/resources/logback.xml b/muyu-modules/muyu-data-test/src/main/resources/logback.xml new file mode 100644 index 0000000..66e0d25 --- /dev/null +++ b/muyu-modules/muyu-data-test/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/muyu-goods-edition/muyu-goods-edition-clinet/src/main/java/com/muyu/efition/clinet/config/AccessConfigRunner.java b/muyu-modules/muyu-goods-edition/muyu-goods-edition-clinet/src/main/java/com/muyu/efition/clinet/config/AccessConfigRunner.java index 818a1cd..b333125 100644 --- a/muyu-modules/muyu-goods-edition/muyu-goods-edition-clinet/src/main/java/com/muyu/efition/clinet/config/AccessConfigRunner.java +++ b/muyu-modules/muyu-goods-edition/muyu-goods-edition-clinet/src/main/java/com/muyu/efition/clinet/config/AccessConfigRunner.java @@ -2,6 +2,7 @@ package com.muyu.efition.clinet.config; import com.alibaba.druid.pool.DruidDataSource; import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; +import com.fasterxml.jackson.databind.ObjectMapper; import com.muyu.common.core.domain.Result; import com.muyu.common.core.utils.StringUtils; import com.muyu.common.core.web.page.TableDataInfo; @@ -12,14 +13,22 @@ import com.muyu.system.domain.DataAccess; import com.muyu.system.domain.vo.FrimaryVo; import com.muyu.system.remote.RemoteSystemManageService; import com.muyu.system.remote.factory.DataMangSystemFactory; +import lombok.SneakyThrows; import lombok.extern.log4j.Log4j2; +import org.springframework.beans.BeansException; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.config.BeanFactoryPostProcessor; +import org.springframework.beans.factory.config.ConfigurableListableBeanFactory; import org.springframework.boot.ApplicationArguments; import org.springframework.boot.ApplicationRunner; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.stereotype.Component; import javax.sql.DataSource; import java.sql.Connection; import java.sql.DriverManager; +import java.sql.SQLException; import java.util.HashMap; import java.util.List; import java.util.Optional; @@ -31,6 +40,8 @@ import java.util.stream.Stream; * 初始化加载 */ @Log4j2 +@Component +@Configuration public class AccessConfigRunner implements ApplicationRunner { @Autowired private RemoteSystemManageService remoteSystemManageService; @@ -94,9 +105,25 @@ public class AccessConfigRunner implements ApplicationRunner { .build(); //存入map hashMap.put(host+"_"+port+"_"+databaseName,build); + //查看连接池 + DataAccess dataAccess = listResultData.get(0); + UnitVo unitVo = hashMap.get(dataAccess.getHost() + "_" + dataAccess.getPort() + "_" + dataAccess.getDatabaseName()); + log.info("存在的连接池有:--{}",unitVo); + //取出连接池 + + //返回连接池 + } - } - + //将对象传入Spring + SpringHashMap(hashMap); } + + @Bean + public HashMap SpringHashMap(HashMap hashMap) { + return hashMap; + } + + + } diff --git a/muyu-modules/muyu-goods-edition/muyu-goods-edition-remote/src/main/java/com/muyu/goods/edition/remote/RemoteDataManagerService.java b/muyu-modules/muyu-goods-edition/muyu-goods-edition-remote/src/main/java/com/muyu/goods/edition/remote/RemoteDataManagerService.java index b03e973..e2700db 100644 --- a/muyu-modules/muyu-goods-edition/muyu-goods-edition-remote/src/main/java/com/muyu/goods/edition/remote/RemoteDataManagerService.java +++ b/muyu-modules/muyu-goods-edition/muyu-goods-edition-remote/src/main/java/com/muyu/goods/edition/remote/RemoteDataManagerService.java @@ -20,7 +20,6 @@ import java.util.List; fallbackFactory = DataMangFacrory.class, path = "/engine" ) -@Service public interface RemoteDataManagerService { @GetMapping("/list") public Result> list(RuleEngine ruleEngine); diff --git a/muyu-modules/muyu-goods-unit/src/main/resources/bootstrap.yml b/muyu-modules/muyu-goods-unit/src/main/resources/bootstrap.yml index 41cf597..27cb197 100644 --- a/muyu-modules/muyu-goods-unit/src/main/resources/bootstrap.yml +++ b/muyu-modules/muyu-goods-unit/src/main/resources/bootstrap.yml @@ -1,6 +1,6 @@ # Tomcat server: - port: 9505 + port: 9515 # Spring spring: diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/remote/RemoteSystemManageService.java b/muyu-modules/muyu-system/src/main/java/com/muyu/system/remote/RemoteSystemManageService.java index e8724ff..0cf7679 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/remote/RemoteSystemManageService.java +++ b/muyu-modules/muyu-system/src/main/java/com/muyu/system/remote/RemoteSystemManageService.java @@ -7,6 +7,7 @@ import com.muyu.system.domain.DataAccess; import com.muyu.system.domain.vo.FrimaryVo; import com.muyu.system.remote.factory.DataMangSystemFactory; import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.stereotype.Service; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; @@ -21,6 +22,7 @@ import java.util.List; fallbackFactory = DataMangSystemFactory.class, path = "/access" ) +@Service public interface RemoteSystemManageService { @GetMapping("/list") public Result> list(DataAccess dataAccess); diff --git a/pom.xml b/pom.xml index e6d1244..f6c74bd 100644 --- a/pom.xml +++ b/pom.xml @@ -215,9 +215,9 @@ muyu-visual muyu-modules muyu-common - muyu-modules/muyu-goods-users - muyu-modules/muyu-goods-unit muyu-modules/muyu-goods-edition + muyu-modules/muyu-data-test + muyu-modules/muyu-data-ranges pom