修改服务状态为健康/异常；新增一个删除按钮

Author: kklldog

AgileConfig.Server.Apisite/Controllers/ReportController.cs

@@ -173,7 +173,7 @@ public async Task<IActionResult> ServiceCount()
         {
             var services = await _serviceInfoService.GetAllServiceInfoAsync();
             var serviceCount = services.Count;
-            var serviceOnCount = services.Count(x => x.Alive == ServiceAlive.Online);
+            var serviceOnCount = services.Count(x => x.Status == ServiceStatus.Healthy);
             return Json(new
             {
                 serviceCount,

AgileConfig.Server.Apisite/Controllers/ServiceController.cs

@@ -67,7 +67,7 @@ public async Task<IActionResult> Add([FromBody] ServiceInfoVM model)
             });
         }
 
-        public async Task<IActionResult> Search(string serviceName, string serviceId, ServiceAlive? alive, 
+        public async Task<IActionResult> Search(string serviceName, string serviceId, ServiceStatus? status, 
             string sortField, string ascOrDesc,
             int current = 1, int pageSize = 20)
         {
@@ -89,9 +89,9 @@ public async Task<IActionResult> Search(string serviceName, string serviceId, Se
             {
                 query = query.Where(x => x.ServiceId.Contains(serviceId)).ToList();
             }
-            if (alive.HasValue)
+            if (status.HasValue)
             {
-                query = query.Where(x => x.Alive == alive).ToList();
+                query = query.Where(x => x.Status == status).ToList();
             }
 
             query = query.OrderByDescending(x => x.RegisterTime).ToList();
@@ -127,7 +127,7 @@ public async Task<IActionResult> Search(string serviceName, string serviceId, Se
                 serviceVMs.Add(new ServiceInfoVM()
                 {
                     Id = service.Id,
-                    Alive = service.Alive,
+                    Status = service.Status,
                     ServiceId = service.ServiceId,
                     ServiceName = service.ServiceName,
                     Ip = service.Ip,

AgileConfig.Server.Apisite/Controllers/api/Models/ServiceInfoVM.cs

@@ -15,7 +15,7 @@ public class ServiceInfoVM
 
         public List<string> MetaData { get; set; } = new List<string>();
 
-        public ServiceAlive Status { get; set; }
+        public ServiceStatus Status { get; set; }
     }
 
     public class QueryServiceInfoResultVM

AgileConfig.Server.Apisite/Controllers/api/RegisterCenterController.cs

@@ -135,7 +135,7 @@ public async Task<List<ServiceInfoVM>> AllServices()
                     Ip = serviceInfo.Ip,
                     Port = serviceInfo.Port,
                     MetaData = JsonConvert.DeserializeObject<List<string>>(serviceInfo.MetaData),
-                    Status = serviceInfo.Alive
+                    Status = serviceInfo.Status
                 };
                 vms.Add(vm);
             }
@@ -157,7 +157,7 @@ public async Task<List<ServiceInfoVM>> OnlineServices()
                     Ip = serviceInfo.Ip,
                     Port = serviceInfo.Port,
                     MetaData = JsonConvert.DeserializeObject<List<string>>(serviceInfo.MetaData),
-                    Status = serviceInfo.Alive
+                    Status = serviceInfo.Status
                 };
                 vms.Add(vm);
             }
@@ -179,7 +179,7 @@ public async Task<List<ServiceInfoVM>> OfflineServices()
                     Ip = serviceInfo.Ip,
                     Port = serviceInfo.Port,
                     MetaData = JsonConvert.DeserializeObject<List<string>>(serviceInfo.MetaData),
-                    Status = serviceInfo.Alive
+                    Status = serviceInfo.Status
                 };
                 vms.Add(vm);
             }

AgileConfig.Server.Apisite/Models/ServiceInfoVM.cs

@@ -23,7 +23,7 @@ public class ServiceInfoVM
 
     public string MetaData { get; set; }
 
-    public ServiceAlive Alive { get; set; }
+    public ServiceStatus Status { get; set; }
 
     public DateTime? RegisterTime { get; set; }
 

AgileConfig.Server.Data.Entity/ServiceInfo.cs

