feat 连接池修改为德罗伊连接池

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";
 
 
 

muyu-modules/muyu-dataSource/muyu-dataSource-client/pom.xml

@@ -5,11 +5,11 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.muyu</groupId>
-        <artifactId>muyu-kvt</artifactId>
+        <artifactId>muyu-dataSource</artifactId>
         <version>3.6.3</version>
     </parent>
 
-    <artifactId>muyu-kvt-client</artifactId>
+    <artifactId>muyu-dataSource-client</artifactId>
 
     <properties>
         <maven.compiler.source>17</maven.compiler.source>
@@ -19,7 +19,7 @@
     <dependencies>
         <dependency>
             <groupId>com.muyu</groupId>
-            <artifactId>muyu-kvt-remote</artifactId>
+            <artifactId>muyu-dataSource-remote</artifactId>
             <version>3.6.3</version>
             <scope>compile</scope>
         </dependency>

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;

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.source.client.source.DataSourceConfig;
-import com.muyu.kvt.client.pool.MysqlPool;
+import com.muyu.source.domain.Kvt;
-import com.muyu.kvt.client.pool.confilg.MysqlPoolConfig;
+import com.muyu.source.remote.RemoteDataManagerService;
-import com.muyu.kvt.client.pool.dto.SysDataSource;
-import com.muyu.kvt.domain.Kvt;
-import com.muyu.kvt.remote.RemoteDataManagerService;
 import lombok.extern.log4j.Log4j2;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.ApplicationArguments;
 import org.springframework.boot.ApplicationRunner;
 
 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<SysDataSource> list = new ArrayList<>();
+
         Result<List<Kvt>> listResult = remoteDataManagerService.selectKvt();
         List<Kvt> data = listResult.getData();
-        HashMap<String, Object> 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<Connection> 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();
+//        List<SysDataSource> list = new ArrayList<>();
-            log.info("map:{}",map);
+//        HashMap<String, Object> hashMap = new HashMap<>();
-                });
+//        data.forEach(kvt -> {
-        Connection connection = map.get("1");
+//
-        Statement statement =null;
+//                    MysqlPoolConfig build = MysqlPoolConfig.builder()
-        try{
+//                            .id(String.valueOf(kvt.getId()))
-            statement = connection.createStatement();
+//                            .ip(kvt.getHost())
-            ResultSet resultSet = statement.executeQuery("SHOW Tables");
+//                            .port(kvt.getPort())
-            while (resultSet.next()){
+//                            .databaseName(kvt.getDatabaseName())
-                String name = resultSet.getString(1);
+//                            .param(kvt.getConnectionParam())
-                log.info("name:{}",name);
+//                            .initTotal(Math.toIntExact(kvt.getInitNum()))
-            }
+//                            .maxTotal(Math.toIntExact(kvt.getMaxNum()))
-            log.info("连接成功");
+//                            .maxWaitTimes(kvt.getMaxWaitTime())
-        }catch (SQLException e){
+//                            .userName(kvt.getUsername())
-            log.error("sql错误");
+//                            .password(kvt.getPassword())
-        }
+//                            .driverName("com.mysql.cj.jdbc.Driver")
+//                            .build();
+//                    BasePool<Connection> 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();

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<String, Object> params = new HashMap<>();
 

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;
 

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

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

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<Connection> {
         this.activeMysqlQueue = new LinkedBlockingQueue<>();
         for (int i = 0; i < initTotal; i++) {
             this.mysqlConnQueue.offer(creatConnection());
+           //
             count.incrementAndGet();
         }
         log.info("Mysql连接池初始化完成");

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;
 
+
     /**
      * 获取数据库连接
      */

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;

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

muyu-modules/muyu-dataSource/muyu-dataSource-common/pom.xml

@@ -5,11 +5,11 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.muyu</groupId>
-        <artifactId>muyu-kvt</artifactId>
+        <artifactId>muyu-dataSource</artifactId>
         <version>3.6.3</version>
     </parent>
 
-    <artifactId>muyu-kvt-common</artifactId>
+    <artifactId>muyu-dataSource-common</artifactId>
 
     <properties>
         <maven.compiler.source>17</maven.compiler.source>

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;

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;

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;

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;

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;

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
  *

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
  *

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;

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;

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;

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;

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;

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;

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.source.domain.req.KvtEditReq;
-import com.muyu.kvt.domain.req.KvtQueryReq;
+import com.muyu.source.domain.req.KvtQueryReq;
-import com.muyu.kvt.domain.req.KvtSaveReq;
+import com.muyu.source.domain.req.KvtSaveReq;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;

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;

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;

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;

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;

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;

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;

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;

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;

muyu-modules/muyu-dataSource/muyu-dataSource-remote/pom.xml

@@ -5,11 +5,11 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.muyu</groupId>
-        <artifactId>muyu-kvt</artifactId>
+        <artifactId>muyu-dataSource</artifactId>
         <version>3.6.3</version>
     </parent>
 
-    <artifactId>muyu-kvt-remote</artifactId>
+    <artifactId>muyu-dataSource-remote</artifactId>
 
     <properties>
         <maven.compiler.source>17</maven.compiler.source>
@@ -24,7 +24,7 @@
         </dependency>
         <dependency>
             <groupId>com.muyu</groupId>
-            <artifactId>muyu-kvt-common</artifactId>
+            <artifactId>muyu-dataSource-common</artifactId>
             <version>3.6.3</version>
             <scope>compile</scope>
         </dependency>

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.source.domain.Kvt;
-import com.muyu.kvt.remote.factory.DataManagerFactory;
+import com.muyu.source.remote.factory.DataManagerFactory;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 

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.source.domain.Kvt;
-import com.muyu.kvt.remote.RemoteDataManagerService;
+import com.muyu.source.remote.RemoteDataManagerService;
 import org.springframework.cloud.openfeign.FallbackFactory;
 import org.springframework.stereotype.Component;
 

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

muyu-modules/muyu-dataSource/muyu-dataSource-server/pom.xml

@@ -5,11 +5,11 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.muyu</groupId>
-        <artifactId>muyu-kvt</artifactId>
+        <artifactId>muyu-dataSource</artifactId>
         <version>3.6.3</version>
     </parent>
 
-    <artifactId>muyu-kvt-server</artifactId>
+    <artifactId>muyu-dataSource-server</artifactId>
 
     <properties>
         <maven.compiler.source>17</maven.compiler.source>
@@ -85,13 +85,13 @@
 
         <dependency>
             <groupId>com.muyu</groupId>
-            <artifactId>muyu-kvt-common</artifactId>
+            <artifactId>muyu-dataSource-common</artifactId>
             <version>3.6.3</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>com.muyu</groupId>
-            <artifactId>muyu-kvt-remote</artifactId>
+            <artifactId>muyu-dataSource-remote</artifactId>
             <version>3.6.3</version>
             <scope>compile</scope>
         </dependency>

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;

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.source.dataStructure.OverallDataStructure;
-import com.muyu.kvt.datadisplay.DataDisplay;
+import com.muyu.source.datadisplay.DataDisplay;
-import com.muyu.kvt.dictionary.Diction;
+import com.muyu.source.dictionary.Diction;
-import com.muyu.kvt.dictionary.DictionaryType;
+import com.muyu.source.dictionary.DictionaryType;
-import com.muyu.kvt.dictionary.Dictionaryy;
+import com.muyu.source.dictionary.Dictionaryy;
-import com.muyu.kvt.domain.*;
+import com.muyu.source.domain.*;
-import com.muyu.kvt.domain.req.KvtEditReq;
+import com.muyu.source.domain.req.KvtEditReq;
-import com.muyu.kvt.domain.req.KvtQueryReq;
+import com.muyu.source.domain.req.KvtQueryReq;
-import com.muyu.kvt.domain.req.KvtSaveReq;
+import com.muyu.source.domain.req.KvtSaveReq;
-import com.muyu.kvt.permissions.PermissionsUser;
+import com.muyu.source.permissions.PermissionsUser;
-import com.muyu.kvt.service.KvtService;
+import com.muyu.source.service.KvtService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;

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.source.datadisplay.DataDisplay;
-import com.muyu.kvt.dept.DataSource;
+import com.muyu.source.dept.DataSource;
-import com.muyu.kvt.dept.DeptUserKvt;
+import com.muyu.source.dept.DeptUserKvt;
-import com.muyu.kvt.dictionary.Diction;
+import com.muyu.source.dictionary.Diction;
-import com.muyu.kvt.dictionary.DictionaryType;
+import com.muyu.source.dictionary.DictionaryType;
-import com.muyu.kvt.dictionary.Dictionaryy;
+import com.muyu.source.dictionary.Dictionaryy;
-import com.muyu.kvt.domain.*;
+import com.muyu.source.domain.*;
-import com.muyu.kvt.permissions.PermissionsUser;
+import com.muyu.source.permissions.PermissionsUser;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

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.source.dataStructure.OverallDataStructure;
-import com.muyu.kvt.datadisplay.DataDisplay;
+import com.muyu.source.datadisplay.DataDisplay;
-import com.muyu.kvt.dictionary.Diction;
+import com.muyu.source.dictionary.Diction;
-import com.muyu.kvt.dictionary.DictionaryType;
+import com.muyu.source.dictionary.DictionaryType;
-import com.muyu.kvt.dictionary.Dictionaryy;
+import com.muyu.source.dictionary.Dictionaryy;
-import com.muyu.kvt.domain.*;
+import com.muyu.source.domain.*;
-import com.muyu.kvt.permissions.PermissionsUser;
+import com.muyu.source.permissions.PermissionsUser;
 import org.apache.ibatis.annotations.Param;
 
 import java.sql.SQLException;

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.source.dataStructure.OverallDataStructure;
-import com.muyu.kvt.datadisplay.DataDisplay;
+import com.muyu.source.datadisplay.DataDisplay;
-import com.muyu.kvt.dept.DeptUserKvt;
+import com.muyu.source.dept.DeptUserKvt;
-import com.muyu.kvt.dictionary.Diction;
+import com.muyu.source.dictionary.Diction;
-import com.muyu.kvt.dictionary.DictionaryType;
+import com.muyu.source.dictionary.DictionaryType;
-import com.muyu.kvt.dictionary.Dictionaryy;
+import com.muyu.source.dictionary.Dictionaryy;
-import com.muyu.kvt.domain.*;
+import com.muyu.source.domain.*;
-import com.muyu.kvt.mapper.KvtMapper;
+import com.muyu.source.mapper.KvtMapper;
-import com.muyu.kvt.permissions.PermissionsUser;
+import com.muyu.source.permissions.PermissionsUser;
-import com.muyu.kvt.service.KvtService;
+import com.muyu.source.service.KvtService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Async;

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

muyu-modules/muyu-dataSource/muyu-dataSource-server/src/main/resources/mapper/source/KvtMapper.xml

@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.muyu.kvt.mapper.KvtMapper">
+<mapper namespace="com.muyu.source.mapper.KvtMapper">
 
-    <resultMap type="com.muyu.kvt.domain.Kvt" id="KvtResult">
+    <resultMap type="com.muyu.source.domain.Kvt" id="KvtResult">
         <result property="id"    column="id"    />
         <result property="name"    column="name"    />
         <result property="systemName"    column="system_name"    />
@@ -73,16 +73,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
 
-    <select id="dataTypeList" resultType="com.muyu.kvt.domain.DataType">
+    <select id="dataTypeList" resultType="com.muyu.source.domain.DataType">
         select  * from  data_type
     </select>
-    <select id="findName" resultType="com.muyu.kvt.domain.Kvt">
+    <select id="findName" resultType="com.muyu.source.domain.Kvt">
         select * from kvt where name =#{name}
     </select>
-    <select id="assetStructureList" resultType="com.muyu.kvt.domain.AssetStructureList">
+    <select id="assetStructureList" resultType="com.muyu.source.domain.AssetStructureList">
         select * from synchronization
     </select>
-    <select id="selectDepartment" resultType="com.muyu.kvt.domain.ChildrenList">
+    <select id="selectDepartment" resultType="com.muyu.source.domain.ChildrenList">
             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>
-    <select id="selectType" resultType="com.muyu.kvt.domain.Kvt">
+    <select id="selectType" resultType="com.muyu.source.domain.Kvt">
         select * from kvt where database_name =#{databaseName}
     </select>
-    <select id="selectDataStructure" resultType="com.muyu.kvt.domain.DataStructure">
+    <select id="selectDataStructure" resultType="com.muyu.source.domain.DataStructure">
 
         SELECT
             TABLE_NAME AS 'tableName',
@@ -148,11 +148,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 --           AND TABLE_NAME = #{name}
 
     </select>
-    <select id="selectDataStur" resultType="com.muyu.kvt.domain.DataStructure">
+    <select id="selectDataStur" resultType="com.muyu.source.domain.DataStructure">
         select * from data_structure where table_name =#{tableName}
     </select>
 
-    <select id="selectChild" resultType="com.muyu.kvt.domain.Child">
+    <select id="selectChild" resultType="com.muyu.source.domain.Child">
         select * from child where name =#{tableName}
     </select>
 
@@ -168,47 +168,47 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             TABLE_SCHEMA = #{databaseName}
     </select>
 
-    <select id="selectDictionaryType" resultType="com.muyu.kvt.dictionary.DictionaryType">
+    <select id="selectDictionaryType" resultType="com.muyu.source.dictionary.DictionaryType">
         select  * from dictionary_type where type =#{type}
     </select>
-    <select id="selectDictionary" resultType="com.muyu.kvt.dictionary.Diction">
+    <select id="selectDictionary" resultType="com.muyu.source.dictionary.Diction">
         SELECT dictionary_type.*, dictionary.dictionary_name, dictionary.dictionary_value, dictionary.`status`
         FROM dictionary_type
                  LEFT JOIN dictionary on dictionary.type = dictionary_type.type
 
     </select>
-    <select id="selectDictionaryy" resultType="com.muyu.kvt.dictionary.DictionaryType">
+    <select id="selectDictionaryy" resultType="com.muyu.source.dictionary.DictionaryType">
         select * from dictionary_type
         where data_access = #{id}
     </select>
-    <select id="selectDiction" resultType="com.muyu.kvt.dictionary.Dictionaryy">
+    <select id="selectDiction" resultType="com.muyu.source.dictionary.Dictionaryy">
         select * from dictionary where type =#{type}
     </select>
-    <select id="selectDictionaryTypeId" resultType="com.muyu.kvt.dictionary.Dictionaryy">
+    <select id="selectDictionaryTypeId" resultType="com.muyu.source.dictionary.Dictionaryy">
         select * from dictionary where  id =#{id}
     </select>
-    <select id="selectDataSource" resultType="com.muyu.kvt.dept.DataSource">
+    <select id="selectDataSource" resultType="com.muyu.source.dept.DataSource">
         select * from data_structure where  table_name =#{tableName}
     </select>
-    <select id="selectChildAll" resultType="com.muyu.kvt.domain.DataStructure">
+    <select id="selectChildAll" resultType="com.muyu.source.domain.DataStructure">
         select * from  child
     </select>
-    <select id="selectSyn" resultType="com.muyu.kvt.domain.Synchronization">
+    <select id="selectSyn" resultType="com.muyu.source.domain.Synchronization">
         select * from synchronization
     </select>
-    <select id="list" resultType="com.muyu.kvt.domain.Child">
+    <select id="list" resultType="com.muyu.source.domain.Child">
         select  * from child
     </select>
-    <select id="listResult" resultType="com.muyu.kvt.datadisplay.DataDisplay">
+    <select id="listResult" resultType="com.muyu.source.datadisplay.DataDisplay">
         select * from data_display
     </select>
-    <select id="selectDataDisplayName" resultType="com.muyu.kvt.datadisplay.DataDisplay">
+    <select id="selectDataDisplayName" resultType="com.muyu.source.datadisplay.DataDisplay">
         SELECT * FROM data_display WHERE war_name LIKE CONCAT('%', #{name}, '%');
     </select>
-    <select id="selectPermission" resultType="com.muyu.kvt.permissions.PermissionsUser">
+    <select id="selectPermission" resultType="com.muyu.source.permissions.PermissionsUser">
         SELECT * FROM permissions_user
     </select>
-    <select id="permissionsUserSelect" resultType="com.muyu.kvt.permissions.PermissionsUser">
+    <select id="permissionsUserSelect" resultType="com.muyu.source.permissions.PermissionsUser">
         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 id="selectTableName" resultType="java.lang.Object">
         select *  from  #{tableName}
     </select>
-    <select id="selectDataStructureAll" resultType="com.muyu.kvt.domain.DataStructure">
+    <select id="selectDataStructureAll" resultType="com.muyu.source.domain.DataStructure">
         select * from child
     </select>
 
 
-    <select id="selectDataStructureTableName" resultType="com.muyu.kvt.domain.DataStructure">
+    <select id="selectDataStructureTableName" resultType="com.muyu.source.domain.DataStructure">
         select * from data_structure where  table_name=#{tableName}
     </select>
-    <select id="selectDataDisplayList" resultType="com.muyu.kvt.domain.DataAuthorization">
+    <select id="selectDataDisplayList" resultType="com.muyu.source.domain.DataAuthorization">
         select * from data_authorization where  database_name=#{databaseName}
     </select>
-    <select id="selectDataDisplayVal" resultType="com.muyu.kvt.datadisplay.DataDisplay">
+    <select id="selectDataDisplayVal" resultType="com.muyu.source.datadisplay.DataDisplay">
         select * from data_display where  table_name=#{tableName}
     </select>
 

muyu-modules/muyu-dataSource/pom.xml

@@ -9,13 +9,13 @@
         <version>3.6.3</version>
     </parent>
 
-    <artifactId>muyu-kvt</artifactId>
+    <artifactId>muyu-dataSource</artifactId>
     <packaging>pom</packaging>
     <modules>
-        <module>muyu-kvt-common</module>
+        <module>muyu-dataSource-common</module>
-        <module>muyu-kvt-remote</module>
+        <module>muyu-dataSource-remote</module>
-        <module>muyu-kvt-server</module>
+        <module>muyu-dataSource-server</module>
-        <module>muyu-kvt-client</module>
+        <module>muyu-dataSource-client</module>
     </modules>
 
     <properties>

muyu-modules/muyu-kvt/muyu-kvt-client/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -1 +0,0 @@
-com.muyu.kvt.client.config.KvtClientConfig

muyu-modules/muyu-kvt/muyu-kvt-remote/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -1 +0,0 @@
-com.muyu.kvt.remote.factory.DataManagerFactory

muyu-modules/muyu-unit/pom.xml

@@ -24,7 +24,7 @@
         </dependency>
         <dependency>
             <groupId>com.muyu</groupId>
-            <artifactId>muyu-kvt-client</artifactId>
+            <artifactId>muyu-dataSource-client</artifactId>
             <version>3.6.3</version>
         </dependency>
         <!-- SpringCloud Alibaba Nacos -->
@@ -90,13 +90,13 @@
 
         <dependency>
             <groupId>com.muyu</groupId>
-            <artifactId>muyu-kvt-common</artifactId>
+            <artifactId>muyu-dataSource-common</artifactId>
             <version>3.6.3</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>com.muyu</groupId>
-            <artifactId>muyu-kvt-remote</artifactId>
+            <artifactId>muyu-dataSource-remote</artifactId>
             <version>3.6.3</version>
             <scope>compile</scope>
         </dependency>

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;

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

muyu-modules/pom.xml

@@ -13,7 +13,7 @@
         <module>muyu-gen</module>
         <module>muyu-job</module>
         <module>muyu-file</module>
-        <module>muyu-kvt</module>
+        <module>muyu-dataSource</module>
         <module>muyu-rule-engine</module>
         <module>muyu-unit</module>
     </modules>