添加druid连接池，Flyway 数据库版本控制，及单元测试实例

Author: lzh-boy

common-utils/pom.xml

@@ -40,11 +40,11 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-redis</artifactId>
         </dependency>
-        <dependency>
+<!--        <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-elasticsearch</artifactId>
             <optional>true</optional>
-        </dependency>
+        </dependency>-->
         <dependency>
             <groupId>org.yaml</groupId>
             <artifactId>snakeyaml</artifactId>
@@ -95,13 +95,6 @@
             <artifactId>spring-web</artifactId>
             <scope>compile</scope>
         </dependency>
-        <dependency>
-            <groupId>org.elasticsearch</groupId>
-            <artifactId>elasticsearch</artifactId>
-            <version>5.6.8</version>
-            <optional>true</optional>
-        </dependency>
-
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
@@ -122,6 +115,20 @@
             <artifactId>spring-kafka</artifactId>
             <version>2.1.10.RELEASE</version>
         </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpcore</artifactId>
+            <version>4.4.9</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+            <version>4.5.5</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpasyncclient</artifactId>
+        </dependency>
         <!-- kafka end -->
     </dependencies>
     <distributionManagement>

common-utils/src/main/java/com/cskit/utils/esutils/EsTemplateService.java

@@ -1,15 +1,19 @@
+/*
 package com.cskit.utils.esutils;
 
 import org.springframework.data.elasticsearch.repository.ElasticsearchRepository;
 
 import java.io.Serializable;
 
+*/
 /**
  * @author Micro
  * @Title: ES操作
  * @Package com.cskit.utils.esutils
  * @Description: ES操作
  * @date 2018/7/20 16:47
- */
+ *//*
+
 public interface EsTemplateService<T extends  Serializable, ID extends Serializable> extends ElasticsearchRepository<T, ID> {
 }
+*/

controlplat-service/pom.xml

@@ -41,11 +41,11 @@
             <artifactId>persistence-api</artifactId>
             <version>1.0.2</version>
         </dependency>
-        <dependency>
+        <!--<dependency>
             <groupId>org.springframework.data</groupId>
             <artifactId>spring-data-elasticsearch</artifactId>
             <version>2.1.1.RELEASE</version>
-        </dependency>
+        </dependency>-->
     </dependencies>
     <repositories>
         <repository>

controlplat-service/src/main/java/com/cskit/controlplatservice/interfaces/UserInfoProvider.java

@@ -1,6 +1,6 @@
 package com.cskit.controlplatservice.interfaces;
 
-import com.cskit.controlplatservice.models.CtrlAccountModel;
+//import com.cskit.controlplatservice.models.CtrlAccountModel;
 import com.cskit.controlplatservice.models.UserInfo;
 import com.cskit.utils.responseinfo.PageInfo;
 import com.cskit.utils.responseinfo.ResponseData;
@@ -68,13 +68,13 @@ public interface UserInfoProvider {
     @GetMapping("/getuserinfobypage")
     ResponseData<PageInfo<UserInfo>> getUserInfoByPage(@RequestParam(value = "pageno", defaultValue = "1", required = false) int pageno, @RequestParam(value = "pagesize", defaultValue = "5") int pagesize);
 
-    @ApiOperation(value = "ES获取单个信息", notes = "ES获取单个信息", tags = {"ElasticSearch"})
-    @GetMapping("/getaccountfromes")
-    ResponseData<CtrlAccountModel> getAccountFromES(@RequestParam(value = "ctrlaccountid", defaultValue = "7", required = true) Long ctrlaccountid);
+//    @ApiOperation(value = "ES获取单个信息", notes = "ES获取单个信息", tags = {"ElasticSearch"})
+//    @GetMapping("/getaccountfromes")
+//    ResponseData<CtrlAccountModel> getAccountFromES(@RequestParam(value = "ctrlaccountid", defaultValue = "7", required = true) Long ctrlaccountid);
 
-    @ApiOperation(value = "获取ES分页数据", notes = "演示ES分页示例", tags = {"ElasticSearch"})
-    @GetMapping("/getpageaccountfromes")
-    PageInfo<CtrlAccountModel> getPageAccountFromES(@RequestParam(value = "pagenum", defaultValue = "0") int pagenum, @RequestParam(value = "pagesize", defaultValue = "2")  int pagesize);
+//    @ApiOperation(value = "获取ES分页数据", notes = "演示ES分页示例", tags = {"ElasticSearch"})
+//    @GetMapping("/getpageaccountfromes")
+//    PageInfo<CtrlAccountModel> getPageAccountFromES(@RequestParam(value = "pagenum", defaultValue = "0") int pagenum, @RequestParam(value = "pagesize", defaultValue = "2")  int pagesize);
 
     @ApiOperation(value = "接收内容", notes = "接收内容", tags = {"kafka"})
     @GetMapping("/kafkareceive")