Merge branch 'test' of http://110.188.24.182:10023/Fengwo/hotline into test

src/Hotline/BatchTask/ApptaskDomainService.cs

@@ -98,7 +98,8 @@ public class ApptaskDomainService : IApptaskDomainService, IScopeDependency
     {
         var anyUnCompleted = await _apptaskItemRepository.Queryable()
             .AnyAsync(d => d.ApptaskId == taskId
-                && d.TaskEndTime == null, cancellation);
+                           && (d.TaskStatus == ETaskStatus.Waiting || d.TaskStatus == ETaskStatus.Failed)
+                           && d.Tries < d.TryLimit, cancellation);
         return !anyUnCompleted;
     }
 

src/Hotline/KnowledgeBase/KnowledgeRecord.cs

@@ -19,6 +19,7 @@ namespace Hotline.KnowledgeBase
         /// <summary>
         /// 知识记录分类值
         /// </summary>
+        [SugarColumn(ColumnDescription = "知识记录分类值", ColumnDataType = "varchar(2000)")]
         public string knowledgeRecordTypeText { get; set; }
     }
 }

test/Hotline.Tests/Controller/OrderDelayControllerTest.cs

@@ -80,7 +80,7 @@ namespace Hotline.Tests.Controller
             SetZuoXi();
 
             var delayIds = new List<string>();
-            for (int i = 0; i < 10; i++)
+            for (int i = 0; i < 6; i++)
             {
                 var order = _orderServiceMock.CreateOrder()
                     .办理到一级部门()

test/Hotline.Tests/appsettings.Development.json

@@ -71,14 +71,14 @@
         }
     },
     "ConnectionStrings": {
-        "Hotline": "PORT=5432;DATABASE=hotline_test;HOST=110.188.24.182;PASSWORD=fengwo11!!;USER ID=dev;",
+        "Hotline": "PORT=5432;DATABASE=hotline_dev;HOST=110.188.24.182;PASSWORD=fengwo11!!;USER ID=dev;",
         "CAP": "PORT=5432;DATABASE=fwmq;HOST=110.188.24.182;PASSWORD=fengwo11!!;USER ID=dev;Search Path=cap"
     },
     "Cache": {
         "Host": "110.188.24.182",
         "Port": 50179,
         "Password": "fengwo123!$!$",
-        "Database": 2 //release:3, dev:5
+        "Database": 5 //release:3, dev:5
     },
     "Swagger": true,
     "Cors": {