From bb0c7d3c6cecdfd04f3a191b59a1b9a8853d69e2 Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <913652501@qq.com>
Date: Mon, 15 Jun 2020 16:12:47 +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-server/src/main/java/com/kidgrow/filecenter/config/AliyunOSSAutoConfigure.java | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-server/src/main/java/com/kidgrow/filecenter/config/AliyunOSSAutoConfigure.java b/kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-server/src/main/java/com/kidgrow/filecenter/config/AliyunOSSAutoConfigure.java
index 1dea60b..e22afd5 100644
--- a/kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-server/src/main/java/com/kidgrow/filecenter/config/AliyunOSSAutoConfigure.java
+++ b/kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-server/src/main/java/com/kidgrow/filecenter/config/AliyunOSSAutoConfigure.java
@@ -16,6 +16,7 @@
import javax.servlet.http.HttpServletRequest;
import java.util.Date;
+import java.util.UUID;
/**
* 石家庄喜高科技有限责任公司 版权所有 © Copyright 2020<br>
@@ -62,16 +63,21 @@
protected void uploadFile(MultipartFile file, FileInfo fileInfo) throws Exception {
String clientID= httpServletRequest.getHeader(SecurityConstants.CLIENT_HEADER);
String folderByDate =DateUtil.formatDate(new Date());
- if(clientID=="hospital"){//医院端平台，根据医院ID，科室ID进行OSS存储
+ int begin = file.getOriginalFilename().indexOf(".");
+ int last = file.getOriginalFilename().length();
+ String fileType = file.getOriginalFilename().substring(begin, last);
+ String fileName= UUID.randomUUID().toString().replaceAll("-","")+fileType;
+ if(clientID.equals("hospital")){//医院端平台，根据医院ID，科室ID进行OSS存储
String orgID=httpServletRequest.getHeader(SecurityConstants.USER_ORG_ID_HEADER);
String depID=httpServletRequest.getHeader(SecurityConstants.USER_DEP_ID_HEADER);
String fileFolder="KidgrowAI/"+orgID+"/"+depID+"/";
- ossClient.putObject(fileProperties.getOss().getBucketName(), fileFolder + folderByDate + "/" + fileInfo.getName(), file.getInputStream());
- fileInfo.setUrl(fileProperties.getOss().getDomain() + fileFolder + folderByDate + "/" + fileInfo.getName());
+
+ ossClient.putObject(fileProperties.getOss().getBucketName(), fileFolder + folderByDate + "/" + fileName, file.getInputStream());
+ fileInfo.setUrl(fileProperties.getOss().getDomain() + fileFolder + folderByDate + "/" + fileName);
}
else {
- ossClient.putObject(fileProperties.getOss().getBucketName(), fileProperties.getOss().getFolder() + folderByDate + "/" + fileInfo.getName(), file.getInputStream());
- fileInfo.setUrl(fileProperties.getOss().getDomain() + fileProperties.getOss().getFolder() + folderByDate + "/" + fileInfo.getName());
+ ossClient.putObject(fileProperties.getOss().getBucketName(), fileProperties.getOss().getFolder() + folderByDate + "/" + fileName, file.getInputStream());
+ fileInfo.setUrl(fileProperties.getOss().getDomain() + fileProperties.getOss().getFolder() + folderByDate + "/" + fileName);
}
}
--
Gitblit v1.8.0