src/Hotline.Api/Controllers/PushMessageController.cs

@@ -1,7 +1,8 @@
-using Hotline.Push;
+using Hotline.Push.FWMessage;
 using Hotline.Repository.SqlSugar.Extensions;
 using Hotline.Share.Dtos;
 using Hotline.Share.Dtos.Push;
+using Hotline.Share.Dtos.Push.FWMessage;
 using MapsterMapper;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;

src/Hotline.Application/Mappers/MapperConfigs.cs

@@ -5,11 +5,12 @@ using Hotline.FlowEngine.Workflows;
 using Hotline.Identity.Roles;
 using Hotline.KnowledgeBase;
 using Hotline.Orders;
+using Hotline.Push.FWMessage;
 using Hotline.Share.Dtos.CallCenter;
 using Hotline.Share.Dtos.FlowEngine;
 using Hotline.Share.Dtos.Knowledge;
 using Hotline.Share.Dtos.Order;
-using Hotline.Share.Dtos.Push;
+using Hotline.Share.Dtos.Push.FWMessage;
 using Hotline.Share.Dtos.Roles;
 using Hotline.Share.Dtos.Users;
 using Hotline.Users;
@@ -214,7 +215,7 @@ namespace Hotline.Application.Mappers
 
             #endregion
 
-            config.ForType<Hotline.Push.Message, MessageDataDto>()
+            config.ForType<Message, MessageDataDto>()
                .Map(d => d.SendUser, x => x.User.Name)
                .Map(d => d.SendOrganize, x => x.SystemOrganize.OrgName)
                .Map(d => d.OrderId, x => x.Order.Id)

src/Hotline.Repository.SqlSugar/Push/MessageRepository.cs → src/Hotline.Repository.SqlSugar/Push/FWMessage/MessageRepository.cs

@@ -1,10 +1,10 @@
 using Hotline.KnowledgeBase;
-using Hotline.Push;
+using Hotline.Push.FWMessage;
 using Hotline.Repository.SqlSugar.DataPermissions;
 using SqlSugar;
 using XF.Domain.Dependency;
 
-namespace Hotline.Repository.SqlSugar.Push
+namespace Hotline.Repository.SqlSugar.Push.FWMessage
 {
     public class MessageRepository : BaseRepository<Message>, IMessageRepository, IScopeDependency
     {

src/Hotline.Share/Dtos/Push/MessageDataDto.cs → src/Hotline.Share/Dtos/Push/FWMessage/MessageDataDto.cs

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

src/Hotline.Share/Dtos/Push/ReceiveMessageDto.cs → src/Hotline.Share/Dtos/Push/FWMessage/ReceiveMessageDto.cs

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

src/Hotline.Share/Dtos/Push/SendSmsModelDto.cs → src/Hotline.Share/Dtos/Push/FWMessage/SendSmsModelDto.cs

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

src/Hotline.Share/Dtos/Push/SmsAccountInfo.cs → src/Hotline.Share/Dtos/Push/FWMessage/SmsAccountInfo.cs

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

src/Hotline.Share/Dtos/Push/PushMessageNotifyDto.cs

@@ -1,10 +1,4 @@
 using Hotline.Share.Enums.Push;
-using System;
-using System.Collections.Generic;
-using System.Data.SqlTypes;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Hotline.Share.Dtos.Push
 {

src/Hotline/Push/IMessageRepository.cs → src/Hotline/Push/FWMessage/IMessageRepository.cs

@@ -1,6 +1,6 @@
 using XF.Domain.Repository;
 
-namespace Hotline.Push
+namespace Hotline.Push.FWMessage
 {
     public interface IMessageRepository : IRepository<Message>
     {

src/Hotline/Push/IPushDomainService.cs → src/Hotline/Push/FWMessage/IPushDomainService.cs

@@ -1,6 +1,7 @@
 using Hotline.Share.Dtos.Push;
+using Hotline.Share.Dtos.Push.FWMessage;
 
-namespace Hotline.Push
+namespace Hotline.Push.FWMessage
 {
     public interface IPushDomainService
     {

src/Hotline/Push/Message.cs → src/Hotline/Push/FWMessage/Message.cs

@@ -5,7 +5,7 @@ using Hotline.Users;
 using SqlSugar;
 using XF.Domain.Repository;
 
-namespace Hotline.Push
+namespace Hotline.Push.FWMessage
 {
     /// <summary>
     /// 推送消息
@@ -105,7 +105,7 @@ namespace Hotline.Push
         /// <summary>
         /// 发送时间
         /// </summary>
-        [SugarColumn(ColumnDescription = "发送时间",IsNullable =true)]
+        [SugarColumn(ColumnDescription = "发送时间", IsNullable = true)]
         public DateTime? SendTime { get; set; }
 
         /// <summary>

src/Hotline/Push/PushDomainService.cs → src/Hotline/Push/FWMessage/PushDomainService.cs

@@ -2,6 +2,7 @@
 using Hotline.Orders;
 using Hotline.Push.Notifies;
 using Hotline.Share.Dtos.Push;
+using Hotline.Share.Dtos.Push.FWMessage;
 using Hotline.Share.Enums.Push;
 using MapsterMapper;
 using MediatR;
@@ -17,7 +18,7 @@ using XF.Domain.Dependency;
 using XF.Domain.Exceptions;
 using static System.Runtime.InteropServices.JavaScript.JSType;
 
-namespace Hotline.Push;
+namespace Hotline.Push.FWMessage;
 
 /// <summary>
 /// 
@@ -52,7 +53,7 @@ public class PushDomainService : IPushDomainService, IScopeDependency
         accountInfo = _config.GetSection("SmsAccountInfo").Get<SmsAccountInfo>();
         _mediator = mediator;
         _cacheWaitSendId = cacheWaitSendId;
-    } 
+    }
     #endregion
 
     #region 短信发送
@@ -116,7 +117,7 @@ public class PushDomainService : IPushDomainService, IScopeDependency
             {
                 // 短信服务中心返回 IFSFWID，用于短信发送状态接收时匹配
                 message.SmsWaitSendingId = strArray[1];
-                message.SendState = Share.Enums.Push.ESendState.Sending;
+                message.SendState = ESendState.Sending;
                 message.Status = EPushStatus.Success;
             }
         }