增加流媒体服务器健康检测并重新格式化代码

CommonFunctions/Common.cs

@@ -35,6 +35,7 @@ public static class Common
 
         //在线播放用户列表
         public static List<PlayerSession> PlayerSessions = new List<PlayerSession>();
+        public static object MediaServerLock = new object();
         public static object CameraSessionLock = new object();
         public static object SipDeviceListLock = new object();
         public static object CameraInstanceListLock = new object();
@@ -49,9 +50,9 @@ static Common()
             {
                 KillSelf();
             }
-            
+
             //清理ffmpeg进程
-           Process[] processes = Process.GetProcessesByName(Path.GetFileNameWithoutExtension(FFmpegBinPath));
+            Process[] processes = Process.GetProcessesByName(Path.GetFileNameWithoutExtension(FFmpegBinPath));
             if (processes != null && processes.Length > 0)
             {
                 foreach (var process in processes)

CommonFunctions/DBStructs/CameraInstance.cs

@@ -5,6 +5,9 @@
 
 namespace CommonFunctions.DBStructs
 {
+    /// <summary>
+    /// 音视频设备的注册实例结构，与数据库中Camera表一致是Camera表的字段映射
+    /// </summary>
     [Table(Name = "Camera")]
     [Index("cmr_cameraid", "CameraId", true)]
     [Index("cmr_cameraname", "CameraName", false)]

CommonFunctions/DBStructs/ClientOnOffLog.cs

@@ -12,6 +12,9 @@ public enum OnOff
         Off,
     }
 
+    /// <summary>
+    /// 设备上线下线的记录，实际作用有点鸡肋，打算将来移除掉
+    /// </summary>
     [Serializable]
     [Table(Name = "ClientLogOnOff")]
     [Index("clof_ipaddress", "IpAddress", false)]

CommonFunctions/DBStructs/DvrDayTimeRange.cs

@@ -4,6 +4,9 @@
 
 namespace CommonFunctions.DBStructs
 {
+    /// <summary>
+    /// 录制计划详细计划的结构，是数据库DvrDayTimeRange表的字段映射
+    /// </summary>
     [Serializable]
     [Table(Name = "DvrDayTimeRange")]
     /// <summary>

CommonFunctions/DBStructs/RecordFile.cs

@@ -3,6 +3,9 @@
 
 namespace CommonFunctions.DBStructs
 {
+    /// <summary>
+    /// 录制文件的记录结构，是数据库RecordFile表的字段映射
+    /// </summary>
     [Table(Name = "RecordFile")]
     [Index("rf_cameraid", "CameraId", false)]
     [Index("rf_cameraname", "CameraName", false)]

CommonFunctions/DBStructs/StreamDvrPlan.cs

@@ -17,6 +17,9 @@ public enum OverStepPlan
         DeleteFile,
     }
 
+    /// <summary>
+    /// 录制计划，是数据库StreamDvrPlan表的字段映射
+    /// </summary>
     [Table(Name = "StreamDvrPlan")]
     [Index("uk_dvrPlan_MId", "MediaServerId", false)]
     [Index("uk_dvrPlan_CId", "CameraId", false)]

CommonFunctions/ManageStructs/AllowKey.cs

@@ -4,7 +4,7 @@
 namespace CommonFunctions.ManageStructs
 {
     /// <summary>
-    /// allowkey管理类
+    /// allowkey管理类，暂时没有启用
     /// </summary>
     [Serializable]
     public class AllowKey

CommonFunctions/ManageStructs/CameraSession.cs

@@ -11,6 +11,9 @@ public enum ClientType
         Livecast,
     }
 
+    /// <summary>
+    /// 在线音视频设备的结构
+    /// </summary>
     [Serializable]
     public class CameraSession
     {

CommonFunctions/ManageStructs/CutMergeTask.cs

@@ -21,6 +21,9 @@ public enum TaskStatus
         Closed,
     }
 
+    /// <summary>
+    /// 裁剪合并任务的结构
+    /// </summary>
     [Serializable]
     public class CutMergeTask
     {

CommonFunctions/ManageStructs/ZLMediaKitConfig.cs

@@ -121,7 +121,7 @@ public class ZLMediaKitConfig_General
         private bool? _rtmp_demand;
         private bool? _ts_demand;
         private bool? _fmp4_demand;
-      
+
 
         /// <summary>
         /// 自动静音
@@ -405,6 +405,7 @@ public class ZLMediaKitConfig_Hook
         /// 录制 hls ts 切片完成事件
         /// </summary>
         public string? On_Record_TS => _on_record_ts;
+
         /// <summary>
         /// rtsp鉴权事件，此事件中比对rtsp的用户名密码
         /// </summary>
@@ -731,9 +732,11 @@ public ushort? Sslport
     public class ZLMediaKitConfig_Rtp
     {
         private int? _audioMtuSize;
-     //   private int? _clearCount;
+
+        //   private int? _clearCount;
         private ulong? _cycleMS;
-       // private int? _maxRtpCount;
+
+        // private int? _maxRtpCount;
         private int? _videoMtuSize;
 
         /// <summary>

CommonFunctions/MediaServerControl/MediaServerInstance.cs

@@ -4,7 +4,6 @@
 using System.Threading;
 using CommonFunctions.DBStructs;
 using CommonFunctions.ManageStructs;
-using CommonFunctions.WebApiStructs.Request;
 using CommonFunctions.WebApiStructs.Response;
 using LibSystemInfo;
 using JsonHelper = LibGB28181SipGate.JsonHelper;
@@ -59,6 +58,8 @@ public string Secret
         /// </summary>
         public bool IsRunning => GetIsRunning(out _);
 
+        public bool Health => GetHealth();
+
         /// <summary>
         /// 获取运行时长（秒）
         /// </summary>
@@ -211,6 +212,26 @@ public MediaServerInstance(string ipaddress, ushort webApiPort, ushort mediaServ
             })).Start();
         }
 
+
+        private bool GetHealth()
+        {
+            try
+            {
+                string innerUrl = "http://" + _ipaddress + ":" + _webApiPort + "/Health";
+                var httpRet = NetHelper.HttpGetRequest(innerUrl, null, "utf-8", 1000);
+                if (!string.IsNullOrEmpty(httpRet) && httpRet.Equals("ok"))
+                {
+                    return true;
+                }
+
+                return false;
+            }
+            catch
+            {
+                return false;
+            }
+        }
+
         public bool GetIsRunning(out ResponseStruct rs)
         {
             rs = new ResponseStruct()