Merge branch 'dev_2.5_ocean' of http://116.204.71.86:3000/UDI/udi-wms-java into dev_2.5_scan_2

# Conflicts:
#	src/main/resources/application-dev.yml

pom.xml

@@ -117,13 +117,23 @@
             <type>pom</type>
         </dependency>
 
+        <dependency>
+            <groupId>com.oceanbase</groupId>
+            <artifactId>oceanbase-client</artifactId>
+            <version>2.4.0</version>
+        </dependency>
+
         <!--mybatis plus -->
         <dependency>
             <groupId>com.baomidou</groupId>
             <artifactId>mybatis-plus-boot-starter</artifactId>
             <version>3.5.2</version>
         </dependency>
-
+        <dependency>
+            <groupId>com.github.pagehelper</groupId>
+            <artifactId>pagehelper</artifactId>
+            <version>5.3.0</version>
+        </dependency>
         <!--分页插件-->
         <dependency>
             <groupId>com.github.pagehelper</groupId>
@@ -196,7 +206,7 @@
         <dependency>
             <groupId>com.github.pagehelper</groupId>
             <artifactId>pagehelper-spring-boot-autoconfigure</artifactId>
-            <version>1.4.5</version>
+            <version>1.4.2</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>

src/main/java/com/glxp/api/config/HdSchemaExecutor.java

@@ -18,8 +18,8 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
-@Order(1)
-@Component
+//@Order(1)
+//@Component
 @Slf4j
 public class HdSchemaExecutor implements ApplicationRunner {
 

src/main/resources/application-pro.yml

@@ -3,7 +3,7 @@ server:
 spring:
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    jdbc-url: jdbc:mysql://192.168.0.166:3306/udi_wms_ct?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
+    jdbc-url: jdbc:mysql://127.0.0.1:3306/udi_wms_cl?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
     username: root
     password: 123456
     hikari:

src/main/resources/application.yml

@@ -20,12 +20,12 @@ mybatis-plus:
 
 pagehelper:
   helperDialect: mysql
-  support-methods-arguments: false
+  support-methods-arguments: true
   params: count=countsql
   offset-as-page-num: false
   row-bounds-with-count: false
   page-size-zero: true
-  reasonable: false
+  reasonable: true
   returnPageInfo: none
   auto-dialect: true
   auto-runtime-dialect: true