Pre Merge pull request !46 from 阿斌/N/A

修复录制计划-编辑时的回显加载问题

src/main/java/com/genersoft/iot/vmp/gb28181/session/SSRCFactory.java

@@ -95,8 +95,10 @@ public class SSRCFactory {
     }
 
     void rebuild() {
+        try {
             List<MediaServer> servers = mediaServerService.getAll();
             for (MediaServer server : servers) {
+                try {
                     if (server.isRtpEnable() && userSetting.getSsrcRandom()) {
                         continue;
                     }
@@ -120,10 +122,6 @@ public class SSRCFactory {
                                     } catch (NumberFormatException ignored) {
                                     }
                                 }
-                    }
-                } catch (Exception e) {
-                    log.warn("[SSRC重建] 查询媒体节点 {} 失败: {}", server.getId(), e.getMessage());
-                }
                                 usedMap.put(server.getId(), bits);
                                 if (count > 8000) {
                                     log.info("[SSRC重建] 媒体节点 {} 的SSRC使用率已超过80%，请注意扩展服务提升性能", server.getId());
@@ -132,6 +130,17 @@ public class SSRCFactory {
                                     log.debug("[SSRC重建] 节点 {} 已占用 {} 个SSRC", server.getId(), count);
                                 }
                             }
+                        } catch (Exception e) {
+                            log.warn("[SSRC重建] 查询媒体节点 {} 失败: {}", server.getId(), e.getMessage());
+                        }
+
+                    }
+                }catch (Exception e) {
+                    log.warn("[SSRC重建] 处理媒体节点 {} 失败: {}", server.getId(), e.getMessage());
+                }
+            }
+        }catch (Exception e) {
+            log.error("[SSRC] 重建SSRC失败", e);
         }
     }
 }

src/main/java/com/genersoft/iot/vmp/gb28181/utils/SipUtils.java

@@ -206,6 +206,21 @@ public class SipUtils {
 
     public static Gb28181Sdp parseSDP(String sdpStr) throws SdpParseException {
         
+        // 校验：拦截空内容与注入攻击特征
+        if (sdpStr == null || sdpStr.trim().isEmpty()) {
+            throw new SdpParseException(0, 0, "SDP内容为空");
+        }
+        // 标准SDP每行格式固定为 "x=value"，不存在SQL关键字；出现则视为注入攻击
+        String sdpUpper = sdpStr.toUpperCase();
+        if (sdpUpper.contains("' OR '") || sdpUpper.contains("' OR 1") || sdpUpper.contains(" OR 1=1")
+                || sdpUpper.contains("--") || sdpUpper.contains("/*") || sdpUpper.contains("*/")
+                || sdpUpper.contains("DROP ") || sdpUpper.contains("INSERT ") || sdpUpper.contains("UPDATE ")
+                || sdpUpper.contains("DELETE ") || sdpUpper.contains("UNION ") || sdpUpper.contains("SELECT ")) {
+            log.error("[SDP注入攻击] 检测到非法SDP内容，已拒绝解析，内容长度: {}", sdpStr.length());
+            throw new SdpParseException(0, 0, "非法SDP内容");
+        }
+        //校验结束
+
         // jainSip不支持y= f=字段， 移除以解析。
         int ssrcIndex = sdpStr.indexOf("y=");
         int mediaDescriptionIndex = sdpStr.indexOf("f=");

web/src/views/common/weekTimePicker.vue

@@ -148,10 +148,17 @@ export default {
     }
   },
   watch: {
-    planArray: function(array) {
+    planArray: {
+      handler(array) {
+        if (!array || !array.length) {
+          return
+        }
         for (let i = 0; i < array.length; i++) {
           this.weekData[i].data = array[i].data
         }
+      },
+      deep: true,
+      immediate: true
     }
   },
   created() {