From b50ece48f5ce468a0997afc738602cfeca206d2f Mon Sep 17 00:00:00 2001
From: liuqingkun <LIUqk6666_>
Date: Thu, 1 Jun 2023 16:44:30 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/websocket/AbstractWebsocketClient.java |  4 ++--
 .../jtt1078/app/websocket/WebsocketClient.java |  1 -
 .../jtt1078/subscriber/RTMPPublisher.java      | 18 +++++++++---------
 3 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/src/main/java/cn/org/hentai/jtt1078/app/websocket/AbstractWebsocketClient.java b/src/main/java/cn/org/hentai/jtt1078/app/websocket/AbstractWebsocketClient.java
index a8ddde7..02e26bb 100644
--- a/src/main/java/cn/org/hentai/jtt1078/app/websocket/AbstractWebsocketClient.java
+++ b/src/main/java/cn/org/hentai/jtt1078/app/websocket/AbstractWebsocketClient.java
@@ -50,12 +50,12 @@ public abstract class AbstractWebsocketClient implements Closeable {
      *
      * @return:
      */
-    public void connect() throws MyException {
+    public void connect() {
         try {
             doOpen();
             doConnect();
         } catch (Exception e) {
-            log.error(BusinessConstant.LOGGER_PREFIX + " : wesocket连接没有成功打开,原因是:{}", e.getMessage(), e);
+            log.error(BusinessConstant.LOGGER_PREFIX + " : wesocket连接没有成功打开,原因是:{}", e.getMessage());
         }
     }
 
diff --git a/src/main/java/cn/org/hentai/jtt1078/app/websocket/WebsocketClient.java b/src/main/java/cn/org/hentai/jtt1078/app/websocket/WebsocketClient.java
index 9e5ac2f..0f52805 100644
--- a/src/main/java/cn/org/hentai/jtt1078/app/websocket/WebsocketClient.java
+++ b/src/main/java/cn/org/hentai/jtt1078/app/websocket/WebsocketClient.java
@@ -38,7 +38,6 @@ public class WebsocketClient extends AbstractWebsocketClient {
         if (wsInstance == null) {
             try {
                 wsInstance = new WebsocketClient("ws://42.192.165.208:19800/ws", 20);
-//                wsInstance = new WebsocketClient("ws://127.0.0.1:19800/ws?" + Base64.getEncoder().encode("jtt1078".getBytes()), 20);
             } catch (URISyntaxException | MyException e) {
                 log.error("发生异常,原因:{}", e.getMessage(), e);
             }
diff --git a/src/main/java/cn/org/hentai/jtt1078/subscriber/RTMPPublisher.java b/src/main/java/cn/org/hentai/jtt1078/subscriber/RTMPPublisher.java
index 73ce326..9b73ed5 100644
--- a/src/main/java/cn/org/hentai/jtt1078/subscriber/RTMPPublisher.java
+++ b/src/main/java/cn/org/hentai/jtt1078/subscriber/RTMPPublisher.java
@@ -37,22 +37,22 @@ public class RTMPPublisher extends Thread {
             );
             logger.info(BusinessConstant.LOGGER_PREFIX + " : 执行ffmpeg命令 : {} ", cmd);
             process = Runtime.getRuntime().exec(cmd);
-
-            if (!closeFlag) {
-                // 若ffmpeg主动退出标志为否, 重新执行一次ffmpeg命令
-                logger.info(BusinessConstant.LOGGER_PREFIX + " : 执行ffmpeg命令失败 - 进行重试 : {} ", cmd);
-                closeFlag = Boolean.FALSE;
-                process = Runtime.getRuntime().exec(cmd);
-            }
-
             stderr = process.getErrorStream();
-
             String errMsg = "";
+            logger.info(BusinessConstant.LOGGER_PREFIX + " : 执行ffmpeg命令 : 执行完成1 ");
             while ((len = stderr.read(buff)) > -1) {
                 String str = new String(buff, 0, len);
 //                errMsg += str;
                 if (debugMode) System.out.print(str);
             }
+            logger.info(BusinessConstant.LOGGER_PREFIX + " : 执行ffmpeg命令 : 执行完成2 ");
+
+            if (!closeFlag) {
+                // 若ffmpeg主动退出标志为否, 重新执行一次ffmpeg命令
+                logger.info(BusinessConstant.LOGGER_PREFIX + " : 执行ffmpeg命令失败 - 进行重试 : {} ", cmd);
+                closeFlag = Boolean.FALSE;
+                process = Runtime.getRuntime().exec(cmd);
+            }
 
             logger.info(BusinessConstant.LOGGER_PREFIX + " : 执行ffmpeg命令失败, 关闭通道[{}], 并调用close方法释放原来的通道 : Process FFMPEG exited... : error msg = {} ", tag, errMsg);
         } catch (Exception ex) {