denny RTCService接口定义都不在Internal命名空间下，且包含了消息DTO（消息中含有Object），代码生成工具生成报错

WingRtcService/Room/LiveRoom.PushMessage.cs

@@ -20,7 +20,7 @@ namespace WingRtcService.Room
         /// </summary>
         /// <param name="clients"></param>
         /// <param name="message"></param>
-        public bool PushMessage(IEnumerable<LiveMemberDTO> clients, NotificationMessage notifyMessage, ApplicantTypeEnum receiverType = ApplicantTypeEnum.Client)
+        public bool PushMessage(IEnumerable<LiveMemberDTO> clients, BaseNotificationRequest notifyMessage, ApplicantTypeEnum receiverType = ApplicantTypeEnum.Client)
         {
             if (clients?.Any() == true)
             {
@@ -33,7 +33,7 @@ namespace WingRtcService.Room
                     MsgQueueId = LiveRoomInfo.MsgQueueId,
                     ClientIds = clients.Select(x => x.Id).ToList(),
                     Message = notifyMessage.Message,
-                    JsonMessage = notifyMessage.MessageJson,
+                    JsonMessage = notifyMessage.JsonMessage,
                     NotificationType = notifyMessage.NotificationType,
                     TransactionType = notifyMessage.TransactionType,
                     RelevanceCode = LiveRoomInfo.RoomId,
@@ -54,7 +54,7 @@ namespace WingRtcService.Room
         /// </summary>
         /// <param name="userMessage"></param>
         /// <param name="deviceMessages"></param>
-        private void PushInitiateMessage(NotificationMessage userMessage, IDictionary<string, NotificationMessage> deviceMessages)
+        private void PushInitiateMessage(BaseNotificationRequest userMessage, IDictionary<string, BaseNotificationRequest> deviceMessages)
         {
             var userInfos = LiveRoomInfo.UserInfos?.Where(x => !x.IsInitiator && !x.IsBusy);
             if (userInfos?.Any() == true)
@@ -76,7 +76,7 @@ namespace WingRtcService.Room
         /// </summary>
         /// <param name="clientIds"></param>
         /// <param name="message"></param>
-        private void PushInviteInMessage(List<string> clientIds, NotificationMessage message)
+        private void PushInviteInMessage(List<string> clientIds, BaseNotificationRequest message)
         {
             var userTokens = CacheMaintenance.Instance.Get<ITokensManager>().Where(x => clientIds.Contains(x.ClientId));
             if (userTokens?.Any() == true)
@@ -99,7 +99,7 @@ namespace WingRtcService.Room
         /// </summary>
         /// <param name="id"></param>
         /// <param name="message"></param>
-        private void PushInviteMessage(string id, NotificationMessage message)
+        private void PushInviteMessage(string id, BaseNotificationRequest message)
         {
             var userInfos = LiveRoomInfo.Members.Where(x => x.Id == id);
             if (userInfos?.Any() == true)
@@ -113,7 +113,7 @@ namespace WingRtcService.Room
         /// </summary>
         /// <param name="canelUserMessage"></param>
         /// <param name="cancelDeviceMessage"></param>
-        private void PushCancelMessage(NotificationMessage canelUserMessage, NotificationMessage cancelDeviceMessage)
+        private void PushCancelMessage(BaseNotificationRequest canelUserMessage, BaseNotificationRequest cancelDeviceMessage)
         {
             var userInfos = LiveRoomInfo.UserInfos?.Where(v => v.Status == LiveMemberStatusEnum.Default);
             if (userInfos?.Any() == true)
@@ -132,7 +132,7 @@ namespace WingRtcService.Room
         /// </summary>
         /// <param name="userMessage"></param>
         /// <param name="deviceMessage"></param>
-        private void PushCloseMessage(NotificationMessage userMessage, NotificationMessage deviceMessage)
+        private void PushCloseMessage(BaseNotificationRequest userMessage, BaseNotificationRequest deviceMessage)
         {
             var userInfos = LiveRoomInfo.UserInfos?.Where(v => v.Status == LiveMemberStatusEnum.Accepted || v.Status == LiveMemberStatusEnum.Joined);
             if (userInfos?.Any() == true)
@@ -151,7 +151,7 @@ namespace WingRtcService.Room
         /// </summary>
         /// <param name="clientIds"></param>
         /// <param name="message"></param>
-        private void PushCancelInviteInMessage(List<string> clientIds, NotificationMessage message)
+        private void PushCancelInviteInMessage(List<string> clientIds, BaseNotificationRequest message)
         {
             var userTokens = CacheMaintenance.Instance.Get<ITokensManager>().Where(x => clientIds.Contains(x.ClientId));
             if (userTokens?.Any() == true)
@@ -174,7 +174,7 @@ namespace WingRtcService.Room
         /// </summary>
         /// <param name="id"></param>
         /// <param name="message"></param>
-        private void PushNotInMessage(string id, NotificationMessage message)
+        private void PushNotInMessage(string id, BaseNotificationRequest message)
         {
             var userInfos = LiveRoomInfo.Members.Where(x => x.Id != id && x.MemberType == LiveMemberEnum.User && x.Status == LiveMemberStatusEnum.Joined);
             if (userInfos?.Any() == true)
@@ -188,7 +188,7 @@ namespace WingRtcService.Room
         /// </summary>
         /// <param name="id"></param>
         /// <param name="message"></param>
-        private void PushInMessage(string id, NotificationMessage message)
+        private void PushInMessage(string id, BaseNotificationRequest message)
         {
             var userInfos = LiveRoomInfo.Members.Where(x => x.Id == id && x.MemberType == LiveMemberEnum.User && x.Status == LiveMemberStatusEnum.Joined);
             if (userInfos?.Any() == true)

WingRtcService/Room/LiveRoom.cs

@@ -1,4 +1,3 @@
-using System.Linq;
 using WingInterfaceLibrary.Enum;
 using WingServerCommon.Interfaces.Cache;
 using WingServerCommon.Log;
@@ -6,7 +5,7 @@ using System.Text;
 using WingInterfaceLibrary.DTO.RTC;
 using WingInterfaceLibrary.Rtc;
 using WingInterfaceLibrary.Enum.CommentEnum;
-using WingInterfaceLibrary.Notifications;
+using WingInterfaceLibrary.Internal.Request;
 
 namespace WingRtcService.Room
 {
@@ -66,8 +65,8 @@ namespace WingRtcService.Room
         /// <param name="integerRoomId"></param>
         /// <param name="userMessage"></param>
         /// <param name="deviceMessages"></param>
-        public void Initiate(string initiatorCode, int integerRoomId, int liveStatus, bool pushMessage, NotificationMessage userMessage, 
-        IDictionary<string, NotificationMessage> deviceMessages)
+        public void Initiate(string initiatorCode, int integerRoomId, int liveStatus, bool pushMessage, BaseNotificationRequest userMessage, 
+        IDictionary<string, BaseNotificationRequest> deviceMessages)
         {
             var initiator = LiveRoomInfo.Members.FirstOrDefault(x => x.Id == initiatorCode);
             if (initiator != null)
@@ -110,7 +109,7 @@ namespace WingRtcService.Room
         /// 接受直播邀请-参与人员
         /// </summary>
         /// <param name="userCode"></param>
-        public void Accept(string userCode, bool pushMessage, NotificationMessage message)
+        public void Accept(string userCode, bool pushMessage, BaseNotificationRequest message)
         {
             var accepter = LiveRoomInfo.Members.FirstOrDefault(x => x.Id == userCode);
             if (accepter != null)
@@ -138,7 +137,7 @@ namespace WingRtcService.Room
         /// <param name="userCode"></param>
         /// <param name="orgCode"></param>
         /// <param name="pushMessage"></param>
-        public void EmergencyAccept(string userCode, string orgCode, bool pushMessage, NotificationMessage message)
+        public void EmergencyAccept(string userCode, string orgCode, bool pushMessage, BaseNotificationRequest message)
         {
             // EmergencyAccepted = true;
             var accepter = LiveRoomInfo.Members.FirstOrDefault(x => x.Id == userCode);
@@ -170,7 +169,7 @@ namespace WingRtcService.Room
         /// 拒绝直播邀请-参与人员
         /// </summary>
         /// <param name="userCode"></param>
-        public void Reject(string userCode, bool pushMessage, NotificationMessage message)
+        public void Reject(string userCode, bool pushMessage, BaseNotificationRequest message)
         {
             var rejecter = LiveRoomInfo.Members.FirstOrDefault(x => x.Id == userCode);
             if (rejecter != null)
@@ -187,7 +186,7 @@ namespace WingRtcService.Room
         /// <summary>
         /// 取消直播
         /// </summary>
-        public void CancelInitiate(bool pushMessage, int liveStatus, NotificationMessage userMessage, NotificationMessage deviceMessage, NotificationMessage canelUserMessage, NotificationMessage cancelDeviceMessage)
+        public void CancelInitiate(bool pushMessage, int liveStatus, BaseNotificationRequest userMessage, BaseNotificationRequest deviceMessage, BaseNotificationRequest canelUserMessage, BaseNotificationRequest cancelDeviceMessage)
         {
             LiveRoomInfo.Status = LiveRoomStatus.Cancelled;
             LiveRoomInfo.LiveStatus = liveStatus;
@@ -210,7 +209,7 @@ namespace WingRtcService.Room
         /// 直播心跳，进入房间
         /// </summary>
         /// <param name="userCode"></param>
-        public void HeartRateJoin(string userCode, bool pushMessage, NotificationMessage message)
+        public void HeartRateJoin(string userCode, bool pushMessage, BaseNotificationRequest message)
         {
             var joiner = LiveRoomInfo.Members.FirstOrDefault(x => x.Id == userCode);
             if (joiner != null && joiner.Status != LiveMemberStatusEnum.Joined)
@@ -228,7 +227,7 @@ namespace WingRtcService.Room
         /// 直播心跳，网络质量不佳
         /// </summary>
         /// <param name="userCode"></param>
-        public void NetworkErr(string userCode, bool pushMessage, NotificationMessage message)
+        public void NetworkErr(string userCode, bool pushMessage, BaseNotificationRequest message)
         {
             var liveMember = LiveRoomInfo.Members.FirstOrDefault(x => x.Id == userCode);
             if (liveMember != null && liveMember.Status == LiveMemberStatusEnum.Joined)
@@ -245,7 +244,7 @@ namespace WingRtcService.Room
         /// 直播心跳，离开房间
         /// </summary>
         /// <param name="userCode"></param>
-        public bool HeartRateLeave(string userCode, bool isMainUsersLeft, int liveStatus, bool pushMessage, NotificationMessage heartRateMessage, NotificationMessage closeUserMessage, NotificationMessage closeDeviceMessage)
+        public bool HeartRateLeave(string userCode, bool isMainUsersLeft, int liveStatus, bool pushMessage, BaseNotificationRequest heartRateMessage, BaseNotificationRequest closeUserMessage, BaseNotificationRequest closeDeviceMessage)
         {
             var leaver = LiveRoomInfo.Members.FirstOrDefault(x => x.Id == userCode);
             var needClose = false;
@@ -270,7 +269,7 @@ namespace WingRtcService.Room
         /// 离开房间，含结束直播
         /// </summary>
         /// <param name="userCode"></param>
-        public bool Leave(string userCode, bool isMainUsersLeft, int liveStatus, bool pushMessage,  NotificationMessage leftMessage, NotificationMessage closeUserMessage, NotificationMessage closeDevicemessage)
+        public bool Leave(string userCode, bool isMainUsersLeft, int liveStatus, bool pushMessage,  BaseNotificationRequest leftMessage, BaseNotificationRequest closeUserMessage, BaseNotificationRequest closeDevicemessage)
         {
             var leaver = LiveRoomInfo.Members.FirstOrDefault(x => x.Id == userCode);
             var needClose = false;
@@ -300,7 +299,7 @@ namespace WingRtcService.Room
         /// <summary>
         /// 结束直播
         /// </summary>
-        public void Close(bool pushMessage, int liveStatus, NotificationMessage userMessage, NotificationMessage deviceMessage)
+        public void Close(bool pushMessage, int liveStatus, BaseNotificationRequest userMessage, BaseNotificationRequest deviceMessage)
         {
             LiveRoomInfo.Status = LiveRoomStatus.Closed;
             LiveRoomInfo.LiveStatus = liveStatus;
@@ -324,7 +323,7 @@ namespace WingRtcService.Room
         /// </summary>
         /// <param name="userCode"></param>
         /// <param name="mute"></param>
-        public void ChangeMuteState(string userCode, bool mute, bool pushMessage, NotificationMessage message)
+        public void ChangeMuteState(string userCode, bool mute, bool pushMessage, BaseNotificationRequest message)
         {
             var liveMember = LiveRoomInfo.Members.FirstOrDefault(x => x.Id == userCode);
             if (liveMember != null && liveMember.Status == LiveMemberStatusEnum.Joined)
@@ -343,7 +342,7 @@ namespace WingRtcService.Room
         /// </summary>
         /// <param name="userCode"></param>
         /// <param name="isVideoOpen"></param>
-        public void ChangeVideoOpenState(string userCode, bool videoOpend, bool pushMessage, NotificationMessage message)
+        public void ChangeVideoOpenState(string userCode, bool videoOpend, bool pushMessage, BaseNotificationRequest message)
         {
             var liveMember = LiveRoomInfo.Members.FirstOrDefault(x => x.Id == userCode);
             if (liveMember != null && liveMember.Status == LiveMemberStatusEnum.Joined)
@@ -377,7 +376,7 @@ namespace WingRtcService.Room
         /// </summary>
         /// <param name="userCode"></param>
         /// <param name="clientIds"></param>
-        public void InviteIn(string userCode, List<string> clientIds, bool pushMessage, NotificationMessage message)
+        public void InviteIn(string userCode, List<string> clientIds, bool pushMessage, BaseNotificationRequest message)
         { 
             var liveMember = LiveRoomInfo.Members.FirstOrDefault(x => x.Id == userCode);
             if (liveMember != null && liveMember.Status == LiveMemberStatusEnum.Joined)
@@ -395,7 +394,7 @@ namespace WingRtcService.Room
         /// </summary>
         /// <param name="userCode"></param>
         /// <param name="clientIds"></param>
-        public void CancelInviteIn(string userCode, List<string> clientIds, bool pushMessage, NotificationMessage message)
+        public void CancelInviteIn(string userCode, List<string> clientIds, bool pushMessage, BaseNotificationRequest message)
         {
             var liveMember = LiveRoomInfo.Members.FirstOrDefault(x => x.Id == userCode);
             if (liveMember != null && liveMember.Status == LiveMemberStatusEnum.Joined)
@@ -426,7 +425,7 @@ namespace WingRtcService.Room
         /// <param name="userCode"></param>
         /// <param name="pushMessage"></param>
         /// <param name="message"></param>
-        public void AcceptIn(string userCode, bool mute, bool isControllingParameter, bool isMainUser, bool videoOpend, bool pushMessage, NotificationMessage message)
+        public void AcceptIn(string userCode, bool mute, bool isControllingParameter, bool isMainUser, bool videoOpend, bool pushMessage, BaseNotificationRequest message)
         {
             var liveMember = LiveRoomInfo.Members.FirstOrDefault(x => x.Id == userCode);
             if (liveMember != null)
@@ -462,7 +461,7 @@ namespace WingRtcService.Room
         /// </summary>
         /// <param name="rejecterCode"></param>
         /// <param name="message"></param>
-        public void RejectIn(bool pushMessage, NotificationMessage message)
+        public void RejectIn(bool pushMessage, BaseNotificationRequest message)
         {
             if (LiveRoomInfo.Initiator != null && LiveRoomInfo.Initiator.Status == LiveMemberStatusEnum.Joined)
             {
@@ -485,7 +484,7 @@ namespace WingRtcService.Room
         /// <param name="userCode"></param>
         /// <param name="boardData"></param>
         /// <param name="isClear"></param>
-        public void SendBoardData(string userCode, string boardData, DateTime interactiveTime, bool isClear, bool pushMessage, NotificationMessage message)
+        public void SendBoardData(string userCode, string boardData, DateTime interactiveTime, bool isClear, bool pushMessage, BaseNotificationRequest message)
         {
             var liveMember = LiveRoomInfo.Members.FirstOrDefault(x => x.Id == userCode);
             if (liveMember != null && liveMember.Status == LiveMemberStatusEnum.Joined)