From e23023b93f34286f5a807b0b85e9a0619a297ed7 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期二, 21 二月 2023 23:25:34 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-api/src/main/java/com/java110/api/smo/file/impl/UploadVedioSMOImpl.java | 28 ++++++++++++++++++++++++----
1 files changed, 24 insertions(+), 4 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..97adeb9 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.component.BaseComponentSMO;
+import com.java110.core.client.OssUploadTemplate;
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.OSSUtil;
+import com.java110.utils.util.StringUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
@@ -28,8 +32,12 @@
@Autowired
private Java110Properties java110Properties;
+
@Autowired
private FtpUploadTemplate ftpUploadTemplate;
+
+ @Autowired
+ private OssUploadTemplate ossUploadTemplate;
@Override
public ResponseEntity<Object> upload(IPageData pd, MultipartFile uploadFile) throws IOException {
@@ -39,9 +47,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(), "hc/");
+//
+ String fileName = "";
+ 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(),
+ java110Properties.getFtpPort(), java110Properties.getFtpUserName(),
+ java110Properties.getFtpUserPassword(), "hc/");
+ } else {
+ fileName = ossUploadTemplate.upload(uploadFile, java110Properties.getFtpServer(),
+ java110Properties.getFtpPort(), java110Properties.getFtpUserName(),
+ java110Properties.getFtpUserPassword(), "hc/");
+ }
JSONObject outParam = new JSONObject();
outParam.put("fileName", uploadFile.getOriginalFilename());
outParam.put("realFileName", fileName);
--
Gitblit v1.8.0