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 @@ 1.34.0 - 2.1.0 + 2.1.4 UTF-8 UTF-8 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 @@ 1.34.0 - 2.1.0 + 2.1.4 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 @@ 3.1.0 6.0.0 3.0.9.RELEASE - 2.1.0 + 2.1.4 1.4.5 - 3.2.50 + 3.2.54 4.9.17 3.14.4 2.5.0 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 { /**