From f6eeb59371816220b8daae493376928607c6ce4e Mon Sep 17 00:00:00 2001
From: hx <2907898590@qq.com>
Date: Sat, 14 Sep 2024 15:16:47 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=AB=AF=E5=8F=A3=E5=88=9D?=
 =?UTF-8?q?=E5=A7=8B=E5=8C=96wssSslPort=E8=8E=B7=E5=8F=96=E5=A4=B1?=
 =?UTF-8?q?=E8=B4=A5=20=E4=BF=AE=E5=A4=8D=E5=AD=97=E7=AC=A6=E9=9B=86?=
 =?UTF-8?q?=E7=A9=BA=E6=8C=87=E9=92=88=E5=BC=82=E5=B8=B8=E5=AF=BC=E8=87=B4?=
 =?UTF-8?q?=E5=BF=83=E8=B7=B3=E7=9A=84=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../iot/vmp/media/zlm/ZLMMediaServerStatusManger.java       | 6 ++++++
 .../genersoft/iot/vmp/service/impl/DeviceServiceImpl.java   | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMMediaServerStatusManger.java b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMMediaServerStatusManger.java
index cdf1e3f2..1d4437a2 100644
--- a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMMediaServerStatusManger.java
+++ b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMMediaServerStatusManger.java
@@ -235,6 +235,12 @@ public class ZLMMediaServerStatusManger {
         if (mediaServerItem.getRtpProxyPort() == 0) {
             mediaServerItem.setRtpProxyPort(zlmServerConfig.getRtpProxyPort());
         }
+        if (mediaServerItem.getFlvSSLPort() == 0) {
+            mediaServerItem.setFlvSSLPort(zlmServerConfig.getHttpSSLport());
+        }
+        if (mediaServerItem.getWsFlvSSLPort() == 0) {
+            mediaServerItem.setWsFlvSSLPort(zlmServerConfig.getHttpSSLport());
+        }
         mediaServerItem.setHookAliveInterval(10F);
     }
 
diff --git a/src/main/java/com/genersoft/iot/vmp/service/impl/DeviceServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/service/impl/DeviceServiceImpl.java
index 47b902e1..3c521640 100755
--- a/src/main/java/com/genersoft/iot/vmp/service/impl/DeviceServiceImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/impl/DeviceServiceImpl.java
@@ -396,7 +396,7 @@ public class DeviceServiceImpl implements IDeviceService {
 
         String now = DateUtil.getNow();
         device.setUpdateTime(now);
-        device.setCharset(device.getCharset().toUpperCase());
+        device.setCharset(device.getCharset() == null ? "" : device.getCharset().toUpperCase());
         device.setUpdateTime(DateUtil.getNow());
         if (deviceMapper.update(device) > 0) {
             redisCatchStorage.updateDevice(device);