Browse Source

update mybatis-plus 3.5.2 => 3.5.3
update 优化 整理无用代码

疯狂的狮子li 2 years ago
parent
commit
d87dfd6397

+ 2 - 6
pom.xml

@@ -25,7 +25,7 @@
         <easyexcel.version>3.1.4</easyexcel.version>
         <velocity.version>2.3</velocity.version>
         <satoken.version>1.33.0</satoken.version>
-        <mybatis-plus.version>3.5.2</mybatis-plus.version>
+        <mybatis-plus.version>3.5.3</mybatis-plus.version>
         <p6spy.version>3.9.1</p6spy.version>
         <hutool.version>5.8.11</hutool.version>
         <okhttp.version>4.10.0</okhttp.version>
@@ -147,11 +147,7 @@
                 <artifactId>mybatis-plus-boot-starter</artifactId>
                 <version>${mybatis-plus.version}</version>
             </dependency>
-            <dependency>
-                <groupId>com.baomidou</groupId>
-                <artifactId>mybatis-plus-extension</artifactId>
-                <version>${mybatis-plus.version}</version>
-            </dependency>
+
             <!-- sql性能分析插件 -->
             <dependency>
                 <groupId>p6spy</groupId>

+ 0 - 4
ruoyi-common/pom.xml

@@ -79,10 +79,6 @@
             <groupId>com.baomidou</groupId>
             <artifactId>mybatis-plus-boot-starter</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.baomidou</groupId>
-            <artifactId>mybatis-plus-extension</artifactId>
-        </dependency>
 
         <!-- dynamic-datasource 多数据源-->
         <dependency>

+ 1 - 2
ruoyi-demo/src/main/java/com/ruoyi/demo/controller/queue/PriorityDemo.java

@@ -2,7 +2,6 @@ package com.ruoyi.demo.controller.queue;
 
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import org.jetbrains.annotations.NotNull;
 
 /**
  * 实体类 注意不允许使用内部类 否则会找不到类
@@ -17,7 +16,7 @@ public class PriorityDemo implements Comparable<PriorityDemo> {
     private Integer orderNum;
 
     @Override
-    public int compareTo(@NotNull PriorityDemo other) {
+    public int compareTo(PriorityDemo other) {
         return Integer.compare(getOrderNum(), other.getOrderNum());
     }
 }

+ 0 - 1
ruoyi-system/src/main/java/com/ruoyi/system/service/SysLoginService.java

@@ -261,7 +261,6 @@ public class SysLoginService {
      * 登录校验
      */
     private void checkLogin(LoginType loginType, String username, Supplier<Boolean> supplier) {
-        HttpServletRequest request = ServletUtils.getRequest();
         String errorKey = CacheConstants.PWD_ERR_CNT_KEY + username;
         String loginFail = Constants.LOGIN_FAIL;