Merge branch 'feature/task_59_order' into test

src/Hotline.Application.Tests/Controller/OrderControllerTest.cs

@@ -74,15 +74,6 @@ public class OrderControllerTest : TestBase
             .办理到派单员()
             .办理到归档(SetPaiDanYuan)
             .GetCreateResult();
-        await _orderPublishEndWorkflowHandler.Handle(new EndWorkflowNotify(
-        new Hotline.FlowEngine.Workflows.Workflow
-        {
-            ModuleCode = WorkflowModuleConsts.OrderHandle,
-            ExternalId = order.Id
-        },
-        new Hotline.FlowEngine.Workflows.WorkflowTrace(),
-             new Share.Dtos.FlowEngine.BasicWorkflowDto()
-        ), new CancellationToken());
         var publish = await _orderPublishRepository.GetAsync(m => m.No == order.No);
         publish.ShouldNotBeNull(order.No);
     }

src/Hotline.Application.Tests/Startup.cs

@@ -39,6 +39,7 @@ using Hotline.Application.Tests.Controller;
 using Hotline.Application.Tests.Infrastructure;
 using Hotline.Authentications;
 using Hotline.FlowEngine.Notifications;
+using Hotline.Application.Handlers.FlowEngine;
 
 namespace Hotline.Application.Tests;
 public class Startup
@@ -118,6 +119,7 @@ public class Startup
                         callCenterConfiguration.TianRun.Username,
                         callCenterConfiguration.TianRun.Password);
             services.RegisterMediatR(appConfiguration);
+            services.RegisterSignalR(configuration);
 
             // services.AddSenparcWeixinServices(configuration);
             AppDomain.CurrentDomain.GetAssemblies().ToList().SelectMany(d => d.GetTypes())
@@ -182,6 +184,24 @@ public static class StartupHelper
         return services;
     }
 
+    /// <summary>
+    /// SignalR
+    /// </summary>
+    /// <param name="services"></param>
+    /// <param name="configuration"></param>
+    /// <returns></returns>
+    public static IServiceCollection RegisterSignalR(this IServiceCollection services, IConfiguration configuration)
+    {
+        var cacheConfig = configuration.GetRequiredSection("Cache").Get<CacheOptions>();
+        services.AddSignalR().AddStackExchangeRedis($"{cacheConfig.Host}:{cacheConfig.Port}", options =>
+        {
+            options.Configuration.ChannelPrefix = "Hotline:signalr:";
+            options.Configuration.Password = cacheConfig.Password;
+            options.Configuration.DefaultDatabase = cacheConfig.Database;
+        });
+        return services;
+    }
+
     public static IServiceCollection AddTestMq(this IServiceCollection services, IConfiguration configuration)
     {
         MqConfiguration mqConfiguration = configuration.GetSection("MqConfiguration").Get<MqConfiguration>();

src/Hotline/Orders/OrderDomainService.cs

@@ -85,7 +85,8 @@ public class OrderDomainService : IOrderDomainService, IScopeDependency
         Publisher publisher,
         IRepository<OrderVisitDetail> orderVisitDetailRepository,
         IRepository<WorkflowStep> workflowStepRepository,
-        ISystemLogRepository systemLogRepository)
+        ISystemLogRepository systemLogRepository,
+        IOptionsSnapshot<AppConfiguration> appOptions)
     {
         _orderRepository = orderRepository;
         _orderRedoRepository = orderRedoRepository;
@@ -109,6 +110,7 @@ public class OrderDomainService : IOrderDomainService, IScopeDependency
         _orderVisitDetailRepository = orderVisitDetailRepository;
         _workflowStepRepository = workflowStepRepository;
         _systemLogRepository = systemLogRepository;
+        _appOptions = appOptions;
     }
 
     /// <summary>