From 08fa9fe06a2a519fa157c1a093df5f4f0e7f0319 Mon Sep 17 00:00:00 2001 From: noear Date: Fri, 9 May 2025 08:39:56 +0800 Subject: [PATCH 1/7] =?UTF-8?q?feat:=20solon=20=E5=8D=87=E7=BA=A7=E4=B8=BA?= =?UTF-8?q?=203.2.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sa-token-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sa-token-dependencies/pom.xml b/sa-token-dependencies/pom.xml index c75944b8..90204478 100644 --- a/sa-token-dependencies/pom.xml +++ b/sa-token-dependencies/pom.xml @@ -25,7 +25,7 @@ 6.0.0 3.0.9.RELEASE 2.3.34 - 3.0.1 + 3.2.1 1.6.9 3.2.127 4.9.17 From 6da1359dcf54fd182e438923f70129e1087cc4c5 Mon Sep 17 00:00:00 2001 From: noear Date: Fri, 9 May 2025 08:42:46 +0800 Subject: [PATCH 2/7] =?UTF-8?q?feat:=20solon=20=E5=8D=87=E7=BA=A7=E4=B8=BA?= =?UTF-8?q?=203.2.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sa-token-demo/sa-token-demo-solon-redisson/pom.xml | 2 +- sa-token-demo/sa-token-demo-solon/pom.xml | 2 +- .../sa-token-demo-sso-server-solon/pom.xml | 2 +- .../sa-token-demo-sso1-client-solon/pom.xml | 2 +- .../sa-token-demo-sso2-client-solon/pom.xml | 2 +- .../sa-token-demo-sso3-client-solon/pom.xml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) 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..5380e3c8 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 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 From 1391b4981af22761877ce94cc4d69c231e2c4497 Mon Sep 17 00:00:00 2001 From: noear Date: Fri, 9 May 2025 08:48:21 +0800 Subject: [PATCH 3/7] =?UTF-8?q?feat:=20noear-snack3=20=E5=8D=87=E4=B8=BA?= =?UTF-8?q?=203.2.132?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sa-token-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sa-token-dependencies/pom.xml b/sa-token-dependencies/pom.xml index 90204478..03e05499 100644 --- a/sa-token-dependencies/pom.xml +++ b/sa-token-dependencies/pom.xml @@ -27,7 +27,7 @@ 2.3.34 3.2.1 1.6.9 - 3.2.127 + 3.2.132 4.9.17 3.14.4 2.5.0 From 1c0831bd9491a0299f1ec75685b4aa36a2bad0d4 Mon Sep 17 00:00:00 2001 From: noear Date: Fri, 9 May 2025 09:45:28 +0800 Subject: [PATCH 4/7] =?UTF-8?q?feat:=20noear-snack3=20=E5=8D=87=E4=B8=BA?= =?UTF-8?q?=203.2.133?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sa-token-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sa-token-dependencies/pom.xml b/sa-token-dependencies/pom.xml index 03e05499..746668bf 100644 --- a/sa-token-dependencies/pom.xml +++ b/sa-token-dependencies/pom.xml @@ -27,7 +27,7 @@ 2.3.34 3.2.1 1.6.9 - 3.2.132 + 3.2.133 4.9.17 3.14.4 2.5.0 From c70152962a3dcbdaef6f357dd7ae0956af1c1290 Mon Sep 17 00:00:00 2001 From: noear Date: Fri, 9 May 2025 10:05:20 +0800 Subject: [PATCH 5/7] =?UTF-8?q?fix:=20sa-token-snack3=20=E4=BC=98=E5=8C=96?= =?UTF-8?q?=20objectToJson=20=E5=BA=8F=E5=88=97=E5=8C=96=E5=A4=84=E7=90=86?= =?UTF-8?q?=EF=BC=88=E5=A2=9E=E5=8A=A0=E7=B1=BB=E5=90=8D=EF=BC=8C=E4=BD=86?= =?UTF-8?q?=E4=B8=8D=E5=A2=9E=E5=8A=A0=E6=A0=B9=E7=B1=BB=E5=90=8D=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/dev33/satoken/json/SaJsonTemplateForSnack3.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) 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); From bef2ae7c84983dfc81b8e162a48407f5fb123d4b Mon Sep 17 00:00:00 2001 From: noear Date: Fri, 9 May 2025 10:08:41 +0800 Subject: [PATCH 6/7] =?UTF-8?q?refactor:=20sa-token-solon-plugin=20?= =?UTF-8?q?=E7=A7=BB=E9=99=A4=20json=20=E9=80=82=E9=85=8D=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=EF=BC=88=E6=94=B9=E7=94=B1=20sa-token=20=E8=87=AA?= =?UTF-8?q?=E7=94=B1=E9=80=89=E6=8B=A9=E5=BA=8F=E5=88=97=E5=8C=96=E6=89=A9?= =?UTF-8?q?=E5=B1=95=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/dev33/satoken/solon/SaSolonPlugin.java | 6 -- .../solon/json/SaJsonTemplateForSnack3.java | 57 ------------------- 2 files changed, 63 deletions(-) delete mode 100644 sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/json/SaJsonTemplateForSnack3.java 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); - } - -} From dc85fe660ab15ee570c1ae75b14ec517cca225f3 Mon Sep 17 00:00:00 2001 From: noear Date: Fri, 9 May 2025 10:14:30 +0800 Subject: [PATCH 7/7] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=20sa-token-demo-s?= =?UTF-8?q?so-server-solon=20=E4=B8=8D=E8=83=BD=E6=AD=A3=E5=B8=B8=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=20SaSsoClientInfo=20=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sa-token-demo-sso-server-solon/pom.xml | 16 ++++++++++++- .../src/main/java/com/pj/SaSsoServerApp.java | 24 +++++++++---------- 2 files changed, 27 insertions(+), 13 deletions(-) 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 5380e3c8..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 @@ -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); + } }