From ee7ef0bf4131ad7b6f91ca204c2b54b7c671dd08 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期五, 02 九月 2022 15:49:40 +0800
Subject: [PATCH] 优化级联平台注册的周期时间
---
src/main/java/com/genersoft/iot/vmp/service/impl/PlatformServiceImpl.java | 5
src/main/java/com/genersoft/iot/vmp/gb28181/bean/ParentPlatform.java | 6
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java | 80 +++++++++----------
src/main/java/com/genersoft/iot/vmp/gb28181/conf/SipLoggerPass.java | 106 ++++++++++++++++++++++++++
4 files changed, 149 insertions(+), 48 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/ParentPlatform.java b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/ParentPlatform.java
index ade5d0e..00a16f9 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/ParentPlatform.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/ParentPlatform.java
@@ -90,7 +90,7 @@
* 蹇冭烦鍛ㄦ湡(绉�)
*/
@Schema(description = "蹇冭烦鍛ㄦ湡(绉�)")
- private String keepTimeout;
+ private int keepTimeout;
/**
* 浼犺緭鍗忚
@@ -294,11 +294,11 @@
this.expires = expires;
}
- public String getKeepTimeout() {
+ public int getKeepTimeout() {
return keepTimeout;
}
- public void setKeepTimeout(String keepTimeout) {
+ public void setKeepTimeout(int keepTimeout) {
this.keepTimeout = keepTimeout;
}
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/conf/SipLoggerPass.java b/src/main/java/com/genersoft/iot/vmp/gb28181/conf/SipLoggerPass.java
new file mode 100644
index 0000000..f8d6485
--- /dev/null
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/conf/SipLoggerPass.java
@@ -0,0 +1,106 @@
+package com.genersoft.iot.vmp.gb28181.conf;
+
+import gov.nist.core.StackLogger;
+
+import java.util.Properties;
+
+/**
+ * sip鏃ュ織鏍煎紡鍖�
+ */
+public class SipLoggerPass implements StackLogger {
+
+ @Override
+ public void logStackTrace() {
+
+ }
+
+ @Override
+ public void logStackTrace(int traceLevel) {
+
+ }
+
+ @Override
+ public int getLineCount() {
+ return 0;
+ }
+
+ @Override
+ public void logException(Throwable ex) {
+
+ }
+
+ @Override
+ public void logDebug(String message) {
+
+ }
+
+ @Override
+ public void logDebug(String message, Exception ex) {
+
+ }
+
+ @Override
+ public void logTrace(String message) {
+
+ }
+
+ @Override
+ public void logFatalError(String message) {
+
+ }
+
+ @Override
+ public void logError(String message) {
+
+ }
+
+ @Override
+ public boolean isLoggingEnabled() {
+ return false;
+ }
+
+ @Override
+ public boolean isLoggingEnabled(int logLevel) {
+ return false;
+ }
+
+ @Override
+ public void logError(String message, Exception ex) {
+
+ }
+
+ @Override
+ public void logWarning(String string) {
+
+ }
+
+ @Override
+ public void logInfo(String string) {
+
+ }
+
+ @Override
+ public void disableLogging() {
+
+ }
+
+ @Override
+ public void enableLogging() {
+
+ }
+
+ @Override
+ public void setBuildTimeStamp(String buildTimeStamp) {
+
+ }
+
+ @Override
+ public void setStackProperties(Properties stackProperties) {
+
+ }
+
+ @Override
+ public String getLoggerName() {
+ return null;
+ }
+}
diff --git a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
index ce46393..78b59d9 100644
--- a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
+++ b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
@@ -103,7 +103,7 @@
*/
@ResponseBody
@PostMapping(value = "/on_server_keepalive", produces = "application/json;charset=UTF-8")
- public ResponseEntity<String> onServerKeepalive(@RequestBody JSONObject json){
+ public JSONObject onServerKeepalive(@RequestBody JSONObject json){
logger.info("[ ZLM HOOK ] on_server_keepalive API璋冪敤锛屽弬鏁帮細" + json.toString());
String mediaServerId = json.getString("mediaServerId");
@@ -118,7 +118,8 @@
JSONObject ret = new JSONObject();
ret.put("code", 0);
ret.put("msg", "success");
- return new ResponseEntity<String>(ret.toString(),HttpStatus.OK);
+
+ return ret;
}
/**
@@ -127,16 +128,15 @@
*/
@ResponseBody
@PostMapping(value = "/on_flow_report", produces = "application/json;charset=UTF-8")
- public ResponseEntity<String> onFlowReport(@RequestBody JSONObject json){
+ public JSONObject onFlowReport(@RequestBody JSONObject json){
if (logger.isDebugEnabled()) {
logger.debug("[ ZLM HOOK ]on_flow_report API璋冪敤锛屽弬鏁帮細" + json.toString());
}
- String mediaServerId = json.getString("mediaServerId");
JSONObject ret = new JSONObject();
ret.put("code", 0);
ret.put("msg", "success");
- return new ResponseEntity<String>(ret.toString(),HttpStatus.OK);
+ return ret;
}
/**
@@ -145,7 +145,7 @@
*/
@ResponseBody
@PostMapping(value = "/on_http_access", produces = "application/json;charset=UTF-8")
- public ResponseEntity<String> onHttpAccess(@RequestBody JSONObject json){
+ public JSONObject onHttpAccess(@RequestBody JSONObject json){
if (logger.isDebugEnabled()) {
logger.debug("[ ZLM HOOK ]on_http_access API 璋冪敤锛屽弬鏁帮細" + json.toString());
@@ -156,7 +156,7 @@
ret.put("err", "");
ret.put("path", "");
ret.put("second", 600);
- return new ResponseEntity<String>(ret.toString(),HttpStatus.OK);
+ return ret;
}
/**
@@ -165,7 +165,7 @@
*/
@ResponseBody
@PostMapping(value = "/on_play", produces = "application/json;charset=UTF-8")
- public ResponseEntity<String> onPlay(@RequestBody OnPlayHookParam param){
+ public JSONObject onPlay(@RequestBody OnPlayHookParam param){
JSONObject json = (JSONObject)JSON.toJSON(param);
@@ -187,13 +187,13 @@
if (streamAuthorityInfo != null && streamAuthorityInfo.getCallId() != null && !streamAuthorityInfo.getCallId().equals(paramMap.get("callId"))) {
ret.put("code", 401);
ret.put("msg", "Unauthorized");
- return new ResponseEntity<>(ret.toString(),HttpStatus.OK);
+ return ret;
}
}
ret.put("code", 0);
ret.put("msg", "success");
- return new ResponseEntity<>(ret.toString(),HttpStatus.OK);
+ return ret;
}
/**
@@ -202,7 +202,7 @@
*/
@ResponseBody
@PostMapping(value = "/on_publish", produces = "application/json;charset=UTF-8")
- public ResponseEntity<String> onPublish(@RequestBody OnPublishHookParam param) {
+ public JSONObject onPublish(@RequestBody OnPublishHookParam param) {
JSONObject json = (JSONObject) JSON.toJSON(param);
@@ -216,7 +216,7 @@
logger.info("鎺ㄦ祦閴存潈澶辫触锛� 缂哄皯涓嶈鍙傛暟锛歴ign=md5(user琛ㄧ殑pushKey)");
ret.put("code", 401);
ret.put("msg", "Unauthorized");
- return new ResponseEntity<>(ret.toString(), HttpStatus.OK);
+ return ret;
}
Map<String, String> paramMap = urlParamToMap(param.getParams());
String sign = paramMap.get("sign");
@@ -224,7 +224,7 @@
logger.info("鎺ㄦ祦閴存潈澶辫触锛� 缂哄皯涓嶈鍙傛暟锛歴ign=md5(user琛ㄧ殑pushKey)");
ret.put("code", 401);
ret.put("msg", "Unauthorized");
- return new ResponseEntity<>(ret.toString(), HttpStatus.OK);
+ return ret;
}
// 鎺ㄦ祦鑷畾涔夋挱鏀鹃壌鏉冪爜
String callId = paramMap.get("callId");
@@ -234,7 +234,7 @@
logger.info("鎺ㄦ祦閴存潈澶辫触锛� sign 鏃犳潈闄�: callId={}. sign={}", callId, sign);
ret.put("code", 401);
ret.put("msg", "Unauthorized");
- return new ResponseEntity<>(ret.toString(), HttpStatus.OK);
+ return ret;
}
StreamAuthorityInfo streamAuthorityInfo = StreamAuthorityInfo.getInstanceByHook(param);
streamAuthorityInfo.setCallId(callId);
@@ -242,12 +242,11 @@
// 閴存潈閫氳繃
redisCatchStorage.updateStreamAuthorityInfo(param.getApp(), param.getStream(), streamAuthorityInfo);
// 閫氱煡assist鏂扮殑callId
- taskExecutor.execute(()->{
- if (mediaInfo != null && mediaInfo.getRecordAssistPort() > 0) {
+ if (mediaInfo != null && mediaInfo.getRecordAssistPort() > 0) {
+ taskExecutor.execute(()->{
assistRESTfulUtils.addStreamCallInfo(mediaInfo, param.getApp(), param.getStream(), callId, null);
- }
- });
-
+ });
+ }
}else {
zlmMediaListManager.sendStreamEvent(param.getApp(),param.getStream(), param.getMediaServerId());
}
@@ -291,10 +290,7 @@
}
}
-
-
-
- return new ResponseEntity<String>(ret.toString(), HttpStatus.OK);
+ return ret;
}
@@ -305,7 +301,7 @@
*/
@ResponseBody
@PostMapping(value = "/on_record_mp4", produces = "application/json;charset=UTF-8")
- public ResponseEntity<String> onRecordMp4(@RequestBody JSONObject json){
+ public JSONObject onRecordMp4(@RequestBody JSONObject json){
if (logger.isDebugEnabled()) {
logger.debug("[ ZLM HOOK ]on_record_mp4 API璋冪敤锛屽弬鏁帮細" + json.toString());
@@ -314,7 +310,7 @@
JSONObject ret = new JSONObject();
ret.put("code", 0);
ret.put("msg", "success");
- return new ResponseEntity<String>(ret.toString(),HttpStatus.OK);
+ return ret;
}
/**
* 褰曞埗hls瀹屾垚鍚庨�氱煡浜嬩欢锛涙浜嬩欢瀵瑰洖澶嶄笉鏁忔劅銆�
@@ -322,7 +318,7 @@
*/
@ResponseBody
@PostMapping(value = "/on_record_ts", produces = "application/json;charset=UTF-8")
- public ResponseEntity<String> onRecordTs(@RequestBody JSONObject json){
+ public JSONObject onRecordTs(@RequestBody JSONObject json){
if (logger.isDebugEnabled()) {
logger.debug("[ ZLM HOOK ]on_record_ts API璋冪敤锛屽弬鏁帮細" + json.toString());
@@ -331,7 +327,7 @@
JSONObject ret = new JSONObject();
ret.put("code", 0);
ret.put("msg", "success");
- return new ResponseEntity<String>(ret.toString(),HttpStatus.OK);
+ return ret;
}
/**
@@ -340,7 +336,7 @@
*/
@ResponseBody
@PostMapping(value = "/on_rtsp_realm", produces = "application/json;charset=UTF-8")
- public ResponseEntity<String> onRtspRealm(@RequestBody JSONObject json){
+ public JSONObject onRtspRealm(@RequestBody JSONObject json){
if (logger.isDebugEnabled()) {
logger.debug("[ ZLM HOOK ]on_rtsp_realm API璋冪敤锛屽弬鏁帮細" + json.toString());
@@ -349,7 +345,7 @@
JSONObject ret = new JSONObject();
ret.put("code", 0);
ret.put("realm", "");
- return new ResponseEntity<String>(ret.toString(),HttpStatus.OK);
+ return ret;
}
@@ -359,7 +355,7 @@
*/
@ResponseBody
@PostMapping(value = "/on_rtsp_auth", produces = "application/json;charset=UTF-8")
- public ResponseEntity<String> onRtspAuth(@RequestBody JSONObject json){
+ public JSONObject onRtspAuth(@RequestBody JSONObject json){
if (logger.isDebugEnabled()) {
logger.debug("[ ZLM HOOK ]on_rtsp_auth API璋冪敤锛屽弬鏁帮細" + json.toString());
@@ -369,7 +365,7 @@
ret.put("code", 0);
ret.put("encrypted", false);
ret.put("passwd", "test");
- return new ResponseEntity<String>(ret.toString(),HttpStatus.OK);
+ return ret;
}
/**
@@ -378,7 +374,7 @@
*/
@ResponseBody
@PostMapping(value = "/on_shell_login", produces = "application/json;charset=UTF-8")
- public ResponseEntity<String> onShellLogin(@RequestBody JSONObject json){
+ public JSONObject onShellLogin(@RequestBody JSONObject json){
if (logger.isDebugEnabled()) {
logger.debug("[ ZLM HOOK ]on_shell_login API璋冪敤锛屽弬鏁帮細" + json.toString());
@@ -396,7 +392,7 @@
JSONObject ret = new JSONObject();
ret.put("code", 0);
ret.put("msg", "success");
- return new ResponseEntity<String>(ret.toString(),HttpStatus.OK);
+ return ret;
}
/**
@@ -405,7 +401,7 @@
*/
@ResponseBody
@PostMapping(value = "/on_stream_changed", produces = "application/json;charset=UTF-8")
- public ResponseEntity<String> onStreamChanged(@RequestBody MediaItem item){
+ public JSONObject onStreamChanged(@RequestBody MediaItem item){
logger.info("[ ZLM HOOK ]on_stream_changed API璋冪敤锛屽弬鏁帮細" + JSONObject.toJSONString(item));
String mediaServerId = item.getMediaServerId();
@@ -520,7 +516,7 @@
JSONObject ret = new JSONObject();
ret.put("code", 0);
ret.put("msg", "success");
- return new ResponseEntity<String>(ret.toString(),HttpStatus.OK);
+ return ret;
}
/**
@@ -529,7 +525,7 @@
*/
@ResponseBody
@PostMapping(value = "/on_stream_none_reader", produces = "application/json;charset=UTF-8")
- public ResponseEntity<String> onStreamNoneReader(@RequestBody JSONObject json){
+ public JSONObject onStreamNoneReader(@RequestBody JSONObject json){
logger.info("[ ZLM HOOK ]on_stream_none_reader API璋冪敤锛屽弬鏁帮細" + json.toString());
String mediaServerId = json.getString("mediaServerId");
@@ -574,7 +570,7 @@
if (mediaServerItem != null && mediaServerItem.getStreamNoneReaderDelayMS() == -1) {
ret.put("close", false);
}
- return new ResponseEntity<String>(ret.toString(),HttpStatus.OK);
+ return ret;
}else {
StreamProxyItem streamProxyItem = streamProxyService.getStreamProxyByAppAndStream(app, streamId);
if (streamProxyItem != null && streamProxyItem.isEnable_remove_none_reader()) {
@@ -585,7 +581,7 @@
}else {
ret.put("close", false);
}
- return new ResponseEntity<String>(ret.toString(),HttpStatus.OK);
+ return ret;
}
}
@@ -595,7 +591,7 @@
*/
@ResponseBody
@PostMapping(value = "/on_stream_not_found", produces = "application/json;charset=UTF-8")
- public ResponseEntity<String> onStreamNotFound(@RequestBody JSONObject json){
+ public JSONObject onStreamNotFound(@RequestBody JSONObject json){
if (logger.isDebugEnabled()) {
logger.debug("[ ZLM HOOK ]on_stream_not_found API璋冪敤锛屽弬鏁帮細" + json.toString());
}
@@ -620,7 +616,7 @@
JSONObject ret = new JSONObject();
ret.put("code", 0);
ret.put("msg", "success");
- return new ResponseEntity<>(ret.toString(),HttpStatus.OK);
+ return ret;
}
/**
@@ -629,7 +625,7 @@
*/
@ResponseBody
@PostMapping(value = "/on_server_started", produces = "application/json;charset=UTF-8")
- public ResponseEntity<String> onServerStarted(HttpServletRequest request, @RequestBody JSONObject jsonObject){
+ public JSONObject onServerStarted(HttpServletRequest request, @RequestBody JSONObject jsonObject){
if (logger.isDebugEnabled()) {
logger.debug("[ ZLM HOOK ]on_server_started API璋冪敤锛屽弬鏁帮細" + jsonObject.toString());
@@ -650,7 +646,7 @@
JSONObject ret = new JSONObject();
ret.put("code", 0);
ret.put("msg", "success");
- return new ResponseEntity<>(ret.toString(),HttpStatus.OK);
+ return ret;
}
private Map<String, String> urlParamToMap(String params) {
diff --git a/src/main/java/com/genersoft/iot/vmp/service/impl/PlatformServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/service/impl/PlatformServiceImpl.java
index 708d693..6df1483 100644
--- a/src/main/java/com/genersoft/iot/vmp/service/impl/PlatformServiceImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/impl/PlatformServiceImpl.java
@@ -125,7 +125,7 @@
dynamicTask.startDelay(registerTaskKey,
// 娉ㄥ唽澶辫触锛堟敞鍐屾垚鍔熸椂鐢辩▼搴忕洿鎺ヨ皟鐢ㄤ簡online鏂规硶锛�
()->commanderForPlatform.register(parentPlatform, eventResult -> offline(parentPlatform),null),
- parentPlatform.getExpires()*1000);
+ (parentPlatform.getExpires() - 10) *1000);
final String keepaliveTaskKey = KEEPALIVE_KEY_PREFIX + parentPlatform.getServerGBId();
if (!dynamicTask.contains(keepaliveTaskKey)) {
@@ -164,7 +164,7 @@
redisCatchStorage.updatePlatformCatchInfo(platformCatch);
}
}),
- parentPlatform.getExpires()*1000);
+ (parentPlatform.getKeepTimeout() - 10)*1000);
}
}
@@ -213,7 +213,6 @@
param.put("stream", sendRtpItem.getStreamId());
zlmrtpServerFactory.stopSendRtpStream(mediaInfo, param);
}
-
}
}
--
Gitblit v1.8.0