|
@@ -90,8 +90,9 @@ public class CsjResourceServiceImpl implements ICsjResourceService {
|
|
|
String ossVideoUrl = uploadToOss(videoUrl, fileName);
|
|
String ossVideoUrl = uploadToOss(videoUrl, fileName);
|
|
|
if (StringUtils.isNotEmpty(ossVideoUrl)){
|
|
if (StringUtils.isNotEmpty(ossVideoUrl)){
|
|
|
seq.setOssSeqVideo(ossVideoUrl);
|
|
seq.setOssSeqVideo(ossVideoUrl);
|
|
|
- csjResourceMapper.updateSeq(seq);
|
|
|
|
|
}
|
|
}
|
|
|
|
|
+ csjResourceMapper.updateSeq(seq);
|
|
|
|
|
+
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
@@ -107,8 +108,8 @@ public class CsjResourceServiceImpl implements ICsjResourceService {
|
|
|
String ossCoverImg = uploadToOss(coverUrl, fileName);
|
|
String ossCoverImg = uploadToOss(coverUrl, fileName);
|
|
|
if (StringUtils.isNotEmpty(ossCoverImg)){
|
|
if (StringUtils.isNotEmpty(ossCoverImg)){
|
|
|
album.setOssCoverImg(ossCoverImg);
|
|
album.setOssCoverImg(ossCoverImg);
|
|
|
- csjResourceMapper.updateAlbum(album);
|
|
|
|
|
}
|
|
}
|
|
|
|
|
+ csjResourceMapper.updateAlbum(album);
|
|
|
}
|
|
}
|
|
|
} else {
|
|
} else {
|
|
|
CsjAlbumSeqResourceInfo seq = seqMap.get(seqNum);
|
|
CsjAlbumSeqResourceInfo seq = seqMap.get(seqNum);
|
|
@@ -122,8 +123,8 @@ public class CsjResourceServiceImpl implements ICsjResourceService {
|
|
|
String ossSeqImg = uploadToOss(coverUrl, fileName);
|
|
String ossSeqImg = uploadToOss(coverUrl, fileName);
|
|
|
if (StringUtils.isNotEmpty(ossSeqImg)){
|
|
if (StringUtils.isNotEmpty(ossSeqImg)){
|
|
|
seq.setOssSeqImg(ossSeqImg);
|
|
seq.setOssSeqImg(ossSeqImg);
|
|
|
- csjResourceMapper.updateSeq(seq);
|
|
|
|
|
}
|
|
}
|
|
|
|
|
+ csjResourceMapper.updateSeq(seq);
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
@@ -144,7 +145,6 @@ public class CsjResourceServiceImpl implements ICsjResourceService {
|
|
|
String ossUrl = ossProperties.getCsjDomain() + objectKey;
|
|
String ossUrl = ossProperties.getCsjDomain() + objectKey;
|
|
|
try {
|
|
try {
|
|
|
System.out.println("文件: "+fileName + ", from: " + url);
|
|
System.out.println("文件: "+fileName + ", from: " + url);
|
|
|
-// return null;
|
|
|
|
|
ossUtil.uploadFromUrl(objectKey, url);
|
|
ossUtil.uploadFromUrl(objectKey, url);
|
|
|
log.info("上传成功: " + ossUrl);
|
|
log.info("上传成功: " + ossUrl);
|
|
|
return ossUrl;
|
|
return ossUrl;
|