From c3548ba95bee6ef01098662a8302bf9620fff67b Mon Sep 17 00:00:00 2001 From: rouchen <3133657697@qq.com> Date: Tue, 14 May 2024 22:41:16 +0800 Subject: [PATCH] =?UTF-8?q?feat=20=E8=BF=9E=E6=8E=A5=E6=B1=A0=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E4=B8=BA=E5=BE=B7=E7=BD=97=E4=BC=8A=E8=BF=9E=E6=8E=A5?= =?UTF-8?q?=E6=B1=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/constant/ServiceNameConstants.java | 2 +- .../muyu-dataSource-client}/pom.xml | 6 +- .../client/config/KvtClientConfig.java | 2 +- .../client/config/KvtClientRunner.java | 114 ++++++++++-------- .../muyu/source}/client/hashMap/HashMapp.java | 5 +- .../muyu/source}/client/pool/BaseConfig.java | 2 +- .../muyu/source}/client/pool/BasePool.java | 2 +- .../client/pool/MysqlConnException.java | 2 +- .../muyu/source}/client/pool/MysqlPool.java | 5 +- .../client/pool/confilg/MysqlPoolConfig.java | 5 +- .../client/pool/dto/SysDataSource.java | 2 +- ...ot.autoconfigure.AutoConfiguration.imports | 1 + .../muyu-dataSource-common}/pom.xml | 4 +- .../dataStructure/OverallDataStructure.java | 2 +- .../muyu/source}/datadisplay/DataDisplay.java | 2 +- .../com/muyu/source}/dept/DataSource.java | 2 +- .../com/muyu/source}/dept/DeptUserKvt.java | 2 +- .../com/muyu/source}/dictionary/Diction.java | 3 +- .../source}/dictionary/DictionaryType.java | 5 +- .../muyu/source}/dictionary/Dictionaryy.java | 5 +- .../source}/domain/AssetStructureList.java | 2 +- .../java/com/muyu/source}/domain/Child.java | 2 +- .../com/muyu/source}/domain/ChildrenList.java | 2 +- .../source}/domain/DataAuthorization.java | 2 +- .../muyu/source}/domain/DataStructure.java | 2 +- .../com/muyu/source}/domain/DataType.java | 2 +- .../java/com/muyu/source}/domain/Kvt.java | 8 +- .../com/muyu/source}/domain/Structure.java | 2 +- .../muyu/source}/domain/Synchronization.java | 2 +- .../java/com/muyu/source}/domain/Tables.java | 2 +- .../java/com/muyu/source}/domain/User.java | 2 +- .../muyu/source}/domain/req/KvtEditReq.java | 2 +- .../muyu/source}/domain/req/KvtQueryReq.java | 2 +- .../muyu/source}/domain/req/KvtSaveReq.java | 2 +- .../source}/permissions/PermissionsUser.java | 2 +- .../muyu-dataSource-remote}/pom.xml | 6 +- .../remote/RemoteDataManagerService.java | 6 +- .../remote/factory/DataManagerFactory.java | 6 +- ...ot.autoconfigure.AutoConfiguration.imports | 1 + .../muyu-dataSource-server}/pom.xml | 8 +- .../com/muyu/source}/MuyuApplication.java | 2 +- .../source}/controller/KvtController.java | 24 ++-- .../com/muyu/source}/mapper/KvtMapper.java | 18 +-- .../com/muyu/source}/service/KvtService.java | 16 +-- .../source}/service/impl/KvtServiceImpl.java | 22 ++-- .../src/main/resources/banner.txt | 0 .../src/main/resources/bootstrap.yml | 4 +- .../src/main/resources/logback.xml | 0 .../resources/mapper/source}/KvtMapper.xml | 54 ++++----- .../{muyu-kvt => muyu-dataSource}/pom.xml | 10 +- ...ot.autoconfigure.AutoConfiguration.imports | 1 - ...ot.autoconfigure.AutoConfiguration.imports | 1 - muyu-modules/muyu-unit/pom.xml | 6 +- .../unit/DataUnitApplication.java | 2 +- .../src/main/resources/bootstrap.yml | 2 +- muyu-modules/pom.xml | 2 +- 56 files changed, 201 insertions(+), 199 deletions(-) rename muyu-modules/{muyu-kvt/muyu-kvt-client => muyu-dataSource/muyu-dataSource-client}/pom.xml (86%) rename muyu-modules/{muyu-kvt/muyu-kvt-client/src/main/java/com/muyu/kvt => muyu-dataSource/muyu-dataSource-client/src/main/java/com/muyu/source}/client/config/KvtClientConfig.java (88%) rename muyu-modules/{muyu-kvt/muyu-kvt-client/src/main/java/com/muyu/kvt => muyu-dataSource/muyu-dataSource-client/src/main/java/com/muyu/source}/client/config/KvtClientRunner.java (66%) rename muyu-modules/{muyu-kvt/muyu-kvt-client/src/main/java/com/muyu/kvt => muyu-dataSource/muyu-dataSource-client/src/main/java/com/muyu/source}/client/hashMap/HashMapp.java (86%) rename muyu-modules/{muyu-kvt/muyu-kvt-client/src/main/java/com/muyu/kvt => muyu-dataSource/muyu-dataSource-client/src/main/java/com/muyu/source}/client/pool/BaseConfig.java (93%) rename muyu-modules/{muyu-kvt/muyu-kvt-client/src/main/java/com/muyu/kvt => muyu-dataSource/muyu-dataSource-client/src/main/java/com/muyu/source}/client/pool/BasePool.java (92%) rename muyu-modules/{muyu-kvt/muyu-kvt-client/src/main/java/com/muyu/kvt => muyu-dataSource/muyu-dataSource-client/src/main/java/com/muyu/source}/client/pool/MysqlConnException.java (85%) rename muyu-modules/{muyu-kvt/muyu-kvt-client/src/main/java/com/muyu/kvt => muyu-dataSource/muyu-dataSource-client/src/main/java/com/muyu/source}/client/pool/MysqlPool.java (97%) rename muyu-modules/{muyu-kvt/muyu-kvt-client/src/main/java/com/muyu/kvt => muyu-dataSource/muyu-dataSource-client/src/main/java/com/muyu/source}/client/pool/confilg/MysqlPoolConfig.java (93%) rename muyu-modules/{muyu-kvt/muyu-kvt-client/src/main/java/com/muyu/kvt => muyu-dataSource/muyu-dataSource-client/src/main/java/com/muyu/source}/client/pool/dto/SysDataSource.java (96%) create mode 100644 muyu-modules/muyu-dataSource/muyu-dataSource-client/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports rename muyu-modules/{muyu-kvt/muyu-kvt-common => muyu-dataSource/muyu-dataSource-common}/pom.xml (88%) rename muyu-modules/{muyu-kvt/muyu-kvt-common/src/main/java/com/muyu/kvt => muyu-dataSource/muyu-dataSource-common/src/main/java/com/muyu/source}/dataStructure/OverallDataStructure.java (92%) rename muyu-modules/{muyu-kvt/muyu-kvt-common/src/main/java/com/muyu/kvt => muyu-dataSource/muyu-dataSource-common/src/main/java/com/muyu/source}/datadisplay/DataDisplay.java (94%) rename muyu-modules/{muyu-kvt/muyu-kvt-common/src/main/java/com/muyu/kvt => muyu-dataSource/muyu-dataSource-common/src/main/java/com/muyu/source}/dept/DataSource.java (95%) rename muyu-modules/{muyu-kvt/muyu-kvt-common/src/main/java/com/muyu/kvt => muyu-dataSource/muyu-dataSource-common/src/main/java/com/muyu/source}/dept/DeptUserKvt.java (92%) rename muyu-modules/{muyu-kvt/muyu-kvt-common/src/main/java/com/muyu/kvt => muyu-dataSource/muyu-dataSource-common/src/main/java/com/muyu/source}/dictionary/Diction.java (91%) rename muyu-modules/{muyu-kvt/muyu-kvt-common/src/main/java/com/muyu/kvt => muyu-dataSource/muyu-dataSource-common/src/main/java/com/muyu/source}/dictionary/DictionaryType.java (81%) rename muyu-modules/{muyu-kvt/muyu-kvt-common/src/main/java/com/muyu/kvt => muyu-dataSource/muyu-dataSource-common/src/main/java/com/muyu/source}/dictionary/Dictionaryy.java (82%) rename muyu-modules/{muyu-kvt/muyu-kvt-common/src/main/java/com/muyu/kvt => muyu-dataSource/muyu-dataSource-common/src/main/java/com/muyu/source}/domain/AssetStructureList.java (94%) rename muyu-modules/{muyu-kvt/muyu-kvt-common/src/main/java/com/muyu/kvt => muyu-dataSource/muyu-dataSource-common/src/main/java/com/muyu/source}/domain/Child.java (93%) rename muyu-modules/{muyu-kvt/muyu-kvt-common/src/main/java/com/muyu/kvt => muyu-dataSource/muyu-dataSource-common/src/main/java/com/muyu/source}/domain/ChildrenList.java (92%) rename muyu-modules/{muyu-kvt/muyu-kvt-common/src/main/java/com/muyu/kvt => muyu-dataSource/muyu-dataSource-common/src/main/java/com/muyu/source}/domain/DataAuthorization.java (95%) rename muyu-modules/{muyu-kvt/muyu-kvt-common/src/main/java/com/muyu/kvt => muyu-dataSource/muyu-dataSource-common/src/main/java/com/muyu/source}/domain/DataStructure.java (97%) rename muyu-modules/{muyu-kvt/muyu-kvt-common/src/main/java/com/muyu/kvt => muyu-dataSource/muyu-dataSource-common/src/main/java/com/muyu/source}/domain/DataType.java (89%) rename muyu-modules/{muyu-kvt/muyu-kvt-common/src/main/java/com/muyu/kvt => muyu-dataSource/muyu-dataSource-common/src/main/java/com/muyu/source}/domain/Kvt.java (97%) rename muyu-modules/{muyu-kvt/muyu-kvt-common/src/main/java/com/muyu/kvt => muyu-dataSource/muyu-dataSource-common/src/main/java/com/muyu/source}/domain/Structure.java (96%) rename muyu-modules/{muyu-kvt/muyu-kvt-common/src/main/java/com/muyu/kvt => muyu-dataSource/muyu-dataSource-common/src/main/java/com/muyu/source}/domain/Synchronization.java (98%) rename muyu-modules/{muyu-kvt/muyu-kvt-common/src/main/java/com/muyu/kvt => muyu-dataSource/muyu-dataSource-common/src/main/java/com/muyu/source}/domain/Tables.java (89%) rename muyu-modules/{muyu-kvt/muyu-kvt-common/src/main/java/com/muyu/kvt => muyu-dataSource/muyu-dataSource-common/src/main/java/com/muyu/source}/domain/User.java (88%) rename muyu-modules/{muyu-kvt/muyu-kvt-common/src/main/java/com/muyu/kvt => muyu-dataSource/muyu-dataSource-common/src/main/java/com/muyu/source}/domain/req/KvtEditReq.java (98%) rename muyu-modules/{muyu-kvt/muyu-kvt-common/src/main/java/com/muyu/kvt => muyu-dataSource/muyu-dataSource-common/src/main/java/com/muyu/source}/domain/req/KvtQueryReq.java (98%) rename muyu-modules/{muyu-kvt/muyu-kvt-common/src/main/java/com/muyu/kvt => muyu-dataSource/muyu-dataSource-common/src/main/java/com/muyu/source}/domain/req/KvtSaveReq.java (98%) rename muyu-modules/{muyu-kvt/muyu-kvt-common/src/main/java/com/muyu/kvt => muyu-dataSource/muyu-dataSource-common/src/main/java/com/muyu/source}/permissions/PermissionsUser.java (94%) rename muyu-modules/{muyu-kvt/muyu-kvt-remote => muyu-dataSource/muyu-dataSource-remote}/pom.xml (85%) rename muyu-modules/{muyu-kvt/muyu-kvt-remote/src/main/java/com/muyu/kvt => muyu-dataSource/muyu-dataSource-remote/src/main/java/com/muyu/source}/remote/RemoteDataManagerService.java (82%) rename muyu-modules/{muyu-kvt/muyu-kvt-remote/src/main/java/com/muyu/kvt => muyu-dataSource/muyu-dataSource-remote/src/main/java/com/muyu/source}/remote/factory/DataManagerFactory.java (82%) create mode 100644 muyu-modules/muyu-dataSource/muyu-dataSource-remote/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports rename muyu-modules/{muyu-kvt/muyu-kvt-server => muyu-dataSource/muyu-dataSource-server}/pom.xml (94%) rename muyu-modules/{muyu-kvt/muyu-kvt-server/src/main/java/com/muyu/kvt => muyu-dataSource/muyu-dataSource-server/src/main/java/com/muyu/source}/MuyuApplication.java (96%) rename muyu-modules/{muyu-kvt/muyu-kvt-server/src/main/java/com/muyu/kvt => muyu-dataSource/muyu-dataSource-server/src/main/java/com/muyu/source}/controller/KvtController.java (95%) rename muyu-modules/{muyu-kvt/muyu-kvt-server/src/main/java/com/muyu/kvt => muyu-dataSource/muyu-dataSource-server/src/main/java/com/muyu/source}/mapper/KvtMapper.java (87%) rename muyu-modules/{muyu-kvt/muyu-kvt-server/src/main/java/com/muyu/kvt => muyu-dataSource/muyu-dataSource-server/src/main/java/com/muyu/source}/service/KvtService.java (84%) rename muyu-modules/{muyu-kvt/muyu-kvt-server/src/main/java/com/muyu/kvt => muyu-dataSource/muyu-dataSource-server/src/main/java/com/muyu/source}/service/impl/KvtServiceImpl.java (98%) rename muyu-modules/{muyu-kvt/muyu-kvt-server => muyu-dataSource/muyu-dataSource-server}/src/main/resources/banner.txt (100%) rename muyu-modules/{muyu-kvt/muyu-kvt-server => muyu-dataSource/muyu-dataSource-server}/src/main/resources/bootstrap.yml (91%) rename muyu-modules/{muyu-kvt/muyu-kvt-server => muyu-dataSource/muyu-dataSource-server}/src/main/resources/logback.xml (100%) rename muyu-modules/{muyu-kvt/muyu-kvt-server/src/main/resources/mapper/kvt => muyu-dataSource/muyu-dataSource-server/src/main/resources/mapper/source}/KvtMapper.xml (85%) rename muyu-modules/{muyu-kvt => muyu-dataSource}/pom.xml (75%) delete mode 100644 muyu-modules/muyu-kvt/muyu-kvt-client/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports delete mode 100644 muyu-modules/muyu-kvt/muyu-kvt-remote/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports rename muyu-modules/muyu-unit/src/main/java/com/muyu/{kvt => source}/unit/DataUnitApplication.java (96%) 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 c14e4af..383deeb 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 @@ -22,7 +22,7 @@ public class ServiceNameConstants { */ public static final String FILE_SERVICE = "muyu-file"; - public static final String MUYU_KVT = "muyu-kvt"; + public static final String MUYU_KVT = "muyu-dataSource"; diff --git a/muyu-modules/muyu-kvt/muyu-kvt-client/pom.xml b/muyu-modules/muyu-dataSource/muyu-dataSource-client/pom.xml similarity index 86% rename from muyu-modules/muyu-kvt/muyu-kvt-client/pom.xml rename to muyu-modules/muyu-dataSource/muyu-dataSource-client/pom.xml index 4348549..9635ae8 100644 --- a/muyu-modules/muyu-kvt/muyu-kvt-client/pom.xml +++ b/muyu-modules/muyu-dataSource/muyu-dataSource-client/pom.xml @@ -5,11 +5,11 @@ 4.0.0 com.muyu - muyu-kvt + muyu-dataSource 3.6.3 - muyu-kvt-client + muyu-dataSource-client 17 @@ -19,7 +19,7 @@ com.muyu - muyu-kvt-remote + muyu-dataSource-remote 3.6.3 compile diff --git a/muyu-modules/muyu-kvt/muyu-kvt-client/src/main/java/com/muyu/kvt/client/config/KvtClientConfig.java b/muyu-modules/muyu-dataSource/muyu-dataSource-client/src/main/java/com/muyu/source/client/config/KvtClientConfig.java similarity index 88% rename from muyu-modules/muyu-kvt/muyu-kvt-client/src/main/java/com/muyu/kvt/client/config/KvtClientConfig.java rename to muyu-modules/muyu-dataSource/muyu-dataSource-client/src/main/java/com/muyu/source/client/config/KvtClientConfig.java index a826112..ff6f09d 100644 --- a/muyu-modules/muyu-kvt/muyu-kvt-client/src/main/java/com/muyu/kvt/client/config/KvtClientConfig.java +++ b/muyu-modules/muyu-dataSource/muyu-dataSource-client/src/main/java/com/muyu/source/client/config/KvtClientConfig.java @@ -1,4 +1,4 @@ -package com.muyu.kvt.client.config; +package com.muyu.source.client.config; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Import; diff --git a/muyu-modules/muyu-kvt/muyu-kvt-client/src/main/java/com/muyu/kvt/client/config/KvtClientRunner.java b/muyu-modules/muyu-dataSource/muyu-dataSource-client/src/main/java/com/muyu/source/client/config/KvtClientRunner.java similarity index 66% rename from muyu-modules/muyu-kvt/muyu-kvt-client/src/main/java/com/muyu/kvt/client/config/KvtClientRunner.java rename to muyu-modules/muyu-dataSource/muyu-dataSource-client/src/main/java/com/muyu/source/client/config/KvtClientRunner.java index cc7482b..d03a89f 100644 --- a/muyu-modules/muyu-kvt/muyu-kvt-client/src/main/java/com/muyu/kvt/client/config/KvtClientRunner.java +++ b/muyu-modules/muyu-dataSource/muyu-dataSource-client/src/main/java/com/muyu/source/client/config/KvtClientRunner.java @@ -1,22 +1,15 @@ -package com.muyu.kvt.client.config; +package com.muyu.source.client.config; import com.muyu.common.core.domain.Result; -import com.muyu.kvt.client.pool.BasePool; -import com.muyu.kvt.client.pool.MysqlPool; -import com.muyu.kvt.client.pool.confilg.MysqlPoolConfig; -import com.muyu.kvt.client.pool.dto.SysDataSource; -import com.muyu.kvt.domain.Kvt; -import com.muyu.kvt.remote.RemoteDataManagerService; +import com.muyu.source.client.source.DataSourceConfig; +import com.muyu.source.domain.Kvt; +import com.muyu.source.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 java.sql.Connection; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.sql.Statement; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -38,54 +31,69 @@ public class KvtClientRunner implements ApplicationRunner { @Override public void run(ApplicationArguments args) throws Exception { - List list = new ArrayList<>(); + Result> listResult = remoteDataManagerService.selectKvt(); List data = listResult.getData(); - HashMap hashMap = new HashMap<>(); + data.stream().forEach(kvt -> { + DataSourceConfig.init(kvt) ; + }); - data.forEach(kvt -> { - MysqlPoolConfig build = MysqlPoolConfig.builder() - .id(String.valueOf(kvt.getId())) - .ip(kvt.getHost()) - .port(kvt.getPort()) - .databaseName(kvt.getDatabaseName()) - .param(kvt.getConnectionParam()) - .initTotal(Math.toIntExact(kvt.getInitNum())) - .maxTotal(Math.toIntExact(kvt.getMaxNum())) - .maxWaitTimes(kvt.getMaxWaitTime()) - .userName(kvt.getUsername()) - .password(kvt.getPassword()) - .driverName("com.mysql.cj.jdbc.Driver") - .build(); - BasePool mysqlPool = new MysqlPool(build); - log.info("初始化开始"); - mysqlPool.init(); - int initNum = build.getInitTotal(); - for (int i = 0; i < initNum; i++) { - Connection connection = mysqlPool.creatConnection(); - map.put(String.valueOf(i), connection); - mysqlPool.returnConn(connection); - } - log.info("-------------------------"); - mysqlPool.close(); - log.info("map:{}",map); - }); - Connection connection = map.get("1"); - Statement statement =null; - try{ - statement = connection.createStatement(); - ResultSet resultSet = statement.executeQuery("SHOW Tables"); - while (resultSet.next()){ - String name = resultSet.getString(1); - log.info("name:{}",name); - } - log.info("连接成功"); - }catch (SQLException e){ - log.error("sql错误"); - } + + + + + + + + +// List list = new ArrayList<>(); +// HashMap hashMap = new HashMap<>(); +// data.forEach(kvt -> { +// +// MysqlPoolConfig build = MysqlPoolConfig.builder() +// .id(String.valueOf(kvt.getId())) +// .ip(kvt.getHost()) +// .port(kvt.getPort()) +// .databaseName(kvt.getDatabaseName()) +// .param(kvt.getConnectionParam()) +// .initTotal(Math.toIntExact(kvt.getInitNum())) +// .maxTotal(Math.toIntExact(kvt.getMaxNum())) +// .maxWaitTimes(kvt.getMaxWaitTime()) +// .userName(kvt.getUsername()) +// .password(kvt.getPassword()) +// .driverName("com.mysql.cj.jdbc.Driver") +// .build(); +// BasePool mysqlPool = new MysqlPool(build); +// +// log.info("初始化开始"); +// +// mysqlPool.init(); +// int initNum = build.getInitTotal(); +// for (int i = 0; i < initNum; i++) { +// Connection connection = mysqlPool.creatConnection(); +// map.put(String.valueOf(i), connection); +// mysqlPool.returnConn(connection); +// } +// log.info("-------------------------"); +// mysqlPool.close(); +// log.info("map:{}",map); +// }); +// Connection connection = map.get("1"); +// Statement statement =null; +// try{ +// statement = connection.createStatement(); +// ResultSet resultSet = statement.executeQuery("SHOW Tables"); +// while (resultSet.next()){ +// String name = resultSet.getString(1); +// log.info("name:{}",name); +// } +// log.info("连接成功"); +// }catch (SQLException e){ +// log.error("sql错误"); +// } // SysDataSource sysDataSource = new SysDataSource(); diff --git a/muyu-modules/muyu-kvt/muyu-kvt-client/src/main/java/com/muyu/kvt/client/hashMap/HashMapp.java b/muyu-modules/muyu-dataSource/muyu-dataSource-client/src/main/java/com/muyu/source/client/hashMap/HashMapp.java similarity index 86% rename from muyu-modules/muyu-kvt/muyu-kvt-client/src/main/java/com/muyu/kvt/client/hashMap/HashMapp.java rename to muyu-modules/muyu-dataSource/muyu-dataSource-client/src/main/java/com/muyu/source/client/hashMap/HashMapp.java index 03995ab..53db897 100644 --- a/muyu-modules/muyu-kvt/muyu-kvt-client/src/main/java/com/muyu/kvt/client/hashMap/HashMapp.java +++ b/muyu-modules/muyu-dataSource/muyu-dataSource-client/src/main/java/com/muyu/source/client/hashMap/HashMapp.java @@ -1,6 +1,6 @@ -package com.muyu.kvt.client.hashMap; +package com.muyu.source.client.hashMap; -import com.muyu.kvt.client.config.KvtClientRunner; +import com.muyu.source.client.config.KvtClientRunner; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Import; @@ -14,7 +14,6 @@ import java.util.HashMap; */ @ComponentScan @Import(value = {KvtClientRunner.class}) - public class HashMapp { public static final HashMap params = new HashMap<>(); diff --git a/muyu-modules/muyu-kvt/muyu-kvt-client/src/main/java/com/muyu/kvt/client/pool/BaseConfig.java b/muyu-modules/muyu-dataSource/muyu-dataSource-client/src/main/java/com/muyu/source/client/pool/BaseConfig.java similarity index 93% rename from muyu-modules/muyu-kvt/muyu-kvt-client/src/main/java/com/muyu/kvt/client/pool/BaseConfig.java rename to muyu-modules/muyu-dataSource/muyu-dataSource-client/src/main/java/com/muyu/source/client/pool/BaseConfig.java index 92cfb4b..cc89789 100644 --- a/muyu-modules/muyu-kvt/muyu-kvt-client/src/main/java/com/muyu/kvt/client/pool/BaseConfig.java +++ b/muyu-modules/muyu-dataSource/muyu-dataSource-client/src/main/java/com/muyu/source/client/pool/BaseConfig.java @@ -1,4 +1,4 @@ -package com.muyu.kvt.client.pool; +package com.muyu.source.client.pool; import lombok.extern.log4j.Log4j2; diff --git a/muyu-modules/muyu-kvt/muyu-kvt-client/src/main/java/com/muyu/kvt/client/pool/BasePool.java b/muyu-modules/muyu-dataSource/muyu-dataSource-client/src/main/java/com/muyu/source/client/pool/BasePool.java similarity index 92% rename from muyu-modules/muyu-kvt/muyu-kvt-client/src/main/java/com/muyu/kvt/client/pool/BasePool.java rename to muyu-modules/muyu-dataSource/muyu-dataSource-client/src/main/java/com/muyu/source/client/pool/BasePool.java index 59df844..c54fc45 100644 --- a/muyu-modules/muyu-kvt/muyu-kvt-client/src/main/java/com/muyu/kvt/client/pool/BasePool.java +++ b/muyu-modules/muyu-dataSource/muyu-dataSource-client/src/main/java/com/muyu/source/client/pool/BasePool.java @@ -1,4 +1,4 @@ -package com.muyu.kvt.client.pool; +package com.muyu.source.client.pool; /** * 提供一个连接池的准则 BasePool diff --git a/muyu-modules/muyu-kvt/muyu-kvt-client/src/main/java/com/muyu/kvt/client/pool/MysqlConnException.java b/muyu-modules/muyu-dataSource/muyu-dataSource-client/src/main/java/com/muyu/source/client/pool/MysqlConnException.java similarity index 85% rename from muyu-modules/muyu-kvt/muyu-kvt-client/src/main/java/com/muyu/kvt/client/pool/MysqlConnException.java rename to muyu-modules/muyu-dataSource/muyu-dataSource-client/src/main/java/com/muyu/source/client/pool/MysqlConnException.java index c10652f..a42b846 100644 --- a/muyu-modules/muyu-kvt/muyu-kvt-client/src/main/java/com/muyu/kvt/client/pool/MysqlConnException.java +++ b/muyu-modules/muyu-dataSource/muyu-dataSource-client/src/main/java/com/muyu/source/client/pool/MysqlConnException.java @@ -1,4 +1,4 @@ -package com.muyu.kvt.client.pool; +package com.muyu.source.client.pool; /** * Mysql超时异常 MysqlConn diff --git a/muyu-modules/muyu-kvt/muyu-kvt-client/src/main/java/com/muyu/kvt/client/pool/MysqlPool.java b/muyu-modules/muyu-dataSource/muyu-dataSource-client/src/main/java/com/muyu/source/client/pool/MysqlPool.java similarity index 97% rename from muyu-modules/muyu-kvt/muyu-kvt-client/src/main/java/com/muyu/kvt/client/pool/MysqlPool.java rename to muyu-modules/muyu-dataSource/muyu-dataSource-client/src/main/java/com/muyu/source/client/pool/MysqlPool.java index 857021b..52cca0e 100644 --- a/muyu-modules/muyu-kvt/muyu-kvt-client/src/main/java/com/muyu/kvt/client/pool/MysqlPool.java +++ b/muyu-modules/muyu-dataSource/muyu-dataSource-client/src/main/java/com/muyu/source/client/pool/MysqlPool.java @@ -1,8 +1,8 @@ -package com.muyu.kvt.client.pool; +package com.muyu.source.client.pool; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.muyu.kvt.client.pool.confilg.MysqlPoolConfig; +import com.muyu.source.client.pool.confilg.MysqlPoolConfig; import java.sql.Connection; import java.sql.DriverManager; @@ -63,6 +63,7 @@ public class MysqlPool implements BasePool { this.activeMysqlQueue = new LinkedBlockingQueue<>(); for (int i = 0; i < initTotal; i++) { this.mysqlConnQueue.offer(creatConnection()); + // count.incrementAndGet(); } log.info("Mysql连接池初始化完成"); diff --git a/muyu-modules/muyu-kvt/muyu-kvt-client/src/main/java/com/muyu/kvt/client/pool/confilg/MysqlPoolConfig.java b/muyu-modules/muyu-dataSource/muyu-dataSource-client/src/main/java/com/muyu/source/client/pool/confilg/MysqlPoolConfig.java similarity index 93% rename from muyu-modules/muyu-kvt/muyu-kvt-client/src/main/java/com/muyu/kvt/client/pool/confilg/MysqlPoolConfig.java rename to muyu-modules/muyu-dataSource/muyu-dataSource-client/src/main/java/com/muyu/source/client/pool/confilg/MysqlPoolConfig.java index 022d66b..2729cf7 100644 --- a/muyu-modules/muyu-kvt/muyu-kvt-client/src/main/java/com/muyu/kvt/client/pool/confilg/MysqlPoolConfig.java +++ b/muyu-modules/muyu-dataSource/muyu-dataSource-client/src/main/java/com/muyu/source/client/pool/confilg/MysqlPoolConfig.java @@ -1,6 +1,6 @@ -package com.muyu.kvt.client.pool.confilg; +package com.muyu.source.client.pool.confilg; -import com.muyu.kvt.client.pool.BaseConfig; +import com.muyu.source.client.pool.BaseConfig; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; @@ -54,6 +54,7 @@ public class MysqlPoolConfig { private String password; + /** * 获取数据库连接 */ diff --git a/muyu-modules/muyu-kvt/muyu-kvt-client/src/main/java/com/muyu/kvt/client/pool/dto/SysDataSource.java b/muyu-modules/muyu-dataSource/muyu-dataSource-client/src/main/java/com/muyu/source/client/pool/dto/SysDataSource.java similarity index 96% rename from muyu-modules/muyu-kvt/muyu-kvt-client/src/main/java/com/muyu/kvt/client/pool/dto/SysDataSource.java rename to muyu-modules/muyu-dataSource/muyu-dataSource-client/src/main/java/com/muyu/source/client/pool/dto/SysDataSource.java index f34dc8c..f3b9f83 100644 --- a/muyu-modules/muyu-kvt/muyu-kvt-client/src/main/java/com/muyu/kvt/client/pool/dto/SysDataSource.java +++ b/muyu-modules/muyu-dataSource/muyu-dataSource-client/src/main/java/com/muyu/source/client/pool/dto/SysDataSource.java @@ -1,4 +1,4 @@ -package com.muyu.kvt.client.pool.dto; +package com.muyu.source.client.pool.dto; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/muyu-modules/muyu-dataSource/muyu-dataSource-client/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/muyu-modules/muyu-dataSource/muyu-dataSource-client/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..7588147 --- /dev/null +++ b/muyu-modules/muyu-dataSource/muyu-dataSource-client/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +com.muyu.source.client.config.KvtClientConfig diff --git a/muyu-modules/muyu-kvt/muyu-kvt-common/pom.xml b/muyu-modules/muyu-dataSource/muyu-dataSource-common/pom.xml similarity index 88% rename from muyu-modules/muyu-kvt/muyu-kvt-common/pom.xml rename to muyu-modules/muyu-dataSource/muyu-dataSource-common/pom.xml index 4e53d45..12467a4 100644 --- a/muyu-modules/muyu-kvt/muyu-kvt-common/pom.xml +++ b/muyu-modules/muyu-dataSource/muyu-dataSource-common/pom.xml @@ -5,11 +5,11 @@ 4.0.0 com.muyu - muyu-kvt + muyu-dataSource 3.6.3 - muyu-kvt-common + muyu-dataSource-common 17 diff --git a/muyu-modules/muyu-kvt/muyu-kvt-common/src/main/java/com/muyu/kvt/dataStructure/OverallDataStructure.java b/muyu-modules/muyu-dataSource/muyu-dataSource-common/src/main/java/com/muyu/source/dataStructure/OverallDataStructure.java similarity index 92% rename from muyu-modules/muyu-kvt/muyu-kvt-common/src/main/java/com/muyu/kvt/dataStructure/OverallDataStructure.java rename to muyu-modules/muyu-dataSource/muyu-dataSource-common/src/main/java/com/muyu/source/dataStructure/OverallDataStructure.java index f573c28..5f21f51 100644 --- a/muyu-modules/muyu-kvt/muyu-kvt-common/src/main/java/com/muyu/kvt/dataStructure/OverallDataStructure.java +++ b/muyu-modules/muyu-dataSource/muyu-dataSource-common/src/main/java/com/muyu/source/dataStructure/OverallDataStructure.java @@ -1,4 +1,4 @@ -package com.muyu.kvt.dataStructure; +package com.muyu.source.dataStructure; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/muyu-modules/muyu-kvt/muyu-kvt-common/src/main/java/com/muyu/kvt/datadisplay/DataDisplay.java b/muyu-modules/muyu-dataSource/muyu-dataSource-common/src/main/java/com/muyu/source/datadisplay/DataDisplay.java similarity index 94% rename from muyu-modules/muyu-kvt/muyu-kvt-common/src/main/java/com/muyu/kvt/datadisplay/DataDisplay.java rename to muyu-modules/muyu-dataSource/muyu-dataSource-common/src/main/java/com/muyu/source/datadisplay/DataDisplay.java index 26cca92..4d5c74e 100644 --- a/muyu-modules/muyu-kvt/muyu-kvt-common/src/main/java/com/muyu/kvt/datadisplay/DataDisplay.java +++ b/muyu-modules/muyu-dataSource/muyu-dataSource-common/src/main/java/com/muyu/source/datadisplay/DataDisplay.java @@ -1,4 +1,4 @@ -package com.muyu.kvt.datadisplay; +package com.muyu.source.datadisplay; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/muyu-modules/muyu-kvt/muyu-kvt-common/src/main/java/com/muyu/kvt/dept/DataSource.java b/muyu-modules/muyu-dataSource/muyu-dataSource-common/src/main/java/com/muyu/source/dept/DataSource.java similarity index 95% rename from muyu-modules/muyu-kvt/muyu-kvt-common/src/main/java/com/muyu/kvt/dept/DataSource.java rename to muyu-modules/muyu-dataSource/muyu-dataSource-common/src/main/java/com/muyu/source/dept/DataSource.java index 846c207..59f5f70 100644 --- a/muyu-modules/muyu-kvt/muyu-kvt-common/src/main/java/com/muyu/kvt/dept/DataSource.java +++ b/muyu-modules/muyu-dataSource/muyu-dataSource-common/src/main/java/com/muyu/source/dept/DataSource.java @@ -1,4 +1,4 @@ -package com.muyu.kvt.dept; +package com.muyu.source.dept; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/muyu-modules/muyu-kvt/muyu-kvt-common/src/main/java/com/muyu/kvt/dept/DeptUserKvt.java b/muyu-modules/muyu-dataSource/muyu-dataSource-common/src/main/java/com/muyu/source/dept/DeptUserKvt.java similarity index 92% rename from muyu-modules/muyu-kvt/muyu-kvt-common/src/main/java/com/muyu/kvt/dept/DeptUserKvt.java rename to muyu-modules/muyu-dataSource/muyu-dataSource-common/src/main/java/com/muyu/source/dept/DeptUserKvt.java index 1fb7797..ce4646d 100644 --- a/muyu-modules/muyu-kvt/muyu-kvt-common/src/main/java/com/muyu/kvt/dept/DeptUserKvt.java +++ b/muyu-modules/muyu-dataSource/muyu-dataSource-common/src/main/java/com/muyu/source/dept/DeptUserKvt.java @@ -1,4 +1,4 @@ -package com.muyu.kvt.dept; +package com.muyu.source.dept; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/muyu-modules/muyu-kvt/muyu-kvt-common/src/main/java/com/muyu/kvt/dictionary/Diction.java b/muyu-modules/muyu-dataSource/muyu-dataSource-common/src/main/java/com/muyu/source/dictionary/Diction.java similarity index 91% rename from muyu-modules/muyu-kvt/muyu-kvt-common/src/main/java/com/muyu/kvt/dictionary/Diction.java rename to muyu-modules/muyu-dataSource/muyu-dataSource-common/src/main/java/com/muyu/source/dictionary/Diction.java index 493e716..7d0aadf 100644 --- a/muyu-modules/muyu-kvt/muyu-kvt-common/src/main/java/com/muyu/kvt/dictionary/Diction.java +++ b/muyu-modules/muyu-dataSource/muyu-dataSource-common/src/main/java/com/muyu/source/dictionary/Diction.java @@ -1,7 +1,6 @@ -package com.muyu.kvt.dictionary; +package com.muyu.source.dictionary; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; diff --git a/muyu-modules/muyu-kvt/muyu-kvt-common/src/main/java/com/muyu/kvt/dictionary/DictionaryType.java b/muyu-modules/muyu-dataSource/muyu-dataSource-common/src/main/java/com/muyu/source/dictionary/DictionaryType.java similarity index 81% rename from muyu-modules/muyu-kvt/muyu-kvt-common/src/main/java/com/muyu/kvt/dictionary/DictionaryType.java rename to muyu-modules/muyu-dataSource/muyu-dataSource-common/src/main/java/com/muyu/source/dictionary/DictionaryType.java index b62f5eb..866edc2 100644 --- a/muyu-modules/muyu-kvt/muyu-kvt-common/src/main/java/com/muyu/kvt/dictionary/DictionaryType.java +++ b/muyu-modules/muyu-dataSource/muyu-dataSource-common/src/main/java/com/muyu/source/dictionary/DictionaryType.java @@ -1,10 +1,7 @@ -package com.muyu.kvt.dictionary; +package com.muyu.source.dictionary; -import com.muyu.common.core.web.domain.BaseEntity; import lombok.*; -import java.util.Date; - /** * 字典類型 DictionaryType * diff --git a/muyu-modules/muyu-kvt/muyu-kvt-common/src/main/java/com/muyu/kvt/dictionary/Dictionaryy.java b/muyu-modules/muyu-dataSource/muyu-dataSource-common/src/main/java/com/muyu/source/dictionary/Dictionaryy.java similarity index 82% rename from muyu-modules/muyu-kvt/muyu-kvt-common/src/main/java/com/muyu/kvt/dictionary/Dictionaryy.java rename to muyu-modules/muyu-dataSource/muyu-dataSource-common/src/main/java/com/muyu/source/dictionary/Dictionaryy.java index a544496..d50b33d 100644 --- a/muyu-modules/muyu-kvt/muyu-kvt-common/src/main/java/com/muyu/kvt/dictionary/Dictionaryy.java +++ b/muyu-modules/muyu-dataSource/muyu-dataSource-common/src/main/java/com/muyu/source/dictionary/Dictionaryy.java @@ -1,10 +1,7 @@ -package com.muyu.kvt.dictionary; +package com.muyu.source.dictionary; -import com.muyu.common.core.web.domain.BaseEntity; import lombok.*; -import java.util.Date; - /** * 字典 Dictionary * diff --git a/muyu-modules/muyu-kvt/muyu-kvt-common/src/main/java/com/muyu/kvt/domain/AssetStructureList.java b/muyu-modules/muyu-dataSource/muyu-dataSource-common/src/main/java/com/muyu/source/domain/AssetStructureList.java similarity index 94% rename from muyu-modules/muyu-kvt/muyu-kvt-common/src/main/java/com/muyu/kvt/domain/AssetStructureList.java rename to muyu-modules/muyu-dataSource/muyu-dataSource-common/src/main/java/com/muyu/source/domain/AssetStructureList.java index 2dc79e7..73131c9 100644 --- a/muyu-modules/muyu-kvt/muyu-kvt-common/src/main/java/com/muyu/kvt/domain/AssetStructureList.java +++ b/muyu-modules/muyu-dataSource/muyu-dataSource-common/src/main/java/com/muyu/source/domain/AssetStructureList.java @@ -1,4 +1,4 @@ -package com.muyu.kvt.domain; +package com.muyu.source.domain; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/muyu-modules/muyu-kvt/muyu-kvt-common/src/main/java/com/muyu/kvt/domain/Child.java b/muyu-modules/muyu-dataSource/muyu-dataSource-common/src/main/java/com/muyu/source/domain/Child.java similarity index 93% rename from muyu-modules/muyu-kvt/muyu-kvt-common/src/main/java/com/muyu/kvt/domain/Child.java rename to muyu-modules/muyu-dataSource/muyu-dataSource-common/src/main/java/com/muyu/source/domain/Child.java index f3eb25f..57db2f9 100644 --- a/muyu-modules/muyu-kvt/muyu-kvt-common/src/main/java/com/muyu/kvt/domain/Child.java +++ b/muyu-modules/muyu-dataSource/muyu-dataSource-common/src/main/java/com/muyu/source/domain/Child.java @@ -1,4 +1,4 @@ -package com.muyu.kvt.domain; +package com.muyu.source.domain; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/muyu-modules/muyu-kvt/muyu-kvt-common/src/main/java/com/muyu/kvt/domain/ChildrenList.java b/muyu-modules/muyu-dataSource/muyu-dataSource-common/src/main/java/com/muyu/source/domain/ChildrenList.java similarity index 92% rename from muyu-modules/muyu-kvt/muyu-kvt-common/src/main/java/com/muyu/kvt/domain/ChildrenList.java rename to muyu-modules/muyu-dataSource/muyu-dataSource-common/src/main/java/com/muyu/source/domain/ChildrenList.java index a12e185..8877153 100644 --- a/muyu-modules/muyu-kvt/muyu-kvt-common/src/main/java/com/muyu/kvt/domain/ChildrenList.java +++ b/muyu-modules/muyu-dataSource/muyu-dataSource-common/src/main/java/com/muyu/source/domain/ChildrenList.java @@ -1,4 +1,4 @@ -package com.muyu.kvt.domain; +package com.muyu.source.domain; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/muyu-modules/muyu-kvt/muyu-kvt-common/src/main/java/com/muyu/kvt/domain/DataAuthorization.java b/muyu-modules/muyu-dataSource/muyu-dataSource-common/src/main/java/com/muyu/source/domain/DataAuthorization.java similarity index 95% rename from muyu-modules/muyu-kvt/muyu-kvt-common/src/main/java/com/muyu/kvt/domain/DataAuthorization.java rename to muyu-modules/muyu-dataSource/muyu-dataSource-common/src/main/java/com/muyu/source/domain/DataAuthorization.java index 31a53c5..6e83e4b 100644 --- a/muyu-modules/muyu-kvt/muyu-kvt-common/src/main/java/com/muyu/kvt/domain/DataAuthorization.java +++ b/muyu-modules/muyu-dataSource/muyu-dataSource-common/src/main/java/com/muyu/source/domain/DataAuthorization.java @@ -1,4 +1,4 @@ -package com.muyu.kvt.domain; +package com.muyu.source.domain; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/muyu-modules/muyu-kvt/muyu-kvt-common/src/main/java/com/muyu/kvt/domain/DataStructure.java b/muyu-modules/muyu-dataSource/muyu-dataSource-common/src/main/java/com/muyu/source/domain/DataStructure.java similarity index 97% rename from muyu-modules/muyu-kvt/muyu-kvt-common/src/main/java/com/muyu/kvt/domain/DataStructure.java rename to muyu-modules/muyu-dataSource/muyu-dataSource-common/src/main/java/com/muyu/source/domain/DataStructure.java index 29a095e..065d1c5 100644 --- a/muyu-modules/muyu-kvt/muyu-kvt-common/src/main/java/com/muyu/kvt/domain/DataStructure.java +++ b/muyu-modules/muyu-dataSource/muyu-dataSource-common/src/main/java/com/muyu/source/domain/DataStructure.java @@ -1,4 +1,4 @@ -package com.muyu.kvt.domain; +package com.muyu.source.domain; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/muyu-modules/muyu-kvt/muyu-kvt-common/src/main/java/com/muyu/kvt/domain/DataType.java b/muyu-modules/muyu-dataSource/muyu-dataSource-common/src/main/java/com/muyu/source/domain/DataType.java similarity index 89% rename from muyu-modules/muyu-kvt/muyu-kvt-common/src/main/java/com/muyu/kvt/domain/DataType.java rename to muyu-modules/muyu-dataSource/muyu-dataSource-common/src/main/java/com/muyu/source/domain/DataType.java index 9d62c5b..163c439 100644 --- a/muyu-modules/muyu-kvt/muyu-kvt-common/src/main/java/com/muyu/kvt/domain/DataType.java +++ b/muyu-modules/muyu-dataSource/muyu-dataSource-common/src/main/java/com/muyu/source/domain/DataType.java @@ -1,4 +1,4 @@ -package com.muyu.kvt.domain; +package com.muyu.source.domain; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/muyu-modules/muyu-kvt/muyu-kvt-common/src/main/java/com/muyu/kvt/domain/Kvt.java b/muyu-modules/muyu-dataSource/muyu-dataSource-common/src/main/java/com/muyu/source/domain/Kvt.java similarity index 97% rename from muyu-modules/muyu-kvt/muyu-kvt-common/src/main/java/com/muyu/kvt/domain/Kvt.java rename to muyu-modules/muyu-dataSource/muyu-dataSource-common/src/main/java/com/muyu/source/domain/Kvt.java index 0ac85ca..aba0ec6 100644 --- a/muyu-modules/muyu-kvt/muyu-kvt-common/src/main/java/com/muyu/kvt/domain/Kvt.java +++ b/muyu-modules/muyu-dataSource/muyu-dataSource-common/src/main/java/com/muyu/source/domain/Kvt.java @@ -1,4 +1,4 @@ -package com.muyu.kvt.domain; +package com.muyu.source.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; @@ -6,9 +6,9 @@ import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import com.muyu.common.core.annotation.Excel; import com.muyu.common.core.web.domain.BaseEntity; -import com.muyu.kvt.domain.req.KvtEditReq; -import com.muyu.kvt.domain.req.KvtQueryReq; -import com.muyu.kvt.domain.req.KvtSaveReq; +import com.muyu.source.domain.req.KvtEditReq; +import com.muyu.source.domain.req.KvtQueryReq; +import com.muyu.source.domain.req.KvtSaveReq; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; diff --git a/muyu-modules/muyu-kvt/muyu-kvt-common/src/main/java/com/muyu/kvt/domain/Structure.java b/muyu-modules/muyu-dataSource/muyu-dataSource-common/src/main/java/com/muyu/source/domain/Structure.java similarity index 96% rename from muyu-modules/muyu-kvt/muyu-kvt-common/src/main/java/com/muyu/kvt/domain/Structure.java rename to muyu-modules/muyu-dataSource/muyu-dataSource-common/src/main/java/com/muyu/source/domain/Structure.java index 4bd688e..1617735 100644 --- a/muyu-modules/muyu-kvt/muyu-kvt-common/src/main/java/com/muyu/kvt/domain/Structure.java +++ b/muyu-modules/muyu-dataSource/muyu-dataSource-common/src/main/java/com/muyu/source/domain/Structure.java @@ -1,4 +1,4 @@ -package com.muyu.kvt.domain; +package com.muyu.source.domain; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/muyu-modules/muyu-kvt/muyu-kvt-common/src/main/java/com/muyu/kvt/domain/Synchronization.java b/muyu-modules/muyu-dataSource/muyu-dataSource-common/src/main/java/com/muyu/source/domain/Synchronization.java similarity index 98% rename from muyu-modules/muyu-kvt/muyu-kvt-common/src/main/java/com/muyu/kvt/domain/Synchronization.java rename to muyu-modules/muyu-dataSource/muyu-dataSource-common/src/main/java/com/muyu/source/domain/Synchronization.java index d9d8fae..148abe3 100644 --- a/muyu-modules/muyu-kvt/muyu-kvt-common/src/main/java/com/muyu/kvt/domain/Synchronization.java +++ b/muyu-modules/muyu-dataSource/muyu-dataSource-common/src/main/java/com/muyu/source/domain/Synchronization.java @@ -1,4 +1,4 @@ -package com.muyu.kvt.domain; +package com.muyu.source.domain; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/muyu-modules/muyu-kvt/muyu-kvt-common/src/main/java/com/muyu/kvt/domain/Tables.java b/muyu-modules/muyu-dataSource/muyu-dataSource-common/src/main/java/com/muyu/source/domain/Tables.java similarity index 89% rename from muyu-modules/muyu-kvt/muyu-kvt-common/src/main/java/com/muyu/kvt/domain/Tables.java rename to muyu-modules/muyu-dataSource/muyu-dataSource-common/src/main/java/com/muyu/source/domain/Tables.java index c93f3f1..5f56766 100644 --- a/muyu-modules/muyu-kvt/muyu-kvt-common/src/main/java/com/muyu/kvt/domain/Tables.java +++ b/muyu-modules/muyu-dataSource/muyu-dataSource-common/src/main/java/com/muyu/source/domain/Tables.java @@ -1,4 +1,4 @@ -package com.muyu.kvt.domain; +package com.muyu.source.domain; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/muyu-modules/muyu-kvt/muyu-kvt-common/src/main/java/com/muyu/kvt/domain/User.java b/muyu-modules/muyu-dataSource/muyu-dataSource-common/src/main/java/com/muyu/source/domain/User.java similarity index 88% rename from muyu-modules/muyu-kvt/muyu-kvt-common/src/main/java/com/muyu/kvt/domain/User.java rename to muyu-modules/muyu-dataSource/muyu-dataSource-common/src/main/java/com/muyu/source/domain/User.java index 17778c4..d0aba23 100644 --- a/muyu-modules/muyu-kvt/muyu-kvt-common/src/main/java/com/muyu/kvt/domain/User.java +++ b/muyu-modules/muyu-dataSource/muyu-dataSource-common/src/main/java/com/muyu/source/domain/User.java @@ -1,4 +1,4 @@ -package com.muyu.kvt.domain; +package com.muyu.source.domain; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/muyu-modules/muyu-kvt/muyu-kvt-common/src/main/java/com/muyu/kvt/domain/req/KvtEditReq.java b/muyu-modules/muyu-dataSource/muyu-dataSource-common/src/main/java/com/muyu/source/domain/req/KvtEditReq.java similarity index 98% rename from muyu-modules/muyu-kvt/muyu-kvt-common/src/main/java/com/muyu/kvt/domain/req/KvtEditReq.java rename to muyu-modules/muyu-dataSource/muyu-dataSource-common/src/main/java/com/muyu/source/domain/req/KvtEditReq.java index 54c52d3..e9d4068 100644 --- a/muyu-modules/muyu-kvt/muyu-kvt-common/src/main/java/com/muyu/kvt/domain/req/KvtEditReq.java +++ b/muyu-modules/muyu-dataSource/muyu-dataSource-common/src/main/java/com/muyu/source/domain/req/KvtEditReq.java @@ -1,4 +1,4 @@ -package com.muyu.kvt.domain.req; +package com.muyu.source.domain.req; import com.fasterxml.jackson.annotation.JsonFormat; import com.muyu.common.core.web.domain.BaseEntity; diff --git a/muyu-modules/muyu-kvt/muyu-kvt-common/src/main/java/com/muyu/kvt/domain/req/KvtQueryReq.java b/muyu-modules/muyu-dataSource/muyu-dataSource-common/src/main/java/com/muyu/source/domain/req/KvtQueryReq.java similarity index 98% rename from muyu-modules/muyu-kvt/muyu-kvt-common/src/main/java/com/muyu/kvt/domain/req/KvtQueryReq.java rename to muyu-modules/muyu-dataSource/muyu-dataSource-common/src/main/java/com/muyu/source/domain/req/KvtQueryReq.java index 6616e2d..10449a2 100644 --- a/muyu-modules/muyu-kvt/muyu-kvt-common/src/main/java/com/muyu/kvt/domain/req/KvtQueryReq.java +++ b/muyu-modules/muyu-dataSource/muyu-dataSource-common/src/main/java/com/muyu/source/domain/req/KvtQueryReq.java @@ -1,4 +1,4 @@ -package com.muyu.kvt.domain.req; +package com.muyu.source.domain.req; import com.fasterxml.jackson.annotation.JsonFormat; import com.muyu.common.core.web.domain.BaseEntity; diff --git a/muyu-modules/muyu-kvt/muyu-kvt-common/src/main/java/com/muyu/kvt/domain/req/KvtSaveReq.java b/muyu-modules/muyu-dataSource/muyu-dataSource-common/src/main/java/com/muyu/source/domain/req/KvtSaveReq.java similarity index 98% rename from muyu-modules/muyu-kvt/muyu-kvt-common/src/main/java/com/muyu/kvt/domain/req/KvtSaveReq.java rename to muyu-modules/muyu-dataSource/muyu-dataSource-common/src/main/java/com/muyu/source/domain/req/KvtSaveReq.java index 80cccf0..b0520bd 100644 --- a/muyu-modules/muyu-kvt/muyu-kvt-common/src/main/java/com/muyu/kvt/domain/req/KvtSaveReq.java +++ b/muyu-modules/muyu-dataSource/muyu-dataSource-common/src/main/java/com/muyu/source/domain/req/KvtSaveReq.java @@ -1,4 +1,4 @@ -package com.muyu.kvt.domain.req; +package com.muyu.source.domain.req; import com.fasterxml.jackson.annotation.JsonFormat; import com.muyu.common.core.web.domain.BaseEntity; diff --git a/muyu-modules/muyu-kvt/muyu-kvt-common/src/main/java/com/muyu/kvt/permissions/PermissionsUser.java b/muyu-modules/muyu-dataSource/muyu-dataSource-common/src/main/java/com/muyu/source/permissions/PermissionsUser.java similarity index 94% rename from muyu-modules/muyu-kvt/muyu-kvt-common/src/main/java/com/muyu/kvt/permissions/PermissionsUser.java rename to muyu-modules/muyu-dataSource/muyu-dataSource-common/src/main/java/com/muyu/source/permissions/PermissionsUser.java index b124dfc..0304a30 100644 --- a/muyu-modules/muyu-kvt/muyu-kvt-common/src/main/java/com/muyu/kvt/permissions/PermissionsUser.java +++ b/muyu-modules/muyu-dataSource/muyu-dataSource-common/src/main/java/com/muyu/source/permissions/PermissionsUser.java @@ -1,4 +1,4 @@ -package com.muyu.kvt.permissions; +package com.muyu.source.permissions; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/muyu-modules/muyu-kvt/muyu-kvt-remote/pom.xml b/muyu-modules/muyu-dataSource/muyu-dataSource-remote/pom.xml similarity index 85% rename from muyu-modules/muyu-kvt/muyu-kvt-remote/pom.xml rename to muyu-modules/muyu-dataSource/muyu-dataSource-remote/pom.xml index f9ae853..0612c82 100644 --- a/muyu-modules/muyu-kvt/muyu-kvt-remote/pom.xml +++ b/muyu-modules/muyu-dataSource/muyu-dataSource-remote/pom.xml @@ -5,11 +5,11 @@ 4.0.0 com.muyu - muyu-kvt + muyu-dataSource 3.6.3 - muyu-kvt-remote + muyu-dataSource-remote 17 @@ -24,7 +24,7 @@ com.muyu - muyu-kvt-common + muyu-dataSource-common 3.6.3 compile diff --git a/muyu-modules/muyu-kvt/muyu-kvt-remote/src/main/java/com/muyu/kvt/remote/RemoteDataManagerService.java b/muyu-modules/muyu-dataSource/muyu-dataSource-remote/src/main/java/com/muyu/source/remote/RemoteDataManagerService.java similarity index 82% rename from muyu-modules/muyu-kvt/muyu-kvt-remote/src/main/java/com/muyu/kvt/remote/RemoteDataManagerService.java rename to muyu-modules/muyu-dataSource/muyu-dataSource-remote/src/main/java/com/muyu/source/remote/RemoteDataManagerService.java index 3c327a2..964e090 100644 --- a/muyu-modules/muyu-kvt/muyu-kvt-remote/src/main/java/com/muyu/kvt/remote/RemoteDataManagerService.java +++ b/muyu-modules/muyu-dataSource/muyu-dataSource-remote/src/main/java/com/muyu/source/remote/RemoteDataManagerService.java @@ -1,9 +1,9 @@ -package com.muyu.kvt.remote; +package com.muyu.source.remote; import com.muyu.common.core.constant.ServiceNameConstants; import com.muyu.common.core.domain.Result; -import com.muyu.kvt.domain.Kvt; -import com.muyu.kvt.remote.factory.DataManagerFactory; +import com.muyu.source.domain.Kvt; +import com.muyu.source.remote.factory.DataManagerFactory; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PostMapping; diff --git a/muyu-modules/muyu-kvt/muyu-kvt-remote/src/main/java/com/muyu/kvt/remote/factory/DataManagerFactory.java b/muyu-modules/muyu-dataSource/muyu-dataSource-remote/src/main/java/com/muyu/source/remote/factory/DataManagerFactory.java similarity index 82% rename from muyu-modules/muyu-kvt/muyu-kvt-remote/src/main/java/com/muyu/kvt/remote/factory/DataManagerFactory.java rename to muyu-modules/muyu-dataSource/muyu-dataSource-remote/src/main/java/com/muyu/source/remote/factory/DataManagerFactory.java index 68edf65..aa88da3 100644 --- a/muyu-modules/muyu-kvt/muyu-kvt-remote/src/main/java/com/muyu/kvt/remote/factory/DataManagerFactory.java +++ b/muyu-modules/muyu-dataSource/muyu-dataSource-remote/src/main/java/com/muyu/source/remote/factory/DataManagerFactory.java @@ -1,9 +1,9 @@ -package com.muyu.kvt.remote.factory; +package com.muyu.source.remote.factory; import com.muyu.common.core.domain.Result; -import com.muyu.kvt.domain.Kvt; -import com.muyu.kvt.remote.RemoteDataManagerService; +import com.muyu.source.domain.Kvt; +import com.muyu.source.remote.RemoteDataManagerService; import org.springframework.cloud.openfeign.FallbackFactory; import org.springframework.stereotype.Component; diff --git a/muyu-modules/muyu-dataSource/muyu-dataSource-remote/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/muyu-modules/muyu-dataSource/muyu-dataSource-remote/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..1d15c89 --- /dev/null +++ b/muyu-modules/muyu-dataSource/muyu-dataSource-remote/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +com.muyu.source.remote.factory.DataManagerFactory diff --git a/muyu-modules/muyu-kvt/muyu-kvt-server/pom.xml b/muyu-modules/muyu-dataSource/muyu-dataSource-server/pom.xml similarity index 94% rename from muyu-modules/muyu-kvt/muyu-kvt-server/pom.xml rename to muyu-modules/muyu-dataSource/muyu-dataSource-server/pom.xml index d4554f5..178a938 100644 --- a/muyu-modules/muyu-kvt/muyu-kvt-server/pom.xml +++ b/muyu-modules/muyu-dataSource/muyu-dataSource-server/pom.xml @@ -5,11 +5,11 @@ 4.0.0 com.muyu - muyu-kvt + muyu-dataSource 3.6.3 - muyu-kvt-server + muyu-dataSource-server 17 @@ -85,13 +85,13 @@ com.muyu - muyu-kvt-common + muyu-dataSource-common 3.6.3 compile com.muyu - muyu-kvt-remote + muyu-dataSource-remote 3.6.3 compile diff --git a/muyu-modules/muyu-kvt/muyu-kvt-server/src/main/java/com/muyu/kvt/MuyuApplication.java b/muyu-modules/muyu-dataSource/muyu-dataSource-server/src/main/java/com/muyu/source/MuyuApplication.java similarity index 96% rename from muyu-modules/muyu-kvt/muyu-kvt-server/src/main/java/com/muyu/kvt/MuyuApplication.java rename to muyu-modules/muyu-dataSource/muyu-dataSource-server/src/main/java/com/muyu/source/MuyuApplication.java index eef5aa5..db8b46a 100644 --- a/muyu-modules/muyu-kvt/muyu-kvt-server/src/main/java/com/muyu/kvt/MuyuApplication.java +++ b/muyu-modules/muyu-dataSource/muyu-dataSource-server/src/main/java/com/muyu/source/MuyuApplication.java @@ -1,4 +1,4 @@ -package com.muyu.kvt; +package com.muyu.source; import com.muyu.common.security.annotation.EnableCustomConfig; import com.muyu.common.security.annotation.EnableMyFeignClients; diff --git a/muyu-modules/muyu-kvt/muyu-kvt-server/src/main/java/com/muyu/kvt/controller/KvtController.java b/muyu-modules/muyu-dataSource/muyu-dataSource-server/src/main/java/com/muyu/source/controller/KvtController.java similarity index 95% rename from muyu-modules/muyu-kvt/muyu-kvt-server/src/main/java/com/muyu/kvt/controller/KvtController.java rename to muyu-modules/muyu-dataSource/muyu-dataSource-server/src/main/java/com/muyu/source/controller/KvtController.java index 01e9bd6..f99f221 100644 --- a/muyu-modules/muyu-kvt/muyu-kvt-server/src/main/java/com/muyu/kvt/controller/KvtController.java +++ b/muyu-modules/muyu-dataSource/muyu-dataSource-server/src/main/java/com/muyu/source/controller/KvtController.java @@ -1,4 +1,4 @@ -package com.muyu.kvt.controller; +package com.muyu.source.controller; import com.muyu.common.core.domain.Result; import com.muyu.common.core.utils.poi.ExcelUtil; @@ -8,17 +8,17 @@ import com.muyu.common.log.annotation.Log; import com.muyu.common.log.enums.BusinessType; import com.muyu.common.security.annotation.RequiresPermissions; import com.muyu.common.system.domain.SysDept; -import com.muyu.kvt.dataStructure.OverallDataStructure; -import com.muyu.kvt.datadisplay.DataDisplay; -import com.muyu.kvt.dictionary.Diction; -import com.muyu.kvt.dictionary.DictionaryType; -import com.muyu.kvt.dictionary.Dictionaryy; -import com.muyu.kvt.domain.*; -import com.muyu.kvt.domain.req.KvtEditReq; -import com.muyu.kvt.domain.req.KvtQueryReq; -import com.muyu.kvt.domain.req.KvtSaveReq; -import com.muyu.kvt.permissions.PermissionsUser; -import com.muyu.kvt.service.KvtService; +import com.muyu.source.dataStructure.OverallDataStructure; +import com.muyu.source.datadisplay.DataDisplay; +import com.muyu.source.dictionary.Diction; +import com.muyu.source.dictionary.DictionaryType; +import com.muyu.source.dictionary.Dictionaryy; +import com.muyu.source.domain.*; +import com.muyu.source.domain.req.KvtEditReq; +import com.muyu.source.domain.req.KvtQueryReq; +import com.muyu.source.domain.req.KvtSaveReq; +import com.muyu.source.permissions.PermissionsUser; +import com.muyu.source.service.KvtService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; diff --git a/muyu-modules/muyu-kvt/muyu-kvt-server/src/main/java/com/muyu/kvt/mapper/KvtMapper.java b/muyu-modules/muyu-dataSource/muyu-dataSource-server/src/main/java/com/muyu/source/mapper/KvtMapper.java similarity index 87% rename from muyu-modules/muyu-kvt/muyu-kvt-server/src/main/java/com/muyu/kvt/mapper/KvtMapper.java rename to muyu-modules/muyu-dataSource/muyu-dataSource-server/src/main/java/com/muyu/source/mapper/KvtMapper.java index 0fe4c93..0d4009f 100644 --- a/muyu-modules/muyu-kvt/muyu-kvt-server/src/main/java/com/muyu/kvt/mapper/KvtMapper.java +++ b/muyu-modules/muyu-dataSource/muyu-dataSource-server/src/main/java/com/muyu/source/mapper/KvtMapper.java @@ -1,15 +1,15 @@ -package com.muyu.kvt.mapper; +package com.muyu.source.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.muyu.common.system.domain.SysDept; -import com.muyu.kvt.datadisplay.DataDisplay; -import com.muyu.kvt.dept.DataSource; -import com.muyu.kvt.dept.DeptUserKvt; -import com.muyu.kvt.dictionary.Diction; -import com.muyu.kvt.dictionary.DictionaryType; -import com.muyu.kvt.dictionary.Dictionaryy; -import com.muyu.kvt.domain.*; -import com.muyu.kvt.permissions.PermissionsUser; +import com.muyu.source.datadisplay.DataDisplay; +import com.muyu.source.dept.DataSource; +import com.muyu.source.dept.DeptUserKvt; +import com.muyu.source.dictionary.Diction; +import com.muyu.source.dictionary.DictionaryType; +import com.muyu.source.dictionary.Dictionaryy; +import com.muyu.source.domain.*; +import com.muyu.source.permissions.PermissionsUser; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/muyu-modules/muyu-kvt/muyu-kvt-server/src/main/java/com/muyu/kvt/service/KvtService.java b/muyu-modules/muyu-dataSource/muyu-dataSource-server/src/main/java/com/muyu/source/service/KvtService.java similarity index 84% rename from muyu-modules/muyu-kvt/muyu-kvt-server/src/main/java/com/muyu/kvt/service/KvtService.java rename to muyu-modules/muyu-dataSource/muyu-dataSource-server/src/main/java/com/muyu/source/service/KvtService.java index eca31ab..c6fb352 100644 --- a/muyu-modules/muyu-kvt/muyu-kvt-server/src/main/java/com/muyu/kvt/service/KvtService.java +++ b/muyu-modules/muyu-dataSource/muyu-dataSource-server/src/main/java/com/muyu/source/service/KvtService.java @@ -1,15 +1,15 @@ -package com.muyu.kvt.service; +package com.muyu.source.service; import com.baomidou.mybatisplus.extension.service.IService; import com.muyu.common.core.domain.Result; import com.muyu.common.system.domain.SysDept; -import com.muyu.kvt.dataStructure.OverallDataStructure; -import com.muyu.kvt.datadisplay.DataDisplay; -import com.muyu.kvt.dictionary.Diction; -import com.muyu.kvt.dictionary.DictionaryType; -import com.muyu.kvt.dictionary.Dictionaryy; -import com.muyu.kvt.domain.*; -import com.muyu.kvt.permissions.PermissionsUser; +import com.muyu.source.dataStructure.OverallDataStructure; +import com.muyu.source.datadisplay.DataDisplay; +import com.muyu.source.dictionary.Diction; +import com.muyu.source.dictionary.DictionaryType; +import com.muyu.source.dictionary.Dictionaryy; +import com.muyu.source.domain.*; +import com.muyu.source.permissions.PermissionsUser; import org.apache.ibatis.annotations.Param; import java.sql.SQLException; diff --git a/muyu-modules/muyu-kvt/muyu-kvt-server/src/main/java/com/muyu/kvt/service/impl/KvtServiceImpl.java b/muyu-modules/muyu-dataSource/muyu-dataSource-server/src/main/java/com/muyu/source/service/impl/KvtServiceImpl.java similarity index 98% rename from muyu-modules/muyu-kvt/muyu-kvt-server/src/main/java/com/muyu/kvt/service/impl/KvtServiceImpl.java rename to muyu-modules/muyu-dataSource/muyu-dataSource-server/src/main/java/com/muyu/source/service/impl/KvtServiceImpl.java index 6701d6b..12e0fa6 100644 --- a/muyu-modules/muyu-kvt/muyu-kvt-server/src/main/java/com/muyu/kvt/service/impl/KvtServiceImpl.java +++ b/muyu-modules/muyu-dataSource/muyu-dataSource-server/src/main/java/com/muyu/source/service/impl/KvtServiceImpl.java @@ -1,4 +1,4 @@ -package com.muyu.kvt.service.impl; +package com.muyu.source.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -8,16 +8,16 @@ import com.muyu.common.security.utils.SecurityUtils; import com.muyu.common.system.domain.SysDept; import com.muyu.common.system.domain.SysUser; import com.muyu.common.system.remote.RemoteUserService; -import com.muyu.kvt.dataStructure.OverallDataStructure; -import com.muyu.kvt.datadisplay.DataDisplay; -import com.muyu.kvt.dept.DeptUserKvt; -import com.muyu.kvt.dictionary.Diction; -import com.muyu.kvt.dictionary.DictionaryType; -import com.muyu.kvt.dictionary.Dictionaryy; -import com.muyu.kvt.domain.*; -import com.muyu.kvt.mapper.KvtMapper; -import com.muyu.kvt.permissions.PermissionsUser; -import com.muyu.kvt.service.KvtService; +import com.muyu.source.dataStructure.OverallDataStructure; +import com.muyu.source.datadisplay.DataDisplay; +import com.muyu.source.dept.DeptUserKvt; +import com.muyu.source.dictionary.Diction; +import com.muyu.source.dictionary.DictionaryType; +import com.muyu.source.dictionary.Dictionaryy; +import com.muyu.source.domain.*; +import com.muyu.source.mapper.KvtMapper; +import com.muyu.source.permissions.PermissionsUser; +import com.muyu.source.service.KvtService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Async; diff --git a/muyu-modules/muyu-kvt/muyu-kvt-server/src/main/resources/banner.txt b/muyu-modules/muyu-dataSource/muyu-dataSource-server/src/main/resources/banner.txt similarity index 100% rename from muyu-modules/muyu-kvt/muyu-kvt-server/src/main/resources/banner.txt rename to muyu-modules/muyu-dataSource/muyu-dataSource-server/src/main/resources/banner.txt diff --git a/muyu-modules/muyu-kvt/muyu-kvt-server/src/main/resources/bootstrap.yml b/muyu-modules/muyu-dataSource/muyu-dataSource-server/src/main/resources/bootstrap.yml similarity index 91% rename from muyu-modules/muyu-kvt/muyu-kvt-server/src/main/resources/bootstrap.yml rename to muyu-modules/muyu-dataSource/muyu-dataSource-server/src/main/resources/bootstrap.yml index e1fd787..7357ffc 100644 --- a/muyu-modules/muyu-kvt/muyu-kvt-server/src/main/resources/bootstrap.yml +++ b/muyu-modules/muyu-dataSource/muyu-dataSource-server/src/main/resources/bootstrap.yml @@ -8,7 +8,7 @@ spring: allow-circular-references: true application: # 应用名称 - name: muyu-kvt + name: muyu-source profiles: # 环境配置 active: dev @@ -28,4 +28,4 @@ spring: - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} logging: level: - com.muyu.kvt.mapper: DEBUG + com.muyu.source.mapper: DEBUG diff --git a/muyu-modules/muyu-kvt/muyu-kvt-server/src/main/resources/logback.xml b/muyu-modules/muyu-dataSource/muyu-dataSource-server/src/main/resources/logback.xml similarity index 100% rename from muyu-modules/muyu-kvt/muyu-kvt-server/src/main/resources/logback.xml rename to muyu-modules/muyu-dataSource/muyu-dataSource-server/src/main/resources/logback.xml diff --git a/muyu-modules/muyu-kvt/muyu-kvt-server/src/main/resources/mapper/kvt/KvtMapper.xml b/muyu-modules/muyu-dataSource/muyu-dataSource-server/src/main/resources/mapper/source/KvtMapper.xml similarity index 85% rename from muyu-modules/muyu-kvt/muyu-kvt-server/src/main/resources/mapper/kvt/KvtMapper.xml rename to muyu-modules/muyu-dataSource/muyu-dataSource-server/src/main/resources/mapper/source/KvtMapper.xml index d739b8a..c71326b 100644 --- a/muyu-modules/muyu-kvt/muyu-kvt-server/src/main/resources/mapper/kvt/KvtMapper.xml +++ b/muyu-modules/muyu-dataSource/muyu-dataSource-server/src/main/resources/mapper/source/KvtMapper.xml @@ -2,9 +2,9 @@ - + - + @@ -73,16 +73,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select * from data_type - select * from kvt where name =#{name} - select * from synchronization - SELECT TABLE_NAME as 'name', TABLE_COMMENT as 'as', @@ -92,10 +92,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" TABLE_SCHEMA = #{databaseName} - select * from kvt where database_name =#{databaseName} - SELECT TABLE_NAME AS 'tableName', @@ -148,11 +148,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" -- AND TABLE_NAME = #{name} - select * from data_structure where table_name =#{tableName} - select * from child where name =#{tableName} @@ -168,47 +168,47 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" TABLE_SCHEMA = #{databaseName} - select * from dictionary_type where type =#{type} - SELECT dictionary_type.*, dictionary.dictionary_name, dictionary.dictionary_value, dictionary.`status` FROM dictionary_type LEFT JOIN dictionary on dictionary.type = dictionary_type.type - select * from dictionary_type where data_access = #{id} - select * from dictionary where type =#{type} - select * from dictionary where id =#{id} - select * from data_structure where table_name =#{tableName} - select * from child - select * from synchronization - select * from child - select * from data_display - SELECT * FROM data_display WHERE war_name LIKE CONCAT('%', #{name}, '%'); - SELECT * FROM permissions_user - select * from permissions_user where user_id = #{userId} and kvt_id = #{kvtId} and tbale_name = #{tbaleName} @@ -217,18 +217,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select * from child - select * from data_structure where table_name=#{tableName} - select * from data_authorization where database_name=#{databaseName} - select * from data_display where table_name=#{tableName} diff --git a/muyu-modules/muyu-kvt/pom.xml b/muyu-modules/muyu-dataSource/pom.xml similarity index 75% rename from muyu-modules/muyu-kvt/pom.xml rename to muyu-modules/muyu-dataSource/pom.xml index 9b7c977..3d76bf1 100644 --- a/muyu-modules/muyu-kvt/pom.xml +++ b/muyu-modules/muyu-dataSource/pom.xml @@ -9,13 +9,13 @@ 3.6.3 - muyu-kvt + muyu-dataSource pom - muyu-kvt-common - muyu-kvt-remote - muyu-kvt-server - muyu-kvt-client + muyu-dataSource-common + muyu-dataSource-remote + muyu-dataSource-server + muyu-dataSource-client diff --git a/muyu-modules/muyu-kvt/muyu-kvt-client/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/muyu-modules/muyu-kvt/muyu-kvt-client/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index 6d2448c..0000000 --- a/muyu-modules/muyu-kvt/muyu-kvt-client/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1 +0,0 @@ -com.muyu.kvt.client.config.KvtClientConfig diff --git a/muyu-modules/muyu-kvt/muyu-kvt-remote/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/muyu-modules/muyu-kvt/muyu-kvt-remote/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index 186b74d..0000000 --- a/muyu-modules/muyu-kvt/muyu-kvt-remote/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1 +0,0 @@ -com.muyu.kvt.remote.factory.DataManagerFactory diff --git a/muyu-modules/muyu-unit/pom.xml b/muyu-modules/muyu-unit/pom.xml index 1d71d9a..3f3041a 100644 --- a/muyu-modules/muyu-unit/pom.xml +++ b/muyu-modules/muyu-unit/pom.xml @@ -24,7 +24,7 @@ com.muyu - muyu-kvt-client + muyu-dataSource-client 3.6.3 @@ -90,13 +90,13 @@ com.muyu - muyu-kvt-common + muyu-dataSource-common 3.6.3 compile com.muyu - muyu-kvt-remote + muyu-dataSource-remote 3.6.3 compile diff --git a/muyu-modules/muyu-unit/src/main/java/com/muyu/kvt/unit/DataUnitApplication.java b/muyu-modules/muyu-unit/src/main/java/com/muyu/source/unit/DataUnitApplication.java similarity index 96% rename from muyu-modules/muyu-unit/src/main/java/com/muyu/kvt/unit/DataUnitApplication.java rename to muyu-modules/muyu-unit/src/main/java/com/muyu/source/unit/DataUnitApplication.java index 523651c..3ca1833 100644 --- a/muyu-modules/muyu-unit/src/main/java/com/muyu/kvt/unit/DataUnitApplication.java +++ b/muyu-modules/muyu-unit/src/main/java/com/muyu/source/unit/DataUnitApplication.java @@ -1,4 +1,4 @@ -package com.muyu.kvt.unit; +package com.muyu.source.unit; import com.muyu.common.security.annotation.EnableCustomConfig; import com.muyu.common.security.annotation.EnableMyFeignClients; diff --git a/muyu-modules/muyu-unit/src/main/resources/bootstrap.yml b/muyu-modules/muyu-unit/src/main/resources/bootstrap.yml index e3a5624..c74afff 100644 --- a/muyu-modules/muyu-unit/src/main/resources/bootstrap.yml +++ b/muyu-modules/muyu-unit/src/main/resources/bootstrap.yml @@ -32,4 +32,4 @@ spring: - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} logging: level: - com.muyu.kvt.mapper: DEBUG + com.muyu.source.mapper: DEBUG diff --git a/muyu-modules/pom.xml b/muyu-modules/pom.xml index 6349d21..255b38e 100644 --- a/muyu-modules/pom.xml +++ b/muyu-modules/pom.xml @@ -13,7 +13,7 @@ muyu-gen muyu-job muyu-file - muyu-kvt + muyu-dataSource muyu-rule-engine muyu-unit