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

Merge pull request #1625 from MightyTiger98/master 

修复zlm端口获取失败和字符集导致心跳报错的问题
pull/1630/head
648540858 2024-09-14 16:06:17 +08:00 committed by GitHub
parent 8d9e19c440 f6eeb59371
commit 3e1f31dab4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
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) { if (mediaServerItem.getRtpProxyPort() == 0) {
mediaServerItem.setRtpProxyPort(zlmServerConfig.getRtpProxyPort()); mediaServerItem.setRtpProxyPort(zlmServerConfig.getRtpProxyPort());
} }
if (mediaServerItem.getFlvSSLPort() == 0) {
mediaServerItem.setFlvSSLPort(zlmServerConfig.getHttpSSLport());
}
if (mediaServerItem.getWsFlvSSLPort() == 0) {
mediaServerItem.setWsFlvSSLPort(zlmServerConfig.getHttpSSLport());
}
mediaServerItem.setHookAliveInterval(10F); 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(); String now = DateUtil.getNow();
device.setUpdateTime(now); device.setUpdateTime(now);
device.setCharset(device.getCharset().toUpperCase()); device.setCharset(device.getCharset() == null ? "" : device.getCharset().toUpperCase());
device.setUpdateTime(DateUtil.getNow()); device.setUpdateTime(DateUtil.getNow());
if (deviceMapper.update(device) > 0) { if (deviceMapper.update(device) > 0) {
redisCatchStorage.updateDevice(device); redisCatchStorage.updateDevice(device);