From b5f23f2455f0dbe22774927d306f943d01a8bfc9 Mon Sep 17 00:00:00 2001
From: click33 <2393584716@qq.com>
Date: Mon, 19 Jul 2021 22:18:40 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AF=B9SpringBoot1.x?=
 =?UTF-8?q?=E7=89=88=E6=9C=AC=E7=9A=84=E5=85=BC=E5=AE=B9=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sa-token-demo/sa-token-demo-springboot/pom.xml                 | 1 +
 sa-token-doc/index.html                                        | 3 +++
 .../dev33/satoken/reactor/spring/SaHistoryVersionInject.java   | 3 +++
 .../java/cn/dev33/satoken/spring/SaHistoryVersionInject.java   | 3 +++
 4 files changed, 10 insertions(+)

diff --git a/sa-token-demo/sa-token-demo-springboot/pom.xml b/sa-token-demo/sa-token-demo-springboot/pom.xml
index 8048ab23..85752598 100644
--- a/sa-token-demo/sa-token-demo-springboot/pom.xml
+++ b/sa-token-demo/sa-token-demo-springboot/pom.xml
@@ -11,6 +11,7 @@
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
 		<version>2.0.0.RELEASE</version>
+		<!-- <version>1.5.9.RELEASE</version> -->
 		<relativePath/>
 	</parent>
 	
diff --git a/sa-token-doc/index.html b/sa-token-doc/index.html
index 361dd81a..af9c2efb 100644
--- a/sa-token-doc/index.html
+++ b/sa-token-doc/index.html
@@ -234,6 +234,9 @@
 						<a href="https://budwk.com/" target="_blank">
 							<img src="https://oss.dev33.cn/sa-token/com/budwk.png">
 						</a>
+						<a href="https://www.quandashi.com/" target="_blank">
+							<img src="https://oss.dev33.cn/sa-token/com/quandashi.png">
+						</a>
 					</div>
 					<div style="height: 10px; clear: both;"></div>
 					<p style="color: #666;">
diff --git a/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/spring/SaHistoryVersionInject.java b/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/spring/SaHistoryVersionInject.java
index aa3244fd..4ac8cb20 100644
--- a/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/spring/SaHistoryVersionInject.java
+++ b/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/spring/SaHistoryVersionInject.java
@@ -3,6 +3,7 @@ package cn.dev33.satoken.reactor.spring;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
+import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.env.OriginTrackedMapPropertySource;
 import org.springframework.context.EnvironmentAware;
 import org.springframework.core.env.ConfigurableEnvironment;
@@ -18,6 +19,8 @@ import cn.dev33.satoken.util.SaTokenConsts;
  * <p> 1. yml配置前缀 [spring.sa-token.] 更改为 [sa-token.]
  * @author kong
  */
+//SpringBoot 1.5.x 版本下不存在 OriginTrackedMapPropertySource ，不加这个注解会导致项目无法启动 
+@ConditionalOnClass(OriginTrackedMapPropertySource.class)	
 public class SaHistoryVersionInject implements EnvironmentAware{
 
 	@Override
diff --git a/sa-token-starter/sa-token-spring-boot-starter/src/main/java/cn/dev33/satoken/spring/SaHistoryVersionInject.java b/sa-token-starter/sa-token-spring-boot-starter/src/main/java/cn/dev33/satoken/spring/SaHistoryVersionInject.java
index 06af474b..75d98f20 100644
--- a/sa-token-starter/sa-token-spring-boot-starter/src/main/java/cn/dev33/satoken/spring/SaHistoryVersionInject.java
+++ b/sa-token-starter/sa-token-spring-boot-starter/src/main/java/cn/dev33/satoken/spring/SaHistoryVersionInject.java
@@ -3,6 +3,7 @@ package cn.dev33.satoken.spring;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
+import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.env.OriginTrackedMapPropertySource;
 import org.springframework.context.EnvironmentAware;
 import org.springframework.core.env.ConfigurableEnvironment;
@@ -18,6 +19,8 @@ import cn.dev33.satoken.util.SaTokenConsts;
  * <p> 1. yml配置前缀 [spring.sa-token.] 更改为 [sa-token.]
  * @author kong
  */
+//SpringBoot 1.5.x 版本下不存在 OriginTrackedMapPropertySource ，不加这个注解会导致项目无法启动 
+@ConditionalOnClass(OriginTrackedMapPropertySource.class)	
 public class SaHistoryVersionInject implements EnvironmentAware{
 
 	@Override