From 5f514e032986ae9d116aaa55a91c4b0617b6e57a Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 20 六月 2025 17:36:40 +0800
Subject: [PATCH] 修改水肥机、气象、墒情值对象中的bug
---
pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/java/com/dy/sso/busi/SsoCtrl.java | 43 ++++++++++++++++++++++++++-----------------
1 files changed, 26 insertions(+), 17 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 2dd7dee..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 ;
@@ -113,25 +115,24 @@
if(vo.orgTag == null || vo.orgTag.trim().length() == 0){
return BaseResponseUtils.buildErrorMsg("鏈�夋嫨缁勭粐鍗曚綅");
}
- if(vo.token == null || vo.token.trim().length() == 0){
- return BaseResponseUtils.buildErrorMsg("鏃爐oken");
- }
- if(vo.code == null || vo.code.trim().length() == 0){
- return BaseResponseUtils.buildErrorMsg("璇疯緭鍏ラ獙璇佺爜");
- }
//鎶婄粍缁囧崟浣嶆爣绛句綔涓烘暟鎹簮鍚嶇О
DataSourceContext.set(vo.orgTag);
- // 浠庢暟鎹簱鑾峰彇楠岃瘉鐮�
- 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(!vo.code.equals(localCode)) {
- return BaseResponseUtils.buildErrorMsg("楠岃瘉鐮侀敊璇�");
+ 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(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(!vo.code.equals(localCode)) {
+ return BaseResponseUtils.buildErrorMsg("楠岃瘉鐮侀敊璇�");
+ }
}
if(!sv.existPhone(vo.phone)){
@@ -262,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