From b421b28125bff8f39675e3f5ce29b3f58f13b5ae Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期三, 15 五月 2024 14:13:35 +0800 Subject: [PATCH] 1、增加了单数据源的Configuration; 2、RestTemplateConfiguration.java更换包路径; 3、完善王江海制定协议的实现代码。 --- pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/java/com/dy/sso/busi/SsoSv.java | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/java/com/dy/sso/busi/SsoSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/java/com/dy/sso/busi/SsoSv.java index f6cad3e..c72b64b 100644 --- a/pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/java/com/dy/sso/busi/SsoSv.java +++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/java/com/dy/sso/busi/SsoSv.java @@ -28,6 +28,7 @@ this.baPrivilegeMapper = baPrivilegeMapper ; } + /** * 闇�瑕丅aUserMapper.xml * @param uuid 缁欑櫥褰曟垚鍔熺殑鐢ㄦ埛璧嬪�煎叾token @@ -40,8 +41,8 @@ @Cacheable(cacheNames=CacheConstants.cacheNames, key="'" + CacheConstants.loginUserKeyPrefix + "' + #uuid", sync=true) public BaUser loginWithMapperXml(String uuid, String phone, String password){ BaUser baUser = this.baUserMapper.login(phone, password) ; - if(baUser != null && baUser.id != null){ - baUser.privileges = this.baPrivilegeMapper.selectPrivilegeByUserId(baUser.id) ; + if(baUser != null && baUser.userId != null){ + baUser.privileges = this.baPrivilegeMapper.selectPrivilegeByUserId(baUser.userId) ; } return baUser; } @@ -65,8 +66,8 @@ .eq("phone", phone) .eq("password", password); BaUser baUser = this.baUserMapper.selectOne(qw) ; - if(baUser != null && baUser.id != null){ - baUser.privileges = this.baPrivilegeMapper.selectPrivilegeByUserId(baUser.id) ; + if(baUser != null && baUser.userId != null){ + baUser.privileges = this.baPrivilegeMapper.selectPrivilegeByUserId(baUser.userId) ; } return baUser; } -- Gitblit v1.8.0