@@ -5,10 +5,10 @@
 
 namespace AgileConfig.Server.Data.Entity
 {
-    public enum ServiceAlive
+    public enum ServiceStatus
     {
-        Offline = 0,
-        Online = 1
+        Unhealthy = 0,
+        Healthy = 1
     }
 
     public enum RegisterWay
@@ -46,8 +46,8 @@ public class ServiceInfo
         [Column(Name = "meta_data", StringLength = 2000)]
         public string MetaData { get; set; }
 
-        [Column(Name = "alive")] 
-        public ServiceAlive Alive { get; set; }
+        [Column(Name = "status")] 
+        public ServiceStatus Status { get; set; }
 
         [Column(Name = "register_time")] 
         public DateTime? RegisterTime { get; set; }

AgileConfig.Server.IService/IServiceInfoService.cs

@@ -12,7 +12,7 @@ public interface IServiceInfoService: IDisposable
 
         Task<bool> RemoveAsync(string id);
 
-        Task UpdateServiceStatus(ServiceInfo service, ServiceAlive status);
+        Task UpdateServiceStatus(ServiceInfo service, ServiceStatus status);
         Task<List<ServiceInfo>> GetAllServiceInfoAsync();
 
         Task<List<ServiceInfo>> GetOnlineServiceInfoAsync();

AgileConfig.Server.Service/EventRegisterService/ServiceInfoStatusUpdateRegister.cs

@@ -104,7 +104,7 @@ public void Register()
                 using var serviceInfoService = NewServiceInfoService();
                 var service = await serviceInfoService.GetByUniqueIdAsync(id);
                 if (service != null && !string.IsNullOrWhiteSpace(service.AlarmUrl) &&
-                    service.Alive == ServiceAlive.Offline)
+                    service.Status == ServiceStatus.Unhealthy)
                 {
                     //如果是下线发送通知
                     _ = SendServiceOfflineMessageAsync(service);
@@ -121,7 +121,7 @@ private async Task SendServiceOfflineMessageAsync(ServiceInfo service)
             service.ServiceId,
             service.ServiceName,
             Time = DateTime.Now,
-            Status = ServiceAlive.Offline.ToString(),
+            Status = ServiceStatus.Unhealthy.ToString(),
             Message = "服务已经下线"
         };
 

AgileConfig.Server.Service/RegisterCenterService.cs

@@ -42,7 +42,7 @@ public async Task<string> RegisterAsync(ServiceInfo serviceInfo)
             if (oldEntity != null)
             {
                 oldEntity.RegisterTime = DateTime.Now;
-                oldEntity.Alive = ServiceAlive.Online;
+                oldEntity.Status = ServiceStatus.Healthy;
                 oldEntity.LastHeartBeat = DateTime.Now;
                 oldEntity.ServiceName = serviceInfo.ServiceName;
                 oldEntity.Ip = serviceInfo.Ip;
@@ -65,7 +65,7 @@ public async Task<string> RegisterAsync(ServiceInfo serviceInfo)
 
             serviceInfo.RegisterTime = DateTime.Now;
             serviceInfo.LastHeartBeat = DateTime.Now;
-            serviceInfo.Alive = ServiceAlive.Online;
+            serviceInfo.Status = ServiceStatus.Healthy;
             serviceInfo.Id = Guid.NewGuid().ToString("n");
 
             _dbContext.ServiceInfo.Add(serviceInfo);
@@ -151,14 +151,14 @@ public async Task<bool> ReceiveHeartbeatAsync(string serviceUniqueId)
             }
             else
             {
-                var oldStatus = entity.Alive;
-                entity.Alive = ServiceAlive.Online;
+                var oldStatus = entity.Status;
+                entity.Status = ServiceStatus.Healthy;
                 entity.LastHeartBeat = DateTime.Now;
                 await _dbContext.UpdateAsync(entity);
 
                 await _dbContext.SaveChangesAsync();
 
-                if (oldStatus != ServiceAlive.Online)
+                if (oldStatus != ServiceStatus.Healthy)
                 {
                     _serviceInfoService.ClearCache();
                     dynamic param = new ExpandoObject();

AgileConfig.Server.Service/ServiceHealthCheckService.cs

@@ -149,9 +149,9 @@ public Task StartCheckAsync()
                             if ((DateTime.Now - lstHeartBeat.Value).TotalSeconds > UnhealthInterval)
                             {
                                 //客户端主动心跳模式：超过 UnhealthInterval 没有心跳，则认为服务不可用
-                                if (service.Alive == ServiceAlive.Online)
+                                if (service.Status == ServiceStatus.Healthy)
                                 {
-                                    await _serviceInfoService.UpdateServiceStatus(service, ServiceAlive.Offline);
+                                    await _serviceInfoService.UpdateServiceStatus(service, ServiceStatus.Unhealthy);
                                 }
                             }
 
@@ -164,15 +164,15 @@ public Task StartCheckAsync()
                             if (string.IsNullOrWhiteSpace(service.CheckUrl))
                             {
                                 //CheckUrl不填，直接认为下线
-                                await _serviceInfoService.UpdateServiceStatus(service, ServiceAlive.Offline);
+                                await _serviceInfoService.UpdateServiceStatus(service, ServiceStatus.Unhealthy);
                                 continue;
                             }
 
                             _ = Task.Run(async () =>
                             {
                                 var result = await CheckAService(service);
                                 await _serviceInfoService.UpdateServiceStatus(service,
-                                    result ? ServiceAlive.Online : ServiceAlive.Offline);
+                                    result ? ServiceStatus.Healthy : ServiceStatus.Unhealthy);
                             });
                         }
                     }