diff --git a/api/src/main/java/com/sv/netty/controller/AdminNettyController.java b/api/src/main/java/com/sv/netty/controller/AdminNettyController.java index bf10afd..2b3460b 100644 --- a/api/src/main/java/com/sv/netty/controller/AdminNettyController.java +++ b/api/src/main/java/com/sv/netty/controller/AdminNettyController.java @@ -182,7 +182,6 @@ public class AdminNettyController extends BaseApiController { private static String getDocument(String barcode, String barcodeSn) throws IOException, InvalidFormatException { String newFilePath = "/home/test/" + barcodeSn + ".docx"; -// String newFilePath = "/Users/limqhz/home/test/" + barcodeSn + ".docx"; XWPFDocument document = new XWPFDocument(); XWPFParagraph paragraph = document.createParagraph(); paragraph.setAlignment(ParagraphAlignment.CENTER); diff --git a/api/src/main/resources/logback.xml b/api/src/main/resources/logback.xml index fa64b74..694a62a 100644 --- a/api/src/main/resources/logback.xml +++ b/api/src/main/resources/logback.xml @@ -1,7 +1,7 @@ - + diff --git a/netty-client/src/main/java/com/sv/barcode/button/EnterClick.java b/netty-client/src/main/java/com/sv/barcode/button/EnterClick.java index 6b3473c..4fef9bc 100644 --- a/netty-client/src/main/java/com/sv/barcode/button/EnterClick.java +++ b/netty-client/src/main/java/com/sv/barcode/button/EnterClick.java @@ -18,6 +18,6 @@ public class EnterClick implements ActionListener { DoorService doorService = new OldDoorService(); doorService.enterOpenDoor(); // 开门 - logger.error("开门成功！！！！！！！"); + logger.error("test open enter door success ！！！！！！！"); } } diff --git a/netty-client/src/main/java/com/sv/barcode/button/OutClick.java b/netty-client/src/main/java/com/sv/barcode/button/OutClick.java index c303a2f..e152e4c 100644 --- a/netty-client/src/main/java/com/sv/barcode/button/OutClick.java +++ b/netty-client/src/main/java/com/sv/barcode/button/OutClick.java @@ -18,6 +18,6 @@ public class OutClick implements ActionListener { DoorService doorService = new OldDoorService(); doorService.outOpenDoor(); // 开门 - logger.error("开门成功！！！！！！！"); + logger.error("test out open door success ！！！！！！！"); } } diff --git a/netty-client/src/main/java/com/sv/barcode/button/TestCodeClick.java b/netty-client/src/main/java/com/sv/barcode/button/TestCodeClick.java index a16254f..d955cb8 100644 --- a/netty-client/src/main/java/com/sv/barcode/button/TestCodeClick.java +++ b/netty-client/src/main/java/com/sv/barcode/button/TestCodeClick.java @@ -21,7 +21,7 @@ public class TestCodeClick implements ActionListener { @Override public void actionPerformed(ActionEvent e) { - logger.error("发送验证二维码消息！！！=========" + barcode.getText()); + logger.error("sending barcode msg to api ！！！=========" + barcode.getText()); ClientThread.getInstance().checkBarcode(barcode.getText()); } } diff --git a/netty-client/src/main/java/com/sv/intergration/LogService.java b/netty-client/src/main/java/com/sv/intergration/LogService.java index 50148a3..0e73379 100644 --- a/netty-client/src/main/java/com/sv/intergration/LogService.java +++ b/netty-client/src/main/java/com/sv/intergration/LogService.java @@ -7,7 +7,6 @@ import org.slf4j.LoggerFactory; import java.io.File; import java.io.FileInputStream; -import java.io.FileNotFoundException; import java.text.SimpleDateFormat; import java.util.Date; @@ -30,11 +29,17 @@ public class LogService { session.connect(3000); } ChannelSftp sftp = (ChannelSftp) session.openChannel("sftp"); - File file = new File("/home/venue/logs/common-default.log"); - if (file.exists()) { + File file1 = new File("/home/venue/logs/common-default.log"); + File file2 = new File("/home/venue/logs/common-error.log"); + if (file1.exists() || file2.exists()) { sftp.connect(); - sftp.put(new FileInputStream(file), "/home/uploadlog/" + System.getProperty(NettyConstant.VENUE_CLIENT_SN) + "-" + sdf.format(new Date()) + "-client.log"); - logger.info("上传日志成功"); + if (file1.exists()){ + sftp.put(new FileInputStream(file1), "/home/uploadlog/" + System.getProperty(NettyConstant.VENUE_CLIENT_SN) + "-" + sdf.format(new Date()) + "-client-common.log"); + } + if (file2.exists()) { + sftp.put(new FileInputStream(file2), "/home/uploadlog/" + System.getProperty(NettyConstant.VENUE_CLIENT_SN) + "-" + sdf.format(new Date()) + "-client-error.log"); + } + logger.info("upload logs success"); } if (sftp != null) { sftp.disconnect(); @@ -43,7 +48,7 @@ public class LogService { session.disconnect(); } }catch (Exception e){ - logger.error("上传日志失败",e); + logger.error("upload log fail",e); } } diff --git a/netty-client/src/main/java/com/sv/intergration/MessageService.java b/netty-client/src/main/java/com/sv/intergration/MessageService.java index fd537ef..b502182 100644 --- a/netty-client/src/main/java/com/sv/intergration/MessageService.java +++ b/netty-client/src/main/java/com/sv/intergration/MessageService.java @@ -65,7 +65,7 @@ public class MessageService { DoorService doorService = new OldDoorService(); doorService.enterOpenDoor(); // 开门 - logger.info("开门成功！！！"); + logger.info("open enter door success！！！"); } /** @@ -75,7 +75,7 @@ public class MessageService { DoorService doorService = new OldDoorService(); doorService.outOpenDoor(); // 开门 - logger.info("开门成功！！！"); + logger.info("open out door success！！！"); } } diff --git a/netty-client/src/main/java/com/sv/intergration/impl/OldDoorService.java b/netty-client/src/main/java/com/sv/intergration/impl/OldDoorService.java index 202c2b2..c64f7b9 100644 --- a/netty-client/src/main/java/com/sv/intergration/impl/OldDoorService.java +++ b/netty-client/src/main/java/com/sv/intergration/impl/OldDoorService.java @@ -30,7 +30,7 @@ public class OldDoorService implements DoorService { OpenDoor openDoor = new OpenDoor(openDoorParameter); boolean command = connector.AddCommand(openDoor); if (!command) { - logger.error("入场开门命令执行失败"); + logger.error("enter door open command exec fail"); } if (openDoor.getIsTimeout()) { logger.info("----in open door timeout ----"); @@ -57,7 +57,7 @@ public class OldDoorService implements DoorService { OpenDoor openDoor = new OpenDoor(openDoorParameter); boolean command = connector.AddCommand(openDoor); if (!command) { - logger.error("出场开门命令执行失败"); + logger.error("out door open command exec fail"); } if (openDoor.getIsTimeout()) { logger.info("----out open door timeout ----"); diff --git a/netty-client/src/main/java/com/sv/netty/ClientHandler.java b/netty-client/src/main/java/com/sv/netty/ClientHandler.java index 4f3e7ef..178d1d3 100644 --- a/netty-client/src/main/java/com/sv/netty/ClientHandler.java +++ b/netty-client/src/main/java/com/sv/netty/ClientHandler.java @@ -52,7 +52,7 @@ public class ClientHandler extends SimpleChannelInboundHandler { */ @Override public void channelRead0(ChannelHandlerContext ctx, String msg) throws Exception { - logger.info("接收服务器响应msg:[" + msg + "]"); + logger.info("get server msg:[" + msg + "]"); VenueMessage message = JsonUtils.decode(msg, VenueMessage.class); MessageService.getInstance().execute(message); } diff --git a/netty-client/src/main/java/com/sv/netty/ClientThread.java b/netty-client/src/main/java/com/sv/netty/ClientThread.java index 76c0e23..3bd2b28 100644 --- a/netty-client/src/main/java/com/sv/netty/ClientThread.java +++ b/netty-client/src/main/java/com/sv/netty/ClientThread.java @@ -84,7 +84,7 @@ public class ClientThread extends Thread{ } } }catch (Exception e) { - logger.error("链接失败，发送二维码失败",e); + logger.error("link netty server fail ,send barcode fail",e); } } @@ -93,11 +93,11 @@ public class ClientThread extends Thread{ } public void doConnect() { - logger.info("现在开始链接了"); + logger.info("connecting"); if (closed) { return; } - logger.info("连接 = " + remoteHost + " " + remotePort); + logger.info("connect info = " + remoteHost + " " + remotePort); future = bootstrap.connect(new InetSocketAddress(remoteHost, remotePort)); future.addListener(new ChannelFutureListener() { public void operationComplete(ChannelFuture f) throws Exception { @@ -106,9 +106,9 @@ public class ClientThread extends Thread{ public void run() { if (!f.isSuccess()) { doConnect(); - logger.info("等待连接"); + logger.info("waiting connection"); } else { - logger.info("已连接"); + logger.info("connected!"); } } }, 2, TimeUnit.SECONDS); diff --git a/netty-client/src/main/java/com/sv/netty/MessageHandler.java b/netty-client/src/main/java/com/sv/netty/MessageHandler.java index 64e2bdd..0288009 100644 --- a/netty-client/src/main/java/com/sv/netty/MessageHandler.java +++ b/netty-client/src/main/java/com/sv/netty/MessageHandler.java @@ -30,21 +30,21 @@ public class MessageHandler { public static String checkBarcode(String barcode) { String decrypt = AesUtil.decrypt(barcode); if (decrypt == null) { - logger.error("二维码不合法" + barcode); + logger.error("barcode unable to decrypt" + barcode); return null; } // 这个二维码是线下的二维码 if (!decrypt.startsWith("venue-")){ VenueBarCode venueBarCode = MakeCode.decodeCode(barcode); if (venueBarCode == null) { - logger.error("二维码不合法" + barcode); + logger.error("user barcode can't not decodeCode" + barcode); return null; } } VenueMessage venueMessage = new VenueMessage(); venueMessage.setMessageType(MessageType.SCAN_CODE); venueMessage.setMessage(barcode); - logger.info("核销二维码===" + barcode); + logger.info("use barcode to api ===" + barcode); return EncodeMsg.INSTANCE.encode(venueMessage); } 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 a0c2e6b..693b7a9 100644 --- a/netty-client/src/main/java/com/sv/service/ClientService.java +++ b/netty-client/src/main/java/com/sv/service/ClientService.java @@ -21,7 +21,6 @@ public class ClientService { public static void main(String[] args) throws IOException, InterruptedException { File file = new File("/home/venue/client/venue.conf"); -// File file = new File("/Users/limqhz/home/venue/client/venue.conf"); FileReader fileReader = new FileReader(file); BufferedReader bufferedReader = new BufferedReader(fileReader); String line = bufferedReader.readLine(); diff --git a/oms/src/main/resources/logback.xml b/oms/src/main/resources/logback.xml index 4807936..607a457 100644 --- a/oms/src/main/resources/logback.xml +++ b/oms/src/main/resources/logback.xml @@ -1,7 +1,7 @@ - + diff --git a/service/src/main/java/com/sv/service/utils/VenueBarcodeUtil.java b/service/src/main/java/com/sv/service/utils/VenueBarcodeUtil.java index 74ddd71..e08e7ca 100644 --- a/service/src/main/java/com/sv/service/utils/VenueBarcodeUtil.java +++ b/service/src/main/java/com/sv/service/utils/VenueBarcodeUtil.java @@ -25,7 +25,6 @@ public class VenueBarcodeUtil { public static String generateBarcode(String barcodeValue,String fileName) { try { String geneFilePath = "/home/test/" + fileName; -// String geneFilePath = "/Users/limqhz/home/test/" + fileName; makeBarcode(geneFilePath,barcodeValue); return geneFilePath; }catch (WriterException e) {