Thirdparty
/
wvp-GB28181-pro
mirror of https://github.com/648540858/wvp-GB28181-pro
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

修复端口初始化wssSslPort获取失败 

修复字符集空指针异常导致心跳的错误
pull/1625/head
hx 2024-09-14 15:16:47 +08:00
parent 8d9e19c440
commit f6eeb59371
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMMediaServerStatusManger.java
View File

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

2
src/main/java/com/genersoft/iot/vmp/service/impl/DeviceServiceImpl.java
View File

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