From eb056c1cac152bf82bff5c7115186a66561bc73b Mon Sep 17 00:00:00 2001
From: liriming <1343021927@qq.com>
Date: 星期三, 04 十二月 2024 13:24:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
pom.xml | 112 ++++++++------------------------------------------------
1 files changed, 16 insertions(+), 96 deletions(-)
diff --git a/pom.xml b/pom.xml
index 37b3502..600c853 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,6 +26,8 @@
<maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
<flatten-maven-plugin.version>1.5.0</flatten-maven-plugin.version>
<!-- 统一依赖管理 -->
+ <spring.framework.version>5.3.39</spring.framework.version>
+ <spring.security.version>5.8.14</spring.security.version>
<spring.boot.version>2.7.18</spring.boot.version>
<spring.cloud.version>2021.0.9</spring.cloud.version>
<spring.cloud.alibaba.version>2021.0.6.1</spring.cloud.alibaba.version>
@@ -82,24 +84,26 @@
<ip2region.version>2.7.0</ip2region.version>
<bizlog-sdk.version>3.0.6</bizlog-sdk.version>
<reflections.version>0.10.2</reflections.version>
- <!-- 三方云服务相关 -->
- <okio.version>3.5.0</okio.version>
- <okhttp3.version>4.11.0</okhttp3.version>
- <commons-io.version>2.15.1</commons-io.version>
- <minio.version>8.5.7</minio.version>
- <aliyun-java-sdk-core.version>4.6.4</aliyun-java-sdk-core.version>
- <aliyun-java-sdk-dysmsapi.version>2.2.1</aliyun-java-sdk-dysmsapi.version>
- <tencentcloud-sdk-java.version>3.1.880</tencentcloud-sdk-java.version>
- <justauth.version>1.0.8</justauth.version>
- <jimureport.version>1.6.6</jimureport.version>
- <xercesImpl.version>2.12.2</xercesImpl.version>
- <weixin-java.version>4.6.0</weixin-java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<dependencyManagement>
<dependencies>
<!-- 统一依赖管理 -->
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-framework-bom</artifactId> <!-- JDK8 版本独有：保证 Spring Framework 尽量高 -->
+ <version>${spring.framework.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.security</groupId>
+ <artifactId>spring-security-bom</artifactId> <!-- JDK8 版本独有：保证 Spring Security 尽量高 -->
+ <version>${spring.security.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
@@ -383,12 +387,6 @@
</dependency>
<dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>${commons-io.version}</version>
- </dependency>
-
- <dependency>
<groupId>org.apache.tika</groupId>
<artifactId>tika-core</artifactId> <!-- 文件类型的识别 -->
<version>${tika-core.version}</version>
@@ -473,84 +471,6 @@
<groupId>org.reflections</groupId>
<artifactId>reflections</artifactId>
<version>${reflections.version}</version>
- </dependency>
-
- <!-- 三方云服务相关 -->
- <dependency>
- <groupId>com.squareup.okio</groupId>
- <artifactId>okio</artifactId>
- <version>${okio.version}</version>
- </dependency>
- <dependency>
- <groupId>com.squareup.okhttp3</groupId>
- <artifactId>okhttp</artifactId>
- <version>${okhttp3.version}</version>
- </dependency>
- <dependency>
- <groupId>io.minio</groupId>
- <artifactId>minio</artifactId>
- <version>${minio.version}</version>
- </dependency>
-
- <dependency>
- <groupId>com.github.binarywang</groupId>
- <artifactId>weixin-java-pay</artifactId>
- <version>${weixin-java.version}</version>
- </dependency>
- <dependency>
- <groupId>com.github.binarywang</groupId>
- <artifactId>wx-java-mp-spring-boot-starter</artifactId>
- <version>${weixin-java.version}</version>
- </dependency>
- <dependency>
- <groupId>com.github.binarywang</groupId>
- <artifactId>wx-java-miniapp-spring-boot-starter</artifactId>
- <version>${weixin-java.version}</version>
- </dependency>
-
- <dependency>
- <groupId>com.xingyuv</groupId>
- <artifactId>spring-boot-starter-justauth</artifactId> <!-- 社交登陆（例如说，个人微信、企业微信等等） -->
- <version>${justauth.version}</version>
- <exclusions>
- <exclusion>
- <groupId>cn.hutool</groupId>
- <artifactId>hutool-core</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>com.github.binarywang</groupId>
- <artifactId>wx-java-miniapp-spring-boot-starter</artifactId>
- <version>${weixin-java.version}</version>
- </dependency>
-
- <!-- SMS SDK begin -->
- <dependency>
- <groupId>com.aliyun</groupId>
- <artifactId>aliyun-java-sdk-core</artifactId>
- <version>${aliyun-java-sdk-core.version}</version>
- <exclusions>
- <exclusion>
- <artifactId>opentracing-api</artifactId>
- <groupId>io.opentracing</groupId>
- </exclusion>
- <exclusion>
- <artifactId>opentracing-util</artifactId>
- <groupId>io.opentracing</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>com.aliyun</groupId>
- <artifactId>aliyun-java-sdk-dysmsapi</artifactId>
- <version>${aliyun-java-sdk-dysmsapi.version}</version>
- </dependency>
- <dependency>
- <groupId>com.tencentcloudapi</groupId>
- <artifactId>tencentcloud-sdk-java-sms</artifactId>
- <version>${tencentcloud-sdk-java.version}</version>
</dependency>
</dependencies>
--
Gitblit v1.9.3