Merge pull request #36 from zlt2000/dev

Dev

Author: zlt2000

README.md

@@ -133,14 +133,14 @@ central-platform -- 父项目，公共依赖
     <tr>
         <td><img alt="首页" src="https://gitee.com/zlt2000/images/raw/master/%E9%A6%96%E9%A1%B5.png"/></td>
         <td><img alt="用户搜索" src="https://gitee.com/zlt2000/images/raw/master/%E7%94%A8%E6%88%B7%E6%90%9C%E7%B4%A2.png"/></td>
+    </tr>
+    <tr>
+        <td><img alt="日志系统" src="https://gitee.com/zlt2000/images/raw/master/%E6%97%A5%E5%BF%97%E7%B3%BB%E7%BB%9F.png"/></td>
+        <td><img alt="日志链路" src="https://gitee.com/zlt2000/images/raw/master/%E6%97%A5%E5%BF%97%E9%93%BE%E8%B7%AF.png"/></td>
     </tr>
 	<tr>
         <td><img alt="server_metrics" src="https://gitee.com/zlt2000/images/raw/master/server_metrics.png"/></td>
         <td><img alt="application_metrics" src="https://gitee.com/zlt2000/images/raw/master/application_metrics.png"/></td>
-    </tr>
-	<tr>
-        <td><img alt="持续集成2" src="https://gitee.com/zlt2000/images/raw/master/%E6%8C%81%E7%BB%AD%E9%9B%86%E6%88%902.png"/></td>
-        <td><img alt="sonar结果" src="https://gitee.com/zlt2000/images/raw/master/sonar%E7%BB%93%E6%9E%9C.png"/></td>
     </tr>
     <tr>
         <td><img alt="skywalking首页.png" src="https://gitee.com/zlt2000/images/raw/master/skywalking%E9%A6%96%E9%A1%B5.png"/></td>

pom.xml

@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.zlt</groupId>
     <artifactId>central-platform</artifactId>
-    <version>5.1.0</version>
+    <version>5.2.0</version>
     <packaging>pom</packaging>
 
     <properties>
@@ -14,12 +14,9 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <java.version>8</java.version>
         <spring-cloud-alibaba-dependencies.version>2021.1</spring-cloud-alibaba-dependencies.version>
-        <spring-boot-dependencies.version>2.5.7</spring-boot-dependencies.version>
+        <spring-boot-dependencies.version>2.5.9</spring-boot-dependencies.version>
         <spring-cloud-dependencies.version>2020.0.4</spring-cloud-dependencies.version>
         <commons-collections4.version>4.4</commons-collections4.version>
-        <swagger.version>2.9.2</swagger.version>
-        <swagger.ui.version>1.8.7</swagger.ui.version>
-        <swagger.mg.ui.version>1.0.6</swagger.mg.ui.version>
         <swagger.butler.version>2.0.1</swagger.butler.version>
         <jjwt.version>0.9.1</jjwt.version>
         <druid-starter>1.2.6</druid-starter>
@@ -29,13 +26,13 @@
         <security-jwt.version>1.1.0.RELEASE</security-jwt.version>
         <redisson-starter.version>3.16.1</redisson-starter.version>
         <easyCaptcha.version>1.6.2</easyCaptcha.version>
-        <hutool.version>5.1.4</hutool.version>
+        <hutool.version>5.7.20</hutool.version>
         <mybatis-plus-boot-starter.version>3.4.0</mybatis-plus-boot-starter.version>
         <aliyun-sdk-oss>3.8.1</aliyun-sdk-oss>
         <qiniu-java-sdk>7.2.28</qiniu-java-sdk>
         <easypoi.version>4.1.3</easypoi.version>
         <poi.version>4.1.1</poi.version>
-        <spring-boot-admin.version>2.5.1</spring-boot-admin.version>
+        <spring-boot-admin.version>2.5.5</spring-boot-admin.version>
         <velocity.version>1.7</velocity.version>
         <commons-configuration2.version>2.7</commons-configuration2.version>
         <txlcn.version>5.0.2.RELEASE</txlcn.version>

zlt-business/code-generator/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.zlt</groupId>
         <artifactId>zlt-business</artifactId>
-        <version>5.1.0</version>
+        <version>5.2.0</version>
     </parent>
     <artifactId>code-generator</artifactId>
 

zlt-business/file-center/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.zlt</groupId>
         <artifactId>zlt-business</artifactId>
-        <version>5.1.0</version>
+        <version>5.2.0</version>
     </parent>
     <artifactId>file-center</artifactId>
     <description>文件中心</description>

zlt-business/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.zlt</groupId>
         <artifactId>central-platform</artifactId>
-        <version>5.1.0</version>
+        <version>5.2.0</version>
     </parent>
     <artifactId>zlt-business</artifactId>
     <description>业务中心</description>

zlt-business/search-center/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.zlt</groupId>
         <artifactId>zlt-business</artifactId>
-        <version>5.1.0</version>
+        <version>5.2.0</version>
     </parent>
     <artifactId>search-center</artifactId>
     <description>搜索中心</description>

zlt-business/search-center/search-client/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.zlt</groupId>
         <artifactId>search-center</artifactId>
-        <version>5.1.0</version>
+        <version>5.2.0</version>
     </parent>
     <artifactId>search-client</artifactId>
     <description>搜索中心客户端</description>

zlt-business/search-center/search-client/src/main/java/com/central/search/model/SearchDto.java

@@ -2,8 +2,6 @@
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import lombok.Getter;
-import lombok.Setter;
 
 import java.io.Serializable;
 
@@ -31,6 +29,10 @@ public class SearchDto implements Serializable {
      * 排序字段
      */
     private String sortCol;
+    /**
+     * 排序顺序
+     */
+    private String sortOrder = "DESC";
     /**
      * 是否显示高亮
      */

zlt-business/search-center/search-server/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.zlt</groupId>
         <artifactId>search-center</artifactId>
-        <version>5.1.0</version>
+        <version>5.2.0</version>
     </parent>
     <artifactId>search-server</artifactId>
     <description>搜索中心服务端</description>

zlt-business/search-center/search-server/src/main/java/com/central/search/service/impl/SearchServiceImpl.java

@@ -35,7 +35,7 @@ public SearchServiceImpl(RestHighLevelClient client) {
     public PageResult<JsonNode> strQuery(String indexName, SearchDto searchDto) throws IOException {
         return SearchBuilder.builder(client, indexName)
                 .setStringQuery(searchDto.getQueryStr())
-                .addSort(searchDto.getSortCol(), SortOrder.DESC)
+                .addSort(searchDto.getSortCol(), searchDto.getSortOrder())
                 .setIsHighlight(searchDto.getIsHighlighter())
                 .getPage(searchDto.getPage(), searchDto.getLimit());
     }