From 8cbe056d52a2b9332e44800c82ad8f23b525e810 Mon Sep 17 00:00:00 2001
From: LiuXin <lxxh1992@163.com>
Date: Wed, 13 Aug 2025 11:59:40 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WeiCloud.Fusion/Alarm.DomainService/Alarm.DomainService.csproj | 1 +
 .../Alarm.DomainService/DahAlarm/DahuaGeneralCtlService.cs     | 3 ++-
 .../Alarm.DomainService/DahAlarm/IDahuaGeneralCtlService.cs    | 1 +
 .../AlarmService/AlarmService.API/AlarmService.API.csproj      | 2 +-
 .../AlarmService.API/Controllers/AlarmController.cs            | 1 +
 .../Video.API/Controllers/DaHua/VideoManageController.cs       | 1 +
 WeiCloud.Fusion/VideoService/Video.API/Video.API.csproj        | 2 ++
 .../Video.DomainService/Dahvision/DahuaGeneralCtlService.cs    | 2 +-
 .../Video.DomainService/Dahvision/IRootVideoPlaybackService.cs | 1 +
 .../Video.DomainService/Dahvision/RootVideoPlaybackService.cs  | 1 +
 .../Video.DomainService/Video.DomainService.csproj             | 1 +
 .../BaseModels}/ApiResult.cs                                   | 2 +-
 12 files changed, 14 insertions(+), 4 deletions(-)
 rename WeiCloud.Fusion/{Common.SharedService/Common.Shared.Application => WeiCloud.Core/BaseModels}/ApiResult.cs (96%)

diff --git a/WeiCloud.Fusion/Alarm.DomainService/Alarm.DomainService.csproj b/WeiCloud.Fusion/Alarm.DomainService/Alarm.DomainService.csproj
index b2d4540..1df926c 100644
--- a/WeiCloud.Fusion/Alarm.DomainService/Alarm.DomainService.csproj
+++ b/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>
diff --git a/WeiCloud.Fusion/Alarm.DomainService/DahAlarm/DahuaGeneralCtlService.cs b/WeiCloud.Fusion/Alarm.DomainService/DahAlarm/DahuaGeneralCtlService.cs
index b7f97b2..c95d75b 100644
--- a/WeiCloud.Fusion/Alarm.DomainService/DahAlarm/DahuaGeneralCtlService.cs
+++ b/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)
diff --git a/WeiCloud.Fusion/Alarm.DomainService/DahAlarm/IDahuaGeneralCtlService.cs b/WeiCloud.Fusion/Alarm.DomainService/DahAlarm/IDahuaGeneralCtlService.cs
index 4140c9c..147adbe 100644
--- a/WeiCloud.Fusion/Alarm.DomainService/DahAlarm/IDahuaGeneralCtlService.cs
+++ b/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
 {
diff --git a/WeiCloud.Fusion/AlarmService/AlarmService.API/AlarmService.API.csproj b/WeiCloud.Fusion/AlarmService/AlarmService.API/AlarmService.API.csproj
index a02dc02..446c877 100644
--- a/WeiCloud.Fusion/AlarmService/AlarmService.API/AlarmService.API.csproj
+++ b/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" />
diff --git a/WeiCloud.Fusion/AlarmService/AlarmService.API/Controllers/AlarmController.cs b/WeiCloud.Fusion/AlarmService/AlarmService.API/Controllers/AlarmController.cs
index b18e876..b76761c 100644
--- a/WeiCloud.Fusion/AlarmService/AlarmService.API/Controllers/AlarmController.cs
+++ b/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
 {
diff --git a/WeiCloud.Fusion/VideoService/Video.API/Controllers/DaHua/VideoManageController.cs b/WeiCloud.Fusion/VideoService/Video.API/Controllers/DaHua/VideoManageController.cs
index 3c373fa..382937b 100644
--- a/WeiCloud.Fusion/VideoService/Video.API/Controllers/DaHua/VideoManageController.cs
+++ b/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
 {
diff --git a/WeiCloud.Fusion/VideoService/Video.API/Video.API.csproj b/WeiCloud.Fusion/VideoService/Video.API/Video.API.csproj
index b5a59f4..e36b91d 100644
--- a/WeiCloud.Fusion/VideoService/Video.API/Video.API.csproj
+++ b/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" />
diff --git a/WeiCloud.Fusion/VideoService/Video.DomainService/Dahvision/DahuaGeneralCtlService.cs b/WeiCloud.Fusion/VideoService/Video.DomainService/Dahvision/DahuaGeneralCtlService.cs
index 850038a..993c9ce 100644
--- a/WeiCloud.Fusion/VideoService/Video.DomainService/Dahvision/DahuaGeneralCtlService.cs
+++ b/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;
diff --git a/WeiCloud.Fusion/VideoService/Video.DomainService/Dahvision/IRootVideoPlaybackService.cs b/WeiCloud.Fusion/VideoService/Video.DomainService/Dahvision/IRootVideoPlaybackService.cs
index 2ce3222..2e1193c 100644
--- a/WeiCloud.Fusion/VideoService/Video.DomainService/Dahvision/IRootVideoPlaybackService.cs
+++ b/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
 {
diff --git a/WeiCloud.Fusion/VideoService/Video.DomainService/Dahvision/RootVideoPlaybackService.cs b/WeiCloud.Fusion/VideoService/Video.DomainService/Dahvision/RootVideoPlaybackService.cs
index 723f097..c37f47f 100644
--- a/WeiCloud.Fusion/VideoService/Video.DomainService/Dahvision/RootVideoPlaybackService.cs
+++ b/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
 {
diff --git a/WeiCloud.Fusion/VideoService/Video.DomainService/Video.DomainService.csproj b/WeiCloud.Fusion/VideoService/Video.DomainService/Video.DomainService.csproj
index ca69cec..9866c24 100644
--- a/WeiCloud.Fusion/VideoService/Video.DomainService/Video.DomainService.csproj
+++ b/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>
diff --git a/WeiCloud.Fusion/Common.SharedService/Common.Shared.Application/ApiResult.cs b/WeiCloud.Fusion/WeiCloud.Core/BaseModels/ApiResult.cs
similarity index 96%
rename from WeiCloud.Fusion/Common.SharedService/Common.Shared.Application/ApiResult.cs
rename to WeiCloud.Fusion/WeiCloud.Core/BaseModels/ApiResult.cs
index 32af101..c7a80b6 100644
--- a/WeiCloud.Fusion/Common.SharedService/Common.Shared.Application/ApiResult.cs
+++ b/WeiCloud.Fusion/WeiCloud.Core/BaseModels/ApiResult.cs
@@ -1,4 +1,4 @@
-namespace Common.Shared.Application.DaHua
+namespace WeiCloud.Core.BaseModels
 {
     public class ApiResult<T>
     {
-- 
2.36.2