11

ipslib/Ips.Library.WebApi/WebApiHelper.cs

@@ -8,6 +8,7 @@ using Microsoft.AspNetCore.Http.Features;
 using Microsoft.AspNetCore.Mvc.ApplicationParts;
 using Microsoft.AspNetCore.Mvc.Controllers;
 using Microsoft.AspNetCore.Server.Kestrel.Core;
+using Microsoft.AspNetCore.SignalR;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
 using Microsoft.Extensions.FileProviders;
@@ -29,8 +30,6 @@ namespace Ips.Library.WebApi
     public static class WebApiHelper
     {
         private static CancellationTokenSource _cts;
-
-
         /// <summary>
         /// 启动AspNetCore WebAPI
         /// (如果Controller所在程序集未被代码使用,且入口Exe被发布为自包含程序,会找不到Controller)

ipsservice/Ips.Service.CapServer/Controllers/AdController.cs

@@ -53,7 +53,7 @@ namespace Ips.Service.CapServer
 
                 Directory.CreateDirectory(dto.StorePath);
                 #endregion
-                var res = await AdcService.StartAsync(dto);
+                var res = await AdcService.StartTestAsync(dto);
                 return Success(res);
             }
             catch (Exception ex)

ipsservice/Ips.Service.CapServer/Service/AdcService.cs

@@ -32,10 +32,10 @@ namespace Ips.Service.CapServer
             }
             try
             {
-                if (dto.CardType.GetEnumDisplayName() != AppConst.CardType.GetEnumDisplayName())
-                {
-                    throw new Exception($"采集卡类型不匹配,采集服务配置={AppConst.CardType.GetEnumDisplayName()},任务设置={dto.CardType.GetEnumDisplayName()}");
-                }
+                //if (dto.CardType.GetEnumDisplayName() != AppConst.CardType.GetEnumDisplayName())
+                //{
+                //    throw new Exception($"采集卡类型不匹配,采集服务配置={AppConst.CardType.GetEnumDisplayName()},任务设置={dto.CardType.GetEnumDisplayName()}");
+                //}
                 isBusy = true;
                 string test = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "test.dat");//测试数据
                 var bytes = File.ReadAllBytes(test);