From c566d4d7cf9bf2b55b745504b434053b75296a45 Mon Sep 17 00:00:00 2001
From: panlinlin <648540858@qq.com>
Date: 星期三, 21 四月 2021 18:14:45 +0800
Subject: [PATCH] 优化播放器以及部分日志

---
 src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRESTfulUtils.java |   15 ++++++---------
 1 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRESTfulUtils.java b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRESTfulUtils.java
index f62ad32..d701c83 100644
--- a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRESTfulUtils.java
+++ b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRESTfulUtils.java
@@ -13,6 +13,7 @@
 import java.net.ConnectException;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Objects;
 
 @Component
 public class ZLMRESTfulUtils {
@@ -40,7 +41,7 @@
 
         FormBody.Builder builder = new FormBody.Builder();
         builder.add("secret",mediaSecret);
-        if (param != null) {
+        if (param != null && param.keySet().size() > 0) {
             for (String key : param.keySet()){
                 builder.add(key, param.get(key).toString());
             }
@@ -65,7 +66,7 @@
                     logger.error(String.format("杩炴帴ZLM澶辫触: %s, %s", e.getCause().getMessage(), e.getMessage()));
                     logger.info("璇锋鏌edia閰嶇疆骞剁‘璁LM宸插惎鍔�...");
                 }catch (IOException e) {
-                    e.printStackTrace();
+                    logger.error(String.format("[ %s ]璇锋眰澶辫触: %s", url, e.getMessage()));
                 }
             }else {
                 client.newCall(request).enqueue(new Callback(){
@@ -74,14 +75,10 @@
                     public void onResponse(@NotNull Call call, @NotNull Response response){
                         if (response.isSuccessful()) {
                             try {
-                                String responseStr = response.body().string();
-                                if (responseStr != null) {
-                                    callback.run(JSON.parseObject(responseStr));
-                                }else {
-                                    callback.run(null);
-                                }
+                                String responseStr = Objects.requireNonNull(response.body()).string();
+                                callback.run(JSON.parseObject(responseStr));
                             } catch (IOException e) {
-                                e.printStackTrace();
+                                logger.error(String.format("[ %s ]璇锋眰澶辫触: %s", url, e.getMessage()));
                             }
                         }
                     }

--
Gitblit v1.8.0