统一定义版本号

This commit is contained in:
click33
2022-10-22 05:18:08 +08:00
parent 4c8be2abda
commit 02b55b7665
39 changed files with 186 additions and 156 deletions

View File

@@ -24,7 +24,7 @@
<dependency>
<groupId>io.jboot</groupId>
<artifactId>jboot</artifactId>
<version>3.14.4</version>
<version>${jboot.version}</version>
<scope>provided</scope>
</dependency>
<dependency>

View File

@@ -32,7 +32,7 @@
<dependency>
<groupId>com.jfinal</groupId>
<artifactId>jfinal</artifactId>
<version>4.9.17</version>
<version>${jfinal.version}</version>
<scope>provided</scope>
</dependency>
<dependency>

View File

@@ -23,27 +23,47 @@
<artifactId>sa-token-core</artifactId>
<version>${revision}</version>
</dependency>
<!-- spring-boot-starter -->
<!-- spring-boot-starter (optional) -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter</artifactId>
<version>2.5.12</version>
<version>${springboot.version}</version>
<optional>true</optional>
</dependency>
<!-- spring-web -->
<!-- spring-web (optional) -->
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
<version>5.0.4.RELEASE</version>
<version>${spring-web.version}</version>
<optional>true</optional>
</dependency>
<!-- reactor-core -->
<!-- reactor-core (optional) -->
<dependency>
<groupId>io.projectreactor</groupId>
<artifactId>reactor-core</artifactId>
<version>3.1.4.RELEASE</version>
<version>${reactor-core.version}</version>
<optional>true</optional>
</dependency>
<!-- jackson-databind (optional) -->
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>${jackson-databind.version}</version>
<optional>true</optional>
</dependency>
<!-- config -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-configuration-processor</artifactId>
<version>${springboot.version}</version>
<optional>true</optional>
</dependency>
<!-- OAuth2.0 (optional) -->
<dependency>
<groupId>cn.dev33</groupId>
@@ -51,6 +71,7 @@
<version>${revision}</version>
<optional>true</optional>
</dependency>
<!-- SSO (optional) -->
<dependency>
<groupId>cn.dev33</groupId>
@@ -59,26 +80,10 @@
<optional>true</optional>
</dependency>
<!-- jackson-databind -->
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.12.6.1</version>
<optional>true</optional>
</dependency>
<!-- config -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-configuration-processor</artifactId>
<version>2.5.12</version>
<optional>true</optional>
</dependency>
<!-- <dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-webflux</artifactId>
<version>2.5.12</version>
<version>${springboot.version}</version>
</dependency> -->
</dependencies>

View File

@@ -23,11 +23,12 @@
<artifactId>sa-token-core</artifactId>
<version>${revision}</version>
</dependency>
<!-- Servlet API -->
<!-- Servlet API (optional) -->
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>3.1.0</version>
<version>${servlet-api.version}</version>
<optional>true</optional>
</dependency>
</dependencies>

View File

@@ -17,17 +17,17 @@
<description>solon integrate sa-token</description>
<dependencies>
<dependency>
<groupId>org.noear</groupId>
<artifactId>solon</artifactId>
<version>1.10.4</version>
</dependency>
<dependency>
<groupId>cn.dev33</groupId>
<artifactId>sa-token-core</artifactId>
<version>${revision}</version>
</dependency>
<dependency>
<groupId>org.noear</groupId>
<artifactId>solon</artifactId>
<version>${solon.version}</version>
</dependency>
</dependencies>
</project>

View File

@@ -3,7 +3,6 @@ package cn.dev33.satoken.solon;
import org.noear.solon.Solon;
import org.noear.solon.core.AopContext;
import org.noear.solon.core.Plugin;
import org.noear.solon.core.event.EventBus;
import cn.dev33.satoken.SaManager;
import cn.dev33.satoken.annotation.SaCheckBasic;
@@ -34,6 +33,7 @@ import cn.dev33.satoken.temp.SaTempInterface;
* @author noear
* @since 1.4
*/
@SuppressWarnings("deprecation")
public class XPluginImp implements Plugin {
@Override

View File

@@ -1,19 +1,21 @@
package demo;
import cn.dev33.satoken.router.SaRouter;
import cn.dev33.satoken.solon.integration.SaTokenPathFilter;
import cn.dev33.satoken.stp.StpUtil;
import org.noear.solon.annotation.Bean;
import org.noear.solon.annotation.Configuration;
import org.noear.solon.core.handle.Filter;
import cn.dev33.satoken.router.SaRouter;
import cn.dev33.satoken.solon.integration.SaTokenPathFilter;
import cn.dev33.satoken.stp.StpUtil;
/**
* @author noear 2022/3/30 created
*/
@SuppressWarnings("deprecation")
@Configuration
public class Config {
@Bean
@Bean
public Filter saTokenFilter() {
return new SaTokenPathFilter()
// 指定 [拦截路由] 与 [放行路由]

View File

@@ -17,16 +17,28 @@
<description>springboot integrate sa-token</description>
<dependencies>
<!-- sa-token-core -->
<dependency>
<groupId>cn.dev33</groupId>
<artifactId>sa-token-servlet</artifactId>
<version>${revision}</version>
</dependency>
<!-- spring-boot-starter-web (optional) -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
<version>2.5.12</version>
<version>${springboot.version}</version>
</dependency>
<!-- config (optional) -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-configuration-processor</artifactId>
<version>${springboot.version}</version>
<optional>true</optional>
</dependency>
<!-- OAuth2.0 (optional) -->
<dependency>
<groupId>cn.dev33</groupId>
@@ -34,6 +46,7 @@
<version>${revision}</version>
<optional>true</optional>
</dependency>
<!-- SSO (optional) -->
<dependency>
<groupId>cn.dev33</groupId>
@@ -41,14 +54,6 @@
<version>${revision}</version>
<optional>true</optional>
</dependency>
<!-- config -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-configuration-processor</artifactId>
<version>2.5.12</version>
<optional>true</optional>
</dependency>
</dependencies>