From ea55110f0bd2a4f1d4ac1cc174d28b716111ca34 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期一, 24 十月 2022 17:21:58 +0800
Subject: [PATCH] 优化 代码
---
service-common/src/main/java/com/java110/common/smo/impl/FileInnerServiceSMOImpl.java | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/service-common/src/main/java/com/java110/common/smo/impl/FileInnerServiceSMOImpl.java b/service-common/src/main/java/com/java110/common/smo/impl/FileInnerServiceSMOImpl.java
index b931143..c80181e 100755
--- a/service-common/src/main/java/com/java110/common/smo/impl/FileInnerServiceSMOImpl.java
+++ b/service-common/src/main/java/com/java110/common/smo/impl/FileInnerServiceSMOImpl.java
@@ -23,6 +23,8 @@
@RestController
public class FileInnerServiceSMOImpl extends BaseServiceSMO implements IFileInnerServiceSMO {
+ private static final String ROOT_PATH = "hc/";
+
@Autowired
private IFileServiceDao fileServiceDaoImpl;
@@ -37,6 +39,7 @@
@Autowired
private OssUploadTemplate ossUploadTemplate;
+
@Autowired
private CosUploadTemplate cosUploadTemplate;
@@ -47,23 +50,24 @@
String fileName = "";
String ossSwitch = MappingCache.getValue(OSSUtil.DOMAIN, OSSUtil.OSS_SWITCH);
- if ( OSSUtil.OSS_SWITCH_OSS.equals(ossSwitch)) {
+ if (OSSUtil.OSS_SWITCH_OSS.equals(ossSwitch)) {
fileName = ossUploadTemplate.upload(fileDto.getContext(), java110Properties.getFtpServer(),
java110Properties.getFtpPort(), java110Properties.getFtpUserName(),
- java110Properties.getFtpUserPassword(), java110Properties.getFtpPath());
+ java110Properties.getFtpUserPassword(), ROOT_PATH);
} else if (COSUtil.COS_SWITCH_COS.equals(ossSwitch)) {
fileName = cosUploadTemplate.upload(fileDto.getContext(), java110Properties.getFtpServer(),
java110Properties.getFtpPort(), java110Properties.getFtpUserName(),
- java110Properties.getFtpUserPassword(), java110Properties.getFtpPath());
+ java110Properties.getFtpUserPassword(), ROOT_PATH);
} 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);
- String ftpPath = java110Properties.getFtpPath();
+ //String ftpPath = java110Properties.getFtpPath();
+
fileName = ftpUploadTemplate.upload(fileDto.getContext(), ftpServer,
- ftpPort, ftpUserName,
- ftpUserPassword, ftpPath);
+ ftpPort, ftpUserName,
+ ftpUserPassword, ROOT_PATH);
}
return fileName;
}
@@ -85,7 +89,7 @@
context = ossUploadTemplate.download(ftpPath, fileName, java110Properties.getFtpServer(),
java110Properties.getFtpPort(), java110Properties.getFtpUserName(),
java110Properties.getFtpUserPassword());
- }else if (COSUtil.COS_SWITCH_COS.equals(ossSwitch)) {
+ } else if (COSUtil.COS_SWITCH_COS.equals(ossSwitch)) {
context = cosUploadTemplate.download(ftpPath, fileName, java110Properties.getFtpServer(),
java110Properties.getFtpPort(), java110Properties.getFtpUserName(),
java110Properties.getFtpUserPassword());
--
Gitblit v1.8.0