#3.5

zhou zhou

14 小时以前 cfe049492f81d2c650a2b17348593edbc5054498

 rsf-server/src/main/java/com/vincent/rsf/server/system/service/impl/UserServiceImpl.java

@@ -11,10 +11,10 @@
import com.vincent.rsf.server.system.service.RoleMenuService;
import com.vincent.rsf.server.system.service.UserRoleService;
import com.vincent.rsf.server.system.service.UserService;
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
import org.springframework.security.crypto.password.PasswordEncoder;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
import jakarta.annotation.Resource;
import java.util.List;

@Service("userService")
@@ -25,7 +25,7 @@
    @Resource
    private RoleMenuService roleMenuService;
    @Resource
    private BCryptPasswordEncoder bCryptPasswordEncoder;
    private PasswordEncoder passwordEncoder;

    @Override
    public PageResult<User> pageRel(PageParam<User, BaseParam> pageParam) {
@@ -69,12 +69,12 @@

    @Override
    public boolean comparePassword(String dbPassword, String inputPassword) {
        return bCryptPasswordEncoder.matches(inputPassword, dbPassword);
        return passwordEncoder.matches(inputPassword, dbPassword);
    }

    @Override
    public String encodePassword(String password) {
        return password == null ? null : bCryptPasswordEncoder.encode(password);
        return password == null ? null : passwordEncoder.encode(password);
    }

    @Override