Merge pull request 'dev_lx' (#4) from dev_lx into main

Reviewed-on: #4

WeiCloud.Fusion/Alarm.DomainService/Alarm.DomainService.csproj

@@ -15,6 +15,7 @@
   <ItemGroup>
     <ProjectReference Include="..\Alarm.Application\Alarm.Application.csproj" />
     <ProjectReference Include="..\Common.SharedService\Common.Shared.Application\Common.Shared.Application.csproj" />
+    <ProjectReference Include="..\WeiCloud.Core\WeiCloud.Core.csproj" />
   </ItemGroup>
 
 </Project>

WeiCloud.Fusion/Alarm.DomainService/DahAlarm/DahuaGeneralCtlService.cs

@@ -8,6 +8,7 @@ using Org.BouncyCastle.Security;
 using System.Net.Http.Json;
 using System.Security.Cryptography;
 using System.Text.Json;
+using WeiCloud.Core.BaseModels;
 
 namespace Alarm.DomainService.DahAlarm
 {
@@ -240,7 +241,7 @@ namespace Alarm.DomainService.DahAlarm
         /// <exception cref="NotImplementedException"></exception>
         public async Task<ApiResult<bool>> HandleAsync(EventEnvelopeDto dto)
         {
-            ApiResult<bool> result = new ApiResult<bool>() { Code = 200, Msg = "接口调用成功", Data = true };
+            ApiResult<bool> result = new() { Code = 200, Msg = "接口调用成功", Data = true };
             try
             {
                 if (dto is null)

WeiCloud.Fusion/Alarm.DomainService/DahAlarm/IDahuaGeneralCtlService.cs

@@ -1,5 +1,6 @@
 using Alarm.Application.ResponeDto;
 using Common.Shared.Application.DaHua;
+using WeiCloud.Core.BaseModels;
 
 namespace Alarm.DomainService.DahAlarm
 {

WeiCloud.Fusion/AlarmService/AlarmService.API/AlarmService.API.csproj

@@ -8,12 +8,12 @@
 
   <ItemGroup>
     <ProjectReference Include="..\..\Alarm.DomainService\Alarm.DomainService.csproj" />
+    <ProjectReference Include="..\..\Common.SharedService\Common.Shared.Application\Common.Shared.Application.csproj" />
     <ProjectReference Include="..\..\WeiCloud.Utils\WeiCloud.Utils.csproj" />
   </ItemGroup>
 
   <ItemGroup>
     <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="10.0.0" />
-    <PackageReference Include="AutoMapper" Version="15.0.1" />
     <PackageReference Include="NLog" Version="6.0.3" />
     <PackageReference Include="NLog.Extensions.Logging" Version="6.0.3" />
     <PackageReference Include="NLog.Web.AspNetCore" Version="6.0.3" />

WeiCloud.Fusion/AlarmService/AlarmService.API/Controllers/AlarmController.cs

@@ -2,6 +2,7 @@
 using Alarm.DomainService.DahAlarm;
 using Common.Shared.Application.DaHua;
 using Microsoft.AspNetCore.Mvc;
+using WeiCloud.Core.BaseModels;
 
 namespace AlarmService.API.Controllers
 {

WeiCloud.Fusion/VideoService/Video.API/Controllers/DaHua/VideoManageController.cs

@@ -2,6 +2,7 @@
 using Microsoft.AspNetCore.Mvc;
 using Video.Application;
 using Video.DomainService;
+using WeiCloud.Core.BaseModels;
 
 namespace Video.API.Controllers.DaHua
 {

WeiCloud.Fusion/VideoService/Video.API/Video.API.csproj

@@ -22,6 +22,8 @@
   </ItemGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\..\Common.SharedService\Common.Shared.Application\Common.Shared.Application.csproj" />
+    <ProjectReference Include="..\..\WeiCloud.Core\WeiCloud.Core.csproj" />
     <ProjectReference Include="..\..\WeiCloud.Utils\WeiCloud.Utils.csproj" />
     <ProjectReference Include="..\Video.Application\Video.Application.csproj" />
     <ProjectReference Include="..\Video.DomainService\Video.DomainService.csproj" />

WeiCloud.Fusion/VideoService/Video.DomainService/Dahvision/DahuaGeneralCtlService.cs

@@ -69,7 +69,7 @@ namespace Video.DomainService
         /// <returns></returns>
         public async Task<DaHApiResult<LoginResDto>> GetToken(LoginRequestDto dto)
         {
-            DaHApiResult<LoginResDto> result = new DaHApiResult<LoginResDto>() { Success = true, Code = "0" };
+            DaHApiResult<LoginResDto> result = new() { Success = true, Code = "0" };
             if (dto is null)
             {
                 result.Success = false;

WeiCloud.Fusion/VideoService/Video.DomainService/Dahvision/IRootVideoPlaybackService.cs

@@ -1,5 +1,6 @@
 using Common.Shared.Application.DaHua;
 using Video.Application;
+using WeiCloud.Core.BaseModels;
 
 namespace Video.DomainService
 {

WeiCloud.Fusion/VideoService/Video.DomainService/Dahvision/RootVideoPlaybackService.cs

@@ -2,6 +2,7 @@
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Logging;
 using Video.Application;
+using WeiCloud.Core.BaseModels;
 
 namespace Video.DomainService
 {

WeiCloud.Fusion/VideoService/Video.DomainService/Video.DomainService.csproj

@@ -8,6 +8,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\..\Common.SharedService\Common.Shared.Application\Common.Shared.Application.csproj" />
+    <ProjectReference Include="..\..\WeiCloud.Core\WeiCloud.Core.csproj" />
     <ProjectReference Include="..\..\WeiCloud.Utils\WeiCloud.Utils.csproj" />
     <ProjectReference Include="..\Video.Application\Video.Application.csproj" />
   </ItemGroup>

WeiCloud.Fusion/WeiCloud.Core/BaseModels/ApiResult.cs

@@ -1,4 +1,4 @@
-namespace Common.Shared.Application.DaHua
+namespace WeiCloud.Core.BaseModels
 {
     public class ApiResult<T>
     {