From 3fdceb6011f62d5d2a9d26f5f840f75055506226 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期二, 12 八月 2025 17:12:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
framework/pom.xml | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/framework/pom.xml b/framework/pom.xml
index 3851799..c746ce1 100644
--- a/framework/pom.xml
+++ b/framework/pom.xml
@@ -15,13 +15,18 @@
<packaging>jar</packaging>
<dependencies>
- <!-- 鑵捐cos瀵硅薄瀛樺偍鏈嶅姟 -->
<dependency>
- <groupId>com.qcloud</groupId>
- <artifactId>cos_api</artifactId>
- <version>${tx-cos.version}</version>
+ <groupId>org.bytedeco</groupId>
+ <artifactId>javacv-platform</artifactId>
+ <version>1.5.9</version>
</dependency>
<dependency>
+ <groupId>org.bytedeco</groupId>
+ <artifactId>ffmpeg-platform</artifactId>
+ <version>6.0-1.5.9</version>
+ </dependency>
+ <!-- cos sts -->
+ <dependency>
<groupId>com.qcloud</groupId>
<artifactId>cos-sts_api</artifactId>
<version>3.1.0</version>
--
Gitblit v1.8.0