dromara/RuoYi-Cloud-Plus
1
0
Fork 0
mirror of https://gitee.com/dromara/RuoYi-Cloud-Plus.git synced 2025-11-28 01:00:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'pr_143' into dev

Browse Source 
# Conflicts:
#	pom.xml
This commit is contained in:
疯狂的狮子Li
2024-01-14 20:36:39 +08:00
parent 9ad354bf3a f3468380c1
commit e0cf338e48
8 changed files with 483 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/dubbo/RemoteFileServiceImpl.java
View File

@@ -37,7 +37,7 @@ public class RemoteFileServiceImpl implements RemoteFileService {
try {
String suffix = StringUtils.substring(originalFilename, originalFilename.lastIndexOf("."), originalFilename.length());
OssClient storage = OssFactory.instance();
UploadResult uploadResult = storage.uploadSuffix(file, suffix, contentType);
UploadResult uploadResult = storage.uploadSuffix(file, suffix);
// 保存文件信息
SysOssBo oss = new SysOssBo();
oss.setUrl(uploadResult.getUrl());

2
ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/service/impl/SysOssServiceImpl.java
View File

@@ -139,7 +139,7 @@ public class SysOssServiceImpl implements ISysOssService {
OssClient storage = OssFactory.instance();
UploadResult uploadResult;
try {
uploadResult = storage.uploadSuffix(file.getBytes(), suffix, file.getContentType());
uploadResult = storage.uploadSuffix(file.getBytes(), suffix);
} catch (IOException e) {
throw new ServiceException(e.getMessage());
}