|
@@ -10,6 +10,7 @@ import org.springframework.security.authentication.AuthenticationManager;
|
|
|
import org.springframework.security.authentication.BadCredentialsException;
|
|
|
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
|
|
|
import org.springframework.security.core.Authentication;
|
|
|
+import org.springframework.security.core.userdetails.UserDetails;
|
|
|
import org.springframework.security.core.userdetails.UserDetailsService;
|
|
|
import org.springframework.stereotype.Component;
|
|
|
import com.ruoyi.common.constant.Constants;
|
|
@@ -115,10 +116,9 @@ public class SysLoginService
|
|
|
}
|
|
|
|
|
|
|
|
|
- LoginUser loginUser = new LoginUser();
|
|
|
- loginUser.setUser(user);
|
|
|
- String token = tokenService.createToken(loginUser);
|
|
|
- userDetailsService.loadUserByUsername(loginUser.getUsername());
|
|
|
+ UserDetails loginUser= userDetailsService.loadUserByUsername(user.getUserName());
|
|
|
+ String token = tokenService.createToken((LoginUser) loginUser);
|
|
|
+
|
|
|
log.info("token:"+token);
|
|
|
AsyncManager.me().execute(AsyncFactory.recordLogininfor(user.getUserName(), Constants.LOGIN_SUCCESS, MessageUtils.message("user.login.success")));
|
|
|
// 生成token
|