|
|
|
@ -23,7 +23,6 @@ import com.baiye.properties.bean.LoginProperties;
|
|
|
|
|
import lombok.RequiredArgsConstructor;
|
|
|
|
|
import org.springframework.security.core.authority.SimpleGrantedAuthority;
|
|
|
|
|
import org.springframework.security.core.userdetails.UserDetailsService;
|
|
|
|
|
import org.springframework.security.core.userdetails.UsernameNotFoundException;
|
|
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
|
|
|
|
import javax.persistence.EntityNotFoundException;
|
|
|
|
@ -68,10 +67,10 @@ public class UserDetailsServiceImpl implements UserDetailsService {
|
|
|
|
|
user = remoteUserService.findByName(username);
|
|
|
|
|
} catch (EntityNotFoundException e) {
|
|
|
|
|
// SpringSecurity会自动转换UsernameNotFoundException为BadCredentialsException
|
|
|
|
|
throw new UsernameNotFoundException("", e);
|
|
|
|
|
throw new BadRequestException("用户名或密码不正确");
|
|
|
|
|
}
|
|
|
|
|
if (user == null) {
|
|
|
|
|
throw new UsernameNotFoundException("");
|
|
|
|
|
throw new BadRequestException("用户名或密码不正确!");
|
|
|
|
|
} else {
|
|
|
|
|
if (Boolean.FALSE.equals(user.getEnabled())) {
|
|
|
|
|
throw new BadRequestException("账号未激活!");
|
|
|
|
@ -125,10 +124,10 @@ public class UserDetailsServiceImpl implements UserDetailsService {
|
|
|
|
|
user = remoteUserService.findByName(username);
|
|
|
|
|
} catch (EntityNotFoundException e) {
|
|
|
|
|
// SpringSecurity会自动转换UsernameNotFoundException为BadCredentialsException
|
|
|
|
|
throw new UsernameNotFoundException("", e);
|
|
|
|
|
throw new BadRequestException("用户名或密码不正确");
|
|
|
|
|
}
|
|
|
|
|
if (user == null) {
|
|
|
|
|
throw new UsernameNotFoundException("");
|
|
|
|
|
throw new BadRequestException("用户名或密码不正确!");
|
|
|
|
|
} else {
|
|
|
|
|
if (Boolean.FALSE.equals(user.getEnabled())) {
|
|
|
|
|
throw new BadRequestException("账号未激活!");
|
|
|
|
|