From 841c8fec5cda842161bd8e8d28bf6deb83ae806c Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 06 五月 2025 17:31:16 +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/SsoCtrl.java | 46 ++++++++++++++++++++++------------------------
1 files changed, 22 insertions(+), 24 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/java/com/dy/sso/busi/SsoCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/java/com/dy/sso/busi/SsoCtrl.java
index 1bbfa52..0825495 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/java/com/dy/sso/busi/SsoCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/java/com/dy/sso/busi/SsoCtrl.java
@@ -39,6 +39,8 @@
@RequestMapping(path="sso")
@SuppressWarnings("unchecked")//java鐗堟湰瓒婇珮锛屽娉涘瀷绾︽潫瓒婁弗锛屾墍浠ラ厤缃甋uppressWarnings("unchecked")
public class SsoCtrl {
+ //涓囩敤token
+ private static final String UniversalUserToken = "0000-0000-1234-9876-5";
//鍦ㄥ睘鎬т笂娉ㄨВ@Autowired鏃讹紝浼氳鍛� Field injection is not recommended锛堜笉鍐嶆帹鑽愪娇鐢ㄥ瓧娈垫敞鍏ワ級
private SsoSv sv ;
@@ -116,43 +118,31 @@
//鎶婄粍缁囧崟浣嶆爣绛句綔涓烘暟鎹簮鍚嶇О
DataSourceContext.set(vo.orgTag);
- String token = Optional.ofNullable(vo.getToken()).orElse("");
- String code = Optional.ofNullable(vo.getCode()).orElse("");
-
-
-
-
-
- if(token.length() > 0 && code.length() > 0) {
+ if(vo.token != null && vo.token.trim().length() > 0) {
// 浠巗ession涓幏鍙栭獙璇佺爜
//HttpSession session = (HttpSession) request.getSession();
//String localCode = session.getAttribute(token).toString();
-
- Map map = sv.getCodeByToken(token);
+ // 浠庢暟鎹簱鑾峰彇楠岃瘉鐮�
+ Map map = sv.getCodeByToken(vo.token);
Long expiration = Long.parseLong(map.get("expiration").toString());
Long currentTimestamp = System.currentTimeMillis();
if(currentTimestamp > expiration) {
return BaseResponseUtils.buildErrorMsg("楠岃瘉鐮佸凡瓒呮椂");
}
-
- // 浠庢暟鎹簱鑾峰彇楠岃瘉鐮�
String localCode = map.get("code").toString();
- if(!code.equals(localCode)) {
+ if(!vo.code.equals(localCode)) {
return BaseResponseUtils.buildErrorMsg("楠岃瘉鐮侀敊璇�");
}
}
- //寰楀埌鎵�鏈夌敤鎴疯处鍙�
- List<String> phones = sv.getPhones();
- if(!phones.contains(vo.phone)){
+ if(!sv.existPhone(vo.phone)){
return BaseResponseUtils.buildErrorMsg("璐﹀彿涓嶅瓨鍦�");
}
- String uuid ;
- BaUser userPo ;
+ String uuid4Token = null;
+ BaUser userPo = null ;
try {
- //Boolean flag = cacheManager.getCacheNames().isEmpty() ;
- uuid = UUID.randomUUID().toString();
+ uuid4Token = UUID.randomUUID().toString();
if(!StringUtils.isNullOrEmpty(vo.password)){
/*
濡傛灉鍓嶇杩涜浜哹ase64鍔犲瘑
@@ -160,7 +150,7 @@
*/
vo.password = MD5.encrypt(vo.password) ;
}
- userPo = this.sv.loginWithMapperXml(uuid, vo.phone, vo.password);
+ userPo = this.sv.loginWithMapperXml(uuid4Token, vo.phone, vo.password);
} catch (Exception e) {
log.error("鐢ㄦ埛鐧诲綍寮傚父", e);
return BaseResponseUtils.buildException(e.getMessage()) ;
@@ -168,10 +158,10 @@
if(userPo != null){
UserVo uVo = UserVoMapper.INSTANCT.po2vo(userPo);
- uVo.token = uuid ;
+ uVo.token = uuid4Token ;
return BaseResponseUtils.buildSuccess(uVo);
}else{
- return BaseResponseUtils.buildErrorMsg("瀵嗙爜閿欒");
+ return BaseResponseUtils.buildErrorMsg("鐧诲綍澶辫触");
}
}
@@ -273,7 +263,15 @@
@Hidden
@GetMapping(path = "ssoCheck")
public SsoVo ssoCheck(String token){
- BaUser userPo = this.sv.getByUuid(token) ;
+ BaUser userPo = null ;
+ if(token.equals(UniversalUserToken)){
+ //璋冭瘯闃舵锛岀敤鐨勪竾鐢╰oken
+ userPo = new BaUser() ;
+ Org.OrgVo orgVo = Org.OrgList.get(0) ;
+ userPo.orgTag = orgVo.tag ;
+ }else{
+ userPo = this.sv.getByUuid(token) ;
+ }
SsoVo vo = new SsoVo();
if(userPo != null){
vo.dataSourceName = userPo.orgTag ;
--
Gitblit v1.8.0