Merge pull request '重构一下实体类' (#9) from dev_lx into main

Reviewed-on: #9

WeiCloud.Fusion/AlarmService/Alarm.Application/Alarm.Application.csproj

@@ -6,4 +6,9 @@
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
+  <ItemGroup>
+    <Folder Include="RequestDto\" />
+    <Folder Include="ResponeDto\" />
+  </ItemGroup>
+
 </Project>

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

@@ -1,12 +1,7 @@
-using Alarm.Application.RequestDto;
+using Common.Shared.Application.DaHua;
-using Alarm.Application.ResponeDto;
-using Common.Shared.Application.DaHua;
 using Common.Shared.DomainService;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Logging;
-using NewLife.Remoting;
-using OfficeOpenXml.FormulaParsing.LexicalAnalysis;
-using Org.BouncyCastle.Ocsp;
 using System.Net.Http.Headers;
 using System.Net.Http.Json;
 using System.Text.Json;

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

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

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

@@ -1,11 +1,12 @@
-using Alarm.Application.ResponeDto;
+using Alarm.DomainService.DahAlarm;
-using Alarm.DomainService.DahAlarm;
 using Common.Shared.Application.DaHua;
 using Microsoft.AspNetCore.Mvc;
-using WeiCloud.Core.BaseModels;
 
 namespace AlarmService.API.Controllers
 {
+    /// <summary>
+    /// 大华设备报警
+    /// </summary>
     [Route("api/[controller]/[action]")]
     [ApiController]
     public class AlarmController : ControllerBase

WeiCloud.Fusion/Common.SharedService/Common.Shared.Application/Common.Shared.Application.csproj

@@ -5,5 +5,13 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
-
+<PropertyGroup>
+  <PackageId>Common.Shared.Application</PackageId>
+  <Version>1.0.1</Version>
+  <Authors>zrh-lx</Authors>
+  <Company>zrh-lx</Company> <!-- 可选 -->
+  <Description>包含所有公共使用的 DTO、契约、接口模型等，供微服务之间共享使用</Description>
+  <PackageTags>shared;dto;contracts;microservices</PackageTags> <!-- 可选但推荐 -->
+  <RepositoryUrl>https://v4.weienergy.cn/(可选)</RepositoryUrl>
+</PropertyGroup>
 </Project>

WeiCloud.Fusion/Common.SharedService/Common.Shared.Application/DaHua/RequestDto/DahuaVideoQueryDto.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Text;
 using System.Text.Json.Serialization;
 
-namespace Video.Application
+namespace Common.Shared.Application.DaHua
 {
     /// <summary>
     /// hls、rtmp回放请求的数据部分

WeiCloud.Fusion/Common.SharedService/Common.Shared.Application/DaHua/RequestDto/SubscribeEventReqDto.cs

@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Alarm.Application.RequestDto
+namespace Common.Shared.Application.DaHua
 {
     public sealed class SubscribeReqDto
     {

WeiCloud.Fusion/Common.SharedService/Common.Shared.Application/DaHua/ResponeDto/DahuaVideoResDto.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Text;
 using System.Text.Json.Serialization;
 
-namespace Video.Application
+namespace Common.Shared.Application.DaHua
 {
     /// <summary>
     /// 录像段信息响应实体类

WeiCloud.Fusion/Common.SharedService/Common.Shared.Application/DaHua/ResponeDto/EventEnvelopeDto.cs

@@ -6,7 +6,7 @@ using System.Text.Json;
 using System.Text.Json.Serialization;
 using System.Threading.Tasks;
 
-namespace Alarm.Application.ResponeDto
+namespace Common.Shared.Application.DaHua
 {
     /// <summary>
     /// ICC 回调的通用消息封包

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

@@ -1,6 +1,5 @@
 using Common.Shared.Application.DaHua;
 using Microsoft.AspNetCore.Mvc;
-using Video.Application;
 using Video.DomainService;
 using WeiCloud.Core.BaseModels;
 

WeiCloud.Fusion/VideoService/Video.Application/Video.Application.csproj

@@ -6,4 +6,9 @@
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
+  <ItemGroup>
+    <Folder Include="RequestDto\" />
+    <Folder Include="ResponeDto\" />
+  </ItemGroup>
+
 </Project>

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

@@ -4,7 +4,6 @@ using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Logging;
 using System.Net.Http.Json;
 using System.Text.Json;
-using Video.Application;
 
 namespace Video.DomainService
 {

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

@@ -1,5 +1,4 @@
 using Common.Shared.Application.DaHua;
-using Video.Application;
 
 namespace Video.DomainService
 {

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

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

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

@@ -1,7 +1,6 @@
 using Common.Shared.Application.DaHua;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Logging;
-using Video.Application;
 using WeiCloud.Core.BaseModels;
 
 namespace Video.DomainService