From 2ecd52b3bede41ad738ba0f623a766caaf668463 Mon Sep 17 00:00:00 2001 From: click33 <2393584716@qq.com> Date: Tue, 6 May 2025 23:26:49 +0800 Subject: [PATCH] =?UTF-8?q?feat(sso):=20=E8=B0=83=E6=95=B4=20SSO=20?= =?UTF-8?q?=E7=A4=BA=E4=BE=8B=E9=80=82=E9=85=8D=E6=9C=80=E6=96=B0=E7=89=88?= =?UTF-8?q?=20&=20=E6=96=B0=E5=A2=9E=20sso-resdk=20=E7=A4=BA=E4=BE=8B=20&?= =?UTF-8?q?=20=E6=96=B0=E5=A2=9E=20sso-anon=20=E7=A4=BA=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/dev33/satoken/util/SaResult.java | 6 +- sa-token-demo/pom.xml | 3 +- .../sa-token-demo-sso-client-h5/index.html | 61 +++++++++--- .../{common.js => sso-common.js} | 3 +- .../sso-login.html | 6 +- .../views/{method-util.js => sso-common.js} | 9 +- .../src/views/sso-index.vue | 69 +++++++++++--- .../src/views/sso-login.vue | 8 +- .../src/router/index.js | 4 +- .../views/{method-util.js => sso-common.js} | 9 +- .../src/views/sso-index.vue | 81 ++++++++++++---- .../src/views/sso-login.vue | 6 +- .../java/com/pj/SaSsoServerApplication.java | 2 +- .../com/pj/{home => sso}/HomeController.java | 2 +- .../java/com/pj/sso/SsoServerController.java | 35 +++---- .../src/main/resources/application.yml | 56 ++++++----- .../java/com/pj/SaSso1ClientApplication.java | 2 +- .../java/com/pj/sso/SsoClientController.java | 8 +- .../src/main/resources/application.yml | 2 +- .../sa-token-demo-sso2-client/pom.xml | 8 +- .../java/com/pj/SaSso2ClientApplication.java | 2 +- .../src/main/java/com/pj/h5/H5Controller.java | 14 +-- .../main/java/com/pj/h5/SaTokenConfigure.java | 2 +- .../com/pj/sso/GlobalExceptionHandler.java | 22 +++++ .../java/com/pj/sso/SsoClientController.java | 58 ++++++++---- .../src/main/resources/application.yml | 13 ++- .../pom.xml | 16 ++-- .../com/pj/SaSso3ClientAnonApplication.java | 23 +++++ .../com/pj/sso/GlobalExceptionHandler.java | 22 +++++ .../java/com/pj/sso/SsoClientController.java | 88 ++++++++++++++++++ .../src/main/resources/application.yml | 14 +-- .../com/pj/SaSsoClientNoSdkApplication.java | 6 +- .../sa-token-demo-sso3-client-resdk/pom.xml | 54 +++++++++++ .../com/pj/SaSsoClientReSdkApplication.java} | 16 ++-- .../com/pj/resdk/MyHttpSessionHolder.java | 34 +++++++ .../com/pj/resdk/StpLogicForHttpSession.java | 69 ++++++++++++++ .../com/pj/sso/GlobalExceptionHandler.java | 22 +++++ .../java/com/pj/sso/SsoClientController.java | 92 +++++++++++++++++++ .../src/main/resources/application.yml | 18 ++++ .../java/com/pj/sso/SsoClientController.java | 78 ---------------- .../java/com/pj/SaSso3ClientApplication.java | 2 +- .../src/main/java/com/pj/h5/H5Controller.java | 14 +-- .../main/java/com/pj/h5/SaTokenConfigure.java | 2 +- .../com/pj/sso/GlobalExceptionHandler.java | 22 +++++ .../java/com/pj/sso/SsoClientController.java | 78 ++++++++-------- .../src/main/resources/application.yml | 6 +- .../satoken/sso/config/SaSsoClientConfig.java | 6 +- .../satoken/sso/config/SaSsoServerConfig.java | 2 +- .../function/SaSsoMessageHandleFunction.java | 35 +++++++ ...Function.java => SendRequestFunction.java} | 2 +- .../sso/message/SaSsoMessageHolder.java | 14 +++ .../handle/SaSsoMessageSimpleHandle.java | 67 ++++++++++++++ .../client/SaSsoMessageLogoutCallHandle.java | 4 +- .../server/SaSsoMessageCheckTicketHandle.java | 2 +- .../server/SaSsoMessageSignoutHandle.java | 2 +- .../sso/processor/SaSsoClientProcessor.java | 32 +++++-- .../sso/processor/SaSsoServerProcessor.java | 16 +++- .../sso/strategy/SaSsoClientStrategy.java | 4 +- .../sso/strategy/SaSsoServerStrategy.java | 16 +++- .../sso/template/SaSsoClientTemplate.java | 1 - .../sso/template/SaSsoServerTemplate.java | 47 ++++++---- .../satoken/sso/template/SaSsoTemplate.java | 32 ++++++- 62 files changed, 1090 insertions(+), 359 deletions(-) rename sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-client-h5/{common.js => sso-common.js} (91%) rename sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-client-vue2/src/views/{method-util.js => sso-common.js} (71%) rename sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-client-vue3/src/views/{method-util.js => sso-common.js} (71%) rename sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-server/src/main/java/com/pj/{home => sso}/HomeController.java (98%) create mode 100644 sa-token-demo/sa-token-demo-sso/sa-token-demo-sso2-client/src/main/java/com/pj/sso/GlobalExceptionHandler.java rename sa-token-demo/sa-token-demo-sso/{sa-token-demo-sso3-client-test2 => sa-token-demo-sso3-client-anon}/pom.xml (88%) create mode 100644 sa-token-demo/sa-token-demo-sso/sa-token-demo-sso3-client-anon/src/main/java/com/pj/SaSso3ClientAnonApplication.java create mode 100644 sa-token-demo/sa-token-demo-sso/sa-token-demo-sso3-client-anon/src/main/java/com/pj/sso/GlobalExceptionHandler.java create mode 100644 sa-token-demo/sa-token-demo-sso/sa-token-demo-sso3-client-anon/src/main/java/com/pj/sso/SsoClientController.java rename sa-token-demo/sa-token-demo-sso/{sa-token-demo-sso3-client-test2 => sa-token-demo-sso3-client-anon}/src/main/resources/application.yml (73%) create mode 100644 sa-token-demo/sa-token-demo-sso/sa-token-demo-sso3-client-resdk/pom.xml rename sa-token-demo/sa-token-demo-sso/{sa-token-demo-sso3-client-test2/src/main/java/com/pj/SaSso3ClientTest2Application.java => sa-token-demo-sso3-client-resdk/src/main/java/com/pj/SaSsoClientReSdkApplication.java} (65%) create mode 100644 sa-token-demo/sa-token-demo-sso/sa-token-demo-sso3-client-resdk/src/main/java/com/pj/resdk/MyHttpSessionHolder.java create mode 100644 sa-token-demo/sa-token-demo-sso/sa-token-demo-sso3-client-resdk/src/main/java/com/pj/resdk/StpLogicForHttpSession.java create mode 100644 sa-token-demo/sa-token-demo-sso/sa-token-demo-sso3-client-resdk/src/main/java/com/pj/sso/GlobalExceptionHandler.java create mode 100644 sa-token-demo/sa-token-demo-sso/sa-token-demo-sso3-client-resdk/src/main/java/com/pj/sso/SsoClientController.java create mode 100644 sa-token-demo/sa-token-demo-sso/sa-token-demo-sso3-client-resdk/src/main/resources/application.yml delete mode 100644 sa-token-demo/sa-token-demo-sso/sa-token-demo-sso3-client-test2/src/main/java/com/pj/sso/SsoClientController.java create mode 100644 sa-token-demo/sa-token-demo-sso/sa-token-demo-sso3-client/src/main/java/com/pj/sso/GlobalExceptionHandler.java create mode 100644 sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/function/SaSsoMessageHandleFunction.java rename sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/function/{SendHttpFunction.java => SendRequestFunction.java} (92%) create mode 100644 sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/message/handle/SaSsoMessageSimpleHandle.java diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/util/SaResult.java b/sa-token-core/src/main/java/cn/dev33/satoken/util/SaResult.java index 215b784f..b178f47d 100644 --- a/sa-token-core/src/main/java/cn/dev33/satoken/util/SaResult.java +++ b/sa-token-core/src/main/java/cn/dev33/satoken/util/SaResult.java @@ -149,8 +149,10 @@ public class SaResult extends LinkedHashMap implements Serializa * @return 对象自身 */ public SaResult setMap(Map map) { - for (String key : map.keySet()) { - this.put(key, map.get(key)); + if(map != null) { + for (String key : map.keySet()) { + this.put(key, map.get(key)); + } } return this; } diff --git a/sa-token-demo/pom.xml b/sa-token-demo/pom.xml index bb34b4f8..f068e233 100644 --- a/sa-token-demo/pom.xml +++ b/sa-token-demo/pom.xml @@ -44,8 +44,9 @@ sa-token-demo-sso/sa-token-demo-sso1-client sa-token-demo-sso/sa-token-demo-sso2-client sa-token-demo-sso/sa-token-demo-sso3-client - sa-token-demo-sso/sa-token-demo-sso3-client-test2 sa-token-demo-sso/sa-token-demo-sso3-client-nosdk + sa-token-demo-sso/sa-token-demo-sso3-client-resdk + sa-token-demo-sso/sa-token-demo-sso3-client-anon sa-token-demo-sso-for-solon/sa-token-demo-sso-server-solon sa-token-demo-sso-for-solon/sa-token-demo-sso1-client-solon sa-token-demo-sso-for-solon/sa-token-demo-sso2-client-solon 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 2e9a50d1..1ce21047 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 @@ -8,22 +8,59 @@

Sa-Token SSO-Client 应用端(前后端分离版-原生h5)

当前是否登录:

- - 注销 + 登录 - + 单应用注销 - + 单浏览器注销 - + 全端注销 - + 账号资料

- + diff --git a/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-client-h5/common.js b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-client-h5/sso-common.js similarity index 91% rename from sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-client-h5/common.js rename to sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-client-h5/sso-common.js index 736f4744..8dcb0a2b 100644 --- a/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-client-h5/common.js +++ b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-client-h5/sso-common.js @@ -1,5 +1,6 @@ // 服务器接口主机地址 -var baseUrl = "http://sa-sso-client1.com:9003"; +// var baseUrl = "http://sa-sso-client1.com:9002"; // 模式二后端 +var baseUrl = "http://sa-sso-client1.com:9003"; // 模式三后端 // 封装一下Ajax function ajax(path, data, successFn, errorFn) { diff --git a/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-client-h5/sso-login.html b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-client-h5/sso-login.html index ba80d0eb..8ac77614 100644 --- a/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-client-h5/sso-login.html +++ b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-client-h5/sso-login.html @@ -2,16 +2,16 @@ - Sa-Token-SSO-Client端-登录页 + Sa-Token-SSO-Client端-登录中转页页 - + diff --git a/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-client-vue2/src/views/sso-login.vue b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-client-vue2/src/views/sso-login.vue index 1ba071a3..09666056 100644 --- a/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-client-vue2/src/views/sso-login.vue +++ b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-client-vue2/src/views/sso-login.vue @@ -1,10 +1,10 @@ - + diff --git a/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-client-vue3/src/views/sso-login.vue b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-client-vue3/src/views/sso-login.vue index 57e718b3..f8d7aea1 100644 --- a/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-client-vue3/src/views/sso-login.vue +++ b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-client-vue3/src/views/sso-login.vue @@ -1,11 +1,11 @@