Browse Source

完善代码

master
李世鹏 3 years ago
parent
commit
4560c0ee81
  1. 4
      src/main/java/com/example/ftpdemo/service/impl/MethodImpl.java
  2. 36
      src/main/java/com/example/ftpdemo/task/IdentificationUpTask.java
  3. 2
      src/main/java/com/example/ftpdemo/task/TestTask.java
  4. 79
      src/main/java/com/example/ftpdemo/util/JschUtil.java

4
src/main/java/com/example/ftpdemo/service/impl/MethodImpl.java

@ -73,7 +73,7 @@ public class MethodImpl implements Method {
jschUtil.directory(upSrc); jschUtil.directory(upSrc);
// 上传文件到指定目录 // 上传文件到指定目录
// SSHRemoteCall.getInstance().uploadFile("/data1/qingniao/" + upSrc + "/" + fileName, src); // SSHRemoteCall.getInstance().uploadFile("/data1/qingniao/" + upSrc + "/" + fileName, src);
jschUtil.upload( src,"/data1/qingniao/" + upSrc + "/" + fileName); jschUtil.upload("/data1/qingniao/" + upSrc + "/" + fileName, src);
} }
@ -417,7 +417,7 @@ public class MethodImpl implements Method {
@Override @Override
public void deletUpFile(String localPackage) { public void deletUpFile(String localPackage) {
File directory = new File(localPackage); File directory = new File(localPackage);
for (File file: Objects.requireNonNull(directory.listFiles())) { for (File file : Objects.requireNonNull(directory.listFiles())) {
if (!file.isDirectory()) { if (!file.isDirectory()) {
file.delete(); file.delete();
} }

36
src/main/java/com/example/ftpdemo/task/IdentificationUpTask.java

@ -82,13 +82,13 @@ public class IdentificationUpTask {
} }
// 如果没有生成文件,可直接结束 // 如果没有生成文件,可直接结束
if (!temp) { if (!temp) {
String logName =""; String logName = "";
if (type==0){ if (type == 0) {
logName ="新增"; logName = "新增";
}else { } else {
logName ="更新"; logName = "更新";
} }
XxlJobHelper.log("表1:昨日无"+logName+"数据日志!"); XxlJobHelper.log("表1:昨日无" + logName + "数据日志!");
return; return;
} }
@ -134,13 +134,13 @@ public class IdentificationUpTask {
} }
// 如果没有生成文件,可直接结束 // 如果没有生成文件,可直接结束
if (!temp) { if (!temp) {
String logName =""; String logName = "";
if (type==0){ if (type == 0) {
logName ="新增"; logName = "新增";
}else { } else {
logName ="更新"; logName = "更新";
} }
XxlJobHelper.log("表2:昨日无"+logName+"数据日志!"); XxlJobHelper.log("表2:昨日无" + logName + "数据日志!");
return; return;
} }
@ -184,13 +184,13 @@ public class IdentificationUpTask {
} }
// 如果没有生成文件,可直接结束 // 如果没有生成文件,可直接结束
if (!temp) { if (!temp) {
String logName =""; String logName = "";
if (type==0){ if (type == 0) {
logName ="新增"; logName = "新增";
}else { } else {
logName ="更新"; logName = "更新";
} }
XxlJobHelper.log("表3:昨日无"+logName+"数据日志!"); XxlJobHelper.log("表3:昨日无" + logName + "数据日志!");
return; return;
} }

2
src/main/java/com/example/ftpdemo/task/TestTask.java

@ -17,7 +17,7 @@ import org.springframework.util.StopWatch;
public class TestTask { public class TestTask {
private final Method method; private final Method method;
@XxlJob("demoJobHandler") // @XxlJob("demoJobHandler")
public void refreshAliDeviceStatus() throws Exception { public void refreshAliDeviceStatus() throws Exception {
StopWatch stopWatch = new StopWatch("task"); StopWatch stopWatch = new StopWatch("task");
stopWatch.start(); stopWatch.start();

79
src/main/java/com/example/ftpdemo/util/JschUtil.java

@ -4,9 +4,6 @@ import com.jcraft.jsch.*;
import com.xxl.job.core.context.XxlJobHelper; import com.xxl.job.core.context.XxlJobHelper;
import java.io.*; import java.io.*;
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
import java.util.Properties; import java.util.Properties;
public class JschUtil { public class JschUtil {
@ -208,20 +205,20 @@ public class JschUtil {
Properties config = new Properties(); Properties config = new Properties();
config.put("StrictHostKeyChecking", "no"); config.put("StrictHostKeyChecking", "no");
session.setConfig(config); session.setConfig(config);
// 超时连接时间为3 // 超时连接时间为60
session.setTimeout(30000); session.setTimeout(60000);
// 进行连接 // 进行连接
session.connect(); session.connect();
// 打开SFTP通道 // 打开SFTP通道
chSftp = (ChannelSftp) session.openChannel("sftp"); chSftp = (ChannelSftp) session.openChannel("sftp");
// 建立STFP连接 // 建立STFP连接
chSftp.connect(); chSftp.connect(60000);
// 设置编码格式 // 设置编码格式
chSftp.setFilenameEncoding("UTF-8"); chSftp.setFilenameEncoding("UTF-8");
// 创建一个文件名称问uploadFile的文件 // 创建一个文件名称问uploadFile的文件
File file = new File(uploadFile); File file = new File(uploadFile);
chSftp.put(new FileInputStream(file), uploadFile); chSftp.put(new FileInputStream(file), directory, ChannelSftp.OVERWRITE);
XxlJobHelper.log("文件上传成功到:"+file.getName()); XxlJobHelper.log("文件上传成功到:" + file.getName());
} catch (JSchException | SftpException | FileNotFoundException e) { } catch (JSchException | SftpException | FileNotFoundException e) {
XxlJobHelper.log(e.getMessage()); XxlJobHelper.log(e.getMessage());
} finally { } finally {
@ -288,54 +285,54 @@ public class JschUtil {
public void directory(String path) { public void directory(String path) {
try { try {
jSch = new JSch(); jSch = new JSch();
// 根据主机账号、ip、端口获取一个Session对象 // 根据主机账号、ip、端口获取一个Session对象
session = jSch.getSession(username, host, port); session = jSch.getSession(username, host, port);
// 存放主机密码 // 存放主机密码
session.setPassword(password); session.setPassword(password);
// 去掉首次连接确认 // 去掉首次连接确认
Properties config = new Properties(); Properties config = new Properties();
config.put("StrictHostKeyChecking", "no"); config.put("StrictHostKeyChecking", "no");
session.setConfig(config); session.setConfig(config);
// 超时连接时间为3秒 // 超时连接时间为3秒
session.setTimeout(30000); session.setTimeout(30000);
// 进行连接 // 进行连接
session.connect(); session.connect();
// 打开SFTP通道 // 打开SFTP通道
chSftp = (ChannelSftp) session.openChannel("sftp"); chSftp = (ChannelSftp) session.openChannel("sftp");
// 建立SFTP通道的连接 // 建立SFTP通道的连接
chSftp.connect(); chSftp.connect();
String[] folders = path.split("/"); String[] folders = path.split("/");
for (String folder : folders) { for (String folder : folders) {
if (folder.length() > 0) { if (folder.length() > 0) {
try {
chSftp.cd(folder);
} catch (SftpException e) {
try { try {
chSftp.mkdir(folder);
XxlJobHelper.log("生成目录" + folder);
chSftp.cd(folder); chSftp.cd(folder);
} catch (SftpException e) { } catch (SftpException ex) {
try { throw new RuntimeException(ex);
chSftp.mkdir(folder);
XxlJobHelper.log("生成目录" + folder);
chSftp.cd(folder);
} catch (SftpException ex) {
throw new RuntimeException(ex);
}
} }
} }
} }
} catch (JSchException e) {
throw new RuntimeException(e);
} finally {
close();
} }
} catch (JSchException e) {
throw new RuntimeException(e);
} finally {
close();
} }
}
} }

Loading…
Cancel
Save