From 1a66c5df1b41a986ee2aac45501098ce6736482d Mon Sep 17 00:00:00 2001 From: limqhz <540344226@qq.com> Date: Thu, 14 Dec 2023 22:23:23 +0800 Subject: [PATCH] =?UTF-8?q?fixbug=20=E6=8C=89=E6=AC=A1=E6=94=B6=E8=B4=B9?= =?UTF-8?q?=E4=BD=99=E9=A2=9D=E4=B8=8D=E8=B6=B3=E5=B0=B1=E4=B8=8B=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=20=E9=9F=B3=E4=B9=90=E5=A4=9A=E6=AC=A1=E6=92=AD?= =?UTF-8?q?=E6=94=BE=E6=9C=89=E9=97=AE=E9=A2=98=EF=BC=8C=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=E6=97=A5=E5=BF=97=E6=9C=89=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/sv/intergration/LogService.java | 22 +++++++--------- .../com/sv/intergration/MessageService.java | 2 +- .../com/sv/intergration/PlayMusicService.java | 25 ++++++++----------- .../java/com/sv/service/api/VenueService.java | 2 +- 4 files changed, 22 insertions(+), 29 deletions(-) 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 0e73379..5d26c10 100644 --- a/netty-client/src/main/java/com/sv/intergration/LogService.java +++ b/netty-client/src/main/java/com/sv/intergration/LogService.java @@ -16,28 +16,24 @@ public class LogService { private static SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); - static Session session; - - public void uploadLog(String password) { + public void uploadLog() { 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); - } + JSch jsch = new JSch(); + String serverIp = System.getProperty(NettyConstant.VENUE_SERVER_IP); + Session 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 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(); if (file1.exists()){ - sftp.put(new FileInputStream(file1), "/home/uploadlog/" + System.getProperty(NettyConstant.VENUE_CLIENT_SN) + "-" + sdf.format(new Date()) + "-client-common.log"); + sftp.put(new FileInputStream(file1), "/home/uploadlog/comm-" + System.getProperty(NettyConstant.VENUE_CLIENT_SN) + "-" + sdf.format(new Date()) + "-client.log"); } if (file2.exists()) { - sftp.put(new FileInputStream(file2), "/home/uploadlog/" + System.getProperty(NettyConstant.VENUE_CLIENT_SN) + "-" + sdf.format(new Date()) + "-client-error.log"); + sftp.put(new FileInputStream(file2), "/home/uploadlog/error-" + System.getProperty(NettyConstant.VENUE_CLIENT_SN) + "-" + sdf.format(new Date()) + "-client.log"); } logger.info("upload logs success"); } 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 91146a9..57c7eb5 100644 --- a/netty-client/src/main/java/com/sv/intergration/MessageService.java +++ b/netty-client/src/main/java/com/sv/intergration/MessageService.java @@ -55,7 +55,7 @@ public class MessageService { private void sendLog() { LogService logService = new LogService(); - logService.uploadLog(System.getProperty(NettyConstant.VENUE_CHECK_PWD)); + logService.uploadLog(); } /** diff --git a/netty-client/src/main/java/com/sv/intergration/PlayMusicService.java b/netty-client/src/main/java/com/sv/intergration/PlayMusicService.java index b85525f..19b4d0d 100644 --- a/netty-client/src/main/java/com/sv/intergration/PlayMusicService.java +++ b/netty-client/src/main/java/com/sv/intergration/PlayMusicService.java @@ -15,27 +15,24 @@ public enum PlayMusicService { private static ArrayListPlayList byeVoice = new ArrayListPlayList(); // PlayList stopUsingVoice = new ArrayListPlayList(); - static { + public void playHello(){ File hello = new File("/home/venue/client/hello.mp3"); if (hello.exists()){ helloVoice.addAudioFile(hello); + player.setPlayList(helloVoice); + player.play(); + player.close(); } - File bye = new File("/home/venue/client/bye.mp3"); - if (bye.exists()){ - byeVoice.addAudioFile(bye); - } - } - - public void playHello(){ - player.setPlayList(helloVoice); - player.play(); - player.close(); } public void playBye(){ - player.setPlayList(byeVoice); - player.play(); - player.close(); + File bye = new File("/home/venue/client/bye.mp3"); + if (bye.exists()){ + byeVoice.addAudioFile(bye); + player.setPlayList(byeVoice); + player.play(); + player.close(); + } } } diff --git a/service/src/main/java/com/sv/service/api/VenueService.java b/service/src/main/java/com/sv/service/api/VenueService.java index b97ae7b..84f7fa3 100644 --- a/service/src/main/java/com/sv/service/api/VenueService.java +++ b/service/src/main/java/com/sv/service/api/VenueService.java @@ -259,9 +259,9 @@ public class VenueService extends BaseServiceImpl { if (effOrder <= 0) { // 单次订单已超时 需要重新付费 synchronized (("scancode-in" + memberId).intern()) { - createBarcodeTimeOrder(memberId,venueId,timePayHour); if (memberService.isMoneyEnough(memberId, price)) { logger.info("用户" + memberId + "使用余额核销订单"); + createBarcodeTimeOrder(memberId,venueId,timePayHour); createMemberMoneyLog(MoneyLogEnum.JOIN.value, price, memberId, 1, PayTypeEnum.BALANCE.value, null, venue.getId(), venue.getType()); } else {