From 22603b2519b8dcb7f9a7c7d9ba636d9aba240a59 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 18 七月 2025 09:15:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/pom.xml | 19 +++++++++++++++++--
1 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/server/pom.xml b/server/pom.xml
index 38b3e63..3ba17e0 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -55,7 +55,7 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
- <!-- <exclusions>
+ <!--<exclusions>
<exclusion>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-tomcat</artifactId>
@@ -65,7 +65,6 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-tomcat</artifactId>
- <scope>provided</scope>
</dependency>
<!-- Redis -->
<dependency>
@@ -121,6 +120,20 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-quartz</artifactId>
</dependency>
+ <!--鍗庝负OBS -->
+ <dependency>
+ <groupId>com.huaweicloud</groupId>
+ <artifactId>esdk-obs-java-bundle</artifactId>
+ <version>3.23.9</version>
+ </dependency>
+
+ <!--鍗庝负OBS -->
+ <dependency>
+ <groupId>com.huaweicloud</groupId>
+ <artifactId>esdk-obs-java</artifactId>
+ <version>3.19.7</version>
+ </dependency>
+
<!-- 杩炴帴姹� -->
<dependency>
<groupId>com.alibaba</groupId>
@@ -249,6 +262,8 @@
<artifactId>wechatpay-java</artifactId>
<version>0.2.12</version>
</dependency>
+
+
<!-- <dependency>
<groupId>com.azure.spring</groupId>
<artifactId>spring-cloud-azure-starter-storage-blob</artifactId>
--
Gitblit v1.9.3