Merge remote-tracking branch 'origin/master'

liuke

2020-12-11 e80adff2cfff2fa9d29aff9e5a7f2feb52681ef8

 kidgrow-uaa/kidgrow-uaa-server/src/main/java/com/kidgrow/oauth2/controller/OAuth2Controller.java

@@ -67,7 +67,8 @@
        //先解密
        String decryptName = AesUtils.desEncrypt(username).trim();
        String decryptPwd = AesUtils.desEncrypt(password).trim();

        log.error("user+++++++++"+decryptName+"+++++++++++");
        log.error("password+++++++++"+decryptPwd+"+++++++++++");
        UsernamePasswordAuthenticationToken token = new UsernamePasswordAuthenticationToken(decryptName, decryptPwd);
        writerToken(request, response, token, "用户名或密码错误");
    }
@@ -120,6 +121,7 @@
            oAuth2Authentication.setAuthenticated(true);
            ResponseUtil.responseSucceed(objectMapper, response, oAuth2AccessToken);
        } catch (BadCredentialsException | InternalAuthenticationServiceException e) {
            e.printStackTrace();
            exceptionHandler(response, badCredenbtialsMsg);
        } catch (Exception e) {
            exceptionHandler(response, e);