diff --git a/pqs-auth/src/main/java/com/njcn/auth/controller/AuthController.java b/pqs-auth/src/main/java/com/njcn/auth/controller/AuthController.java index 4a962c7f3..ee72d5f79 100644 --- a/pqs-auth/src/main/java/com/njcn/auth/controller/AuthController.java +++ b/pqs-auth/src/main/java/com/njcn/auth/controller/AuthController.java @@ -38,10 +38,7 @@ import java.security.Principal; import java.security.interfaces.RSAPublicKey; import java.time.LocalDateTime; import java.time.ZoneOffset; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.Objects; +import java.util.*; /** * @author hongawen @@ -65,8 +62,6 @@ public class AuthController extends BaseController { private final UserTokenService userTokenService; - - @ApiIgnore @OperateInfo(info = LogEnum.SYSTEM_COMMON, operateType = OperateType.AUTHENTICATE) @ApiOperation("登录认证") @@ -86,9 +81,10 @@ public class AuthController extends BaseController { String methodDescribe = getMethodDescribe("postAccessToken"); String username = parameters.get(SecurityConstants.USERNAME); String grantType = parameters.get(SecurityConstants.GRANT_TYPE); + log.error("登录参数为:" + parameters); if (grantType.equalsIgnoreCase(SecurityConstants.GRANT_CAPTCHA)) { username = DesUtils.aesDecrypt(username); - }else if(grantType.equalsIgnoreCase(SecurityConstants.GRANT_SMS_CODE)){ + } else if (grantType.equalsIgnoreCase(SecurityConstants.GRANT_SMS_CODE)) { //短信方式登录,将手机号赋值为用户名 username = parameters.get(SecurityConstants.PHONE); } @@ -99,11 +95,11 @@ public class AuthController extends BaseController { RequestUtil.saveLoginName(username); OAuth2AccessToken oAuth2AccessToken = tokenEndpoint.postAccessToken(principal, parameters).getBody(); //用户的登录名&密码校验成功后,判断当前该用户是否可以正常使用系统 - if(!grantType.equalsIgnoreCase(SecurityConstants.GRANT_SMS_CODE)){ + if (!grantType.equalsIgnoreCase(SecurityConstants.GRANT_SMS_CODE)) { userFeignClient.judgeUserStatus(username); } //登录成功后,记录token信息,并处理踢人效果 - userTokenService.recordUserInfo(oAuth2AccessToken,RequestUtil.getRealIp()); + userTokenService.recordUserInfo(oAuth2AccessToken, RequestUtil.getRealIp()); if (!grantType.equalsIgnoreCase(SecurityConstants.PASSWORD)) { return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, oAuth2AccessToken, methodDescribe); } else { diff --git a/pqs-auth/src/main/java/com/njcn/auth/security/granter/CaptchaTokenGranter.java b/pqs-auth/src/main/java/com/njcn/auth/security/granter/CaptchaTokenGranter.java index b5aa9f613..138089a5c 100644 --- a/pqs-auth/src/main/java/com/njcn/auth/security/granter/CaptchaTokenGranter.java +++ b/pqs-auth/src/main/java/com/njcn/auth/security/granter/CaptchaTokenGranter.java @@ -76,6 +76,7 @@ public class CaptchaTokenGranter extends AbstractTokenGranter { userAuth = authenticationManager.authenticate(userAuth); } catch (AccountStatusException | BadCredentialsException ase) { //covers expired, locked, disabled cases + ase.printStackTrace(); throw new InvalidGrantException(ase.getMessage()); } // If the username/password are wrong the spec says we should send 400/invalid grant