diff --git a/netty-client/pom.xml b/netty-client/pom.xml index 18c232b..ae3c9f6 100644 --- a/netty-client/pom.xml +++ b/netty-client/pom.xml @@ -21,6 +21,11 @@ fc-card 1.0.0 + + com.jcraft + jsch + 0.1.55 + diff --git a/netty-client/src/main/java/com/sv/barcode/ClientConfig.java b/netty-client/src/main/java/com/sv/barcode/ClientConfig.java index 29e7549..3ebfd9e 100644 --- a/netty-client/src/main/java/com/sv/barcode/ClientConfig.java +++ b/netty-client/src/main/java/com/sv/barcode/ClientConfig.java @@ -10,6 +10,8 @@ public class ClientConfig implements Serializable { String clientSN; String clientVid; + String clientPwd; + public String getServerIp() { return serverIp; } @@ -41,4 +43,12 @@ public class ClientConfig implements Serializable { public void setClientVid(String clientVid) { this.clientVid = clientVid; } + + public String getClientPwd() { + return clientPwd; + } + + public void setClientPwd(String clientPwd) { + this.clientPwd = clientPwd; + } } diff --git a/netty-client/src/main/java/com/sv/intergration/LogService.java b/netty-client/src/main/java/com/sv/intergration/LogService.java new file mode 100644 index 0000000..c78a0dd --- /dev/null +++ b/netty-client/src/main/java/com/sv/intergration/LogService.java @@ -0,0 +1,41 @@ +package com.sv.intergration; + +import com.jcraft.jsch.*; +import com.sv.netty.config.NettyConstant; + +import java.io.File; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.text.SimpleDateFormat; +import java.util.Date; + +public class LogService { + + private static SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + + static Session session; + + public void uploadLog(String password) throws JSchException, FileNotFoundException, SftpException { + if (session == null){ + JSch jsch = new JSch(); + String serverIp = System.getProperty(NettyConstant.VENUE_SERVER_IP); + session = jsch.getSession("root", serverIp, 22); + session.setPassword(System.getProperty(NettyConstant.VENUE_CHECK_PWD)); + session.setConfig("StrictHostKeyChecking", "no"); + session.connect(3000); + } + ChannelSftp sftp = (ChannelSftp) session.openChannel("sftp"); + File file = new File("/home/venue/logs/common-default.log"); + if (file.exists()){ + sftp.put(new FileInputStream(file),"/home/uploadlog/" + System.getProperty(NettyConstant.VENUE_CLIENT_SN) + "-" + sdf.format(new Date()) + "-client.log"); + } + if (sftp != null) { + sftp.connect(); + sftp.disconnect(); + } + if (session != null) { + session.disconnect(); + } + } + +} diff --git a/netty-client/src/main/java/com/sv/service/ClientService.java b/netty-client/src/main/java/com/sv/service/ClientService.java index 942e6aa..a0c2e6b 100644 --- a/netty-client/src/main/java/com/sv/service/ClientService.java +++ b/netty-client/src/main/java/com/sv/service/ClientService.java @@ -31,6 +31,7 @@ public class ClientService { System.setProperty(NettyConstant.VENUE_SERVER_PORT,decode.getServerPort()); System.setProperty(NettyConstant.VENUE_CLIENT_SN,decode.getClientSN()); System.setProperty(NettyConstant.VENUE_CLIENT_VID,decode.getClientVid()); + System.setProperty(NettyConstant.VENUE_CHECK_PWD,decode.getClientPwd()); } bufferedReader.close(); fileReader.close(); diff --git a/netty-model/src/main/java/com/sv/netty/config/NettyConstant.java b/netty-model/src/main/java/com/sv/netty/config/NettyConstant.java index 30d9e27..7a36631 100644 --- a/netty-model/src/main/java/com/sv/netty/config/NettyConstant.java +++ b/netty-model/src/main/java/com/sv/netty/config/NettyConstant.java @@ -8,6 +8,7 @@ public interface NettyConstant { String VENUE_SERVER_PORT = "VENUE_SERVER_PORT"; String VENUE_CLIENT_SN = "VENUE_CLIENT_SN"; String VENUE_CLIENT_VID = "VENUE_CLIENT_VID"; + String VENUE_CHECK_PWD = "VENUE_CHECK_PWD"; /** * session中存储终端发送的额外参数