diff --git a/pom.xml b/pom.xml index 7becef836..7290eeb5f 100644 --- a/pom.xml +++ b/pom.xml @@ -25,7 +25,7 @@ 3.1.4 2.3 1.33.0 - 3.5.2 + 3.5.3 3.9.1 5.8.11 4.10.0 @@ -147,11 +147,7 @@ mybatis-plus-boot-starter ${mybatis-plus.version} - - com.baomidou - mybatis-plus-extension - ${mybatis-plus.version} - + p6spy diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml index 90d29940b..f88534367 100644 --- a/ruoyi-common/pom.xml +++ b/ruoyi-common/pom.xml @@ -79,10 +79,6 @@ com.baomidou mybatis-plus-boot-starter - - com.baomidou - mybatis-plus-extension - 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 320a640da..c86c92aa6 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 { 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 d65a40486..3c29b85cf 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 supplier) { - HttpServletRequest request = ServletUtils.getRequest(); String errorKey = CacheConstants.PWD_ERR_CNT_KEY + username; String loginFail = Constants.LOGIN_FAIL;