记得上下班打卡 | git大法好,push需谨慎

Commit 42a9feda authored by 张国柄's avatar 张国柄

~oss;

parent 236aa14b
...@@ -23,6 +23,7 @@ import io.swagger.annotations.ApiImplicitParam; ...@@ -23,6 +23,7 @@ import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
...@@ -99,7 +100,7 @@ public class AlOssController { ...@@ -99,7 +100,7 @@ public class AlOssController {
PlatformOssFiles ossFile = this.getOldOssFile(fileNew); PlatformOssFiles ossFile = this.getOldOssFile(fileNew);
UploadVo uploadVo = new UploadVo(); UploadVo uploadVo = new UploadVo();
try { try {
if (null == ossFile || (isCutFrame > 0 && ossFile.getVideoImg().isEmpty())) { //保证上传过的文件也能截帧 if (null == ossFile || (isCutFrame > 0 && StringUtils.isBlank(ossFile.getVideoImg()))) { //保证上传过的文件也能截帧
// 上传 // 上传
ossFile = this.uploadOssFile(file, pathName, buckType, resize, fileNew, isCutFrame, true); ossFile = this.uploadOssFile(file, pathName, buckType, resize, fileNew, isCutFrame, true);
} }
...@@ -145,7 +146,7 @@ public class AlOssController { ...@@ -145,7 +146,7 @@ public class AlOssController {
PlatformOssFiles ossFile = this.getOldOssFile(fileNew); PlatformOssFiles ossFile = this.getOldOssFile(fileNew);
UploadVo uploadVo = new UploadVo(); UploadVo uploadVo = new UploadVo();
try { try {
if (null == ossFile || (isCutFrame > 0 && ossFile.getVideoImg().isEmpty())) { //保证上传过的文件也能截帧 if (null == ossFile || (isCutFrame > 0 && StringUtils.isBlank(ossFile.getVideoImg()))) { //保证上传过的文件也能截帧
// 上传 // 上传
ossFile = this.uploadOssFile(file, pathName, buckType, resize, fileNew, isCutFrame, false); ossFile = this.uploadOssFile(file, pathName, buckType, resize, fileNew, isCutFrame, false);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment