Skip to content

8
8timerapiv200
Commit 9738f348 by 284718418@qq.com
Options

文件存储地址配置切换

parent 91876c19
Showing with 89 additions and 27 deletions
src/main/java/cn/timer/api/controller/disk/DiskFilesController.java
......@@ -13,6 +13,7 @@ import cn.timer.api.config.sftp.SftpConfiguration;
import cn.timer.api.controller.disk.sevice.DiskFilesService;
import cn.timer.api.dto.disk.*;
import cn.timer.api.service.FtpService;
import cn.timer.api.service.OSSService;
import cn.timer.api.utils.FileUtils;
import cn.timer.api.utils.Result;
import cn.timer.api.utils.ResultUtil;
......@@ -62,6 +63,8 @@ public class DiskFilesController {
@Autowired
private SftpConfiguration config;
@Autowired
private OSSService ossService;
@ResponseBody
@PostMapping("/upload")
......@@ -103,12 +106,12 @@ public class DiskFilesController {
List<FileInfoDto> imageUrls;
try {
//上传文件到服务器
imageUrls = ftpService.uploadFile(file);
imageUrls = ftpService.uploadFile(userBean.getOrgCode(),file);
for (FileInfoDto dto : imageUrls) {
//新增资源上传文件
diskFiles.setFileType(dto.getFileSuffix());
//"/home/disk/123456.jpg"
diskFiles.setDiskPath(config.getRoot() + config.getTargetPath() + "/" + dto.getFileName());
diskFiles.setDiskPath(dto.getFileName());
diskFiles.setUrlPath(dto.getUrlPath());
diskFiles.setTitle(dto.getResourceFileName());
diskFiles.setFileSize(dto.getFileSize());
......@@ -260,7 +263,7 @@ public class DiskFilesController {
// filePath = new File(diskFiles.getDiskPath());
byte[] buffer = new byte[1024];
// fis = new FileInputStream(filePath);
fis = ftpService.downloadFile(diskFiles.getDiskPath());
fis = ftpService.downloadFile(diskFiles);
bis = new BufferedInputStream(fis);
os = resp.getOutputStream();
int i = bis.read(buffer);
......
src/main/java/cn/timer/api/service/FtpService.java
package cn.timer.api.service;
import cn.timer.api.bean.disk.DiskFiles;
import cn.timer.api.dto.disk.FileInfoDto;
import com.jcraft.jsch.ChannelSftp;
import org.springframework.web.multipart.MultipartFile;
......@@ -21,14 +22,14 @@ public interface FtpService {
* @param files
* @return
*/
List<FileInfoDto> uploadFile(MultipartFile[] files);
List<FileInfoDto> uploadFile(int orgCode, MultipartFile[] files);
/**
* 下载单个文件
*
* @param remotePath：远程目录
* @return InputStream
*/
InputStream downloadFile(String remotePath);
InputStream downloadFile(DiskFiles diskFiles);
/**
* 删除服务器文件
......
src/main/java/cn/timer/api/service/OSSService.java
package cn.timer.api.service;
import cn.timer.api.dto.disk.FileInfoDto;
import cn.timer.api.service.impl.OSSServiceImpl;
import cn.timer.api.utils.Result;
import cn.timer.api.utils.ResultUtil;
......@@ -11,6 +12,7 @@ import org.springframework.web.multipart.MultipartFile;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.locks.ReentrantLock;
......@@ -86,4 +88,43 @@ public class OSSService implements OSSServiceImpl {
}
return ResultUtil.data(list, "上传成功！");
}
@Override
public List<FileInfoDto> uploadFile(int orgCode, String moudle,MultipartFile[] files) {
List<FileInfoDto> resultStrs = new ArrayList<FileInfoDto>();
FileInfoDto dto = null;
for (MultipartFile file : files) {
String randomNickname = RandomNum.getRandomNickname();
String name = file.getOriginalFilename().substring(0, file.getOriginalFilename().lastIndexOf("."));
String suffix = file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
File filePath = filePathUpload(orgCode, moudle, randomNickname, file.getOriginalFilename());
int i = 0;
while (filePath.exists()) {
filePath = filePathUpload(orgCode,moudle,randomNickname,file.getOriginalFilename());
i++;
}
if (file == null || file.getSize() <= 0) {
// return ResultUtil.error("上传的文件为空，请重新选择！");
} else {
try {
dto = new FileInfoDto();
dto.setUrlPath(oss.uploadFile(filePath, file.getInputStream()));
dto.setResourceFileName(name);
dto.setFileName(filePath.getPath());
/*Float size = Float.parseFloat(String.valueOf(file.getSize())) / 1024;
BigDecimal b = new BigDecimal(size);
// 2表示2位 ROUND_HALF_UP表明四舍五入，
size = b.setScale(2, BigDecimal.ROUND_HALF_UP).floatValue();*/
dto.setFileSize(file.getSize());
dto.setFileSuffix(suffix);
resultStrs.add(dto);
} catch (IOException e) {
e.printStackTrace();
}
}
}
return resultStrs;
}
}
src/main/java/cn/timer/api/service/impl/FtpServiceImpl.java
package cn.timer.api.service.impl;
import cn.timer.api.bean.disk.DiskFiles;
import cn.timer.api.config.sftp.SftpConfiguration;
import cn.timer.api.controller.disk.constant.FileAddressConstant;
import cn.timer.api.dto.disk.FileInfoDto;
import cn.timer.api.service.FtpService;
import cn.timer.api.service.OSSService;
import cn.timer.api.utils.Md5;
import cn.timer.api.utils.aliyun.OSSUtil;
import com.jcraft.jsch.ChannelSftp;
......@@ -30,6 +32,8 @@ public class FtpServiceImpl implements FtpService {
private SftpConfiguration config;
@Autowired
private OSSUtil oss;
@Autowired
private OSSService ossService;
@Override
......@@ -66,7 +70,7 @@ public class FtpServiceImpl implements FtpService {
}
@Override
public List<FileInfoDto> uploadFile(MultipartFile[] files) {
public List<FileInfoDto> uploadFile(int orgCode, MultipartFile[] files) {
List<FileInfoDto> resultStrs = new ArrayList<FileInfoDto>();
//存储地址判断
......@@ -94,7 +98,7 @@ public class FtpServiceImpl implements FtpService {
sftp.put(file.getInputStream(), fileName);
dto.setUrlPath(config.getServerUrl() + "/" + fileName);
dto.setResourceFileName(name);
dto.setFileName(fileName);
dto.setFileName(config.getRoot() + config.getTargetPath() + "/" +fileName);
/*Float size = Float.parseFloat(String.valueOf(file.getSize())) / 1024;
BigDecimal b = new BigDecimal(size);
......@@ -113,7 +117,7 @@ public class FtpServiceImpl implements FtpService {
config.returnSftpSocket(sftp);
}
} else if (FileAddressConstant.ALIYUN_OSS.equals(config.getFileAddress())) {
resultStrs = ossService.uploadFile(orgCode, "disk",files);
}
return resultStrs;
}
......@@ -122,28 +126,33 @@ public class FtpServiceImpl implements FtpService {
/**
* 下载单个文件
*
* @param remotePath：远程下载目录
* @param diskFiles：远程下载目录
* @return
*/
@Override
public InputStream downloadFile(String remotePath) {
ChannelSftp sftp = config.getSftpSocket();
public InputStream downloadFile(DiskFiles diskFiles) {
//存储地址判断
InputStream nputStream = null;
try {
// sftp.cd(remotePath);
// mkdirs(localPath + localFileName);
//sftp.get(remotePath, fieloutput);
nputStream = sftp.get(remotePath);
if (log.isInfoEnabled()) {
log.info("===DownloadFile:" + remotePath + " success from sftp.");
if (diskFiles.getUrlPath().indexOf(config.getServerUrl())!=-1) {
ChannelSftp sftp = config.getSftpSocket();
try {
// sftp.cd(remotePath);
// mkdirs(localPath + localFileName);
//sftp.get(remotePath, fieloutput);
nputStream = sftp.get(diskFiles.getDiskPath());
if (log.isInfoEnabled()) {
log.info("===DownloadFile:" + diskFiles.getDiskPath() + " success from sftp.");
}
return nputStream;
} catch (SftpException e) {
e.printStackTrace();
} catch (Exception e) {
e.printStackTrace();
} finally {
config.returnSftpSocket(sftp);
}
return nputStream;
} catch (SftpException e) {
e.printStackTrace();
} catch (Exception e) {
e.printStackTrace();
} finally {
config.returnSftpSocket(sftp);
}else if (FileAddressConstant.ALIYUN_OSS.equals(config.getFileAddress())) {
nputStream = oss.downloadFileInputStream(diskFiles.getDiskPath());
}
return nputStream;
}
......
src/main/java/cn/timer/api/service/impl/OSSServiceImpl.java
package cn.timer.api.service.impl;
import cn.timer.api.dto.disk.FileInfoDto;
import cn.timer.api.utils.Result;
import org.springframework.web.multipart.MultipartFile;
import java.io.InputStream;
import java.util.List;
public interface OSSServiceImpl {
public Result<String> upload(int orgCode, String moudle, MultipartFile file);
public Result<Object> uploads(int orgCode, String moudle, List<MultipartFile> files);
/**
* 上传文件到阿里云服务器
* @param files
* @return
*/
List<FileInfoDto> uploadFile(int orgCode, String moudle,MultipartFile[] files);
}
src/main/resources/application-pro.yml
......@@ -227,8 +227,8 @@ config-8timer:
# 文件存储地址类型：aliyun-oss(阿里云OSS)，physics-oss(物理机器OSS)
# 默认存储物理机器OSS
file-address:
type: physics-oss
#type: aliyun-oss
#type: physics-oss
type: aliyun-oss
#导出zip临时地址
zip:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment