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 | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/framework/pom.xml b/framework/pom.xml
index 4bc2af7..c746ce1 100644
--- a/framework/pom.xml
+++ b/framework/pom.xml
@@ -15,6 +15,16 @@
<packaging>jar</packaging>
<dependencies>
+ <dependency>
+ <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>
@@ -22,11 +32,7 @@
<version>3.1.0</version>
</dependency>
- <dependency>
- <groupId>com.xuxueli</groupId>
- <artifactId>xxl-job-core</artifactId>
- <version>${xxl-job}</version>
- </dependency>
+
<dependency>
<groupId>com.qiniu</groupId>
--
Gitblit v1.8.0