4dkankan-base/src/main/java/com/fdkankan/base/mq/ModelingMsgProducer.java

@@ -2,9 +2,9 @@ package com.fdkankan.base.mq;
 
 import lombok.extern.log4j.Log4j2;
 import org.springframework.amqp.core.Queue;
+import org.springframework.amqp.rabbit.connection.CorrelationData;
 import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.amqp.rabbit.core.ChannelCallback;
-import org.springframework.amqp.rabbit.support.CorrelationData;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;

4dkankan-common/src/main/java/com/fdkankan/common/api/BaseController.java

@@ -60,29 +60,29 @@ public class BaseController {
      *
      * @return
      */
-    protected PageRequest getPageRequest() {
-        int page = 0;
-        int size = 10;
-        Sort sort = null;
-        String sortName = request.getParameter("sortName");
-        String sortOrder = request.getParameter("sortOrder");
-        if (!StringUtils.isEmpty(sortName) && !StringUtils.isEmpty(sortOrder)) {
-            if (sortOrder.equalsIgnoreCase("desc")) {
-                sort = new Sort(Direction.DESC, sortName);
-            } else {
-                sort = new Sort(Direction.ASC, sortName);
-            }
-        }
-        String pageNumber = request.getParameter("pageNum");
-        if (!StringUtils.isEmpty(pageNumber)) {
-            page = Integer.parseInt(pageNumber);
-        }
-        String pageSize = request.getParameter("pageSize");
-        if (!StringUtils.isEmpty(pageSize)) {
-            size = Integer.parseInt(pageSize);
-        }
-        return new PageRequest(page, size, sort);
-    }
+//    protected PageRequest getPageRequest() {
+//        int page = 0;
+//        int size = 10;
+//        Sort sort = null;
+//        String sortName = request.getParameter("sortName");
+//        String sortOrder = request.getParameter("sortOrder");
+//        if (!StringUtils.isEmpty(sortName) && !StringUtils.isEmpty(sortOrder)) {
+//            if (sortOrder.equalsIgnoreCase("desc")) {
+//                sort = new Sort(Direction.DESC, sortName);
+//            } else {
+//                sort = new Sort(Direction.ASC, sortName);
+//            }
+//        }
+//        String pageNumber = request.getParameter("pageNum");
+//        if (!StringUtils.isEmpty(pageNumber)) {
+//            page = Integer.parseInt(pageNumber);
+//        }
+//        String pageSize = request.getParameter("pageSize");
+//        if (!StringUtils.isEmpty(pageSize)) {
+//            size = Integer.parseInt(pageSize);
+//        }
+//        return new PageRequest(page, size, sort);
+//    }
 
     /**
      * 获取分页请求
@@ -90,28 +90,28 @@ public class BaseController {
      * @param sort 排序条件
      * @return
      */
-    protected PageRequest getPageRequest(Sort sort) {
-        int page = 0;
-        int size = 10;
-        String sortName = request.getParameter("sortName");
-        String sortOrder = request.getParameter("sortOrder");
-        if (!StringUtils.isEmpty(sortName) && !StringUtils.isEmpty(sortOrder)) {
-            if (sortOrder.equalsIgnoreCase("desc")) {
-                sort.and(new Sort(Direction.DESC, sortName));
-            } else {
-                sort.and(new Sort(Direction.ASC, sortName));
-            }
-        }
-        String pageNumber = request.getParameter("pageNum");
-        if (!StringUtils.isEmpty(pageNumber)) {
-            page = Integer.parseInt(pageNumber);
-        }
-        String pageSize = request.getParameter("pageSize");
-        if (!StringUtils.isEmpty(pageSize)) {
-            size = Integer.parseInt(pageSize);
-        }
-        return new PageRequest(page, size, sort);
-    }
+//    protected PageRequest getPageRequest(Sort sort) {
+//        int page = 0;
+//        int size = 10;
+//        String sortName = request.getParameter("sortName");
+//        String sortOrder = request.getParameter("sortOrder");
+//        if (!StringUtils.isEmpty(sortName) && !StringUtils.isEmpty(sortOrder)) {
+//            if (sortOrder.equalsIgnoreCase("desc")) {
+//                sort.and(new Sort(Direction.DESC, sortName));
+//            } else {
+//                sort.and(new Sort(Direction.ASC, sortName));
+//            }
+//        }
+//        String pageNumber = request.getParameter("pageNum");
+//        if (!StringUtils.isEmpty(pageNumber)) {
+//            page = Integer.parseInt(pageNumber);
+//        }
+//        String pageSize = request.getParameter("pageSize");
+//        if (!StringUtils.isEmpty(pageSize)) {
+//            size = Integer.parseInt(pageSize);
+//        }
+//        return new PageRequest(page, size, sort);
+//    }
 
     public static void output(HttpServletResponse resp, File file) {
         OutputStream os = null;

pom.xml

@@ -51,13 +51,13 @@
         <fdkankan.zuul.version>1.0.0</fdkankan.zuul.version>
 
         <!-- spring boot -->
-        <spring.boot.version>2.1.0.RELEASE</spring.boot.version>
-        <spring-boot-starter.version>2.1.0.RELEASE</spring-boot-starter.version>
+        <spring.boot.version>2.3.4.RELEASE</spring.boot.version>
+        <spring-boot-starter.version>2.3.4.RELEASE</spring-boot-starter.version>
 
         <!-- spring -->
-        <spring.version>5.1.5.RELEASE</spring.version>
-        <spring-amqp.version>2.0.6.RELEASE</spring-amqp.version>
-        <spring-data.version>2.1.0.RELEASE</spring-data.version>
+        <spring.version>5.2.8.RELEASE</spring.version>
+        <!--<spring-amqp.version>2.1.6.RELEASE</spring-amqp.version>-->
+        <!--<spring-data.version>2.1.0.RELEASE</spring-data.version>-->
 
         <apollo.version>1.1.0</apollo.version>
         <aliyun.core.version>4.0.3</aliyun.core.version>
@@ -78,7 +78,7 @@
 
         <httpclient.version>4.5.3</httpclient.version>
 
-        <jackson.version>2.9.2</jackson.version>
+        <jackson.version>2.10.1</jackson.version>
         <javax.servlet-api.version>4.0.1</javax.servlet-api.version>
         <javax-validation.version>2.0.1.Final</javax-validation.version>
         <jedis.version>2.9.0</jedis.version>
@@ -266,21 +266,21 @@
                 <artifactId>spring-webmvc</artifactId>
                 <version>${spring.version}</version>
             </dependency>
-            <dependency>
-                <groupId>org.springframework.amqp</groupId>
-                <artifactId>spring-amqp</artifactId>
-                <version>${spring-amqp.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.springframework.amqp</groupId>
-                <artifactId>spring-rabbit</artifactId>
-                <version>${spring-amqp.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.springframework.data</groupId>
-                <artifactId>spring-data-redis</artifactId>
-                <version>${spring-data.version}</version>
-            </dependency>
+            <!--<dependency>-->
+                <!--<groupId>org.springframework.amqp</groupId>-->
+                <!--<artifactId>spring-amqp</artifactId>-->
+                <!--<version>${spring-amqp.version}</version>-->
+            <!--</dependency>-->
+            <!--<dependency>-->
+                <!--<groupId>org.springframework.amqp</groupId>-->
+                <!--<artifactId>spring-rabbit</artifactId>-->
+                <!--<version>${spring-amqp.version}</version>-->
+            <!--</dependency>-->
+            <!--<dependency>-->
+                <!--<groupId>org.springframework.data</groupId>-->
+                <!--<artifactId>spring-data-redis</artifactId>-->
+                <!--<version>${spring-data.version}</version>-->
+            <!--</dependency>-->
             <!-- mysql -->
             <dependency>
                 <groupId>mysql</groupId>