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 @@ org.springframework.boot spring-boot-starter-parent 2.0.0.RELEASE + 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 @@ + + +

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; *

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; *

1. yml配置前缀 [spring.sa-token.] 更改为 [sa-token.] * @author kong */ +//SpringBoot 1.5.x 版本下不存在 OriginTrackedMapPropertySource ,不加这个注解会导致项目无法启动 +@ConditionalOnClass(OriginTrackedMapPropertySource.class) public class SaHistoryVersionInject implements EnvironmentAware{ @Override