升级依赖版本

febs-cloud/pom.xml

@@ -23,13 +23,13 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.1.6.RELEASE</version>
+        <version>2.1.8.RELEASE</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
 
     <properties>
         <java.version>1.8</java.version>
-        <spring-cloud.version>Greenwich.SR1</spring-cloud.version>
+        <spring-cloud.version>Greenwich.SR3</spring-cloud.version>
         <spring-cloud-alibaba.version>0.9.0.RELEASE</spring-cloud-alibaba.version>
     </properties>
 

febs-common/pom.xml

@@ -22,7 +22,7 @@
         <dependency>
             <groupId>com.alibaba</groupId>
             <artifactId>fastjson</artifactId>
-            <version>1.2.51</version>
+            <version>1.2.60</version>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
@@ -45,7 +45,7 @@
         <dependency>
             <groupId>com.baomidou</groupId>
             <artifactId>mybatis-plus-boot-starter</artifactId>
-            <version>3.1.1</version>
+            <version>3.2.0</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.cloud</groupId>

febs-common/src/main/java/cc/mrbird/febs/common/utils/SortUtil.java

@@ -3,6 +3,7 @@ package cc.mrbird.febs.common.utils;
 import cc.mrbird.febs.common.entity.FebsConstant;
 import cc.mrbird.febs.common.entity.QueryRequest;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.commons.lang3.StringUtils;
 
@@ -35,15 +36,15 @@ public class SortUtil {
                 && !StringUtils.equalsIgnoreCase(request.getField(), "null")
                 && !StringUtils.equalsIgnoreCase(request.getOrder(), "null")) {
             if (StringUtils.equals(request.getOrder(), FebsConstant.ORDER_DESC))
-                page.setDesc(sortField);
+                page.addOrder(OrderItem.desc(sortField));
             else
-                page.setAsc(sortField);
+                page.addOrder(OrderItem.asc(sortField));
         } else {
             if (StringUtils.isNotBlank(defaultSort)) {
                 if (StringUtils.equals(defaultOrder, FebsConstant.ORDER_DESC))
-                    page.setDesc(defaultSort);
+                    page.addOrder(OrderItem.desc(defaultSort));
                 else
-                    page.setAsc(defaultSort);
+                    page.addOrder(OrderItem.asc(defaultSort));
             }
         }
     }

febs-gateway/pom.xml

@@ -8,9 +8,9 @@
         <version>1.0-SNAPSHOT</version>
         <relativePath>../febs-cloud/pom.xml</relativePath>
     </parent>
-    <artifactId>febs-gateway-two</artifactId>
+    <artifactId>febs-gateway</artifactId>
     <version>1.0-SNAPSHOT</version>
-    <name>FEBS-Gateway-Two</name>
+    <name>FEBS-Gateway</name>
     <description>FEBS-Gateway服务网关模块</description>
 
     <dependencies>

febs-server/pom.xml

@@ -35,12 +35,12 @@
         <dependency>
             <groupId>com.baomidou</groupId>
             <artifactId>dynamic-datasource-spring-boot-starter</artifactId>
-            <version>2.5.4</version>
+            <version>2.5.6</version>
         </dependency>
         <dependency>
             <groupId>p6spy</groupId>
             <artifactId>p6spy</artifactId>
-            <version>3.8.1</version>
+            <version>3.8.5</version>
         </dependency>
         <dependency>
             <groupId>mysql</groupId>