From eca80efa8e040df44beb81d53f4478b7c3e35b7e Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期五, 16 六月 2023 17:05:22 +0800
Subject: [PATCH] 优化代码
---
service-api/src/main/java/com/java110/api/smo/file/impl/UploadVedioSMOImpl.java | 30 +++++++++++++++++++++++-------
1 files changed, 23 insertions(+), 7 deletions(-)
diff --git a/service-api/src/main/java/com/java110/api/smo/file/impl/UploadVedioSMOImpl.java b/service-api/src/main/java/com/java110/api/smo/file/impl/UploadVedioSMOImpl.java
index 4989060..5187460 100644
--- a/service-api/src/main/java/com/java110/api/smo/file/impl/UploadVedioSMOImpl.java
+++ b/service-api/src/main/java/com/java110/api/smo/file/impl/UploadVedioSMOImpl.java
@@ -3,12 +3,14 @@
import com.alibaba.fastjson.JSONObject;
import com.java110.api.smo.DefaultAbstractComponentSMO;
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.component.BaseComponentSMO;
import com.java110.core.context.IPageData;
import com.java110.api.smo.file.IUploadVedioSMO;
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,17 +28,21 @@
*/
@Service("uploadVedioSMOImpl")
public class UploadVedioSMOImpl extends DefaultAbstractComponentSMO implements IUploadVedioSMO {
-
+ private static final String ROOT_PATH = "hc/";
@Autowired
private RestTemplate restTemplate;
@Autowired
private Java110Properties java110Properties;
+
@Autowired
private FtpUploadTemplate ftpUploadTemplate;
@Autowired
private OssUploadTemplate ossUploadTemplate;
+
+ @Autowired
+ private CosUploadTemplate cosUploadTemplate;
@Override
public ResponseEntity<Object> upload(IPageData pd, MultipartFile uploadFile) throws IOException {
@@ -48,18 +54,28 @@
// String fileName = ftpUploadTemplate.upload(uploadFile, java110Properties.getFtpServer(),
// java110Properties.getFtpPort(), java110Properties.getFtpUserName(),
-// java110Properties.getFtpUserPassword(), java110Properties.getFtpPath());
+// 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(), java110Properties.getFtpPath());
+ java110Properties.getFtpUserPassword(), ROOT_PATH);
} else {
+
fileName = ossUploadTemplate.upload(uploadFile, java110Properties.getFtpServer(),
java110Properties.getFtpPort(), java110Properties.getFtpUserName(),
- java110Properties.getFtpUserPassword(), java110Properties.getFtpPath());
+ java110Properties.getFtpUserPassword(), ROOT_PATH);
}
JSONObject outParam = new JSONObject();
outParam.put("fileName", uploadFile.getOriginalFilename());
--
Gitblit v1.8.0