From e55b62840d471740b0bc762f64bbcdbf6d26e4ed Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期五, 17 四月 2026 20:20:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/pom.xml | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/server/pom.xml b/server/pom.xml
index cfe91fc..562c3aa 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -109,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>
<!-- 杩炴帴姹� -->
@@ -238,6 +244,12 @@
<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-->
--
Gitblit v1.9.3