兼容海康不规范的xml,大幅度提高通道分页查询速度,优化节点的保活。
This commit is contained in:
@@ -27,6 +27,9 @@ public class ZLMRESTfulUtils {
|
||||
|
||||
public JSONObject sendPost(MediaServerItem mediaServerItem, String api, Map<String, Object> param, RequestCallback callback) {
|
||||
OkHttpClient client = new OkHttpClient();
|
||||
if (mediaServerItem == null) {
|
||||
return null;
|
||||
}
|
||||
String url = String.format("http://%s:%s/index/api/%s", mediaServerItem.getIp(), mediaServerItem.getHttpPort(), api);
|
||||
JSONObject responseJSON = null;
|
||||
|
||||
|
||||
@@ -63,10 +63,9 @@ public class ZLMRunner implements CommandLineRunner {
|
||||
mediaServerService.addToDatabase(mediaConfig.getMediaSerItem());
|
||||
}else {
|
||||
MediaServerItem mediaSerItem = mediaConfig.getMediaSerItem();
|
||||
mediaSerItem.setId(defaultMediaServer.getId());
|
||||
mediaServerService.updateToDatabase(mediaSerItem);
|
||||
}
|
||||
|
||||
mediaServerService.syncCatchFromDatabase();
|
||||
// 订阅 zlm启动事件, 新的zlm也会从这里进入系统
|
||||
hookSubscribe.addSubscribe(ZLMHttpHookSubscribe.HookType.on_server_started,null,
|
||||
(MediaServerItem mediaServerItem, JSONObject response)->{
|
||||
@@ -145,7 +144,6 @@ public class ZLMRunner implements CommandLineRunner {
|
||||
JSONArray data = responseJSON.getJSONArray("data");
|
||||
if (data != null && data.size() > 0) {
|
||||
ZLMServerConfig = JSON.parseObject(JSON.toJSONString(data.get(0)), ZLMServerConfig.class);
|
||||
ZLMServerConfig.setIp(mediaServerItem.getIp());
|
||||
}
|
||||
} else {
|
||||
logger.error("[ {} ]-[ {}:{} ]第{}次主动连接失败, 2s后重试",
|
||||
|
||||
@@ -65,7 +65,7 @@ public class ZLMKeepliveTimeoutListener extends RedisKeyExpirationEventMessageLi
|
||||
if (mediaServerConfig == null) {
|
||||
publisher.zlmOfflineEventPublish(mediaServerId);
|
||||
}else {
|
||||
logger.info("[zlm心跳到期]:{}验证后zlm仍在线,回复心跳信息", mediaServerId);
|
||||
logger.info("[zlm心跳到期]:{}验证后zlm仍在线,恢复心跳信息", mediaServerId);
|
||||
// 添加zlm信息
|
||||
mediaServerService.updateMediaServerKeepalive(mediaServerId, mediaServerConfig);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user