Merge branch 'master' of http://git.12345lm.cn/Fengwo/hotline

src/Hotline.Api/Controllers/OrderController.cs

@@ -2427,8 +2427,9 @@ public class OrderController : BaseController
     [HttpGet("waited")]
     public async Task<PagedDto<OrderDto>> QueryWaited([FromQuery] QueryOrderWaitedDto dto)
     {
+        var isHandled = dto.IsHandled.HasValue && dto.IsHandled.Value;
         var (total, items) = await _orderRepository
-            .Queryable(viewFilter: true, handlerFilter: dto.IsHandled.HasValue && dto.IsHandled.Value)
+            .Queryable(viewFilter: true, handlerFilter: !isHandled)
             .WhereIF(dto.IsProvince.HasValue, d => d.IsProvince == dto.IsProvince)
             .WhereIF(!string.IsNullOrEmpty(dto.Keyword),
                 d => d.No.Contains(dto.Keyword) || d.Title.Contains(dto.Keyword))

src/Hotline.Api/config/appsettings.shared.json

@@ -26,22 +26,22 @@
           "theme": "Serilog.Sinks.SystemConsole.Themes.ConsoleTheme::None, Serilog.Sinks.Console"
         }
       },
-      //{
-      //  "Name": "GrafanaLoki",
-      //  "Args": {
-      //    "outputTemplate": "[{Timestamp:HH:mm:ss} {Level}] {SourceContext} [{TraceId}]{NewLine}{Message:lj}{NewLine}{Exception}{NewLine}",
-      //    "uri": "http://192.168.100.217:3100",
-      //    "labels": [
-      //      {
-      //        "key": "app",
-      //        "value": "hotline"
-      //      }
-      //    ],
-      //    "propertiesAsLabels": [
-      //      "fwhl"
-      //    ]
-      //  }
-      //}
+      {
+        "Name": "GrafanaLoki",
+        "Args": {
+          "outputTemplate": "[{Timestamp:HH:mm:ss} {Level}] {SourceContext} [{TraceId}]{NewLine}{Message:lj}{NewLine}{Exception}{NewLine}",
+          "uri": "http://110.188.24.182:50112",
+          "labels": [
+            {
+              "key": "app",
+              "value": "hotline"
+            }
+          ],
+          "propertiesAsLabels": [
+            "fwhl"
+          ]
+        }
+      }
       //{
       //  "Name": "Exeptionless",
       //  "Args": {