From 0fc5eb0920a741556c693284ad71f19a0291401b Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 21 十二月 2023 14:36:23 +0800
Subject: [PATCH] 1、原SsoAop进行登录验证有鉴权，现改为只验证登录，不做鉴权，相应SsoCtrl中增加只鉴权的方法 2、优化通信中间件代码、common模块中协议代码、
---
pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/java/com/dy/sso/busi/SsoSv.java | 52 +++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 49 insertions(+), 3 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 249facb..e1ddefe 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
@@ -1,5 +1,7 @@
package com.dy.sso.busi;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.dy.pipIrrGlobal.daoBa.BaPrivilegeMapper;
import com.dy.pipIrrGlobal.daoBa.BaUserMapper;
import com.dy.pipIrrGlobal.pojoBa.BaUser;
import lombok.extern.slf4j.Slf4j;
@@ -7,23 +9,67 @@
import org.springframework.cache.annotation.CacheEvict;
import org.springframework.cache.annotation.Cacheable;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
@Slf4j
@Service
public class SsoSv {
private BaUserMapper baUserMapper;
+ private BaPrivilegeMapper baPrivilegeMapper;
@Autowired
private void setBaUserMapper(BaUserMapper baUserMapper){
this.baUserMapper = baUserMapper ;
}
+ @Autowired
+ private void setBaPrivilegeMapper(BaPrivilegeMapper baPrivilegeMapper){
+ this.baPrivilegeMapper = baPrivilegeMapper ;
+ }
+
+
+ /**
+ * 闇�瑕丅aUserMapper.xml
+ * @param uuid 缁欑櫥褰曟垚鍔熺殑鐢ㄦ埛璧嬪�煎叾token
+ * @param phone 鐢ㄦ埛鎵嬫満鍙�
+ * @param password 鐢ㄦ埛瀵嗙爜
+ * @return 鐧诲綍鎴愬姛鐢ㄦ埛
+ */
//褰撴湭娉ㄨВ@Transactional鏃讹紝浼氳緭鍑烘棩蹇楋細SqlSession [org.apache.ibatis.session.defaults.DefaultSqlSession@46727a0c] was not registered for synchronization because synchronization is not active
- //@Transactional
+ @Transactional
@Cacheable(cacheNames=CacheConstants.cacheNames, key="'" + CacheConstants.loginUserKeyPrefix + "' + #uuid", sync=true)
- public BaUser login(String uuid, String phone, String password){
- return this.baUserMapper.login(phone, password) ;
+ 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) ;
+ }
+ return baUser;
+ }
+
+ /**
+ * 涓嶉渶瑕� BaUserMapper.xml
+ * @param uuid 缁欑櫥褰曟垚鍔熺殑鐢ㄦ埛璧嬪�煎叾token
+ * @param phone 鐢ㄦ埛鎵嬫満鍙�
+ * @param password 鐢ㄦ埛瀵嗙爜
+ * @return 鐧诲綍鎴愬姛鐢ㄦ埛
+ */
+ //褰撴湭娉ㄨВ@Transactional鏃讹紝浼氳緭鍑烘棩蹇楋細SqlSession [org.apache.ibatis.session.defaults.DefaultSqlSession@46727a0c] was not registered for synchronization because synchronization is not active
+ @Transactional
+ @Cacheable(cacheNames=CacheConstants.cacheNames, key="'" + CacheConstants.loginUserKeyPrefix + "' + #uuid", sync=true)
+ public BaUser loginWithOutMapperXml(String uuid, String phone, String password){
+ QueryWrapper<BaUser> qw = new QueryWrapper<>();
+ //QueryWrapper<DemoMp> queryWrapper = Wrappers.<DemoMp>query() ;
+ qw.select("id", "name", "phone", "orgTag", "supperAdmin")
+ .eq("disabled", 0)
+ .eq("deleted", 0)
+ .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) ;
+ }
+ return baUser;
}
@CacheEvict(cacheNames=CacheConstants.cacheNames, key="'" + CacheConstants.loginUserKeyPrefix + "' + #uuid")
--
Gitblit v1.8.0