From a2f275c727fafc8d5f5f5908638f9a6ace0bd425 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期五, 16 一月 2026 09:27:51 +0800
Subject: [PATCH] 【景宁】SSO单点登录接口

---
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/sso/SSOController.java |   36 +++++++++++++++++++++++++++---------
 1 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/sso/SSOController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/sso/SSOController.java
index 0de743b..5955095 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/sso/SSOController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/sso/SSOController.java
@@ -25,6 +25,7 @@
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.client.RestTemplate;
 import org.springframework.web.servlet.view.RedirectView;
+import org.springframework.web.util.UriComponentsBuilder;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -123,7 +124,7 @@
 
     /**
      * SSO鐧诲綍鍏ュ彛 - 淇¢�氶櫌浼氳皟鐢ㄨ繖涓湴鍧�
-     * 璁块棶璺緞锛歨ttp://鍩熷悕:8095/sso/login
+     * 璁块棶璺緞锛歨ttp://鍩熷悕:8095/sso/ssoLoginLyra
      */
     @GetMapping("ssoLoginLyra")
     public RedirectView ssoLoginLyra() {
@@ -145,25 +146,42 @@
         String s = HttpUtils.sendGet(url, param);
         Map<String, String> result = getResult(s);
         String code = result.get("code");
+        if (StringUtils.isEmpty(code)) {
+            log.error("鏈幏鍙栧埌鎺堟潈鐮�");
+            throw new BaseException("SSO鎺堟潈澶辫触");
+        }
+
+        String path = sysConfigService.selectConfigByKey("sys.qddz");
         try {
             SSOTokenResponse accessToken = getAccessTokenLyra(code, true);
             SSOUserInfo userInfo = getUserInfoLyra(accessToken.getAccess_token(), true);
 
             createLocalSession(userInfo);
-
-            String path = sysConfigService.selectConfigByKey("sys.qddz");
             if (StringUtils.isEmpty(path)) {
                 throw new BaseException("璇烽厤缃墠绔湴鍧�");
             }
-            String reviewUrl = path + "/loginSSO?token=" + accessToken.getAccess_token() + "&orgid=" +
-                    userInfo.getZuZhiJGID() + "&orgname=" + userInfo.getZuZhiJGMC() +
-                    "&ZuHuID="+ userInfo.getYongHuID() +"&deptCode=null";
+//            String reviewUrl = path + "/loginSSO?token=" + accessToken.getAccess_token() + "&orgid=" +
+//                    userInfo.getZuZhiJGID() + "&orgname=" + userInfo.getZuZhiJGMC() +
+//                    "&ZuHuID="+ userInfo.getYongHuID() +"&deptCode=null";
+            String reviewUrl = "";
+            reviewUrl = UriComponentsBuilder.fromHttpUrl(path)
+                    .path("/loginSSO")
+                    .queryParam("token", accessToken.getAccess_token())
+                    .queryParam("orgid", userInfo.getZuZhiJGID())
+                    .queryParam("orgname", userInfo.getZuZhiJGMC())
+                    .queryParam("ZuHuID", userInfo.getYongHuID())
+                    .queryParam("deptCode", "null")
+                    .build()
+                    .toUriString();
+
             log.info("鍗曠偣鐧婚檰閲嶅畾鍚戝湴鍧�涓猴細{}", reviewUrl);
             redirectView.setUrl(reviewUrl);
-            redirectView.setStatusCode(HttpStatus.MOVED_PERMANENTLY);
+            redirectView.setStatusCode(HttpStatus.FOUND);
         } catch (Exception e) {
-            e.printStackTrace();
-            return new RedirectView();
+            log.error("SSO鐧诲綍澶辫触", e);
+            redirectView.setUrl(path + "/login?error=sso_failed");
+            return redirectView;
+
         }
 
         return redirectView;

--
Gitblit v1.9.3