From c7ecaaac5d72e269c4eba57540eb9860f1f184e9 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 07 十二月 2021 11:50:15 +0800
Subject: [PATCH] 优化代码
---
service-api/src/main/java/com/java110/api/smo/file/impl/UploadVedioSMOImpl.java | 25 ++++++++++++++++++++++---
1 files changed, 22 insertions(+), 3 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 b6b2abd..4989060 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
@@ -4,9 +4,13 @@
import com.java110.api.smo.DefaultAbstractComponentSMO;
import com.java110.config.properties.code.Java110Properties;
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.util.OSSUtil;
+import com.java110.utils.util.StringUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
@@ -31,6 +35,9 @@
@Autowired
private FtpUploadTemplate ftpUploadTemplate;
+ @Autowired
+ private OssUploadTemplate ossUploadTemplate;
+
@Override
public ResponseEntity<Object> upload(IPageData pd, MultipartFile uploadFile) throws IOException {
@@ -39,9 +46,21 @@
throw new IllegalArgumentException("涓婁紶鏂囦欢瓒呰繃1024鍏�");
}
- String fileName = ftpUploadTemplate.upload(uploadFile, java110Properties.getFtpServer(),
- java110Properties.getFtpPort(), java110Properties.getFtpUserName(),
- java110Properties.getFtpUserPassword(), java110Properties.getFtpPath());
+// String fileName = ftpUploadTemplate.upload(uploadFile, java110Properties.getFtpServer(),
+// java110Properties.getFtpPort(), java110Properties.getFtpUserName(),
+// java110Properties.getFtpUserPassword(), java110Properties.getFtpPath());
+//
+ String fileName = "";
+ String ossSwitch = MappingCache.getValue(OSSUtil.DOMAIN, OSSUtil.OSS_SWITCH);
+ if (StringUtil.isEmpty(ossSwitch) || !OSSUtil.OSS_SWITCH_OSS.equals(ossSwitch)) {
+ fileName = ftpUploadTemplate.upload(uploadFile, java110Properties.getFtpServer(),
+ java110Properties.getFtpPort(), java110Properties.getFtpUserName(),
+ java110Properties.getFtpUserPassword(), java110Properties.getFtpPath());
+ } else {
+ fileName = ossUploadTemplate.upload(uploadFile, java110Properties.getFtpServer(),
+ java110Properties.getFtpPort(), java110Properties.getFtpUserName(),
+ java110Properties.getFtpUserPassword(), java110Properties.getFtpPath());
+ }
JSONObject outParam = new JSONObject();
outParam.put("fileName", uploadFile.getOriginalFilename());
outParam.put("realFileName", fileName);
--
Gitblit v1.8.0