From 37efe9a8d88bc58a8337e639cfd14778f5cf884f Mon Sep 17 00:00:00 2001
From: noear <noear@live.cn>
Date: Thu, 1 Dec 2022 14:28:20 +0800
Subject: [PATCH 1/2] =?UTF-8?q?sa-token-solon-plugin:=20=E5=8D=87=E7=BA=A7?=
 =?UTF-8?q?=20solon=20=E4=B8=BA=201.11.3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sa-token-dependencies/pom.xml                                   | 2 +-
 .../src/main/java/cn/dev33/satoken/solon/XPluginImp.java        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sa-token-dependencies/pom.xml b/sa-token-dependencies/pom.xml
index b99f356b..b15e7ae7 100644
--- a/sa-token-dependencies/pom.xml
+++ b/sa-token-dependencies/pom.xml
@@ -21,7 +21,7 @@
 		<jackson-datatype-jsr310.version>2.11.2</jackson-datatype-jsr310.version>
 		<servlet-api.version>3.1.0</servlet-api.version>
 		<thymeleaf.version>3.0.9.RELEASE</thymeleaf.version>
-		<solon.version>1.10.13</solon.version>
+		<solon.version>1.11.3</solon.version>
 		<noear-redisx.version>1.4.4</noear-redisx.version>
 		<jfinal.version>4.9.17</jfinal.version>
 		<jboot.version>3.14.4</jboot.version>
diff --git a/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/XPluginImp.java b/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/XPluginImp.java
index 76327612..7de4636e 100644
--- a/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/XPluginImp.java
+++ b/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/XPluginImp.java
@@ -70,7 +70,7 @@ public class XPluginImp implements Plugin {
         });
 
         // 注入侦听器 Bean
-        context.subBean(SaTokenListener.class, sl -> {
+        context.subBeansOfType(SaTokenListener.class, sl -> {
             SaTokenEventCenter.registerListener(sl);
         });
 

From 422f7d2e4c6e5b654838cb7f0423e498a7fea0d1 Mon Sep 17 00:00:00 2001
From: noear <noear@live.cn>
Date: Mon, 26 Dec 2022 15:37:39 +0800
Subject: [PATCH 2/2] =?UTF-8?q?sa-token-solon-plugin:=20=E5=8D=87=E7=BA=A7?=
 =?UTF-8?q?=20solon=20=E4=B8=BA=201.12.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sa-token-dependencies/pom.xml                               | 2 +-
 .../src/main/java/cn/dev33/satoken/solon/XPluginImp.java    | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/sa-token-dependencies/pom.xml b/sa-token-dependencies/pom.xml
index b15e7ae7..f172bbd8 100644
--- a/sa-token-dependencies/pom.xml
+++ b/sa-token-dependencies/pom.xml
@@ -21,7 +21,7 @@
 		<jackson-datatype-jsr310.version>2.11.2</jackson-datatype-jsr310.version>
 		<servlet-api.version>3.1.0</servlet-api.version>
 		<thymeleaf.version>3.0.9.RELEASE</thymeleaf.version>
-		<solon.version>1.11.3</solon.version>
+		<solon.version>1.12.0</solon.version>
 		<noear-redisx.version>1.4.4</noear-redisx.version>
 		<jfinal.version>4.9.17</jfinal.version>
 		<jboot.version>3.14.4</jboot.version>
diff --git a/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/XPluginImp.java b/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/XPluginImp.java
index 7de4636e..7adaabe6 100644
--- a/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/XPluginImp.java
+++ b/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/XPluginImp.java
@@ -69,7 +69,7 @@ public class XPluginImp implements Plugin {
             SaManager.setSaTokenSecondContext(bean.create());
         });
 
-        // 注入侦听器 Bean
+        // 注入侦听器 Bean （可以有多个）
         context.subBeansOfType(SaTokenListener.class, sl -> {
             SaTokenEventCenter.registerListener(sl);
         });
@@ -115,8 +115,8 @@ public class XPluginImp implements Plugin {
             SaManager.setSaSignTemplate(bean);
         });
 
-        // 自定义 StpLogic 对象
-        context.getBeanAsync(StpLogic.class, bean -> {
+        // 自定义 StpLogic 对象（可以有多个）
+        context.subBeansOfType(StpLogic.class, bean -> {
             StpUtil.setStpLogic(bean);
         });
     }