diff --git a/miniapp/config/index.js b/miniapp/config/index.js index 6bdbd8d..7794e45 100644 --- a/miniapp/config/index.js +++ b/miniapp/config/index.js @@ -23,7 +23,7 @@ const ENV = { } // 当前环境 - 开发时使用 development,打包时改为 production -const CURRENT_ENV = 'production' +const CURRENT_ENV = 'development' // 导出配置 export const config = { diff --git a/server/src/XiangYi.AppApi/Controllers/ChatController.cs b/server/src/XiangYi.AppApi/Controllers/ChatController.cs index b6f6062..a375215 100644 --- a/server/src/XiangYi.AppApi/Controllers/ChatController.cs +++ b/server/src/XiangYi.AppApi/Controllers/ChatController.cs @@ -255,27 +255,6 @@ public class ChatController : ControllerBase var userId = GetCurrentUserId(); var result = await _chatService.RespondExchangeAsync(userId, request); - // 通过 SignalR 推送交换响应给请求者 - // 需要获取原始请求的发送者ID - var messages = await _chatService.GetMessagesAsync(userId, new GetMessagesRequest - { - SessionId = 0, // 这里需要从消息中获取 - PageIndex = 1, - PageSize = 1 - }); - - // 简化处理:直接通知所有相关用户 - var messageResponse = new ChatMessageResponse - { - MessageId = result.ResultMessageId, - MessageType = request.IsAgreed ? 5 : 5, // ExchangeWeChatResult or ExchangePhotoResult - Content = request.IsAgreed ? "已同意交换" : "已拒绝交换", - ExtraData = result.ExchangedData, - IsRead = false, - CreateTime = DateTime.Now, - IsSelf = false - }; - _logger.LogInformation("交换响应已处理: ResultMessageId={ResultMessageId}, IsAgreed={IsAgreed}", result.ResultMessageId, request.IsAgreed); diff --git a/server/src/XiangYi.Application/DTOs/Requests/ChatRequests.cs b/server/src/XiangYi.Application/DTOs/Requests/ChatRequests.cs index 9ace4a1..73b5226 100644 --- a/server/src/XiangYi.Application/DTOs/Requests/ChatRequests.cs +++ b/server/src/XiangYi.Application/DTOs/Requests/ChatRequests.cs @@ -1,3 +1,5 @@ +using System.Text.Json.Serialization; + namespace XiangYi.Application.DTOs.Requests; /// @@ -8,31 +10,37 @@ public class SendMessageRequest /// /// 会话ID /// + [JsonPropertyName("sessionId")] public long SessionId { get; set; } /// /// 接收者ID /// + [JsonPropertyName("receiverId")] public long ReceiverId { get; set; } /// /// 消息类型:1文本 2语音 3图片 /// + [JsonPropertyName("messageType")] public int MessageType { get; set; } /// /// 消息内容(文本消息) /// + [JsonPropertyName("content")] public string? Content { get; set; } /// /// 语音URL(语音消息) /// + [JsonPropertyName("voiceUrl")] public string? VoiceUrl { get; set; } /// /// 语音时长(秒) /// + [JsonPropertyName("voiceDuration")] public int? VoiceDuration { get; set; } } @@ -44,11 +52,13 @@ public class ExchangeWeChatRequest /// /// 会话ID /// + [JsonPropertyName("sessionId")] public long SessionId { get; set; } /// /// 接收者ID /// + [JsonPropertyName("receiverId")] public long ReceiverId { get; set; } } @@ -60,11 +70,13 @@ public class ExchangePhotoRequest /// /// 会话ID /// + [JsonPropertyName("sessionId")] public long SessionId { get; set; } /// /// 接收者ID /// + [JsonPropertyName("receiverId")] public long ReceiverId { get; set; } } @@ -76,11 +88,13 @@ public class RespondExchangeRequest /// /// 原始请求消息ID /// + [JsonPropertyName("requestMessageId")] public long RequestMessageId { get; set; } /// /// 是否同意 /// + [JsonPropertyName("isAgreed")] public bool IsAgreed { get; set; } } @@ -92,15 +106,18 @@ public class GetMessagesRequest /// /// 会话ID /// + [JsonPropertyName("sessionId")] public long SessionId { get; set; } /// /// 页码 /// + [JsonPropertyName("pageIndex")] public int PageIndex { get; set; } = 1; /// /// 每页大小 /// + [JsonPropertyName("pageSize")] public int PageSize { get; set; } = 20; }