xiaoguangbin/AnalysisSystemForRadionuclide
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat：日志管理登录以及查询文件夹内容修改

Browse Source
This commit is contained in:
qiaoqinzheng 2023-05-25 10:23:50 +08:00
parent 7b1c9d1784
commit 9c7be4c981
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
jeecg-module-log-manage/src/main/java/org/jeecg/common/util/FTPUtil.java
View File

@ -14,6 +14,7 @@ import java.io.InputStream;
import java.nio.charset.StandardCharsets;
import java.util.Arrays;
import java.util.List;
import java.util.Objects;
@Component
@Slf4j
@ -42,6 +43,8 @@ public class FTPUtil {
//声明FTP客户端
FTPClient ftp = new FTPClient();
try {
// 切换为本地被动模式，可以解决FTP上传后文件为空的问题，但需要服务器将FTP服务添加至防火墙白名单
ftp.enterLocalPassiveMode();
//连接
ftp.connect(host, port);
//登录
@ -101,9 +104,12 @@ public class FTPUtil {
public InputStream downloadFTPFile(String localPath, String fileName){
InputStream in = null;
FTPClient ftpClient = this.LoginFTP();
//传输模式
try {
FTPClient ftpClient = this.LoginFTP();
if (Objects.isNull(ftpClient)){
throw new RuntimeException("ftp连接失败!");
}
List<String> paths = Arrays.asList(localPath.split("/"));
if (CollectionUtils.isNotEmpty(paths)){
for (String workPath:paths) {
@ -114,8 +120,6 @@ public class FTPUtil {
ftpClient.setFileType(FTPClient.BINARY_FILE_TYPE);
// 设置编码，当文件中存在中文且上传后文件乱码时可使用此配置项
ftpClient.setControlEncoding(encoding);
// 切换为本地被动模式，可以解决FTP上传后文件为空的问题，但需要服务器将FTP服务添加至防火墙白名单
// ftp.enterLocalPassiveMode();
ftpClient.setFileTransferMode(FTPClient.STREAM_TRANSFER_MODE);
List<FTPFile> ftpFiles = Arrays.asList(ftpClient.listFiles());
if (CollectionUtils.isNotEmpty(ftpFiles)){

4
jeecg-module-log-manage/src/main/java/org/jeecg/modules/controller/LogManageController.java
View File

@ -35,11 +35,11 @@ public class LogManageController {
List<LogManage> result = new ArrayList<>();
try {
FTPClient ftpClient = ftpUtil.LoginFTP();
//切换工作文件路径
ftpClient.changeWorkingDirectory(workPath);
if(Objects.isNull(ftpClient)){
throw new RuntimeException("ftp连接失败!");
}
//切换工作文件路径
ftpClient.changeWorkingDirectory(workPath);
List<FTPFile> ftpFiles = Arrays.asList(ftpClient.listDirectories());
if (CollectionUtils.isNotEmpty(ftpFiles)){
int num =1;