From 1d9b7306858fa6a34f6eb9e4ba4725b5bfc2cb49 Mon Sep 17 00:00:00 2001 From: click33 <2393584716@qq.com> Date: Sat, 3 May 2025 11:30:49 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E4=BC=98=E5=8C=96=20SSO=20demo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sa-token-demo-sso-client-h5/index.html | 6 +++++- .../src/main/java/com/pj/h5/H5Controller.java | 2 +- .../src/main/java/com/pj/h5/H5Controller.java | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-client-h5/index.html b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-client-h5/index.html index 1a9200a3..2e9a50d1 100644 --- a/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-client-h5/index.html +++ b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-client-h5/index.html @@ -18,7 +18,11 @@ document.querySelector('.logout-btn').href = baseUrl + '/sso/logout?satoken=' + localStorage.satoken + '&back=' + encodeURIComponent(location.href); ajax('/sso/isLogin', {}, function(res){ - setHtml('.is-login', res.data); + if(res.data) { + setHtml('.is-login', res.data + ' (' + res.loginId + ')'); + } else { + setHtml('.is-login', res.data); + } }) diff --git a/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso2-client/src/main/java/com/pj/h5/H5Controller.java b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso2-client/src/main/java/com/pj/h5/H5Controller.java index 17771d5b..c6ca57e8 100644 --- a/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso2-client/src/main/java/com/pj/h5/H5Controller.java +++ b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso2-client/src/main/java/com/pj/h5/H5Controller.java @@ -22,7 +22,7 @@ public class H5Controller { // 当前是否登录 @RequestMapping("/sso/isLogin") public Object isLogin() { - return SaResult.data(StpUtil.isLogin()); + return SaResult.data(StpUtil.isLogin()).set("loginId", StpUtil.getLoginIdDefaultNull()); } // 返回SSO认证中心登录地址 diff --git a/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso3-client/src/main/java/com/pj/h5/H5Controller.java b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso3-client/src/main/java/com/pj/h5/H5Controller.java index 17771d5b..c6ca57e8 100644 --- a/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso3-client/src/main/java/com/pj/h5/H5Controller.java +++ b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso3-client/src/main/java/com/pj/h5/H5Controller.java @@ -22,7 +22,7 @@ public class H5Controller { // 当前是否登录 @RequestMapping("/sso/isLogin") public Object isLogin() { - return SaResult.data(StpUtil.isLogin()); + return SaResult.data(StpUtil.isLogin()).set("loginId", StpUtil.getLoginIdDefaultNull()); } // 返回SSO认证中心登录地址