From 870b7099de976ed144515a76dc19f6a2c1685543 Mon Sep 17 00:00:00 2001
From: noear <noear@live.cn>
Date: Fri, 3 Mar 2023 16:19:14 +0800
Subject: [PATCH] =?UTF-8?q?sa-token-solon-plugin:=20=E5=8D=87=E7=BA=A7=20s?=
 =?UTF-8?q?olon=20=E4=B8=BA=202.2.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sa-token-demo/sa-token-demo-solon/pom.xml                    | 2 +-
 .../src/main/java/com/pj/SaTokenDemoApp.java                 | 2 ++
 sa-token-demo/sa-token-demo-sso-server-solon/pom.xml         | 2 +-
 .../src/main/java/com/pj/SaSsoServerApp.java                 | 2 ++
 sa-token-dependencies/pom.xml                                | 2 +-
 .../src/main/java/cn/dev33/satoken/solon/XPluginImp.java     | 5 ++---
 6 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/sa-token-demo/sa-token-demo-solon/pom.xml b/sa-token-demo/sa-token-demo-solon/pom.xml
index 2f380611..ffaed51b 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 @@
 	<!-- 定义 Sa-Token 版本号 -->
 	<properties>
 		<sa-token.version>1.34.0</sa-token.version>
-		<solon.version>2.1.4</solon.version>
+		<solon.version>2.2.1</solon.version>
 	    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 	    <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 	</properties>
diff --git a/sa-token-demo/sa-token-demo-solon/src/main/java/com/pj/SaTokenDemoApp.java b/sa-token-demo/sa-token-demo-solon/src/main/java/com/pj/SaTokenDemoApp.java
index 6607050d..8173ea54 100644
--- a/sa-token-demo/sa-token-demo-solon/src/main/java/com/pj/SaTokenDemoApp.java
+++ b/sa-token-demo/sa-token-demo-solon/src/main/java/com/pj/SaTokenDemoApp.java
@@ -2,6 +2,7 @@ package com.pj;
 
 
 import org.noear.solon.Solon;
+import org.noear.solon.annotation.SolonMain;
 
 import cn.dev33.satoken.SaManager;
 
@@ -10,6 +11,7 @@ import cn.dev33.satoken.SaManager;
  * @author noear
  *
  */
+@SolonMain
 public class SaTokenDemoApp {
 
 	public static void main(String[] args) {
diff --git a/sa-token-demo/sa-token-demo-sso-server-solon/pom.xml b/sa-token-demo/sa-token-demo-sso-server-solon/pom.xml
index befa3549..b4428659 100644
--- a/sa-token-demo/sa-token-demo-sso-server-solon/pom.xml
+++ b/sa-token-demo/sa-token-demo-sso-server-solon/pom.xml
@@ -9,7 +9,7 @@
 	<!-- 定义 Sa-Token 版本号 -->
 	<properties>
 		<sa-token.version>1.34.0</sa-token.version>
-		<solon.version>2.1.4</solon.version>
+		<solon.version>2.2.1</solon.version>
 	</properties>
 
 	<dependencies>
diff --git a/sa-token-demo/sa-token-demo-sso-server-solon/src/main/java/com/pj/SaSsoServerApp.java b/sa-token-demo/sa-token-demo-sso-server-solon/src/main/java/com/pj/SaSsoServerApp.java
index 29ba2013..82fae5d6 100644
--- a/sa-token-demo/sa-token-demo-sso-server-solon/src/main/java/com/pj/SaSsoServerApp.java
+++ b/sa-token-demo/sa-token-demo-sso-server-solon/src/main/java/com/pj/SaSsoServerApp.java
@@ -2,7 +2,9 @@ package com.pj;
 
 
 import org.noear.solon.Solon;
+import org.noear.solon.annotation.SolonMain;
 
+@SolonMain
 public class SaSsoServerApp {
 
 	public static void main(String[] args) {
diff --git a/sa-token-dependencies/pom.xml b/sa-token-dependencies/pom.xml
index 528d5f85..8d17df16 100644
--- a/sa-token-dependencies/pom.xml
+++ b/sa-token-dependencies/pom.xml
@@ -23,7 +23,7 @@
 		<servlet-api.version>3.1.0</servlet-api.version>
 		<jakarta-servlet-api.version>6.0.0</jakarta-servlet-api.version>
 		<thymeleaf.version>3.0.9.RELEASE</thymeleaf.version>
-		<solon.version>2.1.4</solon.version>
+		<solon.version>2.2.1</solon.version>
 		<noear-redisx.version>1.4.5</noear-redisx.version>
 		<noear-snack3.version>3.2.54</noear-snack3.version>
 		<jfinal.version>4.9.17</jfinal.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 0005a119..b08c54d1 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,7 +3,6 @@ package cn.dev33.satoken.solon;
 import cn.dev33.satoken.solon.oauth2.SaOAuth2AutoConfigure;
 import cn.dev33.satoken.solon.sso.SaSsoAutoConfigure;
 import org.noear.solon.Solon;
-import org.noear.solon.Utils;
 import org.noear.solon.core.AopContext;
 import org.noear.solon.core.Plugin;
 
@@ -40,8 +39,8 @@ public class XPluginImp implements Plugin {
 
 
         //注入其它 Bean
-        context.beanOnloaded(c -> {
-            beanInitDo(c);
+        context.lifecycle(-99, () -> {
+            beanInitDo(context);
             context.beanMake(SaSsoAutoConfigure.class);
             context.beanMake(SaOAuth2AutoConfigure.class);
         });