From 90f2acaa6c61d5a60822d4fee5a44ec3c5404f67 Mon Sep 17 00:00:00 2001
From: 侯瑞军 <411269194@kidgrow.com>
Date: Wed, 31 Mar 2021 18:52:02 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.2.240:7070/r/kidgrow-microservices-platform into dev
---
kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-biz/src/main/java/com/kidgrow/filecenter/service/impl/AbstractIFileService.java | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-biz/src/main/java/com/kidgrow/filecenter/service/impl/AbstractIFileService.java b/kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-biz/src/main/java/com/kidgrow/filecenter/service/impl/AbstractIFileService.java
index 33591ab..06eb65d 100644
--- a/kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-biz/src/main/java/com/kidgrow/filecenter/service/impl/AbstractIFileService.java
+++ b/kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-biz/src/main/java/com/kidgrow/filecenter/service/impl/AbstractIFileService.java
@@ -33,8 +33,8 @@
/**
* 石家庄喜高科技有限责任公司 版权所有 © Copyright 2020<br>
*
- * @Description: <br>
- * @Project: <br>
+ * @Description: AbstractIFileService 抽取类<br>
+ * @Project: 根据kidgrow.file-server.type 实例化具体对象<br>
* @CreateDate: Created in 2020/2/18 11:24 <br>
* @Author: <a href="4345453@kidgrow.com">liuke</a>
*/
@@ -100,7 +100,7 @@
* @param fileInfo
*/
protected abstract void uploadFile(MultipartFile file, FileInfo fileInfo) throws Exception;
- protected abstract void fileUpLoadOss(FileInfo fileInfo,String newFilePath, InputStream fileStream);
+ protected abstract void fileUpLoadOss(FileInfo fileInfo,String newFilePath, InputStream fileStream,String fileFolder);
protected abstract String FilePath(String imgType,String folderByDate,String hospitalId,String departmentId);
protected abstract OSSObject down(String url);
@@ -172,7 +172,7 @@
newfileInfo.setImgType(imgType);
newfileInfo.setCreateTime(new Date());
//文件上传到oss
- this.fileUpLoadOss(newfileInfo,filefloder+newFileName,inputStream);
+ this.fileUpLoadOss(newfileInfo,filefloder+newFileName,inputStream,filefloder);
inputStream.close();
// //删除暂存文件
// MultipartFileUtils.delteTempFile(thuFile);
@@ -218,7 +218,7 @@
newfileInfo.setCreateTime(new Date());
String folderByDate =DateUtil.formatDate(new Date());
String filePath = FilePath(imgType, folderByDate, hospitalId, departmentId);
- this.fileUpLoadOss(newfileInfo,filePath+newFileName,input);
+ this.fileUpLoadOss(newfileInfo,filePath+newFileName,input,filePath);
input.close();
baseMapper.insert(newfileInfo);
return newfileInfo;
@@ -231,7 +231,7 @@
@Override
public ResultBody baseDownLoad(Map<String, Object> map) throws Exception {
String urlDiZhi=MapUtils.getString(map,"url");
- if(!urlDiZhi.contains(DOMAIN)){
+ if(!urlDiZhi.contains(DOMAIN)&&!urlDiZhi.contains(DOMAIN.replace("https","http"))){
ByteArrayOutputStream outPut = new ByteArrayOutputStream();
byte[] data = new byte[1024];
try {
@@ -260,7 +260,7 @@
List<FileInfo> fileInfos = baseMapper.selectByMap(map);
if (fileInfos.size() > 0) {
FileInfo fileInfo = fileInfos.get(0);
- OSSObject down = this.down(fileInfo.getUrl().replace(DOMAIN, ""));
+ OSSObject down = this.down(fileInfo.getUrl().replace(DOMAIN, "").replace(DOMAIN.replace("https","http"),""));
InputStream objectContent = down.getObjectContent();
//返回Base64编码过的字节数组字符串
byte[] data = null;
@@ -332,7 +332,7 @@
newfileInfo.setSource("aliyun");
newfileInfo.setImgType(houzhui);
newfileInfo.setCreateTime(new Date());
- this.fileUpLoadOss(newfileInfo,"pdf/"+newFileName,inputStream);
+ this.fileUpLoadOss(newfileInfo,"pdf/"+newFileName,inputStream,"pdf/");
baseMapper.insert(newfileInfo);
inputStream.close();
return newfileInfo;
@@ -342,7 +342,7 @@
public FileInfo feignUploadHosIdAndDepId(MultipartFile file, String imgType, String hospitalId, String departmentId) throws Exception {
List<String> lassStr= Arrays.asList("png","bmp","dib","gif","jfif","jpe","jpeg","jpg","tif","tiff","ico");
String suffix=file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")+1);
- if(!lassStr.contains(suffix)){
+ if(!lassStr.contains(suffix.toLowerCase())){
return null;
}
String name = file.getOriginalFilename();
@@ -361,7 +361,7 @@
String folderByDate =DateUtil.formatDate(new Date());
String filePath = FilePath(imgType, folderByDate, hospitalId, departmentId);
InputStream inputStream = file.getInputStream();
- this.fileUpLoadOss(newfileInfo,filePath+newFileName,inputStream);
+ this.fileUpLoadOss(newfileInfo,filePath+newFileName,inputStream,filePath);
inputStream.close();
baseMapper.insert(newfileInfo);
return newfileInfo;
--
Gitblit v1.8.0