file update

Push.sln

@@ -3,17 +3,19 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.8.34330.188
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{6E5A3706-83DA-42CE-A90D-9E97BDDC7642}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "yibin", "yibin", "{E808C602-9785-4A0F-BD48-9F0C7EA8177D}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{C312BBA0-5697-4C44-8882-5F7E2413CD7E}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{9CF80DE1-B358-4AA4-A853-DBD38508B81A}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "yibin", "yibin", "{E808C602-9785-4A0F-BD48-9F0C7EA8177D}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{C97CC8C1-4140-4823-96B0-E8651DB365D5}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Push.YiBin", "src\yibin\Push.YiBin\Push.YiBin.csproj", "{0B07C086-CAEA-41D7-8234-A8B02C355310}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Push.YiBin.Host", "yibin\src\Push.YiBin.Host\Push.YiBin.Host.csproj", "{84A44778-FB99-4C55-A763-E7611C4AD8F8}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Push.YiBin.Host", "src\yibin\Push.YiBin.Host\Push.YiBin.Host.csproj", "{637C6173-952A-42FB-A6CD-D5837AD1E261}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Push.YiBin", "yibin\src\Push.YiBin\Push.YiBin.csproj", "{41772A83-BD3D-4CF2-B783-7481501E7C41}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Push.YiBin.Application", "src\yibin\Push.YiBin.Application\Push.YiBin.Application.csproj", "{EA975175-B34B-4563-9F1F-CF2007BAE24E}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Push.YiBin.Share", "yibin\src\Push.YiBin.Share\Push.YiBin.Share.csproj", "{EC41CC13-1AA2-48FD-AE27-E46F42E1CFDD}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Push.Share", "src\Push.Share\Push.Share.csproj", "{D99D1EAB-DA70-47BD-B360-08BF89550738}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -21,28 +23,32 @@ Global
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{84A44778-FB99-4C55-A763-E7611C4AD8F8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{84A44778-FB99-4C55-A763-E7611C4AD8F8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{84A44778-FB99-4C55-A763-E7611C4AD8F8}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{84A44778-FB99-4C55-A763-E7611C4AD8F8}.Release|Any CPU.Build.0 = Release|Any CPU
-		{41772A83-BD3D-4CF2-B783-7481501E7C41}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{41772A83-BD3D-4CF2-B783-7481501E7C41}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{41772A83-BD3D-4CF2-B783-7481501E7C41}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{41772A83-BD3D-4CF2-B783-7481501E7C41}.Release|Any CPU.Build.0 = Release|Any CPU
-		{EC41CC13-1AA2-48FD-AE27-E46F42E1CFDD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EC41CC13-1AA2-48FD-AE27-E46F42E1CFDD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EC41CC13-1AA2-48FD-AE27-E46F42E1CFDD}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{EC41CC13-1AA2-48FD-AE27-E46F42E1CFDD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0B07C086-CAEA-41D7-8234-A8B02C355310}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0B07C086-CAEA-41D7-8234-A8B02C355310}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0B07C086-CAEA-41D7-8234-A8B02C355310}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0B07C086-CAEA-41D7-8234-A8B02C355310}.Release|Any CPU.Build.0 = Release|Any CPU
+		{637C6173-952A-42FB-A6CD-D5837AD1E261}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{637C6173-952A-42FB-A6CD-D5837AD1E261}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{637C6173-952A-42FB-A6CD-D5837AD1E261}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{637C6173-952A-42FB-A6CD-D5837AD1E261}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EA975175-B34B-4563-9F1F-CF2007BAE24E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EA975175-B34B-4563-9F1F-CF2007BAE24E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EA975175-B34B-4563-9F1F-CF2007BAE24E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EA975175-B34B-4563-9F1F-CF2007BAE24E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D99D1EAB-DA70-47BD-B360-08BF89550738}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D99D1EAB-DA70-47BD-B360-08BF89550738}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D99D1EAB-DA70-47BD-B360-08BF89550738}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D99D1EAB-DA70-47BD-B360-08BF89550738}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{6E5A3706-83DA-42CE-A90D-9E97BDDC7642} = {E808C602-9785-4A0F-BD48-9F0C7EA8177D}
-		{C312BBA0-5697-4C44-8882-5F7E2413CD7E} = {E808C602-9785-4A0F-BD48-9F0C7EA8177D}
-		{84A44778-FB99-4C55-A763-E7611C4AD8F8} = {6E5A3706-83DA-42CE-A90D-9E97BDDC7642}
-		{41772A83-BD3D-4CF2-B783-7481501E7C41} = {6E5A3706-83DA-42CE-A90D-9E97BDDC7642}
-		{EC41CC13-1AA2-48FD-AE27-E46F42E1CFDD} = {6E5A3706-83DA-42CE-A90D-9E97BDDC7642}
+		{E808C602-9785-4A0F-BD48-9F0C7EA8177D} = {9CF80DE1-B358-4AA4-A853-DBD38508B81A}
+		{0B07C086-CAEA-41D7-8234-A8B02C355310} = {E808C602-9785-4A0F-BD48-9F0C7EA8177D}
+		{637C6173-952A-42FB-A6CD-D5837AD1E261} = {E808C602-9785-4A0F-BD48-9F0C7EA8177D}
+		{EA975175-B34B-4563-9F1F-CF2007BAE24E} = {E808C602-9785-4A0F-BD48-9F0C7EA8177D}
+		{D99D1EAB-DA70-47BD-B360-08BF89550738} = {9CF80DE1-B358-4AA4-A853-DBD38508B81A}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {48DA6047-E4BE-443E-8CF5-6077164045FB}

yibin/src/Push.YiBin.Share/Dtos/FWMessage/MessageDataDto.cs → src/Push.Share/Dtos/FWMessage/MessageDataDto.cs

@@ -1,6 +1,6 @@
-using Push.YiBin.Share.Enums;
+using Push.Share.Enums;
 
-namespace Push.YiBin.Share.Dtos.FWMessage
+namespace Push.Share.Dtos.FWMessage
 {
     public record MessageDataDto
     {

yibin/src/Push.YiBin.Share/Dtos/FWMessage/ReceiveMessageDto.cs → src/Push.Share/Dtos/FWMessage/ReceiveMessageDto.cs

@@ -1,4 +1,4 @@
-namespace Push.YiBin.Share.Dtos.FWMessage
+namespace Push.Share.Dtos.FWMessage
 {
     /// <summary>
     /// 丰窝短信接收值

yibin/src/Push.YiBin.Share/Dtos/FWMessage/SendSmsModelDto.cs → src/Push.Share/Dtos/FWMessage/SendSmsModelDto.cs

@@ -1,6 +1,6 @@
 using System.Runtime.Serialization;
 
-namespace Push.YiBin.Share.Dtos.FWMessage
+namespace Push.Share.Dtos.FWMessage
 {
     public class SendSmsModelDto
     {

yibin/src/Push.YiBin.Share/Dtos/FWMessage/SmsAccountInfo.cs → src/Push.Share/Dtos/FWMessage/SmsAccountInfo.cs

@@ -1,4 +1,4 @@
-namespace Push.YiBin.Share.Dtos.FWMessage
+namespace Push.Share.Dtos.FWMessage
 {
     public class SmsAccountInfo
     {

yibin/src/Push.YiBin.Share/Dtos/MessageDto.cs → src/Push.Share/Dtos/MessageDto.cs

@@ -1,6 +1,6 @@
-using Push.YiBin.Share.Enums;
+using Push.Share.Enums;
 
-namespace Push.YiBin.Share.Dtos
+namespace Push.Share.Dtos
 {
     public class MessageDto
     {

yibin/src/Push.YiBin.Share/Dtos/PushMessageNotifyDto.cs → src/Push.Share/Dtos/PushMessageNotifyDto.cs

@@ -1,6 +1,6 @@
-using Push.YiBin.Share.Enums;
+using Push.Share.Enums;
 
-namespace Push.YiBin.Share.Dtos
+namespace Push.Share.Dtos
 {
     public class PushMessageNotifyDto
     {

yibin/src/Push.YiBin.Share/Dtos/TemplateDataDto.cs → src/Push.Share/Dtos/TemplateDataDto.cs

@@ -1,6 +1,6 @@
-using Push.YiBin.Share.Enums;
+using Push.Share.Enums;
 
-namespace Push.YiBin.Share.Dtos
+namespace Push.Share.Dtos
 {
     public record TemplateDataDto
     {

yibin/src/Push.YiBin.Share/Dtos/TemplateDto.cs → src/Push.Share/Dtos/TemplateDto.cs

@@ -1,6 +1,6 @@
-using Push.YiBin.Share.Enums;
+using Push.Share.Enums;
 
-namespace Push.YiBin.Share.Dtos
+namespace Push.Share.Dtos
 {
     /// <summary>
     /// 

yibin/src/Push.YiBin.Share/Enums/EPushBusiness.cs → src/Push.Share/Enums/EPushBusiness.cs

@@ -1,6 +1,6 @@
 using System.ComponentModel;
 
-namespace Push.YiBin.Share.Enums;
+namespace Push.Share.Enums;
 
 /// <summary>
 /// 消息推送业务

yibin/src/Push.YiBin.Share/Enums/EPushPlatform.cs → src/Push.Share/Enums/EPushPlatform.cs

@@ -1,6 +1,6 @@
 using System.ComponentModel;
 
-namespace Push.YiBin.Share.Enums;
+namespace Push.Share.Enums;
 
 /// <summary>
 /// 推送平台

yibin/src/Push.YiBin.Share/Enums/EPushStatus.cs → src/Push.Share/Enums/EPushStatus.cs

@@ -1,6 +1,6 @@
 using System.ComponentModel;
 
-namespace Push.YiBin.Share.Enums;
+namespace Push.Share.Enums;
 
 /// <summary>
 /// 推送状态

yibin/src/Push.YiBin.Share/Enums/ESendState.cs → src/Push.Share/Enums/ESendState.cs

@@ -1,6 +1,6 @@
 using System.ComponentModel;
 
-namespace Push.YiBin.Share.Enums
+namespace Push.Share.Enums
 {
     /// <summary>
     /// 0:未发送  1:发送中  2:发送失败  3:发送成功

src/Push.Share/EventNames.cs

@@ -0,0 +1,6 @@
+namespace Push.Share;
+
+public static class EventNames
+{
+    public const string SendSms = "send.sms";
+}

yibin/src/Push.YiBin.Share/Push.YiBin.Share.csproj → src/Push.Share/Push.Share.csproj

@@ -7,8 +7,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="MediatR.Contracts" Version="1.0.1" />
-        <PackageReference Include="XF.Utility.EnumExtensions" Version="1.0.4" />
+      <PackageReference Include="XF.Utility.EnumExtensions" Version="1.0.4" />
     </ItemGroup>
-    
+
 </Project>

src/yibin/Push.YiBin.Application/EventSubscriber.cs

@@ -0,0 +1,22 @@
+using DotNetCore.CAP;
+using Push.Share;
+using Push.Share.Dtos;
+using XF.Domain.Dependency;
+
+namespace Push.YiBin.Application;
+
+public class EventSubscriber : ICapSubscribe, ISingletonDependency
+{
+    private readonly IPushDomainService _pushDomainService;
+
+    public EventSubscriber(IPushDomainService pushDomainService)
+    {
+        _pushDomainService = pushDomainService;
+    }
+
+    [CapSubscribe(EventNames.SendSms)]
+    public async Task PushSmsAsync(MessageDto dto, CancellationToken cancellationToken)
+    {
+        await _pushDomainService.PushAsync(dto, cancellationToken);
+    }
+}

src/yibin/Push.YiBin.Application/Push.YiBin.Application.csproj

@@ -0,0 +1,17 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <TargetFramework>net8.0</TargetFramework>
+        <ImplicitUsings>enable</ImplicitUsings>
+        <Nullable>enable</Nullable>
+    </PropertyGroup>
+
+    <ItemGroup>
+      <ProjectReference Include="..\Push.YiBin\Push.YiBin.csproj" />
+    </ItemGroup>
+    
+    <ItemGroup>
+        <PackageReference Include="XF.Utility.MQ" Version="1.0.5" />
+    </ItemGroup>
+
+</Project>

yibin/src/Push.YiBin.Host/Push.YiBin.Host.csproj → src/yibin/Push.YiBin.Host/Push.YiBin.Host.csproj

@@ -14,4 +14,8 @@
     <Folder Include="Controllers\" />
   </ItemGroup>
 
+  <ItemGroup>
+    <ProjectReference Include="..\Push.YiBin.Application\Push.YiBin.Application.csproj" />
+  </ItemGroup>
+
 </Project>

yibin/src/Push.YiBin/IPushDomainService.cs → src/yibin/Push.YiBin/IPushDomainService.cs

@@ -1,5 +1,5 @@
-using Push.YiBin.Share.Dtos;
-using Push.YiBin.Share.Dtos.FWMessage;
+using Push.Share.Dtos;
+using Push.Share.Dtos.FWMessage;
 
 namespace Push.YiBin
 {

yibin/src/Push.YiBin/Message.cs → src/yibin/Push.YiBin/Message.cs

@@ -1,4 +1,4 @@
-using Push.YiBin.Share.Enums;
+using Push.Share.Enums;
 
 namespace Push.YiBin
 {

yibin/src/Push.YiBin/MessageTemplate.cs → src/yibin/Push.YiBin/MessageTemplate.cs

@@ -1,4 +1,4 @@
-using Push.YiBin.Share.Enums;
+using Push.Share.Enums;
 
 namespace Push.YiBin
 {

yibin/src/Push.YiBin/Push.YiBin.csproj → src/yibin/Push.YiBin/Push.YiBin.csproj

@@ -6,14 +6,14 @@
         <Nullable>enable</Nullable>
     </PropertyGroup>
 
-    <ItemGroup>
-      <ProjectReference Include="..\Push.YiBin.Share\Push.YiBin.Share.csproj" />
-    </ItemGroup>
-
     <ItemGroup>
         <PackageReference Include="Mapster" Version="7.3.0" />
         <PackageReference Include="MediatR" Version="12.0.1" />
       <PackageReference Include="XF.Domain.Repository" Version="1.0.5" />
     </ItemGroup>
 
+    <ItemGroup>
+      <ProjectReference Include="..\..\Push.Share\Push.Share.csproj" />
+    </ItemGroup>
+
 </Project>

yibin/src/Push.YiBin/PushDomainService.cs → src/yibin/Push.YiBin/PushDomainService.cs

@@ -4,9 +4,9 @@ using System.Xml;
 using MapsterMapper;
 using MediatR;
 using Microsoft.Extensions.Configuration;
-using Push.YiBin.Share.Dtos;
-using Push.YiBin.Share.Dtos.FWMessage;
-using Push.YiBin.Share.Enums;
+using Push.Share.Dtos;
+using Push.Share.Dtos.FWMessage;
+using Push.Share.Enums;
 using XF.Domain.Cache;
 using XF.Domain.Dependency;
 using XF.Domain.Exceptions;