From 675ccd51874f9c005285eab3e4829e451848b4b6 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 07 六月 2023 11:11:29 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
java110-core/src/main/java/com/java110/core/client/FileUploadTemplate.java | 41 +++++++++++++++++++++++++++++++++++------
1 files changed, 35 insertions(+), 6 deletions(-)
diff --git a/java110-core/src/main/java/com/java110/core/client/FileUploadTemplate.java b/java110-core/src/main/java/com/java110/core/client/FileUploadTemplate.java
index cc41fc0..295a3cf 100644
--- a/java110-core/src/main/java/com/java110/core/client/FileUploadTemplate.java
+++ b/java110-core/src/main/java/com/java110/core/client/FileUploadTemplate.java
@@ -1,6 +1,7 @@
package com.java110.core.client;
import com.java110.utils.cache.MappingCache;
+import com.java110.utils.constant.MappingConstant;
import com.java110.utils.util.COSUtil;
import com.java110.utils.util.OSSUtil;
import org.springframework.beans.factory.annotation.Autowired;
@@ -10,6 +11,8 @@
@Component
public class FileUploadTemplate {
+
+ private static final String ROOT_PATH = "hc/";
@Autowired
@@ -27,22 +30,48 @@
public String saveFile(InputStream inputStream,String fileName){
- String ossSwitch = MappingCache.getValue(OSSUtil.DOMAIN, OSSUtil.OSS_SWITCH);
+ String newfileName = ROOT_PATH+ fileName;
+
+ String ossSwitch = MappingCache.getValue(MappingConstant.FILE_DOMAIN, OSSUtil.OSS_SWITCH);
if (OSSUtil.OSS_SWITCH_OSS.equals(ossSwitch)) {
- fileName = ossUploadTemplate.upload(inputStream, fileName);
+ newfileName = ossUploadTemplate.upload(inputStream, newfileName);
} else if (COSUtil.COS_SWITCH_COS.equals(ossSwitch)) {
- fileName = cosUploadTemplate.upload(inputStream, fileName);
+ newfileName = cosUploadTemplate.upload(inputStream, newfileName);
} else {
String ftpServer = MappingCache.getValue(FtpUploadTemplate.FTP_DOMAIN, FtpUploadTemplate.FTP_SERVER);
int ftpPort = Integer.parseInt(MappingCache.getValue(FtpUploadTemplate.FTP_DOMAIN, FtpUploadTemplate.FTP_PORT));
String ftpUserName = MappingCache.getValue(FtpUploadTemplate.FTP_DOMAIN, FtpUploadTemplate.FTP_USERNAME);
String ftpUserPassword = MappingCache.getValue(FtpUploadTemplate.FTP_DOMAIN, FtpUploadTemplate.FTP_USERPASSWORD);
- fileName = ftpUploadTemplate.upload(inputStream, ftpServer,
+ newfileName = ftpUploadTemplate.upload(inputStream, ftpServer,
ftpPort, ftpUserName,
- ftpUserPassword, fileName);
+ ftpUserPassword, newfileName);
}
- return fileName;
+ return newfileName;
+ }
+
+ public InputStream downloadFile(String fileName){
+
+ InputStream inputStream = null;
+
+ String ossSwitch = MappingCache.getValue(MappingConstant.FILE_DOMAIN, OSSUtil.OSS_SWITCH);
+
+ if (OSSUtil.OSS_SWITCH_OSS.equals(ossSwitch)) {
+ inputStream = ossUploadTemplate.download(fileName);
+ } else if (COSUtil.COS_SWITCH_COS.equals(ossSwitch)) {
+ inputStream = cosUploadTemplate.download(fileName);
+ } else {
+ String ftpServer = MappingCache.getValue(FtpUploadTemplate.FTP_DOMAIN, FtpUploadTemplate.FTP_SERVER);
+ int ftpPort = Integer.parseInt(MappingCache.getValue(FtpUploadTemplate.FTP_DOMAIN, FtpUploadTemplate.FTP_PORT));
+ String ftpUserName = MappingCache.getValue(FtpUploadTemplate.FTP_DOMAIN, FtpUploadTemplate.FTP_USERNAME);
+ String ftpUserPassword = MappingCache.getValue(FtpUploadTemplate.FTP_DOMAIN, FtpUploadTemplate.FTP_USERPASSWORD);
+
+ inputStream = ftpUploadTemplate.download(fileName, ftpServer,
+ ftpPort, ftpUserName,
+ ftpUserPassword);
+ }
+
+ return inputStream;
}
}
--
Gitblit v1.8.0