Merge branch '2.6.9' into wvp-28181-2.0

# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
#	src/main/resources/application-dev.yml
This commit is contained in:
648540858
2024-01-31 17:25:32 +08:00
7 changed files with 21 additions and 8 deletions

View File

@@ -161,6 +161,7 @@ public class AssistRESTfulUtils {
if (mediaServerItem == null) {
return null;
}
logger.info("[访问assist] {}, 参数: {}", url, param);
JSONObject responseJSON = new JSONObject();
//-2自定义流媒体 调用错误码
responseJSON.put("code",-2);