修复log4j和logback的漏洞

api-server/src/main/resources/application.yml

@@ -69,7 +69,7 @@ spring:
 mybatis-plus:
 mybatis-plus:
   global-config:
   global-config:
     db-config:
     db-config:
-      select-strategy: not_empty
+      where-strategy: not_empty
       update-strategy: not_empty
       update-strategy: not_empty
 
 
 #logging.level.com.zq.drug.dao: debug
 #logging.level.com.zq.drug.dao: debug
\ No newline at end of file

civil-common-utils/pom.xml

@@ -62,7 +62,7 @@
         <dependency>
         <dependency>
             <groupId>com.github.pagehelper</groupId>
             <groupId>com.github.pagehelper</groupId>
             <artifactId>pagehelper</artifactId>
             <artifactId>pagehelper</artifactId>
-            <version>5.2.1</version>
+            <version>5.3.0</version>
         </dependency>
         </dependency>
 
 
         <!--spring boot 集成redis所需common-pool2-->
         <!--spring boot 集成redis所需common-pool2-->
@@ -82,7 +82,7 @@
         <dependency>
         <dependency>
             <groupId>commons-io</groupId>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
             <artifactId>commons-io</artifactId>
-            <version>2.8.0</version>
+            <version>2.11.0</version>
         </dependency>
         </dependency>
 
 
         <!--工具包-->
         <!--工具包-->
@@ -119,12 +119,18 @@
         <dependency>
         <dependency>
             <groupId>com.jfinal</groupId>
             <groupId>com.jfinal</groupId>
             <artifactId>jfinal-weixin</artifactId>
             <artifactId>jfinal-weixin</artifactId>
-            <version>3.1</version>
+            <version>3.4</version>
         </dependency>
         </dependency>
         <dependency>
         <dependency>
             <groupId>com.jfinal</groupId>
             <groupId>com.jfinal</groupId>
             <artifactId>jfinal-ext3</artifactId>
             <artifactId>jfinal-ext3</artifactId>
             <version>4.0.3</version>
             <version>4.0.3</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>log4j</groupId>
+                    <artifactId>log4j</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         </dependency>
 
 
     </dependencies>
     </dependencies>

civil-common-utils/src/main/java/com/zq/common/config/mybatis/MybatisConfig.java

@@ -21,7 +21,11 @@ public class MybatisConfig {
     @Bean
     @Bean
     public MybatisPlusInterceptor mybatisPlusInterceptor() {
     public MybatisPlusInterceptor mybatisPlusInterceptor() {
         MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
         MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
-        interceptor.addInnerInterceptor(new PaginationInnerInterceptor());
+
+        // 分页插件
+        PaginationInnerInterceptor paginationInnerInterceptor = new PaginationInnerInterceptor();
+        interceptor.addInnerInterceptor(paginationInnerInterceptor);
+
         return interceptor;
         return interceptor;
     }
     }
 
 
@@ -34,13 +38,8 @@ public class MybatisConfig {
     public PageInterceptor pageInterceptor() {
     public PageInterceptor pageInterceptor() {
         PageInterceptor pageInterceptor = new PageInterceptor();
         PageInterceptor pageInterceptor = new PageInterceptor();
         Properties properties = new Properties();
         Properties properties = new Properties();
-        properties.setProperty("offsetAsPageNum", "false");
-        properties.setProperty("rowBoundsWithCount", "false");
-        properties.setProperty("pageSizeZero", "true");
-        properties.setProperty("reasonable", "false");
-        properties.setProperty("supportMethodsArguments", "false");
-        properties.setProperty("returnPageInfo", "none");
-        properties.setProperty("autoRuntimeDialect", "true");
+        // properties.setProperty("helperDialect", "mysql");//指定方言
+        properties.setProperty("autoRuntimeDialect", "true");//自动获取方言
         pageInterceptor.setProperties(properties);
         pageInterceptor.setProperties(properties);
         return pageInterceptor;
         return pageInterceptor;
     }
     }

oauth-server/src/main/resources/application.yml

@@ -71,7 +71,7 @@ spring:
 mybatis-plus:
 mybatis-plus:
   global-config:
   global-config:
     db-config:
     db-config:
-      select-strategy: not_empty
+      where-strategy: not_empty
       update-strategy: not_empty
       update-strategy: not_empty
 
 
 #日志等级
 #日志等级

open-server/src/main/resources/application.yml

@@ -77,5 +77,5 @@ spring:
 mybatis-plus:
 mybatis-plus:
   global-config:
   global-config:
     db-config:
     db-config:
-      select-strategy: not_empty
+      where-strategy: not_empty
       update-strategy: not_empty
       update-strategy: not_empty
\ No newline at end of file

pom.xml

@@ -23,11 +23,14 @@
 
 
         <swagger.version>2.9.2</swagger.version>
         <swagger.version>2.9.2</swagger.version>
         <alibaba.druid.version>1.1.22</alibaba.druid.version>
         <alibaba.druid.version>1.1.22</alibaba.druid.version>
-        <mybatis.plus.version>3.4.3</mybatis.plus.version>
+        <mybatis.plus.version>3.5.0</mybatis.plus.version>
         <pagehelper.version>5.2.0</pagehelper.version>
         <pagehelper.version>5.2.0</pagehelper.version>
         <jjwt.version>0.9.1</jjwt.version>
         <jjwt.version>0.9.1</jjwt.version>
-        <fastjson.version>1.2.76</fastjson.version>
-        <hutool.version>5.7.16</hutool.version>
+        <fastjson.version>1.2.79</fastjson.version>
+        <hutool.version>5.7.18</hutool.version>
+
+        <logback.version>1.2.10</logback.version>
+        <log4j2.version>2.17.1</log4j2.version>
     </properties>
     </properties>
 
 
     <modules>
     <modules>

portal-server/src/main/resources/application.yml

@@ -121,5 +121,5 @@ spring:
 mybatis-plus:
 mybatis-plus:
   global-config:
   global-config:
     db-config:
     db-config:
-      select-strategy: not_empty
+      where-strategy: not_empty
       update-strategy: not_empty
       update-strategy: not_empty

resource-server/src/main/resources/application.yml

@@ -71,7 +71,7 @@ spring:
 mybatis-plus:
 mybatis-plus:
   global-config:
   global-config:
     db-config:
     db-config:
-      select-strategy: not_empty
+      where-strategy: not_empty
       update-strategy: not_empty
       update-strategy: not_empty
 
 
 #日志等级
 #日志等级

sync-server/src/main/resources/application.yml

@@ -53,5 +53,5 @@ spring:
 mybatis-plus:
 mybatis-plus:
   global-config:
   global-config:
     db-config:
     db-config:
-      select-strategy: not_empty
+      where-strategy: not_empty
       update-strategy: not_empty
       update-strategy: not_empty
\ No newline at end of file

user-server/src/main/resources/application.yml

@@ -63,5 +63,5 @@ spring:
 mybatis-plus:
 mybatis-plus:
   global-config:
   global-config:
     db-config:
     db-config:
-      select-strategy: not_empty
+      where-strategy: not_empty
       update-strategy: not_empty
       update-strategy: not_empty