From 7634d7ff15b1fa84ea84a51a1ba6e45b11a4aa21 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期日, 27 四月 2025 11:17:34 +0800
Subject: [PATCH] SSO登录逻辑再修改

---
 pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/java/com/dy/sso/busi/SsoCtrl.java |   31 +++++++++++++++----------------
 1 files changed, 15 insertions(+), 16 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..f475e27 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
@@ -113,25 +113,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)){

--
Gitblit v1.8.0