From 17365b81e0a89ee81b987adaae22c46b4282d747 Mon Sep 17 00:00:00 2001
From: liguoyang <Ligy.97@foxmail.com>
Date: Thu, 19 Sep 2024 11:23:20 +0800
Subject: [PATCH] fix log

---
 .../Order/Services/Implements/OrderService.cs        |  7 ++++++-
 Src/Dlhis.Entity/Basic/Entity/OutsourceEntity.cs     |  8 ++++----
 .../Services/Implements/CanteenSettingService.cs     |  4 +---
 .../Services/Implements/HealthcheckService.cs        | 12 +++++++-----
 4 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/Src/Dlhis.Canteen/Order/Services/Implements/OrderService.cs b/Src/Dlhis.Canteen/Order/Services/Implements/OrderService.cs
index c12467a4..9f8363b5 100644
--- a/Src/Dlhis.Canteen/Order/Services/Implements/OrderService.cs
+++ b/Src/Dlhis.Canteen/Order/Services/Implements/OrderService.cs
@@ -58,6 +58,7 @@ public class OrderService : BaseOrderService, IOrderService
         {
             if (_httpContextAccessor.HttpContext!.Request.Headers.TryGetValue("X-Requested-DeviceIp", out var ip))
             {
+                Logger.LogInformation("设备:{deviceNo} Ip:{ip}", request.DeviceUniqueNo, ip);
                 var device = await DbContext.Queryable<DeviceEntity>().Where(x => x.UniqueNo == request.DeviceUniqueNo).SingleAsync();
                 device.ConnectionInfo = new
                 {
@@ -137,7 +138,7 @@ public class OrderService : BaseOrderService, IOrderService
     {
         //尝试匹配userId
         var s = long.TryParse(request.UserUniqueNo, out var userId);
-        GainfoEntity gainfo = null;
+        GainfoEntity gainfo;
 
         if (request.Source == BalanceRecordSourceEnumType.QrCode)
         {
@@ -153,6 +154,10 @@ public class OrderService : BaseOrderService, IOrderService
                 var code = eMealVoucherQrCode.OriginData.Split(':')[2];
                 gainfo = await DbContext.Queryable<GainfoEntity>().Where(x => x.Code == code).SingleAsync();
             }
+            else
+            {
+                throw new UserFriendlyException($"无法识别{request.UserUniqueNo}");
+            }
         }
         else
         {
diff --git a/Src/Dlhis.Entity/Basic/Entity/OutsourceEntity.cs b/Src/Dlhis.Entity/Basic/Entity/OutsourceEntity.cs
index 6a32abc5..d06b2506 100644
--- a/Src/Dlhis.Entity/Basic/Entity/OutsourceEntity.cs
+++ b/Src/Dlhis.Entity/Basic/Entity/OutsourceEntity.cs
@@ -10,25 +10,25 @@ namespace Dlhis.Entity.Basic.Entity;
 public class OutsourceEntity : SugarBaseEntity
 {
     /// <summary>
-    ///     外包人员工号 LS开头
+    /// 外包人员工号 LS开头
     /// </summary>
     [SugarColumn(IsNullable = false, ColumnDescription = "工号")]
     public string Code { get; set; }
 
     /// <summary>
-    ///     供应商
+    /// 供应商
     /// </summary>
     [SugarColumn(IsNullable = false, ColumnDescription = "供应商")]
     public string Supplier { get; set; }
 
     /// <summary>
-    ///     对接人员工号
+    /// 对接人员工号
     /// </summary>
     [SugarColumn(IsNullable = false, ColumnDescription = "对接人工号")]
     public string SapCode { get; set; }
 
     /// <summary>
-    ///     对接人员手机号
+    /// 对接人员手机号
     /// </summary>
     [SugarColumn(IsNullable = false, ColumnDescription = "对接人手机号")]
     public string SapPhone { get; set; }
diff --git a/Src/Dlhis.Middle/Services/Implements/CanteenSettingService.cs b/Src/Dlhis.Middle/Services/Implements/CanteenSettingService.cs
index 79239dda..2c2ffe74 100644
--- a/Src/Dlhis.Middle/Services/Implements/CanteenSettingService.cs
+++ b/Src/Dlhis.Middle/Services/Implements/CanteenSettingService.cs
@@ -1,8 +1,6 @@
-using Dlhis.Entity.Basic.Entity;
-using Dlhis.Entity.Canteen.Enums;
+using Dlhis.Entity.Canteen.Enums;
 using Dlhis.Middle.Entities;
 using Kurisu.AspNetCore.DataAccess.SqlSugar.Services;
-using Mapster;
 
 namespace Dlhis.Middle.Services.Implements;
 
diff --git a/Src/Dlhis.Middle/Services/Implements/HealthcheckService.cs b/Src/Dlhis.Middle/Services/Implements/HealthcheckService.cs
index 07fc0946..7e4e22b6 100644
--- a/Src/Dlhis.Middle/Services/Implements/HealthcheckService.cs
+++ b/Src/Dlhis.Middle/Services/Implements/HealthcheckService.cs
@@ -4,7 +4,7 @@ namespace Dlhis.Middle.Services.Implements;
 
 public class HealthCheckService : IHealthCheckService
 {
-    private bool _isOffline = false;
+    private bool _isOffline;
     private readonly string _hostName;
     private readonly ILogger<HealthCheckService> _logger;
     private int _successRetry;
@@ -23,11 +23,13 @@ public class HealthCheckService : IHealthCheckService
 
     public async Task DoHealthCheckAsync()
     {
+        var cancellationTokenSource = new CancellationTokenSource(1000);
         var tcpClient = new TcpClient();
+
         try
         {
             _logger.LogDebug("tcp connecting {host} {port}", _hostName, 443);
-            await tcpClient.ConnectAsync(_hostName, 443);
+            await tcpClient.ConnectAsync(_hostName, 443, cancellationTokenSource.Token);
             _retry++;
             _logger.LogDebug("retry {retry}", _retry);
             if (tcpClient.Connected)
@@ -44,7 +46,7 @@ public class HealthCheckService : IHealthCheckService
                 else
                 {
                     _logger.LogDebug("wait next check in {waitTime}", _successRetry * 1000);
-                    await Task.Delay(_successRetry * 1000);
+                    await Task.Delay(_successRetry * 1000, cancellationTokenSource.Token);
                 }
             }
             else
@@ -52,14 +54,14 @@ public class HealthCheckService : IHealthCheckService
                 _successRetry = 0;
                 _isOffline = true;
                 _logger.LogDebug("current is {status}", "unavailable");
-                await Task.Delay(500);
+                await Task.Delay(500, cancellationTokenSource.Token);
             }
         }
         catch (Exception ex)
         {
             _logger.LogError("fail cause :{reason}", ex.Message);
             _isOffline = true;
-            await Task.Delay(5000);
+            await Task.Delay(5000, cancellationTokenSource.Token);
         }
     }
 }
\ No newline at end of file