Pre Merge pull request !45 from 山海紫穹/dev260107_2

docker/docker-compose.yml

@@ -59,7 +59,7 @@ services:
     networks:
       - media-net
     ports:
-     #- "6080:80/tcp"     # [播流]HTTP  安全考虑-非测试阶段需要注释掉，改为由nginx代理播流地址
+     - "80:80/tcp"     # [播流]HTTP  安全考虑-非测试阶段需要注释掉，改为由nginx代理播流地址
      #- "4443:443/tcp"     # [播流]HTTPS 安全考虑-非测试阶段需要注释掉，改为由nginx代理播流地址
       - "${MediaRtmp:-10935}:${MediaRtmp:-10935}/tcp"   # [收流]RTMP  
       - "${MediaRtmp:-10935}:${MediaRtmp:-10935}/udp"   # [收流]RTMP  

src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java

@@ -1148,6 +1148,15 @@ public class SIPCommander implements ISIPCommander {
                 if (code == ErrorCode.SUCCESS.getCode() && data instanceof Element) {
                     Element responseElement = (Element) data;
                     Element configElement = responseElement.element(configType);
+                    if (configElement == null) {
+                        // 兼容部分宇视设备ElementName和configType不一致的情况
+                        for (Element child : responseElement.elements()) {
+                            if (child.element("Item") != null) {
+                                configElement = child;
+                                break;
+                            }
+                        }
+                    }
                     if (configElement != null) {
                         try {
                             T result = configClass.getDeclaredConstructor().newInstance();