From efa8523a2067568dcba9b5eb159c51ccf8961d8b Mon Sep 17 00:00:00 2001
From: noear <noear@live.cn>
Date: Sun, 29 Jan 2023 18:21:47 +0800
Subject: [PATCH] =?UTF-8?q?sa-token-demo-sso-server-solon::=E6=A0=B9?=
 =?UTF-8?q?=E6=8D=AE=20sa-token-solon-plugin=20=E6=9C=80=E6=96=B0=E7=9A=84?=
 =?UTF-8?q?=E9=80=82=E9=85=8D=E4=BB=A3=E7=A0=81=EF=BC=8C=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=E7=A4=BA=E4=BE=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sa-token-demo/sa-token-demo-sso-server-solon/pom.xml | 12 ++++--------
 .../src/main/java/com/pj/sso/SsoConfig.java          |  9 +--------
 sa-token-dependencies/pom.xml                        |  2 +-
 3 files changed, 6 insertions(+), 17 deletions(-)

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 0c7c41d7..fda1c56e 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
@@ -6,17 +6,10 @@
 	<artifactId>sa-token-demo-sso-server-solon</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
 	
-	<!-- SpringBoot -->
-	<parent>
-		<groupId>org.noear</groupId>
-		<artifactId>solon-parent</artifactId>
-		<version>1.12.0</version>
-		<relativePath/>
-	</parent>
-	
 	<!-- 定义 Sa-Token 版本号 -->
 	<properties>
 		<sa-token.version>1.34.0</sa-token.version>
+		<solon.version>1.12.4</solon.version>
 	</properties>
 
 	<dependencies>
@@ -25,6 +18,7 @@
 		<dependency>
 			<groupId>org.noear</groupId>
 			<artifactId>solon-web</artifactId>
+			<version>${solon.version}</version>
 		</dependency>
 		
 		<!-- Sa-Token 权限认证, 在线文档：https://sa-token.cc/ -->
@@ -52,12 +46,14 @@
 		<dependency>
 			<groupId>org.noear</groupId>
 			<artifactId>solon.view.thymeleaf</artifactId>
+			<version>${solon.version}</version>
 		</dependency>
 		
 		<!-- Http请求工具（在模式三的单点注销功能下用到，如不需要可以注释掉） -->
 		<dependency>
 		    <groupId>org.noear</groupId>
 		    <artifactId>forest-solon-plugin</artifactId>
+			<version>${solon.version}</version>
 		</dependency>
 
 
diff --git a/sa-token-demo/sa-token-demo-sso-server-solon/src/main/java/com/pj/sso/SsoConfig.java b/sa-token-demo/sa-token-demo-sso-server-solon/src/main/java/com/pj/sso/SsoConfig.java
index 2e77fd2f..645885d8 100644
--- a/sa-token-demo/sa-token-demo-sso-server-solon/src/main/java/com/pj/sso/SsoConfig.java
+++ b/sa-token-demo/sa-token-demo-sso-server-solon/src/main/java/com/pj/sso/SsoConfig.java
@@ -16,13 +16,6 @@ import org.noear.solon.core.handle.ModelAndView;
  */
 @Configuration
 public class SsoConfig {
-    /**
-     * 构建 SaSsoConfig bean
-     * */
-    @Bean
-    public SaSsoConfig getSaSsoConfig(@Inject("${sa-token.sso}") SaSsoConfig ssoConfig) {
-        return ssoConfig;
-    }
 
     /**
      * 构建建 SaToken redis dao（如果不需要 redis；可以注释掉）
@@ -34,7 +27,7 @@ public class SsoConfig {
 
     // 配置SSO相关参数
     @Bean
-    public void configSso(SaSsoConfig sso) {
+    public void configSso(SaSsoConfig sso) { //SaSsoConfig 已自动构建
 
         // 配置：未登录时返回的View
         sso.setNotLoginView(() -> {
diff --git a/sa-token-dependencies/pom.xml b/sa-token-dependencies/pom.xml
index 47955d76..63c7f8f2 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>1.12.2</solon.version>
+		<solon.version>1.12.4</solon.version>
 		<noear-redisx.version>1.4.5</noear-redisx.version>
 		<noear-snack3.version>3.2.50</noear-snack3.version>
 		<jfinal.version>4.9.17</jfinal.version>