From f45bcaf01cd2c96e66b08d3f9b7287aa5b4cdab2 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期五, 17 四月 2026 19:19:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/pom.xml | 34 ++++++++++++++++++++++++++++++----
1 files changed, 30 insertions(+), 4 deletions(-)
diff --git a/server/pom.xml b/server/pom.xml
index 8f1190d..562c3aa 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -35,6 +35,8 @@
<poi.version>5.0.0</poi.version>
<jjwt.version>0.9.1</jjwt.version>
<weixin-java-pay.version>4.1.0</weixin-java-pay.version>
+ <!-- 闃块噷浜慜SS瀛樺偍 -->
+ <aliyun-oss.version>3.8.0</aliyun-oss.version>
</properties>
<dependencies>
<!-- Spring Boot -->
@@ -107,6 +109,12 @@
<groupId>com.huaweicloud</groupId>
<artifactId>esdk-obs-java</artifactId>
<version>3.19.7</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>okhttp</artifactId>
+ <groupId>com.squareup.okhttp3</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
<!-- 杩炴帴姹� -->
@@ -236,12 +244,19 @@
<groupId>com.github.wechatpay-apiv3</groupId>
<artifactId>wechatpay-java</artifactId>
<version>0.2.15</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>okhttp</artifactId>
+ <groupId>com.squareup.okhttp3</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
+ <!-- 闃块噷浜慜SS-->
<dependency>
- <groupId>com.aliyun</groupId>
- <artifactId>aliyun-java-sdk-core</artifactId>
- <version>3.5.0</version>
+ <groupId>com.aliyun.oss</groupId>
+ <artifactId>aliyun-sdk-oss</artifactId>
+ <version>${aliyun-oss.version}</version>
</dependency>
<dependency>
@@ -249,7 +264,18 @@
<artifactId>aliyun-java-sdk-dysmsapi</artifactId>
<version>1.1.0</version>
</dependency>
-
+ <!-- aliyun sms SDK -->
+ <dependency>
+ <groupId>com.aliyun</groupId>
+ <artifactId>aliyun-java-sdk-core</artifactId>
+ <version>4.5.3</version>
+ </dependency>
+ <!-- 鎷奸煶杞崲 -->
+ <dependency>
+ <groupId>com.belerweb</groupId>
+ <artifactId>pinyin4j</artifactId>
+ <version>2.5.1</version>
+ </dependency>
<!-- <dependency>
<groupId>com.azure.spring</groupId>
<artifactId>spring-cloud-azure-starter-storage-blob</artifactId>
--
Gitblit v1.9.3