From 59b1f0e9967902aa10f5e017d5a0bdfd1b60c9ea Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期三, 29 四月 2026 09:42:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/pom.xml | 15 +++++++++++++++
1 files changed, 15 insertions(+), 0 deletions(-)
diff --git a/server/pom.xml b/server/pom.xml
index cfe91fc..f8e767d 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -37,6 +37,9 @@
<weixin-java-pay.version>4.1.0</weixin-java-pay.version>
<!-- 闃块噷浜慜SS瀛樺偍 -->
<aliyun-oss.version>3.8.0</aliyun-oss.version>
+ <okhttp3.version>4.9.3</okhttp3.version>
+ <kotlin.version>1.5.31</kotlin.version>
+ <okio.version>2.10.0</okio.version>
</properties>
<dependencies>
<!-- Spring Boot -->
@@ -109,6 +112,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>
<!-- 杩炴帴姹� -->
@@ -239,6 +248,12 @@
<artifactId>wechatpay-java</artifactId>
<version>0.2.15</version>
</dependency>
+ <!-- OkHttp 4.x 闇�瑕� okio 2.x锛圞otlin 鐗堟湰锛� -->
+ <dependency>
+ <groupId>com.squareup.okio</groupId>
+ <artifactId>okio</artifactId>
+ <version>2.10.0</version>
+ </dependency>
<!-- 闃块噷浜慜SS-->
<dependency>
--
Gitblit v1.9.3