From 4e7907983a99e695f2acba4dec8bd73b7dbe6b2b Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 29 六月 2023 14:41:33 +0800
Subject: [PATCH] optimize
---
java110-core/src/main/java/com/java110/core/client/FileUploadTemplate.java | 29 ++++++++++++++++++++++++++---
1 files changed, 26 insertions(+), 3 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 fdf2642..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;
@@ -31,7 +32,7 @@
String newfileName = ROOT_PATH+ fileName;
- String ossSwitch = MappingCache.getValue(OSSUtil.DOMAIN, OSSUtil.OSS_SWITCH);
+ String ossSwitch = MappingCache.getValue(MappingConstant.FILE_DOMAIN, OSSUtil.OSS_SWITCH);
if (OSSUtil.OSS_SWITCH_OSS.equals(ossSwitch)) {
newfileName = ossUploadTemplate.upload(inputStream, newfileName);
@@ -47,8 +48,30 @@
ftpPort, ftpUserName,
ftpUserPassword, newfileName);
}
+ return newfileName;
+ }
- String imgUrl = MappingCache.getValue("IMG_PATH");
- return imgUrl+fileName;
+ 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