src/Hotline.Api/Controllers/TestController.cs

@@ -1,4 +1,5 @@
 using Dapr;
+using Dapr.Client;
 using Hotline.Application.TimeLimits;
 using Hotline.CallCenter.BlackLists;
 using Hotline.CallCenter.Devices;
@@ -51,6 +52,7 @@ public class TestController : BaseController
     private readonly ITimeLimitApplication _timeLimitApplication;
     private readonly IDistributedLock _distributedLock;
     private readonly IWexClient _wexClient;
+    private readonly DaprClient _daprClient;
     private readonly IGroupManager _goupManager;
 
     //private readonly ITypedCache<List<User>> _cache;
@@ -75,7 +77,8 @@ public class TestController : BaseController
         IMediator mediator,
         ITimeLimitApplication timeLimitApplication,
         IDistributedLock distributedLock,
-        IWexClient wexClient
+        IWexClient wexClient,
+        DaprClient daprClient
     )
     {
         _logger = logger;
@@ -93,6 +96,7 @@ public class TestController : BaseController
         _timeLimitApplication = timeLimitApplication;
         _distributedLock = distributedLock;
         _wexClient = wexClient;
+        _daprClient = daprClient;
     }
 
     [HttpGet("time")]
@@ -100,8 +104,10 @@ public class TestController : BaseController
     {
         //var rsp = await _wexClient.QueryTelsAsync(new QueryTelRequest { StaffNo = "123" }, HttpContext.RequestAborted);
 
-        return DateTime.Now.ToString("F");
+        //return DateTime.Now.ToString("F");
 
+        var rsp = await _daprClient.InvokeMethodAsync<string>(HttpMethod.Get, "identity", "api/v1/Test/time", HttpContext.RequestAborted);
+        return rsp;
     }
 
     [HttpGet("pgsql")]

src/Hotline.Api/Controllers/WorkflowController.cs

@@ -387,8 +387,7 @@ public class WorkflowController : BaseController
         return new DefineWithSelectionStepsDto
         {
             Id = workflow.DefinitionId,
-            Steps = nextStepDefines.Select(d => new KeyValuePair<string, string>(d.Code, d.Name)).ToList(),
-            ExpiredTime = workflow.ExpiredTime
+            Steps = nextStepDefines.Select(d => new KeyValuePair<string, string>(d.Code, d.Name)).ToList()
         };
     }
 

src/Hotline.Api/Hotline.Api.csproj

@@ -9,10 +9,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="FluentValidation.AspNetCore" Version="11.2.2" />
+    <PackageReference Include="FluentValidation.AspNetCore" Version="11.3.0" />
     <PackageReference Include="Mapster.DependencyInjection" Version="1.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.10" />
-    <PackageReference Include="Microsoft.AspNetCore.SignalR.StackExchangeRedis" Version="6.0.8" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="7.0.9" />
+    <PackageReference Include="Microsoft.AspNetCore.SignalR.StackExchangeRedis" Version="7.0.9" />
     <PackageReference Include="Serilog.Sinks.Grafana.Loki" Version="8.1.0" />
     <PackageReference Include="Serilog.Sinks.MongoDB" Version="5.3.1" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />

src/Hotline.Api/StartupExtensions.cs

@@ -56,7 +56,8 @@ internal static class StartupExtensions
             .AddDapr(d =>
             {
 #if DEBUG
-                d.UseHttpEndpoint("http://110.188.24.28:50105");
+                d.UseHttpEndpoint("http://110.188.24.28:50202");
+                d.UseGrpcEndpoint("http://110.188.24.28:50203");
 #endif
             })
             ;

src/Hotline.Application.Contracts/Hotline.Application.Contracts.csproj

@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="FluentValidation" Version="11.2.0" />
+    <PackageReference Include="FluentValidation" Version="11.6.0" />
   </ItemGroup>
 
   <ItemGroup>

src/Hotline/FlowEngine/Workflows/WorkflowDomainService.cs

@@ -1113,6 +1113,7 @@ namespace Hotline.FlowEngine.Workflows
             {
                 stepBox = CreateStepBox(workflow.Id, stepBoxDefine, prevStepBox.Id);
                 await _workflowStepRepository.AddAsync(stepBox, cancellationToken);
+                workflow.StepBoxes.Add(stepBox);
             }
             else if (stepBox.Status != EWorkflowStepStatus.Created)
             {
@@ -1131,6 +1132,7 @@ namespace Hotline.FlowEngine.Workflows
 
             await CreateSubStepsAsync(workflow, isPrevStartCountersign, stepBoxDefine, dto, stepBox, status, prevStep, traceStatus, expiredTime, cancellationToken);
 
+
             return stepBox;
         }
 

src/NewRock.Sdk/NewRock.Sdk.csproj

@@ -13,9 +13,9 @@
   <ItemGroup>
     <PackageReference Include="Mapster" Version="7.3.0" />
     <PackageReference Include="MediatR.Contracts" Version="1.0.1" />
-    <PackageReference Include="Microsoft.Extensions.Configuration" Version="6.0.1" />
+    <PackageReference Include="Microsoft.Extensions.Configuration" Version="7.0.0" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Http" Version="6.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Http" Version="7.0.0" />
     <PackageReference Include="System.Xml.XmlSerializer" Version="4.3.0" />
   </ItemGroup>
 

src/XF.Domain.Repository/XF.Domain.Repository.csproj

@@ -9,7 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="SqlSugarCore" Version="5.1.3.52-preview04" />
+    <PackageReference Include="SqlSugarCore" Version="5.1.4.94" />
     <PackageReference Include="XF.Utility.SequentialId" Version="1.0.2" />
   </ItemGroup>
 

src/XF.Domain/XF.Domain.csproj

@@ -12,7 +12,7 @@
   <ItemGroup>
     <PackageReference Include="IdentityModel" Version="6.1.0" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Hosting" Version="6.0.1" />
+    <PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.1" />
     <PackageReference Include="Serilog.AspNetCore" Version="6.0.1" />
     <PackageReference Include="Serilog.Enrichers.Span" Version="2.3.0" />
     <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.25.1" />