From e470d9f6ed30f1a2fb5e4e4b87995ccf7b9b3d44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=86=B7=E5=86=B7?= Date: Mon, 20 Apr 2020 09:22:32 +0800 Subject: [PATCH] =?UTF-8?q?:lipstick:=20Updating=20the=20UI=20and=20style?= =?UTF-8?q?=20files.=20#1054=20=E3=80=90=E9=87=8D=E6=9E=84=E3=80=91=20?= =?UTF-8?q?=E7=99=BB=E5=BD=95=E6=B5=81=E7=A8=8B=E7=AE=80=E5=8C=96=EF=BC=8C?= =?UTF-8?q?=E5=87=8F=E5=B0=91DB=20=E8=AE=BF=E9=97=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit :lipstick: Updating the UI and style files. #1054 【重构】 登录流程简化，减少DB 访问 --- .../pigx/common/security/component/PigxTokenEnhancer.java | 2 ++ .../pig4cloud/pigx/admin/service/impl/SysUserServiceImpl.java | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/component/PigxTokenEnhancer.java b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/component/PigxTokenEnhancer.java index c23931c4b..98536ece1 100644 --- a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/component/PigxTokenEnhancer.java +++ b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/component/PigxTokenEnhancer.java @@ -52,6 +52,8 @@ public class PigxTokenEnhancer implements TokenEnhancer { final Map additionalInfo = new HashMap<>(8); PigxUser pigxUser = (PigxUser) authentication.getUserAuthentication().getPrincipal(); additionalInfo.put(SecurityConstants.DETAILS_USER, pigxUser); + additionalInfo.put(SecurityConstants.DETAILS_USER_ID, pigxUser.getId()); + additionalInfo.put(SecurityConstants.DETAILS_USERNAME, pigxUser.getUsername()); additionalInfo.put(SecurityConstants.DETAILS_LICENSE, SecurityConstants.PIGX_LICENSE); additionalInfo.put(SecurityConstants.ACTIVE, Boolean.TRUE); ((DefaultOAuth2AccessToken) accessToken).setAdditionalInformation(additionalInfo); diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysUserServiceImpl.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysUserServiceImpl.java index 208988b6c..7c28f041e 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysUserServiceImpl.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysUserServiceImpl.java @@ -170,8 +170,8 @@ public class SysUserServiceImpl extends ServiceImpl impl if (ENCODER.matches(userDto.getPassword(), userVO.getPassword())) { sysUser.setPassword(ENCODER.encode(userDto.getNewpassword1())); } else { - log.warn("原密码错误，修改密码失败:{}", userDto.getUsername()); - return R.ok(Boolean.FALSE, "原密码错误，修改失败"); + log.info("原密码错误，修改密码失败:{}", userDto.getUsername()); + return R.failed("原密码错误，修改失败"); } } sysUser.setPhone(userDto.getPhone());