From a3746878de35c40c34537d3771abf0934ddc323b Mon Sep 17 00:00:00 2001 From: click33 <2393584716@qq.com> Date: Fri, 2 Aug 2024 03:17:09 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=20sso-server=20=E5=89=8D?= =?UTF-8?q?=E5=90=8E=E7=AB=AF=E5=88=86=E7=A6=BB=E6=97=B6=E7=9A=84=E8=B7=B3?= =?UTF-8?q?=E8=BD=AC=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sa-token-demo-sso/sa-token-demo-sso-server-h5/login.js | 2 +- .../src/main/java/com/pj/h5/H5Controller.java | 7 ++++--- .../src/main/resources/application.yml | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-server-h5/login.js b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-server-h5/login.js index 6d4f803f..fbe230be 100644 --- a/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-server-h5/login.js +++ b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-server-h5/login.js @@ -50,7 +50,7 @@ var pData = { sa.ajax("/sso/getRedirectUrl", pData, function(res) { if(res.code == 200) { // 已登录，并且redirect地址有效，开始跳转 - location.href = decodeURIComponent(res.data); + location.href = res.data; } else if(res.code == 401) { console.log('未登录'); } else { diff --git a/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-server/src/main/java/com/pj/h5/H5Controller.java b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-server/src/main/java/com/pj/h5/H5Controller.java index e26fa93f..cdd858b5 100644 --- a/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-server/src/main/java/com/pj/h5/H5Controller.java +++ b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-server/src/main/java/com/pj/h5/H5Controller.java @@ -28,13 +28,14 @@ public class H5Controller { if(StpUtil.isLogin() == false) { return SaResult.code(401); } - // 已登录情况下，构建 redirectUrl + // 已登录情况下，构建 redirectUrl + redirect = SaFoxUtil.decoderUrl(redirect); if(SaSsoConsts.MODE_SIMPLE.equals(mode)) { // 模式一 - SaSsoUtil.checkRedirectUrl(SaFoxUtil.decoderUrl(redirect)); + SaSsoUtil.checkRedirectUrl(redirect); return SaResult.data(redirect); } else { - // 模式二或模式三 + // 模式二或模式三 String redirectUrl = SaSsoUtil.buildRedirectUrl(StpUtil.getLoginId(), client, redirect); return SaResult.data(redirectUrl); } diff --git a/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso2-client/src/main/resources/application.yml b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso2-client/src/main/resources/application.yml index 8ce56dd6..c38d41ba 100644 --- a/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso2-client/src/main/resources/application.yml +++ b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso2-client/src/main/resources/application.yml @@ -8,7 +8,7 @@ sa-token: sso-client: # SSO-Server 端主机地址 server-url: http://sa-sso-server.com:9000 - # 前后端分离时用这个 + # 前后端分离时打开这个 # auth-url: http://127.0.0.1:8848/sa-token-demo-sso-server-h5/sso-auth.html sign: # API 接口调用秘钥