From a04d76dc568b4a13455ea6ca4ae2a92e6387736d Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <279049017@qq.com>
Date: Wed, 25 Nov 2020 16:36:14 +0800
Subject: [PATCH] Merge branch 'development' into dev
---
kidgrow-uaa/kidgrow-uaa-server/src/main/java/com/kidgrow/oauth2/controller/OAuth2Controller.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/kidgrow-uaa/kidgrow-uaa-server/src/main/java/com/kidgrow/oauth2/controller/OAuth2Controller.java b/kidgrow-uaa/kidgrow-uaa-server/src/main/java/com/kidgrow/oauth2/controller/OAuth2Controller.java
index f5e695b..fe1f754 100644
--- a/kidgrow-uaa/kidgrow-uaa-server/src/main/java/com/kidgrow/oauth2/controller/OAuth2Controller.java
+++ b/kidgrow-uaa/kidgrow-uaa-server/src/main/java/com/kidgrow/oauth2/controller/OAuth2Controller.java
@@ -6,6 +6,7 @@
import com.kidgrow.authclient.util.AuthUtils;
import com.kidgrow.common.constant.SecurityConstants;
import com.kidgrow.common.context.ClientContextHolder;
+import com.kidgrow.common.utils.AesUtils;
import com.kidgrow.common.utils.ResponseUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -62,8 +63,12 @@
public void getUserTokenInfo(
@ApiParam(required = true, name = "username", value = "账号") String username,
@ApiParam(required = true, name = "password", value = "密码") String password,
- HttpServletRequest request, HttpServletResponse response) throws IOException {
- UsernamePasswordAuthenticationToken token = new UsernamePasswordAuthenticationToken(username, password);
+ HttpServletRequest request, HttpServletResponse response) throws Exception {
+ //先解密
+ String decryptName = AesUtils.desEncrypt(username).trim();
+ String decryptPwd = AesUtils.desEncrypt(password).trim();
+
+ UsernamePasswordAuthenticationToken token = new UsernamePasswordAuthenticationToken(decryptName, decryptPwd);
writerToken(request, response, token, "用户名或密码错误");
}
@@ -115,6 +120,7 @@
oAuth2Authentication.setAuthenticated(true);
ResponseUtil.responseSucceed(objectMapper, response, oAuth2AccessToken);
} catch (BadCredentialsException | InternalAuthenticationServiceException e) {
+ e.printStackTrace();
exceptionHandler(response, badCredenbtialsMsg);
} catch (Exception e) {
exceptionHandler(response, e);
--
Gitblit v1.8.0