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 @@