From c1170cbdf92d1299e71ec087783b849c9e869900 Mon Sep 17 00:00:00 2001
From: dougang <78125310@kidgrow.com>
Date: Wed, 20 Jan 2021 18:29:31 +0800
Subject: [PATCH] 兼容上传图片后缀大写问题
---
kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-biz/src/main/java/com/kidgrow/filecenter/service/impl/AbstractIFileService.java | 9 +++++----
1 files changed, 5 insertions(+), 4 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 9dbb316..818970b 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
@@ -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;
@@ -320,7 +320,7 @@
}
@Override
- public FileInfo byteUplaod(String fileName, InputStream inputStream,int size) {
+ public FileInfo byteUplaod(String fileName, InputStream inputStream,int size) throws IOException {
String houzhui=fileName.substring(fileName.lastIndexOf(".")+1);
String newFileName= RandomValueUtils.uuid()+"."+houzhui;
FileInfo newfileInfo=new FileInfo();
@@ -334,6 +334,7 @@
newfileInfo.setCreateTime(new Date());
this.fileUpLoadOss(newfileInfo,"pdf/"+newFileName,inputStream);
baseMapper.insert(newfileInfo);
+ inputStream.close();
return newfileInfo;
}
@@ -341,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();
--
Gitblit v1.8.0