diff --git a/muyu-modules/muyu-data-range/muyu-data-range-clinet/src/main/java/muyu/data/range/config/DataRangeConfig.java b/muyu-modules/muyu-data-range/muyu-data-range-clinet/src/main/java/muyu/data/range/config/DataRangeConfig.java deleted file mode 100644 index f687ffc..0000000 --- a/muyu-modules/muyu-data-range/muyu-data-range-clinet/src/main/java/muyu/data/range/config/DataRangeConfig.java +++ /dev/null @@ -1,13 +0,0 @@ -package muyu.data.range.config; - -import muyu.data.range.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-range/muyu-data-range-clinet/src/main/java/muyu/data/range/config/runner/DataGoodsConfigRunner.java b/muyu-modules/muyu-data-range/muyu-data-range-clinet/src/main/java/muyu/data/range/config/runner/DataGoodsConfigRunner.java deleted file mode 100644 index f16f6ca..0000000 --- a/muyu-modules/muyu-data-range/muyu-data-range-clinet/src/main/java/muyu/data/range/config/runner/DataGoodsConfigRunner.java +++ /dev/null @@ -1,29 +0,0 @@ -package muyu.data.range.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(); - List rows = list.getData(); - log.info("远程调用成功：{}",rows); - } -} diff --git a/muyu-modules/muyu-data-range/muyu-data-range-clinet/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/muyu-modules/muyu-data-range/muyu-data-range-clinet/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index 18ef652..0000000 --- a/muyu-modules/muyu-data-range/muyu-data-range-clinet/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1,2 +0,0 @@ -muyu.data.range.config.DataGoodsConfig -muyu.data.range.config.DataRangeConfig diff --git a/muyu-modules/muyu-data-range/muyu-data-range-server/src/main/java/muyu/data/range/DataRangesApplication.java b/muyu-modules/muyu-data-range/muyu-data-range-server/src/main/java/muyu/data/range/DataRangesApplication.java deleted file mode 100644 index b3a0d1f..0000000 --- a/muyu-modules/muyu-data-range/muyu-data-range-server/src/main/java/muyu/data/range/DataRangesApplication.java +++ /dev/null @@ -1,20 +0,0 @@ -package muyu.data.range; - -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 DataRangesApplication { - public static void main(String[] args) { - SpringApplication.run(DataRangesApplication.class); - } -} diff --git a/muyu-modules/muyu-data-range/muyu-data-range-server/src/main/java/muyu/data/range/controller/RangesController.java b/muyu-modules/muyu-data-range/muyu-data-range-server/src/main/java/muyu/data/range/controller/RangesController.java deleted file mode 100644 index c749109..0000000 --- a/muyu-modules/muyu-data-range/muyu-data-range-server/src/main/java/muyu/data/range/controller/RangesController.java +++ /dev/null @@ -1,19 +0,0 @@ -package muyu.data.range.controller; - -import com.data.ranges.clinet.config.runner.DataGoodsConfigRunner; -import lombok.extern.log4j.Log4j2; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -@RestController -@RequestMapping("/range") -@Log4j2 -public class RangesController { - - @PostMapping("sel") - private static void sel(){ - DataGoodsConfigRunner dataGoodsConfigRunner = new DataGoodsConfigRunner(); - System.out.println(dataGoodsConfigRunner.toString()); - } -} diff --git a/muyu-modules/muyu-data-range/muyu-data-range-server/src/main/resources/bootstrap.yml b/muyu-modules/muyu-data-range/muyu-data-range-server/src/main/resources/bootstrap.yml deleted file mode 100644 index ba47a3e..0000000 --- a/muyu-modules/muyu-data-range/muyu-data-range-server/src/main/resources/bootstrap.yml +++ /dev/null @@ -1,28 +0,0 @@ -# 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-range/pom.xml b/muyu-modules/muyu-data-range/pom.xml deleted file mode 100644 index d8db098..0000000 --- a/muyu-modules/muyu-data-range/pom.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - 4.0.0 - - com.muyu - muyu - 3.6.3 - ../../pom.xml - - - muyu-data-range - pom - - muyu-data-range-server - muyu-data-range-common - muyu-data-range-clinet - - - - 17 - 17 - UTF-8 - - - diff --git a/muyu-modules/muyu-data-range/muyu-data-range-clinet/pom.xml b/muyu-modules/muyu-data-test/muyu-data-test-client/pom.xml similarity index 51% rename from muyu-modules/muyu-data-range/muyu-data-range-clinet/pom.xml rename to muyu-modules/muyu-data-test/muyu-data-test-client/pom.xml index 04a7b58..5976ad9 100644 --- a/muyu-modules/muyu-data-range/muyu-data-range-clinet/pom.xml +++ b/muyu-modules/muyu-data-test/muyu-data-test-client/pom.xml @@ -1,15 +1,16 @@ - 4.0.0 com.muyu - muyu-data-range + muyu 3.6.3 + ../../../pom.xml - muyu-data-range-clinet + muyu-data-test-client 17 @@ -17,35 +18,22 @@ UTF-8 - com.muyu - muyu-modules-system + muyu-goods-edition-common 3.6.3 com.muyu - muyu-goods-edition - 3.6.3 + muyu-common-system com.muyu - muyu-data-range-common + muyu-data-test-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-test/muyu-data-test-client/src/main/java/muyu/data/test/clinet/DataClientApplication.java b/muyu-modules/muyu-data-test/muyu-data-test-client/src/main/java/muyu/data/test/clinet/DataClientApplication.java new file mode 100644 index 0000000..2d8ee52 --- /dev/null +++ b/muyu-modules/muyu-data-test/muyu-data-test-client/src/main/java/muyu/data/test/clinet/DataClientApplication.java @@ -0,0 +1,11 @@ +package muyu.data.test.clinet; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class DataClientApplication { + public static void main(String[] args) { + SpringApplication.run(DataClientApplication.class); + } +} diff --git a/muyu-modules/muyu-data-range/muyu-data-range-clinet/src/main/java/muyu/data/range/config/DataGoodsConfig.java b/muyu-modules/muyu-data-test/muyu-data-test-client/src/main/java/muyu/data/test/clinet/config/AccessConfig.java similarity index 50% rename from muyu-modules/muyu-data-range/muyu-data-range-clinet/src/main/java/muyu/data/range/config/DataGoodsConfig.java rename to muyu-modules/muyu-data-test/muyu-data-test-client/src/main/java/muyu/data/test/clinet/config/AccessConfig.java index 542d304..f95a866 100644 --- a/muyu-modules/muyu-data-range/muyu-data-range-clinet/src/main/java/muyu/data/range/config/DataGoodsConfig.java +++ b/muyu-modules/muyu-data-test/muyu-data-test-client/src/main/java/muyu/data/test/clinet/config/AccessConfig.java @@ -1,6 +1,6 @@ -package muyu.data.range.config; +package muyu.data.test.clinet.config; -import muyu.data.range.config.runner.DataGoodsConfigRunner; +import muyu.data.test.clinet.config.runner.AccessConfigRunner; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Import; @@ -8,6 +8,6 @@ import org.springframework.context.annotation.Import; * 规则引擎客户端配置类 */ @ComponentScan -@Import(value = DataGoodsConfigRunner.class) -public class DataGoodsConfig { +@Import(value = AccessConfigRunner.class) +public class AccessConfig { } diff --git a/muyu-modules/muyu-data-range/muyu-data-range-clinet/src/main/java/muyu/data/range/config/runner/DataRangeConfigRunner.java b/muyu-modules/muyu-data-test/muyu-data-test-client/src/main/java/muyu/data/test/clinet/config/runner/AccessConfigRunner.java similarity index 58% rename from muyu-modules/muyu-data-range/muyu-data-range-clinet/src/main/java/muyu/data/range/config/runner/DataRangeConfigRunner.java rename to muyu-modules/muyu-data-test/muyu-data-test-client/src/main/java/muyu/data/test/clinet/config/runner/AccessConfigRunner.java index aaab473..217078b 100644 --- a/muyu-modules/muyu-data-range/muyu-data-range-clinet/src/main/java/muyu/data/range/config/runner/DataRangeConfigRunner.java +++ b/muyu-modules/muyu-data-test/muyu-data-test-client/src/main/java/muyu/data/test/clinet/config/runner/AccessConfigRunner.java @@ -1,16 +1,13 @@ -package muyu.data.range.config.runner; +package muyu.data.test.clinet.config.runner; -import com.alibaba.druid.pool.DruidDataSource; import com.muyu.common.core.domain.Result; -import com.muyu.common.core.web.page.TableDataInfo; -import com.muyu.edition.dataSoutce.DataSourceConfig; import com.muyu.system.domain.DataAccess; import com.muyu.system.remote.RemoteSystemManageService; import lombok.extern.log4j.Log4j2; +import muyu.data.test.common.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; @@ -24,15 +21,15 @@ import java.util.List; @Log4j2 @Component @Configuration -public class DataRangeConfigRunner implements ApplicationRunner { +public class AccessConfigRunner implements ApplicationRunner { @Autowired - private RemoteSystemManageService remoteSystemManageService;// 远程调用 - @Autowired - private DataSourceConfig dataSourceConfig; + private RemoteSystemManageService remoteSystemManageService; + @Override public void run(ApplicationArguments args) throws Exception { //远程调用 Result> lists = remoteSystemManageService.lists(); + log.info("数据源调用状态：{}",lists); //判断非空 if (lists.getData() == null || lists.getData().isEmpty()){ log.error("数据为空"); @@ -40,7 +37,7 @@ public class DataRangeConfigRunner implements ApplicationRunner { } //获取数据源集合 List listResultData = lists.getData(); -// log.info("远程调用：{}",listResultData); + log.info("远程调用：{}",listResultData); //存入map //创建map HashMap frimaryVoHashMap = new HashMap<>(); @@ -50,35 +47,26 @@ public class DataRangeConfigRunner implements ApplicationRunner { }); //遍历添加到hashMap for (DataAccess listResultDatum : listResultData) { - if (listResultDatum.getType() == "MySql"){ + if (listResultDatum.getType().equals("MySql")){ //记录线程池 - dataSourceConfig.index(listResultDatum); + DataSourceConfig.index(listResultDatum); } } //连接上线程池 DataAccess dataAccess = listResultData.get(0); - System.out.println(dataAccess); - dataSourceConfig.verify(dataAccess.getId()); + DataSourceConfig.verify(dataAccess.getId()); //获取一个线程池 - Connection connection = dataSourceConfig.getConnection(dataAccess.getId()); - log.info("获取线程：{}",connection); - //查看线程 - System.out.println("查看线程"); - dataSourceConfig.verify(dataAccess.getId()); + Connection connection = DataSourceConfig.getConnection(dataAccess.getId()); + log.info("获取一个线程：{}",connection); + DataSourceConfig.verify(dataAccess.getId()); //归还线程池 - System.out.println("归还线程池"); - dataSourceConfig.returnConnection(connection); - //查看线程 - System.out.println("查看线程"); - dataSourceConfig.verify(dataAccess.getId()); + DataSourceConfig.returnConnection(connection); + DataSourceConfig.verify(dataAccess.getId()); //将对象传入Spring //SpringHashMap(hashMap); } - @Bean - public HashMap SpringHashMap(HashMap hashMap) { - return hashMap; - } + diff --git a/muyu-modules/muyu-data-test/muyu-data-test-client/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/muyu-modules/muyu-data-test/muyu-data-test-client/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..2eac0ee --- /dev/null +++ b/muyu-modules/muyu-data-test/muyu-data-test-client/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +muyu.data.test.clinet.config.AccessConfig diff --git a/muyu-modules/muyu-data-range/muyu-data-range-clinet/src/main/resources/META-INF/logback.xml b/muyu-modules/muyu-data-test/muyu-data-test-client/src/main/resources/logback.xml similarity index 100% rename from muyu-modules/muyu-data-range/muyu-data-range-clinet/src/main/resources/META-INF/logback.xml rename to muyu-modules/muyu-data-test/muyu-data-test-client/src/main/resources/logback.xml diff --git a/muyu-modules/muyu-data-range/muyu-data-range-common/pom.xml b/muyu-modules/muyu-data-test/muyu-data-test-common/pom.xml similarity index 80% rename from muyu-modules/muyu-data-range/muyu-data-range-common/pom.xml rename to muyu-modules/muyu-data-test/muyu-data-test-common/pom.xml index 9f33ed4..48f780a 100644 --- a/muyu-modules/muyu-data-range/muyu-data-range-common/pom.xml +++ b/muyu-modules/muyu-data-test/muyu-data-test-common/pom.xml @@ -1,27 +1,27 @@ - 4.0.0 com.muyu - muyu-data-range + muyu-data-test 3.6.3 - muyu-data-range-common + muyu-data-test-common 17 17 UTF-8 - com.muyu muyu-common-core + com.muyu muyu-modules-system @@ -29,5 +29,4 @@ compile - diff --git a/muyu-modules/muyu-data-test/muyu-data-test-common/src/main/java/muyu/data/test/common/dataSoutce/DataSourceConfig.java b/muyu-modules/muyu-data-test/muyu-data-test-common/src/main/java/muyu/data/test/common/dataSoutce/DataSourceConfig.java new file mode 100644 index 0000000..3339354 --- /dev/null +++ b/muyu-modules/muyu-data-test/muyu-data-test-common/src/main/java/muyu/data/test/common/dataSoutce/DataSourceConfig.java @@ -0,0 +1,93 @@ +package muyu.data.test.common.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.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.cj.jdbc.Driver"); + //数据库连接池 + dataSource.setUrl(url); + //数据库用户名 + dataSource.setUsername(dataAccess.getUsername()); + //数据库密码 + dataSource.setPassword(dataAccess.getPassword()); + dataSource.init();// 初始化 + hashMap.put(dataAccess.getId(),dataSource); + log.info("储存线程池：{}",hashMap); +// HashMap dataSourceHashMap = SpringHashMap(hashMap); +// log.info("hashmap存储",dataSourceHashMap); + } + + /** + * 取出线程池 + */ + 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 DruidDataSource verify(Long key) throws SQLException { + DruidDataSource dataSource = hashMap.get(key); + // 获取连接 + log.info("查看连接上的线程池：{}",dataSource); + return dataSource; + } +} diff --git a/muyu-modules/muyu-data-test/muyu-data-test-common/src/main/java/muyu/data/test/common/domain/Table.java b/muyu-modules/muyu-data-test/muyu-data-test-common/src/main/java/muyu/data/test/common/domain/Table.java new file mode 100644 index 0000000..5cb041c --- /dev/null +++ b/muyu-modules/muyu-data-test/muyu-data-test-common/src/main/java/muyu/data/test/common/domain/Table.java @@ -0,0 +1,11 @@ +package muyu.data.test.common.domain; + +import lombok.Data; +import lombok.experimental.SuperBuilder; + +@Data +@SuperBuilder +public class Table { + public String key; + public Object val; +} diff --git a/muyu-modules/muyu-data-range/muyu-data-range-server/src/main/resources/logback.xml b/muyu-modules/muyu-data-test/muyu-data-test-common/src/main/resources/logback.xml similarity index 100% rename from muyu-modules/muyu-data-range/muyu-data-range-server/src/main/resources/logback.xml rename to muyu-modules/muyu-data-test/muyu-data-test-common/src/main/resources/logback.xml diff --git a/muyu-modules/muyu-data-range/muyu-data-range-server/pom.xml b/muyu-modules/muyu-data-test/muyu-data-test-server/pom.xml similarity index 79% rename from muyu-modules/muyu-data-range/muyu-data-range-server/pom.xml rename to muyu-modules/muyu-data-test/muyu-data-test-server/pom.xml index fd139ae..501d825 100644 --- a/muyu-modules/muyu-data-range/muyu-data-range-server/pom.xml +++ b/muyu-modules/muyu-data-test/muyu-data-test-server/pom.xml @@ -1,15 +1,15 @@ - 4.0.0 com.muyu - muyu-data-range + muyu-data-test 3.6.3 - muyu-data-range-server + muyu-data-test-server 17 @@ -17,22 +17,31 @@ UTF-8 + + + com.muyu + muyu-data-test-common + 3.6.3 + + + + com.muyu + muyu-data-test-client + 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 @@ -82,17 +91,6 @@ muyu-common-swagger - - - com.microsoft.sqlserver - mssql-jdbc - 9.4.0.jre8 - - - com.muyu - muyu-goods-edition-clinet - 3.6.3 - @@ -117,13 +115,6 @@ true - - org.springframework.boot - spring-boot-maven-plugin - - com.muyu.ruleEngine.GtlRuleEngineApplication - - diff --git a/muyu-modules/muyu-data-test/src/main/java/com.data.test/MuyuGoodsTestApplication.java b/muyu-modules/muyu-data-test/muyu-data-test-server/src/main/java/com/data/test/DataTestApplication.java similarity index 65% rename from muyu-modules/muyu-data-test/src/main/java/com.data.test/MuyuGoodsTestApplication.java rename to muyu-modules/muyu-data-test/muyu-data-test-server/src/main/java/com/data/test/DataTestApplication.java index 98ad2bd..2e371b8 100644 --- a/muyu-modules/muyu-data-test/src/main/java/com.data.test/MuyuGoodsTestApplication.java +++ b/muyu-modules/muyu-data-test/muyu-data-test-server/src/main/java/com/data/test/DataTestApplication.java @@ -5,20 +5,16 @@ 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.cloud.openfeign.FeignClient; import org.springframework.scheduling.annotation.EnableAsync; -/** - * 测试启动类 - * - */ -@SpringBootApplication(exclude = DataSourceAutoConfiguration.class) +@SpringBootApplication @EnableCustomConfig @EnableCustomSwagger2 @EnableMyFeignClients @EnableAsync -public class MuyuGoodsTestApplication { +public class DataTestApplication { public static void main(String[] args) { - SpringApplication.run(MuyuGoodsTestApplication.class); + SpringApplication.run(DataTestApplication.class,args); } } diff --git a/muyu-modules/muyu-data-test/muyu-data-test-server/src/main/java/com/data/test/common/TestController.java b/muyu-modules/muyu-data-test/muyu-data-test-server/src/main/java/com/data/test/common/TestController.java new file mode 100644 index 0000000..24f1c40 --- /dev/null +++ b/muyu-modules/muyu-data-test/muyu-data-test-server/src/main/java/com/data/test/common/TestController.java @@ -0,0 +1,78 @@ +package com.data.test.common; + +import com.alibaba.druid.pool.DruidDataSource; +import com.muyu.common.core.domain.Result; +import com.muyu.common.core.web.controller.BaseController; +import lombok.extern.log4j.Log4j2; +import muyu.data.test.common.dataSoutce.DataSourceConfig; +import muyu.data.test.common.domain.Table; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.sql.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Random; + +@Log4j2 +@RestController +@RequestMapping("/data") +public class TestController extends BaseController { + /** + * 随机字段 + * @param id + * @return + */ + @GetMapping("randomField") + public Result randomField(Long id,String tableName) throws SQLException { + System.out.println("id="+id); + Connection connection = DataSourceConfig.getConnection(id); + DruidDataSource verify = DataSourceConfig.verify(id); + System.out.println(verify.getUrl()); + log.info("获取一个线程池:{}",connection); + //运行sql语句 + Statement statement = connection.createStatement(); + ResultSet resultSet = statement.executeQuery("select * from " + tableName); + //获取meteData + ResultSetMetaData metaData = resultSet.getMetaData(); + //总数量 + int columnCount = metaData.getColumnCount(); + //随机数 + Random random = new Random(); + List list = new ArrayList<>(); + int i = random.nextInt(columnCount)+1; + System.out.println("随机数"+i); + while (resultSet.next()){ + for (int i1 = 1; i1 <= columnCount; i1++) { + String s = metaData.getColumnName(i1); + Object o = resultSet.getObject(i1); + System.out.println(s); + System.out.println(o); + Table build = Table.builder() + .key(s) + .val(o) + .build(); + list.add(build); + } + } + if (list.size()==0){ + return null; + } + int qu = list.size()/columnCount; + System.out.println("区间数："+qu); + int in = i*qu; + System.out.println("字段长度"+columnCount); + System.out.println("新数"+in); + System.out.println(list); + System.out.println("长度"+list.size()); + List
tables = new ArrayList<>(); + for (int idd = i*columnCount-columnCount; idd < i*columnCount; idd++) { + System.out.println(idd); + tables.add(list.get(idd)); + } + System.out.println(tables); + DataSourceConfig.returnConnection(connection); + return success(tables); + } +} diff --git a/muyu-modules/muyu-data-test/muyu-data-test-server/src/main/java/com/data/test/mapper/TestMapper.java b/muyu-modules/muyu-data-test/muyu-data-test-server/src/main/java/com/data/test/mapper/TestMapper.java new file mode 100644 index 0000000..93d383c --- /dev/null +++ b/muyu-modules/muyu-data-test/muyu-data-test-server/src/main/java/com/data/test/mapper/TestMapper.java @@ -0,0 +1,7 @@ +package com.data.test.mapper; + +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface TestMapper { +} diff --git a/muyu-modules/muyu-data-test/muyu-data-test-server/src/main/java/com/data/test/server/TestService.java b/muyu-modules/muyu-data-test/muyu-data-test-server/src/main/java/com/data/test/server/TestService.java new file mode 100644 index 0000000..211dc5c --- /dev/null +++ b/muyu-modules/muyu-data-test/muyu-data-test-server/src/main/java/com/data/test/server/TestService.java @@ -0,0 +1,4 @@ +package com.data.test.server; + +public interface TestService { +} diff --git a/muyu-modules/muyu-data-test/muyu-data-test-server/src/main/java/com/data/test/server/impl/TestServiceImpl.java b/muyu-modules/muyu-data-test/muyu-data-test-server/src/main/java/com/data/test/server/impl/TestServiceImpl.java new file mode 100644 index 0000000..055eb0a --- /dev/null +++ b/muyu-modules/muyu-data-test/muyu-data-test-server/src/main/java/com/data/test/server/impl/TestServiceImpl.java @@ -0,0 +1,8 @@ +package com.data.test.server.impl; + +import com.data.test.server.TestService; +import org.springframework.stereotype.Service; + +@Service +public class TestServiceImpl implements TestService { +} diff --git a/muyu-modules/muyu-data-test/src/main/resources/bootstrap.yml b/muyu-modules/muyu-data-test/muyu-data-test-server/src/main/resources/bootstrap.yml similarity index 97% rename from muyu-modules/muyu-data-test/src/main/resources/bootstrap.yml rename to muyu-modules/muyu-data-test/muyu-data-test-server/src/main/resources/bootstrap.yml index 27cb197..cdb3498 100644 --- a/muyu-modules/muyu-data-test/src/main/resources/bootstrap.yml +++ b/muyu-modules/muyu-data-test/muyu-data-test-server/src/main/resources/bootstrap.yml @@ -1,6 +1,6 @@ # Tomcat server: - port: 9515 + port: 9509 # Spring spring: diff --git a/muyu-modules/muyu-data-test/src/main/resources/logback.xml b/muyu-modules/muyu-data-test/muyu-data-test-server/src/main/resources/logback.xml similarity index 100% rename from muyu-modules/muyu-data-test/src/main/resources/logback.xml rename to muyu-modules/muyu-data-test/muyu-data-test-server/src/main/resources/logback.xml diff --git a/muyu-modules/muyu-data-test/pom.xml b/muyu-modules/muyu-data-test/pom.xml index 8516b4c..7523abf 100644 --- a/muyu-modules/muyu-data-test/pom.xml +++ b/muyu-modules/muyu-data-test/pom.xml @@ -1,6 +1,6 @@ - 4.0.0 @@ -11,98 +11,17 @@ muyu-data-test + pom + + muyu-data-test-common + muyu-data-test-client + muyu-data-test-server + 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-goods-edition/muyu-goods-edition-clinet/src/main/java/com/muyu/efition/clinet/config/runner/AccessConfigRunner.java b/muyu-modules/muyu-goods-edition/muyu-goods-edition-clinet/src/main/java/com/muyu/efition/clinet/config/runner/AccessConfigRunner.java index 476452b..8a40b90 100644 --- a/muyu-modules/muyu-goods-edition/muyu-goods-edition-clinet/src/main/java/com/muyu/efition/clinet/config/runner/AccessConfigRunner.java +++ b/muyu-modules/muyu-goods-edition/muyu-goods-edition-clinet/src/main/java/com/muyu/efition/clinet/config/runner/AccessConfigRunner.java @@ -45,6 +45,8 @@ import java.util.stream.Stream; @Configuration public class AccessConfigRunner implements ApplicationRunner { // @Autowired +// private RemoteSystemManageService remoteSystemManageService; +// @Autowired // private RemoteSystemManageService remoteSystemManageService; @Override diff --git a/muyu-modules/muyu-data-range/muyu-data-range-common/src/main/java/muyu/data/range/common/domain/dataSoutce/DataSourceConfig.java b/muyu-modules/muyu-goods-edition/muyu-goods-edition-common/src/main/java/com/muyu/edition/dataSoutce/DataSourceConfig.java similarity index 79% rename from muyu-modules/muyu-data-range/muyu-data-range-common/src/main/java/muyu/data/range/common/domain/dataSoutce/DataSourceConfig.java rename to muyu-modules/muyu-goods-edition/muyu-goods-edition-common/src/main/java/com/muyu/edition/dataSoutce/DataSourceConfig.java index 3e1cd6f..47d4aa9 100644 --- a/muyu-modules/muyu-data-range/muyu-data-range-common/src/main/java/muyu/data/range/common/domain/dataSoutce/DataSourceConfig.java +++ b/muyu-modules/muyu-goods-edition/muyu-goods-edition-common/src/main/java/com/muyu/edition/dataSoutce/DataSourceConfig.java @@ -1,4 +1,4 @@ -package muyu.data.range.common.domain.dataSoutce; +package com.muyu.edition.dataSoutce; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.pool.DruidPooledConnection; @@ -35,7 +35,7 @@ public class DataSourceConfig { //数据库名 String databaseName = dataAccess.getDatabaseName(); // url - String url = String.format("jdbc:mysql://"+ host+":"+port+":"+databaseName); + String url = String.format("jdbc:mysql://"+ host+":"+port+"/"+databaseName); log.info("集成化的url:{}",url); DruidDataSource dataSource = new DruidDataSource(); //初始化链接池数量 @@ -45,20 +45,18 @@ public class DataSourceConfig { //最大等待时间 dataSource.setMaxWait(dataAccess.getMaxWaitTime()); //配置数据库的基本信息 - dataSource.setDriverClassName("com.mysql/jdbc.Driver"); + dataSource.setDriverClassName("com.mysql.cj.jdbc.Driver"); //数据库连接池 - dataSource.setUrl("jdbc:mysql://"+host+":"+port+":"+databaseName); + dataSource.setUrl(url); //数据库用户名 dataSource.setUsername(dataAccess.getUsername()); //数据库密码 dataSource.setPassword(dataAccess.getPassword()); - try { - dataSource.init();// 初始化 - } catch (SQLException e) { - throw new RuntimeException(e); - } + dataSource.init();// 初始化 hashMap.put(dataAccess.getId(),dataSource); - SpringHashMap(hashMap); + log.info("储存线程池：{}",hashMap); +// HashMap dataSourceHashMap = SpringHashMap(hashMap); +// log.info("hashmap存储",dataSourceHashMap); } /** @@ -90,12 +88,11 @@ public class DataSourceConfig { public static void verify(Long key) throws SQLException { DruidDataSource dataSource = hashMap.get(key); // 获取连接 - DruidPooledConnection connection = dataSource.getConnection(); - log.info("连接上线程池：{}",connection); + log.info("查看连接上的线程池：{}",dataSource); } - @Bean - public static HashMap SpringHashMap(HashMap hashMap) { - return hashMap; - } +// @Bean +// public static HashMap SpringHashMap(HashMap hashMap) { +// return hashMap; +// } } diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/AccreditController.java b/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/AccreditController.java index 9f4d063..96dc8c3 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/AccreditController.java +++ b/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/AccreditController.java @@ -20,6 +20,7 @@ import org.springframework.web.bind.annotation.*; import java.sql.Connection; import java.sql.SQLException; import java.util.List; +import java.util.stream.Collectors; @RestController @RequestMapping("accredit") @@ -189,6 +190,18 @@ public class AccreditController extends BaseController { return success(list); } + /** + * 根据父类集主键获取子类集 + * @param id + * @return + */ + @PostMapping("/selectTableList/{id}") + public Result> selectTableList(@PathVariable Long id){ + List collect = selectFrimary().getData().stream().filter(i -> i.getId().equals(id)).collect(Collectors.toList()); + List tableLists = collect.get(0).getTableLists(); + return success(tableLists); + } + @PostMapping("/selStatus") public Result selStatus(String databaseName, String tableName) { return success(service.selStatus(databaseName,tableName)); diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/TestSystemController.java b/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/TestSystemController.java new file mode 100644 index 0000000..bd14523 --- /dev/null +++ b/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/TestSystemController.java @@ -0,0 +1,26 @@ +package com.muyu.system.controller; + +import com.muyu.common.core.domain.Result; +import com.muyu.common.core.web.controller.BaseController; +import com.muyu.system.domain.vo.DataModel; +import com.muyu.system.service.TestSystemService; +import com.mysql.cj.x.protobuf.MysqlxCrud; +import org.apache.poi.util.Internal; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +@RestController +@RequestMapping("extract") +public class TestSystemController extends BaseController { + @Autowired + private TestSystemService testSystemService; + + @GetMapping("/getRandomDate") + public Result>> getRandomDate(Long id,String tableName,Integer cope){ + return success(testSystemService.getRandomDate(id,tableName,cope)); + } +} diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/vo/DataModel.java b/muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/vo/DataModel.java new file mode 100644 index 0000000..6d90efe --- /dev/null +++ b/muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/vo/DataModel.java @@ -0,0 +1,10 @@ +package com.muyu.system.domain.vo; + +import lombok.Data; +import lombok.experimental.SuperBuilder; + +@Data +@SuperBuilder +public class DataModel { + private String key; +} diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/TestSystemService.java b/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/TestSystemService.java new file mode 100644 index 0000000..83bfd2c --- /dev/null +++ b/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/TestSystemService.java @@ -0,0 +1,5 @@ +package com.muyu.system.service; + +public interface TestSystemService { + String getRandomDate(Long id, String tableName, Integer cope); +} diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/TestSystemServiceImpl.java b/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/TestSystemServiceImpl.java new file mode 100644 index 0000000..09ca122 --- /dev/null +++ b/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/TestSystemServiceImpl.java @@ -0,0 +1,21 @@ +package com.muyu.system.service.impl; + +import com.muyu.system.domain.vo.FrimaryVo; +import com.muyu.system.service.AccreditService; +import com.muyu.system.service.TestSystemService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +public class TestSystemServiceImpl implements TestSystemService { + @Autowired + private AccreditService accreditService; + + @Override + public String getRandomDate(Long id, String tableName, Integer cope) { + + return null; + } +} diff --git a/muyu-modules/pom.xml b/muyu-modules/pom.xml index 10cd36b..dde9c19 100644 --- a/muyu-modules/pom.xml +++ b/muyu-modules/pom.xml @@ -14,7 +14,6 @@ muyu-job muyu-file muyu-goods - muyu-goods muyu-modules diff --git a/pom.xml b/pom.xml index 85c2515..1fc29eb 100644 --- a/pom.xml +++ b/pom.xml @@ -217,8 +217,6 @@ muyu-common muyu-modules/muyu-goods-edition muyu-modules/muyu-data-test - muyu-modules/muyu-data-ranges - muyu-modules/muyu-data-range pom