This commit is contained in:
2024-01-10 22:04:30 +08:00
parent 210ddec5ff
commit 8618d0cf09
5 changed files with 9 additions and 9 deletions

View File

@@ -173,7 +173,7 @@ public class NetDiskController {
@RequestParam("parent") String parent, @RequestParam("parent") String parent,
@RequestParam("size") Long size, @RequestParam("size") Long size,
@RequestParam("sha256") String sha256, @RequestParam("sha256") String sha256,
@RequestParam("mineType") String mineType, @RequestParam("mimeType") String mineType,
@RequestParam("multipartFile") MultipartFile multipartFile, @RequestParam("multipartFile") MultipartFile multipartFile,
@RequestParam("ossKey") String ossKey, @RequestParam("ossKey") String ossKey,
@RequestParam("name") String name, @RequestParam("name") String name,
@@ -185,7 +185,7 @@ public class NetDiskController {
request.setParent(parent); request.setParent(parent);
request.setSize(size); request.setSize(size);
request.setSha256(sha256); request.setSha256(sha256);
request.setMineType(mineType); request.setMimeType(mineType);
request.setMultipartFile(multipartFile); request.setMultipartFile(multipartFile);
request.setOssKey(ossKey); request.setOssKey(ossKey);
request.setName(name); request.setName(name);
@@ -221,7 +221,7 @@ public class NetDiskController {
@RequestParam("parent") String parent, @RequestParam("parent") String parent,
@RequestParam("size") Long size, @RequestParam("size") Long size,
@RequestParam("sha256") String sha256, @RequestParam("sha256") String sha256,
@RequestParam("mineType") String mineType, @RequestParam("mimeType") String mineType,
@RequestParam("multipartFile") MultipartFile multipartFile, @RequestParam("multipartFile") MultipartFile multipartFile,
@RequestParam("ossKey") String ossKey, @RequestParam("ossKey") String ossKey,
@RequestParam("name") String name, @RequestParam("name") String name,
@@ -233,7 +233,7 @@ public class NetDiskController {
request.setParent(parent); request.setParent(parent);
request.setSize(size); request.setSize(size);
request.setSha256(sha256); request.setSha256(sha256);
request.setMineType(mineType); request.setMimeType(mineType);
request.setMultipartFile(multipartFile); request.setMultipartFile(multipartFile);
request.setOssKey(ossKey); request.setOssKey(ossKey);
request.setName(name); request.setName(name);

View File

@@ -25,7 +25,7 @@ public class CreateFileDto extends OrgCommonDto {
@Comment("文件 mime 类型, 文件夹没有") @Comment("文件 mime 类型, 文件夹没有")
private String mineType; private String mimeType;
private MultipartFile multipartFile; private MultipartFile multipartFile;

View File

@@ -38,5 +38,5 @@ public class NetDiskDto extends OrgCommonDto {
@Comment("文件 mime 类型, 文件夹没有") @Comment("文件 mime 类型, 文件夹没有")
private String mineType; private String mimeType;
} }

View File

@@ -51,7 +51,7 @@ public class NetDiskEntity extends OrgCommonEntity {
@Comment("文件 mime 类型, 文件夹没有") @Comment("文件 mime 类型, 文件夹没有")
private String mineType; private String mimeType;
private String ossKey; private String ossKey;

View File

@@ -646,7 +646,7 @@ public class NetDiskService extends BaseService<NetDiskEntity, NetDiskRepository
request.setExpiration(addedMinutes); request.setExpiration(addedMinutes);
ResponseHeaderOverrides responseHeaders = new ResponseHeaderOverrides(); ResponseHeaderOverrides responseHeaders = new ResponseHeaderOverrides();
responseHeaders.setContentType(disk.getMineType()); responseHeaders.setContentType(disk.getMimeType());
if (attachment) { if (attachment) {
responseHeaders.setContentDisposition( responseHeaders.setContentDisposition(
"attachment;filename=" "attachment;filename="
@@ -851,7 +851,7 @@ public class NetDiskService extends BaseService<NetDiskEntity, NetDiskRepository
OSSObject ossObject = ossClient.getObject(aliyunProperty.getOSS().getBucketName(), ossKey); OSSObject ossObject = ossClient.getObject(aliyunProperty.getOSS().getBucketName(), ossKey);
response.setContentType(disk.getMineType()); response.setContentType(disk.getMimeType());
if (attachment) { if (attachment) {
response.setHeader( response.setHeader(