hz/java-servers
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/per-boe/java-servers.git synced 2025-12-11 03:46:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'nyx/20251103-1282-fix-gj' into release-20250328-master

Browse Source 
# Conflicts:
#	servers/boe-server-all/src/main/java/com/xboe/module/course/api/CourseFileApi.java
This commit is contained in:
joshen
2025-11-04 16:58:24 +08:00
parent 4ede914452 748f7c5913
commit 07b501742f
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
servers/boe-server-all/src/main/java/com/xboe/module/course/api/CourseFileApi.java
View File

@@ -15,6 +15,8 @@ import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import it.sauronsoftware.jave.Encoder;
import it.sauronsoftware.jave.MultimediaInfo;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.orm.ObjectOptimisticLockingFailureException; import org.springframework.orm.ObjectOptimisticLockingFailureException;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
@@ -46,8 +48,6 @@ import com.xboe.module.scorm.SCORMParser;
import com.xboe.standard.BaseConstant; import com.xboe.standard.BaseConstant;
import com.xboe.standard.enums.BoedxCourseFileType; import com.xboe.standard.enums.BoedxCourseFileType;
import it.sauronsoftware.jave.Encoder;
import it.sauronsoftware.jave.MultimediaInfo;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
/** /**
@@ -279,7 +279,7 @@ public class CourseFileApi extends ApiBaseController {
} }
} catch (Exception e) { } catch (Exception e) {
log.error("读取视频时长错误", e); log.error("读取视频时长错误", e);
// e.printStackTrace(); return error("视频解析失败，尝试重新上传或联系管理员", "视频解析失败，尝试重新上传或联系管理员");
} }
} }