Merge pull request #1625 from MightyTiger98/master

修复zlm端口获取失败和字符集导致心跳报错的问题

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);
     }
 

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);