wangli/oss
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

加上通过url上传文件-channelType更换channelCode

Browse Source
This commit is contained in:
xudawei 2024-04-26 16:30:30 +08:00
parent dbfb8c8c99
commit d1212e402b
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
oss-manager-api/src/main/java/cn/axzo/oss/manager/api/FileManager.java
View File

@ -80,5 +80,5 @@ public interface FileManager {
* 通过url上传至云
*/
String uploadByUrl(String bulkName, String keyPath, String fileName, String url,
Integer channelType);
String channelCode);
}

8
oss-manager/src/main/java/cn/axzo/oss/manager/impl/FileManagerImpl.java
View File

@ -257,9 +257,9 @@ public class FileManagerImpl implements FileManager {
* 通过url上传至云
*/
public String uploadByUrl(String bulkName, String keyPath, String fileName, String url,
Integer channelType) {
String channelCode) {
try {
switch (ChannelTypeEnum.getChannelTypeByCode(channelType)) {
switch (ChannelTypeEnum.getChannelTypeByChannelCode(channelCode)) {
case OSS:
return aliOssService.uploadByUrl(bulkName,keyPath, fileName, url);
case OBS:
@ -268,8 +268,8 @@ public class FileManagerImpl implements FileManager {
BizException.error(CodeEnum.CHANNEL_TYPE_NOT_EXIST);
}
} catch (Exception e) {
log.error("通过url上传至云 exception,bulkName:{}, key:{}, fileName:{}, url:{},channelType:{}"
, bulkName, keyPath, fileName, url, channelType, e);
log.error("通过url上传至云 exception,bulkName:{}, key:{}, fileName:{}, url:{},channelCode:{}"
, bulkName, keyPath, fileName, url, channelCode, e);
}
return StringUtils.EMPTY;
}

6
oss-service/src/main/java/cn/axzo/oss/service/impl/FileByUrlServiceImpl.java
View File

@ -191,7 +191,7 @@ public class FileByUrlServiceImpl implements FileByUrlService {
FileUploadConfig fileUploadConfig = getFileUploadConfig(appCode, bizScene, channelType);
// 上传文件并生成file对象
return generateFile(fileUploadConfig, appCode, fileName,url, channelType);
return generateFile(fileUploadConfig, fileName,url, fileUploadConfig.getChannelCode());
}
/**
@ -228,7 +228,7 @@ public class FileByUrlServiceImpl implements FileByUrlService {
/**
* 生产File对象
*/
private File generateFile(FileUploadConfig fileUploadConfig, String appCode, String fileName, String url, Integer channelType) {
private File generateFile(FileUploadConfig fileUploadConfig, String fileName, String url, String channelCode) {
// 判断容量
String fileConform = isFileConform(fileUploadConfig, fileName);
@ -236,7 +236,7 @@ public class FileByUrlServiceImpl implements FileByUrlService {
// 生成上传文件的唯一key
String tgtFileKey = Utility.generateFileKey(fileUploadConfig.getDirectory(), uuid, fileConform);
// 上传文件
String fileUrl = fileManager.uploadByUrl(fileUploadConfig.getBucketName(), tgtFileKey, fileName, url, channelType);
String fileUrl = fileManager.uploadByUrl(fileUploadConfig.getBucketName(), tgtFileKey, fileName, url, channelCode);
// 保存失败
if (Utility.isBlank(fileUrl)) {