From 1ab5bbe3d60660da87b3648ca5883df0899c1e0e Mon Sep 17 00:00:00 2001
From: noear <noear@live.cn>
Date: Sat, 11 May 2024 13:45:40 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=20solon=20=E7=9A=84=E9=80=82?=
 =?UTF-8?q?=E9=85=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../solon/oauth2/SaOAuth2AutoConfigure.java   | 10 +++----
 .../satoken/solon/sso/SaSsoAutoConfigure.java | 26 +++++++++----------
 2 files changed, 15 insertions(+), 21 deletions(-)

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 42c3cc3e..0b01e86e 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
@@ -24,7 +24,6 @@ import org.noear.solon.annotation.Condition;
 import org.noear.solon.annotation.Configuration;
 import org.noear.solon.annotation.Inject;
 import org.noear.solon.core.AppContext;
-import org.noear.solon.core.bean.InitializingBean;
 
 /**
  * @author noear
@@ -33,12 +32,9 @@ import org.noear.solon.core.bean.InitializingBean;
 
 @Condition(onClass = SaOAuth2Manager.class)
 @Configuration
-public class SaOAuth2AutoConfigure implements InitializingBean {
-    @Inject
-    private AppContext appContext;
-
-    @Override
-    public void afterInjection() throws Throwable {
+public class SaOAuth2AutoConfigure {
+    @Bean
+    public void init(AppContext appContext) throws Throwable {
         appContext.subBeansOfType(SaOAuth2Template.class, bean -> {
             SaOAuth2Util.saOAuth2Template = bean;
         });
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 4b40bada..171ddfc0 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
@@ -36,39 +36,37 @@ import org.noear.solon.core.bean.InitializingBean;
 
 @Condition(onClass = SaSsoManager.class)
 @Configuration
-public class SaSsoAutoConfigure implements InitializingBean {
-    @Inject
-    private AppContext appContext;
-
-    @Override
-    public void afterInjection() throws Throwable {
-        appContext.subBeansOfType(SaSsoServerTemplate.class, bean->{
+public class SaSsoAutoConfigure {
+    @Bean
+    public void init(AppContext appContext) throws Throwable {
+        appContext.subBeansOfType(SaSsoServerTemplate.class, bean -> {
             SaSsoServerProcessor.instance.ssoServerTemplate = bean;
         });
-        appContext.subBeansOfType(SaSsoClientTemplate.class, bean->{
+        appContext.subBeansOfType(SaSsoClientTemplate.class, bean -> {
             SaSsoClientProcessor.instance.ssoClientTemplate = bean;
         });
 
-        appContext.subBeansOfType(SaSsoServerConfig.class, bean->{
+        appContext.subBeansOfType(SaSsoServerConfig.class, bean -> {
             SaSsoManager.setServerConfig(bean);
         });
-        appContext.subBeansOfType(SaSsoClientConfig.class, bean->{
+        appContext.subBeansOfType(SaSsoClientConfig.class, bean -> {
             SaSsoManager.setClientConfig(bean);
         });
     }
 
     /**
      * 获取 SSO Server 配置Bean
-     * */
+     */
     @Bean
-    public SaSsoServerConfig getConfig(@Inject(value = "${sa-token.sso-server}",required = false) SaSsoServerConfig ssoConfig) {
+    public SaSsoServerConfig getConfig(@Inject(value = "${sa-token.sso-server}", required = false) SaSsoServerConfig ssoConfig) {
         return ssoConfig;
     }
+
     /**
      * 获取 SSO Client 配置Bean
-     * */
+     */
     @Bean
-    public SaSsoClientConfig getClientConfig(@Inject(value = "${sa-token.sso-client}",required = false) SaSsoClientConfig ssoConfig) {
+    public SaSsoClientConfig getClientConfig(@Inject(value = "${sa-token.sso-client}", required = false) SaSsoClientConfig ssoConfig) {
         return ssoConfig;
     }
 }
\ No newline at end of file