Merge branch 'dev' into oscs_fix_cd7pr50au51q1alfu1g0

This commit is contained in:
click33
2022-10-22 05:27:43 +08:00
committed by GitHub
112 changed files with 2487 additions and 515 deletions

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.3.7</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>