From 8458e64aab474c0fc2f49ae4ff22fb11ce5cf6e2 Mon Sep 17 00:00:00 2001
From: “djh” <“3298565835@qq.com”>
Date: 星期一, 11 十一月 2024 16:55:28 +0800
Subject: [PATCH] 批次新增学员查询条件，新增题目导入接口
---
exam-common/src/main/java/com/gkhy/exam/common/config/FFmpegConfig.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/exam-common/src/main/java/com/gkhy/exam/common/config/FFmpegConfig.java b/exam-common/src/main/java/com/gkhy/exam/common/config/FFmpegConfig.java
index 7e16065..0eecf2d 100644
--- a/exam-common/src/main/java/com/gkhy/exam/common/config/FFmpegConfig.java
+++ b/exam-common/src/main/java/com/gkhy/exam/common/config/FFmpegConfig.java
@@ -20,8 +20,11 @@
@Bean
public FFmpeg fFmpeg() {
String path = System.getProperty("user.dir");
+ if(path.endsWith("exam-admin")){
+ path=path.replace("\\exam-admin","");
+ }
if (isLinux()){
- path+="ffmpeg/ffmpeg-linux/ffmpeg";
+ path+="/ffmpeg/ffmpeg-linux/ffmpeg";
}else if (isWindows()){
path+="/ffmpeg/ffmpeg-win/bin/ffmpeg.exe";
}
@@ -34,7 +37,7 @@
public FFprobe fFprobe() {
String path = System.getProperty("user.dir");
if (isLinux()){
- path+="ffmpeg/ffmpeg-linux/ffprobe";
+ path+="/ffmpeg/ffmpeg-linux/ffprobe";
}else if (isWindows()){
path+="/ffmpeg/ffmpeg-win/bin/ffprobe.exe";
}
--
Gitblit v1.9.2