diff --git a/servers/boe-server-all/pom.xml b/servers/boe-server-all/pom.xml index af1decf5..9f4e7327 100644 --- a/servers/boe-server-all/pom.xml +++ b/servers/boe-server-all/pom.xml @@ -82,19 +82,12 @@ 5.8.16 - - - ws.schild - jave-core - 3.3.1 - system - ${project.basedir}/src/main/resources/libs/jave-core-3.3.1.jar com.auth0 diff --git a/servers/boe-server-all/src/main/java/com/xboe/config/CustomFFMPEGLocator.java b/servers/boe-server-all/src/main/java/com/xboe/config/CustomFFMPEGLocator.java deleted file mode 100644 index ad6a5b9d..00000000 --- a/servers/boe-server-all/src/main/java/com/xboe/config/CustomFFMPEGLocator.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.xboe.config; - -import ws.schild.jave.process.ffmpeg.DefaultFFMPEGLocator; - -/** - * @author guo jia - */ -public class CustomFFMPEGLocator extends DefaultFFMPEGLocator { - - @Override - public String getExecutablePath() { - return "/usr/local/opt/ffmpeg/ffmpeg"; - } - -} diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/course/api/CourseFileApi.java b/servers/boe-server-all/src/main/java/com/xboe/module/course/api/CourseFileApi.java index a0716cee..6a125ef0 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/course/api/CourseFileApi.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/course/api/CourseFileApi.java @@ -15,7 +15,8 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import com.xboe.config.CustomFFMPEGLocator; +import it.sauronsoftware.jave.Encoder; +import it.sauronsoftware.jave.MultimediaInfo; import org.apache.commons.lang3.StringUtils; import org.springframework.orm.ObjectOptimisticLockingFailureException; import org.springframework.web.bind.annotation.GetMapping; @@ -48,8 +49,6 @@ import com.xboe.standard.BaseConstant; import com.xboe.standard.enums.BoedxCourseFileType; import lombok.extern.slf4j.Slf4j; -import ws.schild.jave.MultimediaObject; -import ws.schild.jave.info.MultimediaInfo; /** * 课件资源表,课程的相关文件内容 @@ -257,10 +256,11 @@ public class CourseFileApi extends ApiBaseController { } String fileFullPath = SysConstant.getConfigValue(BaseConstant.CONFIG_UPLOAD_FILES_SAVEPATH) + file.getFilePath(); if ("mp3,mp4".indexOf(file.getFileType()) > -1){ - log.info("上传 "+file.getFileType()+"文件:"+file.getFilePath()); + log.info("上传 "+file.getFileType()+"文件:"+file.getFilePath()); + Encoder encoder = new Encoder(); try { //System.out.println(fileFullPath); - MultimediaInfo m = new MultimediaObject(new File(fileFullPath), new CustomFFMPEGLocator()).getInfo(); + MultimediaInfo m = encoder.getInfo(new File(fileFullPath)); Long ls = m.getDuration() / 1000;//秒 log.info("文件时长 "+ls); //System.out.print("视频时长:" + ls + "秒"); diff --git a/servers/boe-server-all/src/main/resources/libs/jave-core-3.3.1.jar b/servers/boe-server-all/src/main/resources/libs/jave-core-3.3.1.jar deleted file mode 100644 index f3b7f602..00000000 Binary files a/servers/boe-server-all/src/main/resources/libs/jave-core-3.3.1.jar and /dev/null differ