From 2b919980a8c70554a64cb3d03cc95679af4d817f Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期一, 03 七月 2023 00:22:16 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
springboot/src/main/java/com/java110/boot/smo/file/impl/UploadVedioSMOImpl.java | 26 ++++++++++++++++++++++----
1 files changed, 22 insertions(+), 4 deletions(-)
diff --git a/springboot/src/main/java/com/java110/boot/smo/file/impl/UploadVedioSMOImpl.java b/springboot/src/main/java/com/java110/boot/smo/file/impl/UploadVedioSMOImpl.java
index e80a926..aab8cae 100644
--- a/springboot/src/main/java/com/java110/boot/smo/file/impl/UploadVedioSMOImpl.java
+++ b/springboot/src/main/java/com/java110/boot/smo/file/impl/UploadVedioSMOImpl.java
@@ -4,10 +4,13 @@
import com.java110.boot.smo.DefaultAbstractComponentSMO;
import com.java110.boot.smo.file.IUploadVedioSMO;
import com.java110.config.properties.code.Java110Properties;
+import com.java110.core.client.CosUploadTemplate;
import com.java110.core.client.FtpUploadTemplate;
import com.java110.core.client.OssUploadTemplate;
import com.java110.core.context.IPageData;
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 com.java110.utils.util.StringUtil;
import org.springframework.beans.factory.annotation.Autowired;
@@ -26,6 +29,8 @@
@Service("uploadVedioSMOImpl")
public class UploadVedioSMOImpl extends DefaultAbstractComponentSMO implements IUploadVedioSMO {
+ private static final String ROOT_PATH = "hc/";
+
@Autowired
private RestTemplate restTemplate;
@@ -36,6 +41,9 @@
@Autowired
private OssUploadTemplate ossUploadTemplate;
+
+ @Autowired
+ private CosUploadTemplate cosUploadTemplate;
@Override
public ResponseEntity<Object> upload(IPageData pd, MultipartFile uploadFile) throws IOException {
@@ -50,15 +58,25 @@
// java110Properties.getFtpUserPassword(), "hc/");
//
String fileName = "";
- String ossSwitch = MappingCache.getValue(OSSUtil.DOMAIN, OSSUtil.OSS_SWITCH);
+ String ossSwitch = MappingCache.getValue(MappingConstant.FILE_DOMAIN, OSSUtil.OSS_SWITCH);
if (StringUtil.isEmpty(ossSwitch) || !OSSUtil.OSS_SWITCH_OSS.equals(ossSwitch)) {
- fileName = ftpUploadTemplate.upload(uploadFile, java110Properties.getFtpServer(),
+ 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(uploadFile, ftpServer,
+ ftpPort, ftpUserName,
+ ftpUserPassword, ROOT_PATH);
+ } else if (COSUtil.COS_SWITCH_COS.equals(ossSwitch)) {
+ fileName = cosUploadTemplate.upload(uploadFile, java110Properties.getFtpServer(),
java110Properties.getFtpPort(), java110Properties.getFtpUserName(),
- java110Properties.getFtpUserPassword(), "hc/");
+ java110Properties.getFtpUserPassword(), ROOT_PATH);
} else {
+
fileName = ossUploadTemplate.upload(uploadFile, java110Properties.getFtpServer(),
java110Properties.getFtpPort(), java110Properties.getFtpUserName(),
- java110Properties.getFtpUserPassword(), "hc/");
+ java110Properties.getFtpUserPassword(), ROOT_PATH);
}
JSONObject outParam = new JSONObject();
outParam.put("fileName", uploadFile.getOriginalFilename());
--
Gitblit v1.8.0