From 9d32174e60062dc49d23ae2c1cfc139cdb08d3d9 Mon Sep 17 00:00:00 2001
From: click33 <2393584716@qq.com>
Date: Sat, 20 Aug 2022 08:29:56 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96bean=E6=B3=A8?=
 =?UTF-8?q?=E5=85=A5=E6=94=B9=E4=B8=BAEventBus=E8=AE=A2=E9=98=85=E6=A8=A1?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cn/dev33/satoken/solon/XPluginImp.java   | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

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 c8966040..f7b5e800 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
@@ -3,9 +3,14 @@ package cn.dev33.satoken.solon;
 import org.noear.solon.Solon;
 import org.noear.solon.core.AopContext;
 import org.noear.solon.core.Plugin;
+import org.noear.solon.core.event.EventBus;
 
 import cn.dev33.satoken.SaManager;
-import cn.dev33.satoken.annotation.*;
+import cn.dev33.satoken.annotation.SaCheckBasic;
+import cn.dev33.satoken.annotation.SaCheckLogin;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.dev33.satoken.annotation.SaCheckRole;
+import cn.dev33.satoken.annotation.SaCheckSafe;
 import cn.dev33.satoken.basic.SaBasicTemplate;
 import cn.dev33.satoken.basic.SaBasicUtil;
 import cn.dev33.satoken.config.SaTokenConfig;
@@ -17,8 +22,8 @@ import cn.dev33.satoken.json.SaJsonTemplate;
 import cn.dev33.satoken.listener.SaTokenEventCenter;
 import cn.dev33.satoken.listener.SaTokenListener;
 import cn.dev33.satoken.sign.SaSignTemplate;
-import cn.dev33.satoken.solon.model.SaContextForSolon;
 import cn.dev33.satoken.solon.integration.SaTokenAnnotationInterceptor;
+import cn.dev33.satoken.solon.model.SaContextForSolon;
 import cn.dev33.satoken.stp.StpInterface;
 import cn.dev33.satoken.stp.StpLogic;
 import cn.dev33.satoken.stp.StpUtil;
@@ -64,10 +69,8 @@ public class XPluginImp implements Plugin {
         });
 
         // 注入侦听器 Bean
-        // TODO：这里需要改为注入一组 Bean 
-        context.getWrapAsyn(SaTokenListener.class, bw->{
-//            SaManager.setSaTokenListener(bw.raw());
-        	SaTokenEventCenter.registerListener(bw.raw());
+        EventBus.subscribe(SaTokenListener.class, bw->{
+        	SaTokenEventCenter.registerListener(bw);
         });
 
         // 注入权限认证 Bean