Merge remote-tracking branch 'origin/master'

liuhaonan

2022-03-11 da823ef0819982dfa74bb0b7a9ce6d534d2fcc2d

 ximon-admin/src/main/java/com/sandu/ximon/admin/service/LedSFileService.java

@@ -29,6 +29,9 @@

    public boolean addProgramFile(MultipartFile file) {
        FileUploadDto fileUploadDto = aliOssFileService.uploadFile(file);
        if("mp4".equals(fileUploadDto.getFileType())){
            fileUploadDto.setScreenShot(fileUploadDto.getFileUrl()+"?x-oss-process=video/snapshot,t_10000,m_fast");
        }
        FileOperationRecord fileOperationRecord=new FileOperationRecord();
        if("mp4".equals(fileUploadDto.getFileType())){
            fileUploadDto.setScreenShot(fileUploadDto.getFileUrl()+"?x-oss-process=video/snapshot,t_10000,m_fast");