From d87dfd63971e204730d130741c1e485e48039953 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90li?=
 <15040126243@163.com>
Date: Thu, 29 Dec 2022 10:12:25 +0800
Subject: [PATCH] =?UTF-8?q?update=20mybatis-plus=203.5.2=20=3D>=203.5.3=20?=
 =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=20=E6=95=B4=E7=90=86=E6=97=A0?=
 =?UTF-8?q?=E7=94=A8=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                                   | 8 ++------
 ruoyi-common/pom.xml                                      | 4 ----
 .../com/ruoyi/demo/controller/queue/PriorityDemo.java     | 3 +--
 .../java/com/ruoyi/system/service/SysLoginService.java    | 1 -
 4 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/pom.xml b/pom.xml
index 7becef83..7290eeb5 100644
--- a/pom.xml
+++ b/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>
diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml
index 90d29940..f8853436 100644
--- a/ruoyi-common/pom.xml
+++ b/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>
diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/queue/PriorityDemo.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/queue/PriorityDemo.java
index 320a640d..c86c92aa 100644
--- a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/queue/PriorityDemo.java
+++ b/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());
     }
 }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/SysLoginService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/SysLoginService.java
index d65a4048..3c29b85c 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/SysLoginService.java
+++ b/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;