From 229741972d5998de57d0d246f73c5e7ff0d42530 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 13 九月 2024 08:40:49 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/java/com/dy/sso/busi/SsoSv.java | 40 +++++++++++++++++++++++-----------------
1 files changed, 23 insertions(+), 17 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 52c1c6a..bed8576 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,7 +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.BaCaptchaMapper;
import com.dy.pipIrrGlobal.daoBa.BaUserMapper;
import com.dy.pipIrrGlobal.pojoBa.BaUser;
import lombok.extern.slf4j.Slf4j;
@@ -11,12 +11,13 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import java.util.List;
+import java.util.Map;
+
@Slf4j
@Service
public class SsoSv {
-
private BaUserMapper baUserMapper;
- private BaPrivilegeMapper baPrivilegeMapper;
@Autowired
private void setBaUserMapper(BaUserMapper baUserMapper){
@@ -24,10 +25,7 @@
}
@Autowired
- private void setBaPrivilegeMapper(BaPrivilegeMapper baPrivilegeMapper){
- this.baPrivilegeMapper = baPrivilegeMapper ;
- }
-
+ private BaCaptchaMapper baCaptchaMapper;
/**
* 闇�瑕丅aUserMapper.xml
@@ -40,11 +38,7 @@
@Transactional
@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) ;
- }
- return baUser;
+ return this.baUserMapper.login(phone, password) ;
}
/**
@@ -65,11 +59,7 @@
.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;
+ return this.baUserMapper.selectOne(qw) ;
}
@CacheEvict(cacheNames=CacheConstants.cacheNames, key="'" + CacheConstants.loginUserKeyPrefix + "' + #uuid")
@@ -82,4 +72,20 @@
return null ;
}
+ /**
+ * 寰楀埌鎵�鏈夌敤鎴锋墜鏈哄彿
+ * @return
+ */
+ public List<String> getPhones(){
+ return baUserMapper.getPhones() ;
+ }
+
+ /**
+ * 渚濇嵁楠岃瘉鐮乼oken鑾峰彇楠岃瘉瀛楃
+ * @param token
+ * @return
+ */
+ public Map getCodeByToken(String token) {
+ return baCaptchaMapper.getCodeByToken(token);
+ }
}
--
Gitblit v1.8.0