From c1eef12901b912eedfde6b30bb9682e717772bd5 Mon Sep 17 00:00:00 2001 From: limqhz <540344226@qq.com> Date: Wed, 13 Dec 2023 23:35:01 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E7=AB=AF=20fixbug=20?= =?UTF-8?q?=E5=BC=80=E5=90=AF=E4=B8=8A=E4=BC=A0=E6=97=A5=E5=BF=97=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/ServerMessageHandlerAdapter.java | 2 +- .../java/com/sv/intergration/LogService.java | 49 +++++++++++-------- .../com/sv/intergration/MessageService.java | 9 ++-- .../sv/mapper/MemberEnterStatusMapper.java | 4 +- 4 files changed, 39 insertions(+), 25 deletions(-) diff --git a/api/src/main/java/com/sv/netty/netty/service/impl/ServerMessageHandlerAdapter.java b/api/src/main/java/com/sv/netty/netty/service/impl/ServerMessageHandlerAdapter.java index 76c03dd..140955a 100644 --- a/api/src/main/java/com/sv/netty/netty/service/impl/ServerMessageHandlerAdapter.java +++ b/api/src/main/java/com/sv/netty/netty/service/impl/ServerMessageHandlerAdapter.java @@ -179,7 +179,7 @@ public class ServerMessageHandlerAdapter implements MessageService { memberEnterVenueLogService.save(memberEnterVenueLog); doorLockUtil.lockDoor(doorSn); writeOffCode(barcode); - logger.info("用户" + member.getNickname() + "入场"); + logger.info("用户" + member.getId() + "&" + member.getNickname() + "入场"); ServerMessageUtils.INSTANCE.sendMsg(channel,new VenueMessage(MessageType.ENTER_DOOR,"OK")); } } 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 c78a0dd..293bb07 100644 --- a/netty-client/src/main/java/com/sv/intergration/LogService.java +++ b/netty-client/src/main/java/com/sv/intergration/LogService.java @@ -2,6 +2,8 @@ package com.sv.intergration; import com.jcraft.jsch.*; import com.sv.netty.config.NettyConstant; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.io.File; import java.io.FileInputStream; @@ -11,30 +13,37 @@ import java.util.Date; public class LogService { + private final Logger logger = LoggerFactory.getLogger(LogService.class); + 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(); + public void uploadLog(String password) { + try { + 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"); + logger.info("上传日志成功"); + } + if (sftp != null) { + sftp.connect(); + sftp.disconnect(); + } + if (session != null) { + session.disconnect(); + } + }catch (Exception e){ + logger.error("上传日志失败",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 63a5865..fd537ef 100644 --- a/netty-client/src/main/java/com/sv/intergration/MessageService.java +++ b/netty-client/src/main/java/com/sv/intergration/MessageService.java @@ -1,6 +1,7 @@ package com.sv.intergration; import com.sv.intergration.impl.OldDoorService; +import com.sv.netty.config.NettyConstant; import com.sv.netty.config.VenueMessage; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -45,14 +46,16 @@ public class MessageService { outDoor(); break; case LOG: - sendlog(); + sendLog(); + break; default: logger.info( "default"); } } - private void sendlog() { -// File file = new File(); + private void sendLog() { + LogService logService = new LogService(); + logService.uploadLog(System.getProperty(NettyConstant.VENUE_CHECK_PWD)); } /** diff --git a/service/src/main/java/com/sv/mapper/MemberEnterStatusMapper.java b/service/src/main/java/com/sv/mapper/MemberEnterStatusMapper.java index 52ff37b..c28633e 100644 --- a/service/src/main/java/com/sv/mapper/MemberEnterStatusMapper.java +++ b/service/src/main/java/com/sv/mapper/MemberEnterStatusMapper.java @@ -1,5 +1,6 @@ package com.sv.mapper; +import com.sv.annotation.NoPlatform; import com.sv.entity.MemberEnterStatus; import org.apache.ibatis.annotations.Param; @@ -18,8 +19,9 @@ public interface MemberEnterStatusMapper { int updateByPrimaryKey(MemberEnterStatus record); + @NoPlatform MemberEnterStatus selectByMemberVenue(@Param("memberId") Integer memberId, @Param("venueId") Integer venueId); List findAllNeedClear(); -} \ No newline at end of file +}