feat:文件服务补充feign接口-增加流式调用
This commit is contained in:
parent
72ba3c8daf
commit
8c13532322
|
|
@ -1,5 +1,10 @@
|
||||||
package com.ruoyi.file.controller;
|
package com.ruoyi.file.controller;
|
||||||
|
|
||||||
|
import com.ruoyi.common.core.domain.R;
|
||||||
|
import com.ruoyi.common.core.utils.StringUtils;
|
||||||
|
import com.ruoyi.common.core.utils.file.FileUtils;
|
||||||
|
import com.ruoyi.file.service.ISysFileService;
|
||||||
|
import com.ruoyi.system.api.domain.SysFile;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
|
|
@ -7,11 +12,8 @@ import org.springframework.web.bind.annotation.DeleteMapping;
|
||||||
import org.springframework.web.bind.annotation.PostMapping;
|
import org.springframework.web.bind.annotation.PostMapping;
|
||||||
import org.springframework.web.bind.annotation.RestController;
|
import org.springframework.web.bind.annotation.RestController;
|
||||||
import org.springframework.web.multipart.MultipartFile;
|
import org.springframework.web.multipart.MultipartFile;
|
||||||
import com.ruoyi.common.core.domain.R;
|
|
||||||
import com.ruoyi.common.core.utils.StringUtils;
|
import java.io.ByteArrayOutputStream;
|
||||||
import com.ruoyi.common.core.utils.file.FileUtils;
|
|
||||||
import com.ruoyi.file.service.ISysFileService;
|
|
||||||
import com.ruoyi.system.api.domain.SysFile;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 文件请求处理
|
* 文件请求处理
|
||||||
|
|
@ -19,8 +21,7 @@ import com.ruoyi.system.api.domain.SysFile;
|
||||||
* @author ruoyi
|
* @author ruoyi
|
||||||
*/
|
*/
|
||||||
@RestController
|
@RestController
|
||||||
public class SysFileController
|
public class SysFileController {
|
||||||
{
|
|
||||||
private static final Logger log = LoggerFactory.getLogger(SysFileController.class);
|
private static final Logger log = LoggerFactory.getLogger(SysFileController.class);
|
||||||
|
|
||||||
@Autowired
|
@Autowired
|
||||||
|
|
@ -30,19 +31,15 @@ public class SysFileController
|
||||||
* 文件上传请求
|
* 文件上传请求
|
||||||
*/
|
*/
|
||||||
@PostMapping("upload")
|
@PostMapping("upload")
|
||||||
public R<SysFile> upload(MultipartFile file)
|
public R<SysFile> upload(MultipartFile file) {
|
||||||
{
|
try {
|
||||||
try
|
|
||||||
{
|
|
||||||
// 上传并返回访问地址
|
// 上传并返回访问地址
|
||||||
String url = sysFileService.uploadFile(file);
|
String url = sysFileService.uploadFile(file);
|
||||||
SysFile sysFile = new SysFile();
|
SysFile sysFile = new SysFile();
|
||||||
sysFile.setName(FileUtils.getName(url));
|
sysFile.setName(FileUtils.getName(url));
|
||||||
sysFile.setUrl(url);
|
sysFile.setUrl(url);
|
||||||
return R.ok(sysFile);
|
return R.ok(sysFile);
|
||||||
}
|
} catch (Exception e) {
|
||||||
catch (Exception e)
|
|
||||||
{
|
|
||||||
log.error("上传文件失败", e);
|
log.error("上传文件失败", e);
|
||||||
return R.fail(e.getMessage());
|
return R.fail(e.getMessage());
|
||||||
}
|
}
|
||||||
|
|
@ -52,19 +49,27 @@ public class SysFileController
|
||||||
* 文件删除请求
|
* 文件删除请求
|
||||||
*/
|
*/
|
||||||
@DeleteMapping("delete")
|
@DeleteMapping("delete")
|
||||||
public R<Boolean> delete(String fileUrl)
|
public R<Boolean> delete(String fileUrl) {
|
||||||
{
|
try {
|
||||||
try
|
if (!FileUtils.validateFilePath(fileUrl)) {
|
||||||
{
|
|
||||||
if (!FileUtils.validateFilePath(fileUrl))
|
|
||||||
{
|
|
||||||
throw new Exception(StringUtils.format("资源文件({})非法,不允许删除。 ", fileUrl));
|
throw new Exception(StringUtils.format("资源文件({})非法,不允许删除。 ", fileUrl));
|
||||||
}
|
}
|
||||||
sysFileService.deleteFile(fileUrl);
|
sysFileService.deleteFile(fileUrl);
|
||||||
return R.ok();
|
return R.ok();
|
||||||
|
} catch (Exception e) {
|
||||||
|
log.error("删除文件失败", e);
|
||||||
|
return R.fail(e.getMessage());
|
||||||
}
|
}
|
||||||
catch (Exception e)
|
}
|
||||||
{
|
|
||||||
|
/**
|
||||||
|
* 文件流上传请求
|
||||||
|
*/
|
||||||
|
@PostMapping("uploadStream")
|
||||||
|
public R<String> uploadFileByStream(String filename, String extension, ByteArrayOutputStream out) {
|
||||||
|
try {
|
||||||
|
return R.ok(sysFileService.uploadFileByStream(filename, extension, out));
|
||||||
|
} catch (Exception e) {
|
||||||
log.error("删除文件失败", e);
|
log.error("删除文件失败", e);
|
||||||
return R.fail(e.getMessage());
|
return R.fail(e.getMessage());
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -5,7 +5,6 @@ import com.ruoyi.common.core.utils.file.FileUtils;
|
||||||
import com.ruoyi.file.utils.FileUploadUtils;
|
import com.ruoyi.file.utils.FileUploadUtils;
|
||||||
import org.springframework.beans.factory.annotation.Value;
|
import org.springframework.beans.factory.annotation.Value;
|
||||||
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
|
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
|
||||||
import org.springframework.context.annotation.Primary;
|
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
import org.springframework.web.multipart.MultipartFile;
|
import org.springframework.web.multipart.MultipartFile;
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue