提交 efb2061a authored 作者: Whispa's avatar Whispa

commit commit

上级 3799d742
......@@ -410,11 +410,11 @@ public class AuthController extends Controller {
user.setLastLoginTime(new Date());
if (user.getAccount() == null) {
user.setAccount(user.getEmail() == null ? user.getEmail() : user.getPhone());
user.setAccount(user.getEmail() != null ? user.getEmail() : user.getPhone());
}
if( user.getNick() == null ){
user.setNick(user.getEmail() == null ? user.getEmail() : user.getPhone());
user.setNick(user.getEmail() != null ? user.getEmail() : user.getPhone());
}
userRepository.save(user);
......@@ -467,7 +467,7 @@ public class AuthController extends Controller {
toicouponRepository.save(toi);
}
} catch (Exception e) {
System.out.println(e.getMessage());
}
}
......
......@@ -26,7 +26,7 @@ public class JwtUtils {
UserDetailsImpl userPrincipal = (UserDetailsImpl) authentication.getPrincipal();
return Jwts.builder()
.setSubject((userPrincipal.getUsername()))
.setSubject((userPrincipal.getId()))
.setIssuedAt(new Date())
.setExpiration(new Date((new Date()).getTime() + (jwtExpirationMs * 20)))
.signWith(SignatureAlgorithm.HS512, jwtSecret)
......
......@@ -30,7 +30,7 @@ public class AuthenticationUser implements IAuthenticationFacade {
// logger.info("登录的用户:" + name);
Optional<TbCfUserInfo> user = repository.findFirstByFirebaseUidOrAccount(name, name);
// logger.info("用户:" + user);
return user.isPresent() ? user.get() : null;
return user.orElse(null);
}
public String userId() {
......
......@@ -20,7 +20,7 @@ public class UserDetailsServiceImpl implements UserDetailsService {
@Override
@Transactional
public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException {
TbCfUserInfo user = userRepository.findFirstByAccount(username)
TbCfUserInfo user = userRepository.findById(username)
.orElseThrow(() -> new UsernameNotFoundException("User Not Found with username: " + username));
return UserDetailsImpl.build(user);
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论