Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro

云

2 天以前 a77decc3df26449414639082293e2ee6722e643c

 src/main/java/com/ruoyi/framework/security/service/SysPasswordService.java

@@ -1,10 +1,5 @@
package com.ruoyi.framework.security.service;



import java.util.concurrent.TimeUnit;

import org.springframework.beans.factory.annotation.Autowired;

import org.springframework.beans.factory.annotation.Value;

import org.springframework.security.core.Authentication;

import org.springframework.stereotype.Component;

import com.ruoyi.common.constant.CacheConstants;

import com.ruoyi.common.exception.user.UserPasswordNotMatchException;

import com.ruoyi.common.exception.user.UserPasswordRetryLimitExceedException;

@@ -12,6 +7,12 @@
import com.ruoyi.framework.redis.RedisCache;

import com.ruoyi.framework.security.context.AuthenticationContextHolder;

import com.ruoyi.project.system.domain.SysUser;

import lombok.RequiredArgsConstructor;

import org.springframework.beans.factory.annotation.Value;

import org.springframework.security.core.Authentication;

import org.springframework.stereotype.Component;



import java.util.concurrent.TimeUnit;



/**

 * 登录密码方法

@@ -19,10 +20,10 @@
 * @author ruoyi

 */

@Component

@RequiredArgsConstructor

public class SysPasswordService

{

    @Autowired

    private RedisCache redisCache;

    private final RedisCache redisCache;



    @Value(value = "${user.password.maxRetryCount}")

    private int maxRetryCount;