diff --git a/sa-token-demo/sa-token-demo-solon-redisson/pom.xml b/sa-token-demo/sa-token-demo-solon-redisson/pom.xml index 3bd1e224..9ca9a5ea 100644 --- a/sa-token-demo/sa-token-demo-solon-redisson/pom.xml +++ b/sa-token-demo/sa-token-demo-solon-redisson/pom.xml @@ -10,7 +10,7 @@ org.noear solon-parent - 3.0.1 + 3.2.1 diff --git a/sa-token-demo/sa-token-demo-solon/pom.xml b/sa-token-demo/sa-token-demo-solon/pom.xml index 2d45c537..fb1b11af 100644 --- a/sa-token-demo/sa-token-demo-solon/pom.xml +++ b/sa-token-demo/sa-token-demo-solon/pom.xml @@ -10,7 +10,7 @@ org.noear solon-parent - 3.0.4 + 3.2.1 diff --git a/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso-server-solon/pom.xml b/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso-server-solon/pom.xml index eb7f9370..bdbb5af0 100644 --- a/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso-server-solon/pom.xml +++ b/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso-server-solon/pom.xml @@ -10,7 +10,7 @@ org.noear solon-parent - 3.0.1 + 3.2.1 @@ -42,13 +42,27 @@ ${sa-token.version} - + cn.dev33 sa-token-redisx ${sa-token.version} + + + cn.dev33 + sa-token-snack3 + ${sa-token.version} + + + + + org.noear + snack3 + 3.2.133 + + org.noear diff --git a/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso-server-solon/src/main/java/com/pj/SaSsoServerApp.java b/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso-server-solon/src/main/java/com/pj/SaSsoServerApp.java index ecd7d807..e5cbc5b2 100644 --- a/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso-server-solon/src/main/java/com/pj/SaSsoServerApp.java +++ b/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso-server-solon/src/main/java/com/pj/SaSsoServerApp.java @@ -23,18 +23,18 @@ public class SaSsoServerApp { System.out.println("测试前需要根据官网文档修改 hosts 文件，测试账号密码：sa / 123456"); System.out.println(); -// SaSsoClientInfo sci = new SaSsoClientInfo(); -// sci.setClient("client1"); -// -// List list = new ArrayList<>(); -// list.add(sci); -// -// StpUtil.getSessionByLoginId(10001).set("list", list); -// -// List list2 = (List)StpUtil.getSessionByLoginId(10001).get("list"); -// for (SaSsoClientInfo info : list2) { -// System.out.println(info); -// } + SaSsoClientInfo sci = new SaSsoClientInfo(); + sci.setClient("client1"); + + List list = new ArrayList<>(); + list.add(sci); + + StpUtil.getSessionByLoginId(10001).set("list", list); + + List list2 = (List)StpUtil.getSessionByLoginId(10001).get("list"); + for (SaSsoClientInfo info : list2) { + System.out.println(info); + } } diff --git a/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso1-client-solon/pom.xml b/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso1-client-solon/pom.xml index 96f0adf1..a9b3f988 100644 --- a/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso1-client-solon/pom.xml +++ b/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso1-client-solon/pom.xml @@ -10,7 +10,7 @@ org.noear solon-parent - 3.0.1 + 3.2.1 diff --git a/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso2-client-solon/pom.xml b/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso2-client-solon/pom.xml index 306b0f57..7e15a502 100644 --- a/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso2-client-solon/pom.xml +++ b/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso2-client-solon/pom.xml @@ -10,7 +10,7 @@ org.noear solon-parent - 3.0.1 + 3.2.1 diff --git a/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso3-client-solon/pom.xml b/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso3-client-solon/pom.xml index 65dbccd6..c1ef4a17 100644 --- a/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso3-client-solon/pom.xml +++ b/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso3-client-solon/pom.xml @@ -10,7 +10,7 @@ org.noear solon-parent - 3.0.1 + 3.2.1 diff --git a/sa-token-dependencies/pom.xml b/sa-token-dependencies/pom.xml index c75944b8..746668bf 100644 --- a/sa-token-dependencies/pom.xml +++ b/sa-token-dependencies/pom.xml @@ -25,9 +25,9 @@ 6.0.0 3.0.9.RELEASE 2.3.34 - 3.0.1 + 3.2.1 1.6.9 - 3.2.127 + 3.2.133 4.9.17 3.14.4 2.5.0 diff --git a/sa-token-plugin/sa-token-snack3/src/main/java/cn/dev33/satoken/json/SaJsonTemplateForSnack3.java b/sa-token-plugin/sa-token-snack3/src/main/java/cn/dev33/satoken/json/SaJsonTemplateForSnack3.java index 9a7f83ee..3c846d9b 100644 --- a/sa-token-plugin/sa-token-snack3/src/main/java/cn/dev33/satoken/json/SaJsonTemplateForSnack3.java +++ b/sa-token-plugin/sa-token-snack3/src/main/java/cn/dev33/satoken/json/SaJsonTemplateForSnack3.java @@ -17,10 +17,11 @@ package cn.dev33.satoken.json; import cn.dev33.satoken.util.SaFoxUtil; import org.noear.snack.ONode; +import org.noear.snack.core.Feature; /** * JSON 转换器， Snack3 版实现 - * + * * @author click33 * @author noear * @since 1.41.0 @@ -32,10 +33,10 @@ public class SaJsonTemplateForSnack3 implements SaJsonTemplate { */ @Override public String objectToJson(Object obj) { - if(SaFoxUtil.isEmpty(obj)) { + if (SaFoxUtil.isEmpty(obj)) { return null; } - return ONode.stringify(obj); + return ONode.loadObj(obj, Feature.WriteClassName, Feature.NotWriteRootClassName).toJson(); } /** @@ -43,7 +44,7 @@ public class SaJsonTemplateForSnack3 implements SaJsonTemplate { */ @Override public T jsonToObject(String jsonStr, Class type) { - if(SaFoxUtil.isEmpty(jsonStr)) { + if (SaFoxUtil.isEmpty(jsonStr)) { return null; } return ONode.deserialize(jsonStr, type); diff --git a/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/SaSolonPlugin.java b/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/SaSolonPlugin.java index c0324868..67ddd9db 100644 --- a/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/SaSolonPlugin.java +++ b/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/SaSolonPlugin.java @@ -15,8 +15,6 @@ */ package cn.dev33.satoken.solon; -import cn.dev33.satoken.SaManager; -import cn.dev33.satoken.solon.json.SaJsonTemplateForSnack3; import cn.dev33.satoken.solon.oauth2.SaOAuth2BeanInject; import cn.dev33.satoken.solon.oauth2.SaOAuth2BeanRegister; import cn.dev33.satoken.solon.sso.SaSsoBeanInject; @@ -32,10 +30,6 @@ public class SaSolonPlugin implements Plugin { @Override public void start(AppContext context) { - - // 注入JSON解析器Bean - SaManager.setSaJsonTemplate(new SaJsonTemplateForSnack3()); - //sa-token context.beanMake(SaBeanRegister.class); context.beanMake(SaBeanInject.class); diff --git a/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/json/SaJsonTemplateForSnack3.java b/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/json/SaJsonTemplateForSnack3.java deleted file mode 100644 index f40bf566..00000000 --- a/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/json/SaJsonTemplateForSnack3.java +++ /dev/null @@ -1,57 +0,0 @@ -/* - * Copyright 2020-2099 sa-token.cc - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package cn.dev33.satoken.solon.json; - -import cn.dev33.satoken.json.SaJsonTemplate; -import org.noear.snack.ONode; - -/** - * @author noear - * @since 2.0 - */ -public class SaJsonTemplateForSnack3 implements SaJsonTemplate { - - /** - * 序列化：对象 -> json 字符串 - * - * @param obj / - * @return / - */ - @Override - public String objectToJson(Object obj) { - return ONode.stringify(obj); - } - - /** - * 反序列化：json 字符串 → 对象 - */ - @Override - public T jsonToObject(String jsonStr, Class type) { - return ONode.deserialize(jsonStr, type); - } - - /** - * 反序列化：json 字符串 → 对象 - * - * @param jsonStr / - * @return / - */ - @Override - public Object jsonToObject(String jsonStr) { - return ONode.deserialize(jsonStr); - } - -}