mirror of
				https://github.com/dromara/RuoYi-Vue-Plus.git
				synced 2025-11-04 08:13:44 +08:00 
			
		
		
		
	update mybatis-plus 3.5.2 => 3.5.3
update 优化 整理无用代码
This commit is contained in:
		
							
								
								
									
										8
									
								
								pom.xml
									
									
									
									
									
								
							
							
						
						
									
										8
									
								
								pom.xml
									
									
									
									
									
								
							@@ -25,7 +25,7 @@
 | 
				
			|||||||
        <easyexcel.version>3.1.4</easyexcel.version>
 | 
					        <easyexcel.version>3.1.4</easyexcel.version>
 | 
				
			||||||
        <velocity.version>2.3</velocity.version>
 | 
					        <velocity.version>2.3</velocity.version>
 | 
				
			||||||
        <satoken.version>1.33.0</satoken.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>
 | 
					        <p6spy.version>3.9.1</p6spy.version>
 | 
				
			||||||
        <hutool.version>5.8.11</hutool.version>
 | 
					        <hutool.version>5.8.11</hutool.version>
 | 
				
			||||||
        <okhttp.version>4.10.0</okhttp.version>
 | 
					        <okhttp.version>4.10.0</okhttp.version>
 | 
				
			||||||
@@ -147,11 +147,7 @@
 | 
				
			|||||||
                <artifactId>mybatis-plus-boot-starter</artifactId>
 | 
					                <artifactId>mybatis-plus-boot-starter</artifactId>
 | 
				
			||||||
                <version>${mybatis-plus.version}</version>
 | 
					                <version>${mybatis-plus.version}</version>
 | 
				
			||||||
            </dependency>
 | 
					            </dependency>
 | 
				
			||||||
            <dependency>
 | 
					
 | 
				
			||||||
                <groupId>com.baomidou</groupId>
 | 
					 | 
				
			||||||
                <artifactId>mybatis-plus-extension</artifactId>
 | 
					 | 
				
			||||||
                <version>${mybatis-plus.version}</version>
 | 
					 | 
				
			||||||
            </dependency>
 | 
					 | 
				
			||||||
            <!-- sql性能分析插件 -->
 | 
					            <!-- sql性能分析插件 -->
 | 
				
			||||||
            <dependency>
 | 
					            <dependency>
 | 
				
			||||||
                <groupId>p6spy</groupId>
 | 
					                <groupId>p6spy</groupId>
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -79,10 +79,6 @@
 | 
				
			|||||||
            <groupId>com.baomidou</groupId>
 | 
					            <groupId>com.baomidou</groupId>
 | 
				
			||||||
            <artifactId>mybatis-plus-boot-starter</artifactId>
 | 
					            <artifactId>mybatis-plus-boot-starter</artifactId>
 | 
				
			||||||
        </dependency>
 | 
					        </dependency>
 | 
				
			||||||
        <dependency>
 | 
					 | 
				
			||||||
            <groupId>com.baomidou</groupId>
 | 
					 | 
				
			||||||
            <artifactId>mybatis-plus-extension</artifactId>
 | 
					 | 
				
			||||||
        </dependency>
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
        <!-- dynamic-datasource 多数据源-->
 | 
					        <!-- dynamic-datasource 多数据源-->
 | 
				
			||||||
        <dependency>
 | 
					        <dependency>
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -2,7 +2,6 @@ package com.ruoyi.demo.controller.queue;
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
import lombok.Data;
 | 
					import lombok.Data;
 | 
				
			||||||
import lombok.NoArgsConstructor;
 | 
					import lombok.NoArgsConstructor;
 | 
				
			||||||
import org.jetbrains.annotations.NotNull;
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
/**
 | 
					/**
 | 
				
			||||||
 * 实体类 注意不允许使用内部类 否则会找不到类
 | 
					 * 实体类 注意不允许使用内部类 否则会找不到类
 | 
				
			||||||
@@ -17,7 +16,7 @@ public class PriorityDemo implements Comparable<PriorityDemo> {
 | 
				
			|||||||
    private Integer orderNum;
 | 
					    private Integer orderNum;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    @Override
 | 
					    @Override
 | 
				
			||||||
    public int compareTo(@NotNull PriorityDemo other) {
 | 
					    public int compareTo(PriorityDemo other) {
 | 
				
			||||||
        return Integer.compare(getOrderNum(), other.getOrderNum());
 | 
					        return Integer.compare(getOrderNum(), other.getOrderNum());
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -261,7 +261,6 @@ public class SysLoginService {
 | 
				
			|||||||
     * 登录校验
 | 
					     * 登录校验
 | 
				
			||||||
     */
 | 
					     */
 | 
				
			||||||
    private void checkLogin(LoginType loginType, String username, Supplier<Boolean> supplier) {
 | 
					    private void checkLogin(LoginType loginType, String username, Supplier<Boolean> supplier) {
 | 
				
			||||||
        HttpServletRequest request = ServletUtils.getRequest();
 | 
					 | 
				
			||||||
        String errorKey = CacheConstants.PWD_ERR_CNT_KEY + username;
 | 
					        String errorKey = CacheConstants.PWD_ERR_CNT_KEY + username;
 | 
				
			||||||
        String loginFail = Constants.LOGIN_FAIL;
 | 
					        String loginFail = Constants.LOGIN_FAIL;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user