From ddaaec1d16f66bc2d50cc889c8a64cfc8ca06824 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期日, 26 四月 2020 23:09:49 +0800
Subject: [PATCH] 优化 处理人没有时处理为空
---
CommonService/src/main/java/com/java110/common/smo/impl/FileInnerServiceSMOImpl.java | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/CommonService/src/main/java/com/java110/common/smo/impl/FileInnerServiceSMOImpl.java b/CommonService/src/main/java/com/java110/common/smo/impl/FileInnerServiceSMOImpl.java
index 1b17740..e45b9b7 100644
--- a/CommonService/src/main/java/com/java110/common/smo/impl/FileInnerServiceSMOImpl.java
+++ b/CommonService/src/main/java/com/java110/common/smo/impl/FileInnerServiceSMOImpl.java
@@ -3,11 +3,10 @@
import com.java110.common.dao.IFileServiceDao;
import com.java110.config.properties.code.Java110Properties;
import com.java110.core.base.smo.BaseServiceSMO;
+import com.java110.core.client.JSchFtpUploadTemplate;
import com.java110.core.smo.file.IFileInnerServiceSMO;
import com.java110.dto.file.FileDto;
-import com.java110.utils.util.Base64Convert;
-import com.java110.utils.util.BeanConvertUtil;
-import com.java110.utils.util.FtpUpload;
+import com.java110.core.client.FtpUploadTemplate;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
@@ -25,6 +24,12 @@
@Autowired
private Java110Properties java110Properties;
+ @Autowired
+ private FtpUploadTemplate ftpUploadTemplate;
+
+ @Autowired
+ private JSchFtpUploadTemplate jSchFtpUploadTemplate;
+
@Override
public String saveFile(@RequestBody FileDto fileDto) {
@@ -32,10 +37,13 @@
//int saveFileFlag = fileServiceDaoImpl.saveFile(BeanConvertUtil.beanCovertMap(fileDto));
- String fileName = FtpUpload.upload(fileDto.getContext(), java110Properties.getFtpServer(),
+ String fileName = ftpUploadTemplate.upload(fileDto.getContext(), java110Properties.getFtpServer(),
java110Properties.getFtpPort(), java110Properties.getFtpUserName(),
java110Properties.getFtpUserPassword(), java110Properties.getFtpPath());
+// String fileName = jSchFtpUploadTemplate.upload(fileDto.getContext(), java110Properties.getFtpServer(),
+// java110Properties.getFtpPort(), java110Properties.getFtpUserName(),
+// java110Properties.getFtpUserPassword(), java110Properties.getFtpPath());
return fileName;
}
@@ -49,7 +57,7 @@
ftpPath += fileName.substring(0, fileName.lastIndexOf("/")+1);
fileName = fileName.substring(fileName.lastIndexOf("/")+1, fileName.length());
}
- byte[] fileImg = FtpUpload.downFileByte(ftpPath, fileName, java110Properties.getFtpServer(),
+ byte[] fileImg = ftpUploadTemplate.downFileByte(ftpPath, fileName, java110Properties.getFtpServer(),
java110Properties.getFtpPort(), java110Properties.getFtpUserName(),
java110Properties.getFtpUserPassword());
--
Gitblit v1.8.0