From d87dfd63971e204730d130741c1e485e48039953 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期四, 29 十二月 2022 10:12:25 +0800
Subject: [PATCH] update mybatis-plus 3.5.2 => 3.5.3 update 优化 整理无用代码
---
ruoyi-system/src/main/java/com/ruoyi/system/service/SysLoginService.java | 1 -
ruoyi-demo/src/main/java/com/ruoyi/demo/controller/queue/PriorityDemo.java | 3 +--
pom.xml | 8 ++------
ruoyi-common/pom.xml | 4 ----
4 files changed, 3 insertions(+), 13 deletions(-)
diff --git a/pom.xml b/pom.xml
index 7becef8..7290eeb 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 90d2994..f885343 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 320a640..c86c92a 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 @@
import lombok.Data;
import lombok.NoArgsConstructor;
-import org.jetbrains.annotations.NotNull;
/**
* 瀹炰綋绫� 娉ㄦ剰涓嶅厑璁镐娇鐢ㄥ唴閮ㄧ被 鍚﹀垯浼氭壘涓嶅埌绫�
@@ -17,7 +16,7 @@
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 d65a404..3c29b85 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 @@
* 鐧诲綍鏍￠獙
*/
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;
--
Gitblit v1.9.3