From 088f7569add35aa306dca839280a80d4f14d1574 Mon Sep 17 00:00:00 2001
From: noear <noear@live.cn>
Date: Mon, 20 Feb 2023 23:10:49 +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.1.4?=
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/resources/{application.yml => app.yml}           | 0
 sa-token-demo/sa-token-demo-sso-server-solon/pom.xml          | 2 +-
 sa-token-dependencies/pom.xml                                 | 4 ++--
 .../cn/dev33/satoken/solon/oauth2/SaOAuth2AutoConfigure.java  | 2 +-
 .../java/cn/dev33/satoken/solon/sso/SaSsoAutoConfigure.java   | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)
 rename sa-token-demo/sa-token-demo-solon/src/main/resources/{application.yml => app.yml} (100%)

diff --git a/sa-token-demo/sa-token-demo-solon/pom.xml b/sa-token-demo/sa-token-demo-solon/pom.xml
index 32cc9d83..2f380611 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.0</solon.version>
+		<solon.version>2.1.4</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/resources/application.yml b/sa-token-demo/sa-token-demo-solon/src/main/resources/app.yml
similarity index 100%
rename from sa-token-demo/sa-token-demo-solon/src/main/resources/application.yml
rename to sa-token-demo/sa-token-demo-solon/src/main/resources/app.yml
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 6dd25507..befa3549 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.0</solon.version>
+		<solon.version>2.1.4</solon.version>
 	</properties>
 
 	<dependencies>
diff --git a/sa-token-dependencies/pom.xml b/sa-token-dependencies/pom.xml
index 7731f596..528d5f85 100644
--- a/sa-token-dependencies/pom.xml
+++ b/sa-token-dependencies/pom.xml
@@ -23,9 +23,9 @@
 		<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.0</solon.version>
+		<solon.version>2.1.4</solon.version>
 		<noear-redisx.version>1.4.5</noear-redisx.version>
-		<noear-snack3.version>3.2.50</noear-snack3.version>
+		<noear-snack3.version>3.2.54</noear-snack3.version>
 		<jfinal.version>4.9.17</jfinal.version>
 		<jboot.version>3.14.4</jboot.version>
 		<commons-pool2.version>2.5.0</commons-pool2.version>
diff --git a/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/oauth2/SaOAuth2AutoConfigure.java b/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/oauth2/SaOAuth2AutoConfigure.java
index a7bb1230..7805e0ed 100644
--- a/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/oauth2/SaOAuth2AutoConfigure.java
+++ b/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/oauth2/SaOAuth2AutoConfigure.java
@@ -13,7 +13,7 @@ import org.noear.solon.annotation.Inject;
  * @author noear
  * @since 2.0
  */
-@Condition(hasClass = SaOAuth2Manager.class)
+@Condition(onClass = SaOAuth2Manager.class)
 @Configuration
 public class SaOAuth2AutoConfigure {
     /**
diff --git a/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/sso/SaSsoAutoConfigure.java b/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/sso/SaSsoAutoConfigure.java
index c40002c9..56edc176 100644
--- a/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/sso/SaSsoAutoConfigure.java
+++ b/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/sso/SaSsoAutoConfigure.java
@@ -14,7 +14,7 @@ import org.noear.solon.annotation.Inject;
  * @author noear
  * @since 2.0
  */
-@Condition(hasClass = SaSsoManager.class)
+@Condition(onClass = SaSsoManager.class)
 @Configuration
 public class SaSsoAutoConfigure {
     /**