Hello world
", maxRunes: 128, want: "Hello world"}, + {name: "rune truncation", contentType: "markdown", content: "你好世界", maxRunes: 3, want: "你好世..."}, + {name: "plain text", contentType: "text", content: " first\n second ", maxRunes: 128, want: "first second"}, + } + + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + if got := BuildContentSummary(tt.contentType, tt.content, tt.maxRunes); got != tt.want { + t.Fatalf("BuildContentSummary() = %q, want %q", got, tt.want) + } + }) + } +} diff --git a/internal/repositories/support_repository.go b/internal/repositories/support_repository.go index f717d5e9..482567cf 100644 --- a/internal/repositories/support_repository.go +++ b/internal/repositories/support_repository.go @@ -87,6 +87,15 @@ func (r *supportCategoryRepository) Find(db *gorm.DB, cnd *sqls.Cnd) (list []mod return } +func (r *supportCategoryRepository) FindByIDs(db *gorm.DB, ids []int64) []models.Category { + if len(ids) == 0 { + return []models.Category{} + } + var list []models.Category + db.Where("id IN ?", ids).Find(&list) + return list +} + func (r *supportCategoryRepository) FindPageByCnd(db *gorm.DB, cnd *sqls.Cnd) (list []models.Category, paging *sqls.Paging) { cnd.Find(db, &list) paging = &sqls.Paging{Page: cnd.Paging.Page, Limit: cnd.Paging.Limit, Total: cnd.Count(db, &models.Category{})} diff --git a/internal/repositories/system_log_repository.go b/internal/repositories/system_log_repository.go new file mode 100644 index 00000000..a42a0854 --- /dev/null +++ b/internal/repositories/system_log_repository.go @@ -0,0 +1,47 @@ +package repositories + +import ( + "time" + + "agent-desk/internal/models" + + "github.com/mlogclub/simple/sqls" + "gorm.io/gorm" +) + +var SystemLogRepository = newSystemLogRepository() + +func newSystemLogRepository() *systemLogRepository { + return &systemLogRepository{} +} + +type systemLogRepository struct { +} + +func (r *systemLogRepository) Get(db *gorm.DB, id int64) *models.SystemLog { + ret := &models.SystemLog{} + if err := db.First(ret, "id = ?", id).Error; err != nil { + return nil + } + return ret +} + +func (r *systemLogRepository) FindPageByCnd(db *gorm.DB, cnd *sqls.Cnd) (list []models.SystemLog, paging *sqls.Paging) { + cnd.Find(db, &list) + count := cnd.Count(db, &models.SystemLog{}) + + paging = &sqls.Paging{ + Page: cnd.Paging.Page, + Limit: cnd.Paging.Limit, + Total: count, + } + return +} + +func (r *systemLogRepository) DeleteOlderThan(db *gorm.DB, before time.Time) (count int64) { + res := db.Where("created_at < ?", before).Delete(&models.SystemLog{}) + if res.Error == nil { + count = res.RowsAffected + } + return +} diff --git a/internal/repositories/user_repository.go b/internal/repositories/user_repository.go index ebbcb3c1..521d7ffe 100644 --- a/internal/repositories/user_repository.go +++ b/internal/repositories/user_repository.go @@ -111,6 +111,17 @@ func (r *userRepository) FindByIds(db *gorm.DB, ids []int64) []models.User { return list } +// FindSimpleInfoByIDs selects exactly the fields required by public community +// user cards, instead of loading account contact or authentication fields. +func (r *userRepository) FindSimpleInfoByIDs(db *gorm.DB, ids []int64) []models.User { + if len(ids) == 0 { + return []models.User{} + } + var list []models.User + db.Select("id", "username", "nickname", "avatar", "user_type").Where("id IN ?", ids).Find(&list) + return list +} + func (r *userRepository) GetByUsername(db *gorm.DB, username string) *models.User { username = strings.TrimSpace(username) if username == "" { diff --git a/internal/services/ai_reply_placeholder_service.go b/internal/services/ai_reply_placeholder_service.go new file mode 100644 index 00000000..c4e8d613 --- /dev/null +++ b/internal/services/ai_reply_placeholder_service.go @@ -0,0 +1,205 @@ +package services + +import ( + "log/slog" + "strconv" + "strings" + "time" + + "agent-desk/internal/models" + "agent-desk/internal/pkg/dto" + "agent-desk/internal/pkg/enums" + "agent-desk/internal/repositories" + + "github.com/mlogclub/simple/sqls" +) + +// AI 回复占位消息使用确定性 clientMsgID 前缀，保证同一触发消息的占位与超时提示幂等； +// aiReplyPendingPayload 为占位消息的 payload 标记，原地替换前用于守卫，避免覆盖已生成的正式回复。 +const ( + aiReplyPlaceholderClientMsgIDPrefix = "ai_placeholder_" + aiReplyTimeoutNoticeClientMsgIDPrefix = "ai_timeout_" + aiReplyPendingPayload = `{"aiReplyPending":true}` +) + +// aiReplyPrincipal 构建 AI 消息的操作者信息。 +func aiReplyPrincipal(aiAgent models.AIAgent) *dto.AuthPrincipal { + username := "AI" + if strings.TrimSpace(aiAgent.Name) != "" { + username = strings.TrimSpace(aiAgent.Name) + } + return &dto.AuthPrincipal{ + UserID: 0, + Username: username, + Nickname: username, + } +} + +// aiReplyPlaceholderClientMsgID 返回触发消息对应的占位消息 clientMsgID。 +func aiReplyPlaceholderClientMsgID(triggerMessageID int64) string { + return aiReplyPlaceholderClientMsgIDPrefix + strconv.FormatInt(triggerMessageID, 10) +} + +// SendAIReplyPlaceholder 在正式 AI 回复生成前，向客户发送一条占位提示消息。 +// 通过确定性 clientMsgID 保证幂等；发送失败仅记录日志，不阻断 AI 回复流程。 +func (s *messageService) SendAIReplyPlaceholder(conversation *models.Conversation, aiAgent *models.AIAgent, triggerMessage *models.Message, channel *models.Channel, requestID string) { + if conversation == nil || aiAgent == nil || triggerMessage == nil { + return + } + content := models.DefaultAIReplyPlaceholder + if channel != nil { + content = channel.EffectiveAIReplyPlaceholder() + } + if _, err := s.SendAIMessageWithRequestIDAndWorkflowRunID( + conversation.ID, + aiAgent.ID, + aiReplyPlaceholderClientMsgID(triggerMessage.ID), + enums.IMMessageTypeText, + content, + aiReplyPendingPayload, + aiReplyPrincipal(*aiAgent), + requestID, + 0, + ); err != nil { + slog.Error("send ai reply placeholder failed", + "conversation_id", conversation.ID, + "message_id", triggerMessage.ID, + "error", err, + ) + } +} + +// TryReplaceAIReplyPlaceholder 尝试将 web 渠道仍处于待回复状态的占位消息原地替换为正式回复。 +// 仅 web 渠道支持原地替换；占位消息不存在或已被替换时返回 nil，由调用方回退为新消息。 +func (s *messageService) TryReplaceAIReplyPlaceholder(conversation *models.Conversation, triggerMessageID int64, replyText string, workflowRunID int64, aiAgent models.AIAgent) *models.Message { + if conversation == nil { + return nil + } + channel := ChannelService.Get(conversation.ChannelID) + if channel == nil || channel.ChannelType != enums.ChannelTypeWeb { + return nil + } + placeholder := repositories.MessageRepository.GetByClientMsgID(sqls.DB(), conversation.ID, aiReplyPlaceholderClientMsgID(triggerMessageID)) + if placeholder == nil || strings.TrimSpace(placeholder.Payload) != aiReplyPendingPayload { + return nil + } + content, _, summary, err := s.normalizeMessageContent(conversation.ID, enums.IMMessageTypeText, replyText, "") + if err != nil { + slog.Error("normalize ai reply content failed", + "conversation_id", conversation.ID, + "message_id", placeholder.ID, + "error", err, + ) + return nil + } + return s.replaceAIReplyPlaceholder(conversation, placeholder, content, summary, workflowRunID, aiAgent) +} + +// CompleteAIReplyPlaceholderAsFailed 在 AI 处理超时或失败时向客户发送失败提示： +// web 渠道且占位消息仍待回复时原地替换为提示语；否则以新消息补发（确定性 clientMsgID 保证幂等）。 +// 已转人工或已关闭的会话不再补发提示。 +func (s *messageService) CompleteAIReplyPlaceholderAsFailed(conversation *models.Conversation, aiAgent *models.AIAgent, triggerMessage *models.Message, requestID string) { + if conversation == nil || aiAgent == nil || triggerMessage == nil { + return + } + if conversation.Status == enums.IMConversationStatusClosed { + return + } + if conversation.CurrentAssigneeID > 0 || conversation.HandoffAt != nil { + return + } + notice := models.DefaultAIReplyTimeoutNotice + if channel := ChannelService.Get(conversation.ChannelID); channel != nil { + notice = channel.EffectiveAIReplyTimeoutNotice() + } + content, _, summary, err := s.normalizeMessageContent(conversation.ID, enums.IMMessageTypeText, notice, "") + if err != nil { + slog.Error("normalize ai timeout notice failed", + "conversation_id", conversation.ID, + "message_id", triggerMessage.ID, + "error", err, + ) + return + } + + placeholder := repositories.MessageRepository.GetByClientMsgID(sqls.DB(), conversation.ID, aiReplyPlaceholderClientMsgID(triggerMessage.ID)) + if placeholder != nil { + if strings.TrimSpace(placeholder.Payload) != aiReplyPendingPayload { + // 正式回复已生成并替换占位消息，无需再提示失败 + return + } + if channel := ChannelService.Get(conversation.ChannelID); channel != nil && channel.ChannelType == enums.ChannelTypeWeb { + s.replaceAIReplyPlaceholder(conversation, placeholder, content, summary, 0, *aiAgent) + return + } + } + + // 外部渠道无法编辑已发送消息，或占位消息缺失时，以新消息补发失败提示 + if _, err := s.SendAIMessageWithRequestIDAndWorkflowRunID( + conversation.ID, + aiAgent.ID, + aiReplyTimeoutNoticeClientMsgIDPrefix+strconv.FormatInt(triggerMessage.ID, 10), + enums.IMMessageTypeText, + content, + "", + aiReplyPrincipal(*aiAgent), + requestID, + 0, + ); err != nil { + slog.Error("send ai timeout notice failed", + "conversation_id", conversation.ID, + "message_id", triggerMessage.ID, + "error", err, + ) + } +} + +// replaceAIReplyPlaceholder 将占位消息原地更新为指定内容，并同步会话摘要与实时事件。 +func (s *messageService) replaceAIReplyPlaceholder(conversation *models.Conversation, placeholder *models.Message, content string, summary string, workflowRunID int64, aiAgent models.AIAgent) *models.Message { + now := time.Now() + agentName := strings.TrimSpace(aiAgent.Name) + // 占位消息内容与会话摘要的更新保持原子性 + if err := sqls.WithTransaction(func(ctx *sqls.TxContext) error { + if err := repositories.MessageRepository.Updates(ctx.Tx, placeholder.ID, map[string]any{ + "content": content, + "payload": "", + "workflow_run_id": workflowRunID, + "update_user_id": 0, + "update_user_name": agentName, + "updated_at": now, + }); err != nil { + return err + } + + // 占位消息仍是会话最后一条消息时，同步列表摘要 + if conversation.LastMessageID == placeholder.ID { + summaryText := limitText(summary, 255) + conversation.LastMessageSummary = summaryText + conversation.UpdatedAt = now + return repositories.ConversationRepository.Updates(ctx.Tx, conversation.ID, map[string]any{ + "last_message_summary": summaryText, + "update_user_id": 0, + "update_user_name": agentName, + "updated_at": now, + }) + } + return nil + }); err != nil { + slog.Error("replace ai reply placeholder failed", + "conversation_id", conversation.ID, + "message_id", placeholder.ID, + "error", err, + ) + return nil + } + placeholder.Content = content + placeholder.Payload = "" + placeholder.WorkflowRunID = workflowRunID + placeholder.UpdatedAt = now + placeholder.UpdateUserID = 0 + placeholder.UpdateUserName = agentName + + WsService.PublishMessageUpdated(conversation, placeholder) + WsService.PublishConversationChanged(conversation, enums.IMRealtimeEventConversationUpdated) + return placeholder +} diff --git a/internal/services/asset_service.go b/internal/services/asset_service.go index b7596beb..8746994a 100644 --- a/internal/services/asset_service.go +++ b/internal/services/asset_service.go @@ -136,6 +136,15 @@ func (s *assetService) Upload(reader io.Reader, info storage.UploadInfo) (*model func (s *assetService) GetSignedURL(id int64) (string, error) { item := s.Get(id) + return s.getSignedURL(item) +} + +func (s *assetService) GetSignedURLByAssetID(assetID string) (string, error) { + item := s.GetByAssetID(assetID) + return s.getSignedURL(item) +} + +func (s *assetService) getSignedURL(item *models.Asset) (string, error) { if item == nil { return "", errorsx.InvalidParamI18n("error.e0214") } diff --git a/internal/services/asset_service_test.go b/internal/services/asset_service_test.go new file mode 100644 index 00000000..43df5486 --- /dev/null +++ b/internal/services/asset_service_test.go @@ -0,0 +1,48 @@ +package services + +import ( + "agent-desk/internal/models" + "agent-desk/internal/pkg/config" + "agent-desk/internal/pkg/enums" + "testing" + + "github.com/glebarez/sqlite" + "github.com/mlogclub/simple/sqls" + "gorm.io/gorm" + "gorm.io/gorm/schema" +) + +func TestGetSignedURLByAssetID(t *testing.T) { + db, err := gorm.Open(sqlite.Open("file:asset_service_test?mode=memory&cache=shared"), &gorm.Config{ + NamingStrategy: schema.NamingStrategy{TablePrefix: "t_", SingularTable: true}, + }) + if err != nil { + t.Fatalf("open sqlite: %v", err) + } + if err := db.AutoMigrate(&models.Asset{}); err != nil { + t.Fatalf("migrate asset: %v", err) + } + sqls.SetDB(db) + config.SetCurrent(&config.Config{Storage: config.StorageConfig{ + Default: enums.AssetProviderLocal, + Local: config.LocalStorageConfig{BaseURL: "/storage"}, + }}) + asset := &models.Asset{ + AssetID: "avatar_asset_1", + Provider: enums.AssetProviderLocal, + StorageKey: "avatars/avatar.png", + MimeType: "image/png", + Status: enums.AssetStatusSuccess, + } + if err := db.Create(asset).Error; err != nil { + t.Fatalf("create asset: %v", err) + } + + got, err := AssetService.GetSignedURLByAssetID(asset.AssetID) + if err != nil { + t.Fatalf("GetSignedURLByAssetID() error = %v", err) + } + if got != "/storage/avatars/avatar.png" { + t.Fatalf("GetSignedURLByAssetID() = %q", got) + } +} diff --git a/internal/services/auth_service.go b/internal/services/auth_service.go index 5765768c..645d4e0d 100644 --- a/internal/services/auth_service.go +++ b/internal/services/auth_service.go @@ -205,14 +205,15 @@ func (s *authService) CurrentProfile(ctx *gin.Context) (*response.LoginResponse, return &response.LoginResponse{ User: &response.AuthUserResponse{ - ID: user.ID, - Username: user.Username, - Nickname: user.Nickname, - Avatar: user.Avatar, - Email: derefString(user.Email), - UserType: user.UserType, - Status: user.Status, - Roles: principal.Roles, + ID: user.ID, + Username: user.Username, + Nickname: user.Nickname, + Avatar: user.UserAvatarURL(), + AvatarAssetID: user.UserAvatarAssetID(), + Email: derefString(user.Email), + UserType: user.UserType, + Status: user.Status, + Roles: principal.Roles, }, Permissions: principal.Permissions, Roles: principal.Roles, @@ -308,14 +309,15 @@ func (s *authService) issueTokens(ctx *sqls.TxContext, user *models.User, client AccessToken: accessToken, ExpiresAt: now.Add(tokenTTL).Format(time.DateTime), User: &response.AuthUserResponse{ - ID: user.ID, - Username: user.Username, - Nickname: user.Nickname, - Avatar: user.Avatar, - Email: derefString(user.Email), - UserType: user.UserType, - Status: user.Status, - Roles: roles, + ID: user.ID, + Username: user.Username, + Nickname: user.Nickname, + Avatar: user.UserAvatarURL(), + AvatarAssetID: user.UserAvatarAssetID(), + Email: derefString(user.Email), + UserType: user.UserType, + Status: user.Status, + Roles: roles, }, Permissions: permissions, Roles: roles, diff --git a/internal/services/channel_message_outbox_service.go b/internal/services/channel_message_outbox_service.go index 2660a8bc..8a088503 100644 --- a/internal/services/channel_message_outbox_service.go +++ b/internal/services/channel_message_outbox_service.go @@ -254,12 +254,19 @@ func (s *channelMessageOutboxService) ListPending(channelType string, limit int) if limit <= 0 { limit = 20 } + // 只取"现在就可以尝试发送"的记录，保证每批取出的记录都会被真正尝试、投递循环必然收敛： + // pending：无重试计划限制（新入队或人工重试后 next_retry_at 为空）； + // failed：必须存在重试计划且已到期。达到最大重试次数（next_retry_at 为空）的记录 + // 停止自动重试，等待管理端人工处置；退避窗口内的记录不占用批次。 + now := time.Now() cnd := sqls.NewCnd(). Eq("channel_type", strings.TrimSpace(channelType)). - In("send_status", []string{ - string(enums.ChannelMessageOutboxStatusPending), - string(enums.ChannelMessageOutboxStatusFailed), - }). + Where( + "((send_status = ? AND (next_retry_at IS NULL OR next_retry_at <= ?)) "+ + "OR (send_status = ? AND next_retry_at IS NOT NULL AND next_retry_at <= ?))", + string(enums.ChannelMessageOutboxStatusPending), now, + string(enums.ChannelMessageOutboxStatusFailed), now, + ). Asc("id"). Limit(limit) return s.Find(cnd) diff --git a/internal/services/channel_message_outbox_service_test.go b/internal/services/channel_message_outbox_service_test.go new file mode 100644 index 00000000..914f583d --- /dev/null +++ b/internal/services/channel_message_outbox_service_test.go @@ -0,0 +1,201 @@ +package services + +import ( + "strings" + "testing" + "time" + + "agent-desk/internal/models" + "agent-desk/internal/pkg/config" + "agent-desk/internal/pkg/dto" + "agent-desk/internal/pkg/enums" + "agent-desk/internal/repositories" + "agent-desk/internal/wxwork" + + "github.com/glebarez/sqlite" + "github.com/mlogclub/simple/sqls" + "gorm.io/gorm" + "gorm.io/gorm/schema" +) + +func setupChannelMessageOutboxTestDB(t *testing.T) *gorm.DB { + t.Helper() + + db, err := gorm.Open(sqlite.Open("file::memory:?cache=shared"), &gorm.Config{ + NamingStrategy: schema.NamingStrategy{ + TablePrefix: "t_", + SingularTable: true, + }, + }) + if err != nil { + t.Fatalf("open sqlite error = %v", err) + } + t.Cleanup(func() { + sqlDB, err := db.DB() + if err == nil { + _ = sqlDB.Close() + } + }) + if err := db.AutoMigrate(&models.ChannelMessageOutbox{}, &models.Message{}); err != nil { + t.Fatalf("auto migrate error = %v", err) + } + sqls.SetDB(db) + return db +} + +func createOutboxRecordForTest(t *testing.T, db *gorm.DB, item *models.ChannelMessageOutbox) { + t.Helper() + if err := repositories.ChannelMessageOutboxRepository.Create(db, item); err != nil { + t.Fatalf("create outbox error = %v", err) + } +} + +// TestChannelMessageOutboxListPendingEligibility 校验 ListPending 只取"现在可以尝试发送"的记录： +// failed 达到最大重试次数（next_retry_at 为空）后必须停止自动重试，退避窗口内的记录不能占用批次。 +func TestChannelMessageOutboxListPendingEligibility(t *testing.T) { + db := setupChannelMessageOutboxTestDB(t) + + now := time.Now() + past := now.Add(-time.Minute) + future := now.Add(time.Hour) + + cases := []struct { + name string + channel string + status enums.ChannelMessageOutboxStatus + retryCount int + nextAt *time.Time + expected bool + }{ + {"pending 无重试时间", enums.ChannelTypeWxWorkKF, enums.ChannelMessageOutboxStatusPending, 0, nil, true}, + {"failed 已到期", enums.ChannelTypeWxWorkKF, enums.ChannelMessageOutboxStatusFailed, 1, &past, true}, + {"failed 退避窗口内", enums.ChannelTypeWxWorkKF, enums.ChannelMessageOutboxStatusFailed, 1, &future, false}, + {"failed 达上限无重试时间", enums.ChannelTypeWxWorkKF, enums.ChannelMessageOutboxStatusFailed, 6, nil, false}, + {"pending 未来重试时间", enums.ChannelTypeWxWorkKF, enums.ChannelMessageOutboxStatusPending, 0, &future, false}, + {"sending 状态", enums.ChannelTypeWxWorkKF, enums.ChannelMessageOutboxStatusSending, 0, nil, false}, + {"sent 状态", enums.ChannelTypeWxWorkKF, enums.ChannelMessageOutboxStatusSent, 0, nil, false}, + {"其他渠道", enums.ChannelTypeTelegram, enums.ChannelMessageOutboxStatusPending, 0, nil, false}, + } + for i, tc := range cases { + createOutboxRecordForTest(t, db, &models.ChannelMessageOutbox{ + ChannelType: tc.channel, + MessageID: int64(i + 1), + Payload: "{}", + SendStatus: string(tc.status), + RetryCount: tc.retryCount, + NextRetryAt: tc.nextAt, + }) + } + + items := ChannelMessageOutboxService.ListPending(enums.ChannelTypeWxWorkKF, 20) + included := make(map[int64]bool, len(items)) + for _, item := range items { + included[item.MessageID] = true + } + var mismatches []string + for i, tc := range cases { + messageID := int64(i + 1) + if included[messageID] != tc.expected { + mismatches = append(mismatches, + "case "+tc.name+": 期望 included="+boolText(tc.expected)+", 实际 included="+boolText(included[messageID])) + } + } + if len(mismatches) > 0 { + t.Fatalf("ListPending 资格判定不符合预期:\n%s", strings.Join(mismatches, "\n")) + } +} + +func boolText(v bool) string { + if v { + return "true" + } + return "false" +} + +// TestTelegramDispatchSkipsBackoffBatch 回归守卫：整批记录都处于退避窗口时投递必须零进度终止， +// 而不是把 skip 当作成功导致外层 drain 循环空转。 +func TestTelegramDispatchSkipsBackoffBatch(t *testing.T) { + db := setupChannelMessageOutboxTestDB(t) + future := time.Now().Add(time.Hour) + for i := 1; i <= 3; i++ { + nextAt := future + createOutboxRecordForTest(t, db, &models.ChannelMessageOutbox{ + ChannelType: enums.ChannelTypeTelegram, + MessageID: int64(i), + Payload: "{}", + SendStatus: string(enums.ChannelMessageOutboxStatusFailed), + RetryCount: 1, + NextRetryAt: &nextAt, + }) + } + + if got := TelegramOutboundService.doDispatchPendingOutbox(20); got != 0 { + t.Fatalf("全退避批次应零进度终止, got %d", got) + } +} + +// TestWxWorkExhaustedOutboxNotAutoRetried 回归守卫：达到最大重试次数的记录不参与自动投递， +// 状态与重试次数保持不变，等待管理端人工处置。 +func TestWxWorkExhaustedOutboxNotAutoRetried(t *testing.T) { + db := setupChannelMessageOutboxTestDB(t) + enableWxWorkForTest(t) + createOutboxRecordForTest(t, db, &models.ChannelMessageOutbox{ + ChannelType: enums.ChannelTypeWxWorkKF, + MessageID: 1, + Payload: "{}", + SendStatus: string(enums.ChannelMessageOutboxStatusFailed), + RetryCount: wxWorkKFOutboxMaxRetry, + }) + + if got := WxWorkKFOutboundService.doDispatchPendingOutbox(20); got != 0 { + t.Fatalf("达上限记录不应被自动重试, got %d", got) + } + item := repositories.ChannelMessageOutboxRepository.Get(db, 1) + if item == nil { + t.Fatal("outbox record not found") + } + if item.SendStatus != string(enums.ChannelMessageOutboxStatusFailed) || item.RetryCount != wxWorkKFOutboxMaxRetry { + t.Fatalf("达上限记录应保持 failed 且重试次数不变, got status=%s retryCount=%d", item.SendStatus, item.RetryCount) + } +} + +// enableWxWorkForTest 在测试期间启用 wxwork（doDispatchPendingOutbox 有 Enabled 门），结束后复位。 +func enableWxWorkForTest(t *testing.T) { + t.Helper() + config.SetCurrent(&config.Config{ + WxWork: config.WxWorkConfig{ + Enabled: true, + CorpID: "corp-test", + CorpSecret: "secret-test", + }, + }) + wxwork.Init() + t.Cleanup(func() { + config.SetCurrent(&config.Config{}) + wxwork.Init() + }) +} + +// TestRetryWxWorkFailureRevivesExhaustedRecord 校验人工重试可以把达上限记录复活为 pending。 +func TestRetryWxWorkFailureRevivesExhaustedRecord(t *testing.T) { + db := setupChannelMessageOutboxTestDB(t) + createOutboxRecordForTest(t, db, &models.ChannelMessageOutbox{ + ChannelType: enums.ChannelTypeWxWorkKF, + MessageID: 1, + Payload: "{}", + SendStatus: string(enums.ChannelMessageOutboxStatusFailed), + RetryCount: wxWorkKFOutboxMaxRetry, + }) + + if err := ChannelMessageOutboxService.RetryWxWorkFailure(1, &dto.AuthPrincipal{}); err != nil { + t.Fatalf("retry error = %v", err) + } + + items := ChannelMessageOutboxService.ListPending(enums.ChannelTypeWxWorkKF, 20) + if len(items) != 1 { + t.Fatalf("人工重试后应重新可投递, got %d", len(items)) + } + if items[0].SendStatus != string(enums.ChannelMessageOutboxStatusPending) { + t.Fatalf("人工重试后状态应为 pending, got %s", items[0].SendStatus) + } +} diff --git a/internal/services/channel_service.go b/internal/services/channel_service.go index 6a5399fc..452e9c53 100644 --- a/internal/services/channel_service.go +++ b/internal/services/channel_service.go @@ -465,6 +465,9 @@ func (s *channelService) buildChannelModel(id int64, req request.CreateChannelRe if req.AIAgentRolloutPercent < 1 || req.AIAgentRolloutPercent > 100 { return nil, errorsx.InvalidParam("channel ai agent rollout percent must be between 1 and 100") } + if req.AIReplyTimeoutSeconds < 0 || req.AIReplyTimeoutSeconds > models.MaxAIReplyTimeoutSeconds { + return nil, errorsx.InvalidParamI18n("error.e0348") + } aiAgent := AIAgentService.Get(req.AIAgentID) if aiAgent == nil || aiAgent.Status != enums.StatusOk { return nil, errorsx.InvalidParamI18n("error.e0004") @@ -603,6 +606,9 @@ func (s *channelService) buildChannelModel(id int64, req request.CreateChannelRe ChannelID: channelID, AIAgentID: req.AIAgentID, AIAgentRolloutPercent: req.AIAgentRolloutPercent, + AIReplyPlaceholder: strings.TrimSpace(req.AIReplyPlaceholder), + AIReplyTimeoutSeconds: req.AIReplyTimeoutSeconds, + AIReplyTimeoutNotice: strings.TrimSpace(req.AIReplyTimeoutNotice), Name: name, ConfigJSON: configJSON, Status: status, diff --git a/internal/services/cronx/cron.go b/internal/services/cronx/cron.go index 52ab00e2..d47d6cf3 100644 --- a/internal/services/cronx/cron.go +++ b/internal/services/cronx/cron.go @@ -4,12 +4,18 @@ import ( "agent-desk/internal/services" "fmt" "log/slog" + "time" "github.com/robfig/cron/v3" ) func Init() { - c := cron.New() + // Recover：任务 panic 不拖垮整个 cron； + // SkipIfStillRunning：上一轮未结束前跳过本轮触发，避免任务慢于间隔时 goroutine 无限堆积。 + c := cron.New(cron.WithChain( + cron.Recover(cron.DefaultLogger), + cron.SkipIfStillRunning(cron.DefaultLogger), + )) addFunc(c, "0 4 ? * *", func() { fmt.Println("cron test") @@ -36,6 +42,15 @@ func Init() { } }) + // 每天凌晨 3 点清理一个月以前的系统日志。 + addFunc(c, "0 3 * * *", func() { + before := time.Now().AddDate(0, -1, 0) + deleted := services.SystemLogService.DeleteOlderThan(before) + if deleted > 0 { + slog.Info("system log cleanup completed", "deleted", deleted, "before", before.Format(time.DateTime)) + } + }) + c.Start() } diff --git a/internal/services/customer_service.go b/internal/services/customer_service.go index 14d8fa4a..e4b838c5 100644 --- a/internal/services/customer_service.go +++ b/internal/services/customer_service.go @@ -4,6 +4,9 @@ import ( "crypto/md5" "encoding/hex" "log/slog" + "strconv" + "strings" + "time" "agent-desk/internal/models" "agent-desk/internal/pkg/dto" @@ -13,8 +16,6 @@ import ( "agent-desk/internal/pkg/openidentity" "agent-desk/internal/pkg/utils" "agent-desk/internal/repositories" - "strings" - "time" "agent-desk/internal/pkg/httpx/params" @@ -124,11 +125,18 @@ func (s *customerService) EnsureExternalCustomer(ctx *sqls.TxContext, externalUs return 0, errorsx.UnauthorizedI18n("error.e0149") } now := time.Now() + localUserID, localUserEmail := supportUserProfileFromExternalUser(externalUser) if identity := repositories.CustomerIdentityRepository.GetBy(ctx.Tx, externalSource, externalID); identity != nil { updates := map[string]any{ "last_active_at": now, "updated_at": now, } + if localUserID > 0 { + updates["user_id"] = localUserID + } + if localUserEmail != "" { + updates["primary_email"] = localUserEmail + } if strs.IsNotBlank(externalUser.ExternalName) { updates["name"] = externalUser.ExternalName } @@ -151,8 +159,10 @@ func (s *customerService) EnsureExternalCustomer(ctx *sqls.TxContext, externalUs } customer := &models.Customer{ + UserID: localUserID, Name: buildExternalCustomerName(externalUser), LastActiveAt: &now, + PrimaryEmail: localUserEmail, Status: enums.StatusOk, AuditFields: utils.BuildAuditFields(nil), } @@ -171,6 +181,25 @@ func (s *customerService) EnsureExternalCustomer(ctx *sqls.TxContext, externalUs return customer.ID, nil } +func supportUserProfileFromExternalUser(externalUser openidentity.ExternalUser) (int64, string) { + if externalUser.ExternalSource != enums.ExternalSourceUser { + return 0, "" + } + userID, err := strconv.ParseInt(strings.TrimSpace(externalUser.ExternalID), 10, 64) + if err != nil || userID <= 0 { + return 0, "" + } + user := UserService.Get(userID) + if user == nil || user.Status != enums.StatusOk { + return 0, "" + } + email := "" + if user.Email != nil { + email = strings.TrimSpace(*user.Email) + } + return user.ID, email +} + func buildExternalCustomerName(externalUser openidentity.ExternalUser) string { if strs.IsNotBlank(externalUser.ExternalName) { return externalUser.ExternalName diff --git a/internal/services/customer_service_test.go b/internal/services/customer_service_test.go index b23349cb..6cf80b8e 100644 --- a/internal/services/customer_service_test.go +++ b/internal/services/customer_service_test.go @@ -1,6 +1,7 @@ package services_test import ( + "strconv" "testing" "time" @@ -21,7 +22,7 @@ func TestEnsureExternalCustomerUpdatesNameFromExternalIdentity(t *testing.T) { var firstID int64 if err := sqls.WithTransaction(func(ctx *sqls.TxContext) error { id, err := services.CustomerService.EnsureExternalCustomer(ctx, openidentity.ExternalUser{ - ExternalSource: enums.ExternalSourceUser, + ExternalSource: enums.ExternalSourceExternal, ExternalID: "user-1", ExternalName: "张三", }) @@ -44,7 +45,7 @@ func TestEnsureExternalCustomerUpdatesNameFromExternalIdentity(t *testing.T) { var secondID int64 if err := sqls.WithTransaction(func(ctx *sqls.TxContext) error { id, err := services.CustomerService.EnsureExternalCustomer(ctx, openidentity.ExternalUser{ - ExternalSource: enums.ExternalSourceUser, + ExternalSource: enums.ExternalSourceExternal, ExternalID: "user-1", ExternalName: "李四", }) @@ -74,6 +75,47 @@ func TestEnsureExternalCustomerUpdatesNameFromExternalIdentity(t *testing.T) { } } +func TestEnsureExternalCustomerLinksSupportUserProfile(t *testing.T) { + db := setupCustomerServiceTestDB(t) + email := "support-user@example.com" + user := models.User{ + Username: "support-user", + Nickname: "支持中心用户", + Email: &email, + Status: enums.StatusOk, + } + if err := db.Create(&user).Error; err != nil { + t.Fatalf("create user: %v", err) + } + + var customerID int64 + if err := sqls.WithTransaction(func(ctx *sqls.TxContext) error { + id, err := services.CustomerService.EnsureExternalCustomer(ctx, openidentity.ExternalUser{ + ExternalSource: enums.ExternalSourceUser, + ExternalID: strconv.FormatInt(user.ID, 10), + ExternalName: "支持中心用户", + }) + customerID = id + return err + }); err != nil { + t.Fatalf("EnsureExternalCustomer() error = %v", err) + } + + customer := services.CustomerService.Get(customerID) + if customer == nil { + t.Fatal("customer not found") + } + if customer.UserID != user.ID { + t.Fatalf("customer.UserID = %d, want %d", customer.UserID, user.ID) + } + if customer.Name != "支持中心用户" { + t.Fatalf("customer.Name = %q", customer.Name) + } + if customer.PrimaryEmail != email { + t.Fatalf("customer.PrimaryEmail = %q, want %q", customer.PrimaryEmail, email) + } +} + func setupCustomerServiceTestDB(t *testing.T) *gorm.DB { t.Helper() @@ -92,7 +134,7 @@ func setupCustomerServiceTestDB(t *testing.T) *gorm.DB { _ = sqlDB.Close() } }) - if err := db.AutoMigrate(&models.Customer{}, &models.CustomerIdentity{}, &models.Conversation{}); err != nil { + if err := db.AutoMigrate(&models.User{}, &models.Customer{}, &models.CustomerIdentity{}, &models.Conversation{}); err != nil { t.Fatalf("auto migrate error = %v", err) } sqls.SetDB(db) diff --git a/internal/services/customer_session_service.go b/internal/services/customer_session_service.go index 1bd4dc9a..9ed6657e 100644 --- a/internal/services/customer_session_service.go +++ b/internal/services/customer_session_service.go @@ -2,6 +2,7 @@ package services import ( "errors" + "strconv" "strings" "time" @@ -24,6 +25,7 @@ const ( customerSessionTokenType = "customer_session" customerSessionHeader = "X-Customer-Session-Token" customerSessionExpHeader = "X-Customer-Session-Expires-At" + supportUserTokenTTL = 10 * time.Minute ) var CustomerSessionService = newCustomerSessionService() @@ -86,6 +88,39 @@ func (s *customerSessionService) Exchange(channel *models.Channel, externalUser }, nil } +func (s *customerSessionService) SignSupportUserToken(channel *models.Channel, user *models.User) (*response.SupportAICustomerServiceUserTokenResponse, error) { + if channel == nil || channel.Status != enums.StatusOk || channel.ChannelType != enums.ChannelTypeWeb { + return nil, errorsx.InvalidParamI18n("error.e0209") + } + if user == nil || user.Status != enums.StatusOk { + return nil, errorsx.UnauthorizedI18n("error.e0256") + } + secret := strings.TrimSpace(config.Current().CustomerSession.Secret) + if strings.TrimSpace(secret) == "" { + return nil, errorsx.BusinessErrorI18n(1, "error.customerSession.secretMissing") + } + now := time.Now() + expiresAt := now.Add(supportUserTokenTTL) + name := strings.TrimSpace(user.Nickname) + if name == "" { + name = strings.TrimSpace(user.Username) + } + token, err := jwt.NewWithClaims(jwt.SigningMethodHS256, jwt.MapClaims{ + "typ": openidentity.SupportUserTokenType, + "userId": strconv.FormatInt(user.ID, 10), + "name": name, + "iat": now.Unix(), + "exp": expiresAt.Unix(), + }).SignedString([]byte(secret)) + if err != nil { + return nil, err + } + return &response.SupportAICustomerServiceUserTokenResponse{ + UserToken: token, + ExpiresAt: expiresAt.Format(time.DateTime), + }, nil +} + func (s *customerSessionService) Sign(channel *models.Channel, customer *models.Customer, externalUser openidentity.ExternalUser) (string, time.Time, error) { cfg := config.Current().CustomerSession secret := strings.TrimSpace(cfg.Secret) @@ -206,6 +241,8 @@ func (s *customerSessionService) externalUserFromClaims(claims *customerSessionC switch parts[0] { case "user": source = enums.ExternalSourceUser + case "external": + source = enums.ExternalSourceExternal case "guest": source = enums.ExternalSourceGuest default: @@ -235,6 +272,8 @@ func (s *customerSessionService) identityKey(externalUser openidentity.ExternalU switch externalUser.ExternalSource { case enums.ExternalSourceUser: return "user:" + strings.TrimSpace(externalUser.ExternalID) + case enums.ExternalSourceExternal: + return "external:" + strings.TrimSpace(externalUser.ExternalID) default: return "guest:" + strings.TrimSpace(externalUser.ExternalID) } diff --git a/internal/services/knowledge_document_service.go b/internal/services/knowledge_document_service.go index 0e700473..1db89870 100644 --- a/internal/services/knowledge_document_service.go +++ b/internal/services/knowledge_document_service.go @@ -237,6 +237,31 @@ func (s *knowledgeDocumentService) BatchMoveKnowledgeDocuments(req request.Batch return nil } +// BatchBuildKnowledgeDocuments 对所选文档逐个重建索引。 +// 单篇失败不中断整体（失败状态会由 IndexDocumentByID 落库为 failed）， +// 与 BatchMoveKnowledgeDocuments 移动后重建索引的处理保持一致。 +func (s *knowledgeDocumentService) BatchBuildKnowledgeDocuments(req request.BatchBuildKnowledgeDocumentRequest, operator *dto.AuthPrincipal) error { + if operator == nil { + return errorsx.UnauthorizedI18n("error.auth.expired") + } + ids := uniquePositiveIDs(req.IDs) + if len(ids) == 0 { + return errorsx.InvalidParamI18n("error.e0331") + } + for _, id := range ids { + current := s.Get(id) + if current == nil || current.Status == enums.StatusDeleted { + return errorsx.InvalidParamI18n("error.e0218") + } + } + for _, id := range ids { + if err := rag.Index.IndexDocumentByID(context.Background(), id); err != nil { + slog.Error("failed to batch rebuild knowledge document index", "document_id", id, "error", err) + } + } + return nil +} + func (s *knowledgeDocumentService) BatchDeleteKnowledgeDocuments(req request.BatchDeleteKnowledgeDocumentRequest) error { ids := uniquePositiveIDs(req.IDs) if len(ids) == 0 { diff --git a/internal/services/message_service_test.go b/internal/services/message_service_test.go index 222e636e..897a5e42 100644 --- a/internal/services/message_service_test.go +++ b/internal/services/message_service_test.go @@ -100,7 +100,7 @@ func createWelcomeTestAIAgent(t *testing.T, db *gorm.DB, welcomeMessage string) func welcomeTestExternalUser(id string) openidentity.ExternalUser { return openidentity.ExternalUser{ - ExternalSource: enums.ExternalSourceUser, + ExternalSource: enums.ExternalSourceExternal, ExternalID: id, ExternalName: "访客" + id, } diff --git a/internal/services/support_service.go b/internal/services/support_service.go index 170495d9..5f691609 100644 --- a/internal/services/support_service.go +++ b/internal/services/support_service.go @@ -36,6 +36,60 @@ type CommentListResult struct { Paging *sqls.Paging } +// CommunityResponseData contains the shared, batch-loaded relations needed by +// community response builders. It keeps handlers and builders free of per-row +// repository lookups. +type CommunityResponseData struct { + Users map[int64]*models.User + Categories map[int64]*models.Category +} + +func mapKeys(values map[int64]struct{}) []int64 { + keys := make([]int64, 0, len(values)) + for key := range values { + keys = append(keys, key) + } + return keys +} + +func (s *supportService) LoadCommunityResponseData(posts []models.Post, comments []models.Comment, replies map[int64][]models.Comment) CommunityResponseData { + userIDs := make(map[int64]struct{}) + categoryIDs := make(map[int64]struct{}) + for _, post := range posts { + if post.UserID > 0 { + userIDs[post.UserID] = struct{}{} + } + if post.CategoryID > 0 { + categoryIDs[post.CategoryID] = struct{}{} + } + } + collectCommentUserIDs := func(items []models.Comment) { + for _, item := range items { + if item.AuthorID > 0 { + userIDs[item.AuthorID] = struct{}{} + } + } + } + collectCommentUserIDs(comments) + for _, items := range replies { + collectCommentUserIDs(items) + } + + users := repositories.UserRepository.FindSimpleInfoByIDs(sqls.DB(), mapKeys(userIDs)) + categories := repositories.CategoryRepository.FindByIDs(sqls.DB(), mapKeys(categoryIDs)) + data := CommunityResponseData{ + Users: make(map[int64]*models.User, len(users)), + Categories: make(map[int64]*models.Category, len(categories)), + } + for i := range users { + data.Users[users[i].ID] = &users[i] + } + for i := range categories { + data.Categories[categories[i].ID] = &categories[i] + } + return data +} + func (s *supportService) RegisterUser(req request.SupportCustomerRegisterRequest, authCfg config.AuthConfig, clientIP, userAgent string) (*response.LoginResponse, error) { name := strings.TrimSpace(req.Name) email := normalizeSupportEmail(req.Email) @@ -90,6 +144,16 @@ func (s *supportService) RequireSupportUser(ctx *gin.Context) (*dto.AuthPrincipa return principal, nil } +func (s *supportService) OptionalSupportUser(ctx *gin.Context) (*dto.AuthPrincipal, error) { + if principal := s.GetSupportUser(ctx); principal != nil { + return principal, nil + } + if ctx == nil || (strings.TrimSpace(ctx.GetHeader("Authorization")) == "" && strings.TrimSpace(ctx.Query("accessToken")) == "") { + return nil, nil + } + return s.RequireSupportUser(ctx) +} + func (s *supportService) GetSupportUser(ctx *gin.Context) *dto.AuthPrincipal { if ctx == nil { return nil @@ -642,6 +706,13 @@ func (s *supportService) ToggleReaction(targetType enums.ReactionTarget, targetI }) } +func (s *supportService) HasReaction(targetType enums.ReactionTarget, targetID int64, reactionType enums.ReactionType, principal *dto.AuthPrincipal) bool { + if principal == nil || principal.UserID <= 0 { + return false + } + return repositories.ReactionRepository.Get(sqls.DB(), string(targetType), targetID, principal.UserID, string(reactionType)) != nil +} + func (s *supportService) ModeratePost(req request.ModeratePostRequest) error { if repositories.PostRepository.Get(sqls.DB(), req.ID) == nil { return errorsx.InvalidParam("post not found") diff --git a/internal/services/support_service_test.go b/internal/services/support_service_test.go index 9b777baa..cc916d7f 100644 --- a/internal/services/support_service_test.go +++ b/internal/services/support_service_test.go @@ -274,6 +274,21 @@ func TestCommentDiscussionWorkflow(t *testing.T) { if err != nil { t.Fatalf("create post: %v", err) } + if SupportService.HasReaction(enums.ReactionTargetPost, post.ID, enums.ReactionTypeLike, commenter) { + t.Fatal("new post should not be liked by the commenter") + } + if err := SupportService.ToggleReaction(enums.ReactionTargetPost, post.ID, enums.ReactionTypeLike, commenter); err != nil { + t.Fatalf("like post: %v", err) + } + if !SupportService.HasReaction(enums.ReactionTargetPost, post.ID, enums.ReactionTypeLike, commenter) { + t.Fatal("post should be liked by the commenter") + } + if err := SupportService.ToggleReaction(enums.ReactionTargetPost, post.ID, enums.ReactionTypeLike, commenter); err != nil { + t.Fatalf("unlike post: %v", err) + } + if SupportService.HasReaction(enums.ReactionTargetPost, post.ID, enums.ReactionTypeLike, commenter) { + t.Fatal("post should not be liked after toggling again") + } comment, err := SupportService.CreateCustomerComment(request.CreateCommentRequest{ PostID: post.ID, Content: "top level comment", diff --git a/internal/services/system_config_service.go b/internal/services/system_config_service.go index 57f24050..47a0bfcd 100644 --- a/internal/services/system_config_service.go +++ b/internal/services/system_config_service.go @@ -29,8 +29,9 @@ type systemConfigService struct { } const ( - systemConfigGroupSupportCenter = "support" - systemConfigKeySupportNavMenu = "navigationMenu" + systemConfigGroupSupportCenter = "support" + systemConfigKeySupportNavMenu = "navigationMenu" + systemConfigKeySupportAICustomerService = "aiCustomerService" ) type configValidator interface { @@ -89,6 +90,14 @@ var systemConfigDefinitions = map[string]map[string]systemConfigDefinition{ DefaultValue: defaultSupportNavigationMenu(), Validator: supportNavigationMenuValidator{}, }, + systemConfigKeySupportAICustomerService: { + GroupCode: systemConfigGroupSupportCenter, + Key: systemConfigKeySupportAICustomerService, + TitleKey: "systemConfig.support.aiCustomerService.title", + DescriptionKey: "systemConfig.support.aiCustomerService.description", + DefaultValue: defaultSupportAICustomerServiceConfig(), + Validator: supportAICustomerServiceConfigValidator{}, + }, }, } @@ -118,14 +127,24 @@ func (s *systemConfigService) FindPageByCnd(cnd *sqls.Cnd) (list []models.System func (s *systemConfigService) GetPublicSupportConfig() response.PublicSupportConfigResponse { return response.PublicSupportConfigResponse{ - NavigationMenu: s.enabledSupportNavigationMenu(), + NavigationMenu: s.enabledSupportNavigationMenu(), + AICustomerService: s.publicSupportAICustomerServiceConfig(), } } func (s *systemConfigService) GetDashboardSupportConfig() response.DashboardSupportConfigResponse { return response.DashboardSupportConfigResponse{ - NavigationMenu: s.supportNavigationMenu(), + NavigationMenu: s.supportNavigationMenu(), + AICustomerService: s.supportAICustomerServiceConfig(), + } +} + +func (s *systemConfigService) GetPublicSupportAICustomerServiceChannel() *models.Channel { + cfg := s.publicSupportAICustomerServiceConfig() + if !cfg.Enabled || strings.TrimSpace(cfg.ChannelID) == "" { + return nil } + return repositories.ChannelRepository.GetByChannelID(sqls.DB(), cfg.ChannelID) } func (s *systemConfigService) SaveSupportConfig(payload map[string]json.RawMessage, operator *dto.AuthPrincipal) (response.DashboardSupportConfigResponse, error) { @@ -247,6 +266,35 @@ func (s *systemConfigService) supportNavigationMenu() []response.SupportNavigati return sortSupportNavigationMenu(list) } +func (s *systemConfigService) publicSupportAICustomerServiceConfig() response.SupportAICustomerServiceConfigResponse { + cfg := s.supportAICustomerServiceConfig() + if !cfg.Enabled { + return response.SupportAICustomerServiceConfigResponse{} + } + channel := repositories.ChannelRepository.GetByChannelID(sqls.DB(), cfg.ChannelID) + if channel == nil || channel.Status != enums.StatusOk || channel.ChannelType != enums.ChannelTypeWeb { + return response.SupportAICustomerServiceConfigResponse{} + } + aiAgent := repositories.AIAgentRepository.Get(sqls.DB(), channel.AIAgentID) + if aiAgent == nil || aiAgent.Status != enums.StatusOk || aiAgent.PublishedRevisionID <= 0 { + return response.SupportAICustomerServiceConfigResponse{} + } + return cfg +} + +func (s *systemConfigService) supportAICustomerServiceConfig() response.SupportAICustomerServiceConfigResponse { + item := repositories.SystemConfigRepository.FindByGroupAndKey(sqls.DB(), systemConfigGroupSupportCenter, systemConfigKeySupportAICustomerService) + if item == nil || strings.TrimSpace(item.ConfigValue) == "" { + return defaultSupportAICustomerServiceConfig() + } + var cfg response.SupportAICustomerServiceConfigResponse + if err := json.Unmarshal([]byte(item.ConfigValue), &cfg); err != nil { + return defaultSupportAICustomerServiceConfig() + } + cfg.ChannelID = strings.TrimSpace(cfg.ChannelID) + return cfg +} + func sortSupportNavigationMenu(items []response.SupportNavigationMenuItemResponse) []response.SupportNavigationMenuItemResponse { ret := append([]response.SupportNavigationMenuItemResponse(nil), items...) for i := 0; i < len(ret)-1; i++ { diff --git a/internal/services/system_config_support_validator.go b/internal/services/system_config_support_validator.go index 79ebc65c..6c99ae0c 100644 --- a/internal/services/system_config_support_validator.go +++ b/internal/services/system_config_support_validator.go @@ -8,13 +8,18 @@ import ( "agent-desk/internal/pkg/dto/request" "agent-desk/internal/pkg/dto/response" + "agent-desk/internal/pkg/enums" "agent-desk/internal/pkg/i18nx" + "agent-desk/internal/repositories" "github.com/mlogclub/simple/common/strs" + "github.com/mlogclub/simple/sqls" ) type supportNavigationMenuValidator struct{} +type supportAICustomerServiceConfigValidator struct{} + func (supportNavigationMenuValidator) Validate(raw json.RawMessage) (json.RawMessage, []response.ConfigFieldError, error) { var input []request.SupportNavigationMenuItemRequest if err := json.Unmarshal(raw, &input); err != nil { @@ -31,6 +36,53 @@ func (supportNavigationMenuValidator) Validate(raw json.RawMessage) (json.RawMes return normalized, nil, nil } +func (supportAICustomerServiceConfigValidator) Validate(raw json.RawMessage) (json.RawMessage, []response.ConfigFieldError, error) { + var input request.SupportAICustomerServiceConfigRequest + if err := json.Unmarshal(raw, &input); err != nil { + return nil, []response.ConfigFieldError{configFieldError("aiCustomerService", "invalid_json", "error.supportConfig.aiCustomerServiceInvalidJSON")}, nil + } + cfg, fieldErrors := normalizeSupportAICustomerServiceConfig(input) + if len(fieldErrors) > 0 { + return nil, fieldErrors, nil + } + normalized, err := json.Marshal(cfg) + if err != nil { + return nil, nil, err + } + return normalized, nil, nil +} + +func normalizeSupportAICustomerServiceConfig(input request.SupportAICustomerServiceConfigRequest) (response.SupportAICustomerServiceConfigResponse, []response.ConfigFieldError) { + cfg := response.SupportAICustomerServiceConfigResponse{ + Enabled: input.Enabled, + ChannelID: strings.TrimSpace(input.ChannelID), + } + if !cfg.Enabled { + return cfg, nil + } + if cfg.ChannelID == "" { + return cfg, []response.ConfigFieldError{configFieldError("aiCustomerService.channelId", "required", "error.supportConfig.aiCustomerServiceChannelRequired")} + } + channel := repositories.ChannelRepository.GetByChannelID(sqls.DB(), cfg.ChannelID) + if channel == nil || channel.Status == enums.StatusDeleted { + return cfg, []response.ConfigFieldError{configFieldError("aiCustomerService.channelId", "not_found", "error.supportConfig.aiCustomerServiceChannelNotFound")} + } + if channel.ChannelType != enums.ChannelTypeWeb { + return cfg, []response.ConfigFieldError{configFieldError("aiCustomerService.channelId", "type_invalid", "error.supportConfig.aiCustomerServiceChannelTypeInvalid")} + } + if channel.Status != enums.StatusOk { + return cfg, []response.ConfigFieldError{configFieldError("aiCustomerService.channelId", "disabled", "error.supportConfig.aiCustomerServiceChannelDisabled")} + } + aiAgent := repositories.AIAgentRepository.Get(sqls.DB(), channel.AIAgentID) + if aiAgent == nil || aiAgent.Status != enums.StatusOk { + return cfg, []response.ConfigFieldError{configFieldError("aiCustomerService.channelId", "agent_disabled", "error.supportConfig.aiCustomerServiceAgentDisabled")} + } + if aiAgent.PublishedRevisionID <= 0 { + return cfg, []response.ConfigFieldError{configFieldError("aiCustomerService.channelId", "agent_unpublished", "error.supportConfig.aiCustomerServiceAgentUnpublished")} + } + return cfg, nil +} + func normalizeSupportNavigationMenu(input []request.SupportNavigationMenuItemRequest) ([]response.SupportNavigationMenuItemResponse, []response.ConfigFieldError) { if len(input) == 0 { return nil, []response.ConfigFieldError{configFieldError("navigationMenu", "required", "error.supportConfig.navigationRequired")} @@ -168,3 +220,7 @@ func defaultSupportNavigationMenu() []response.SupportNavigationMenuItemResponse {ID: "community", Title: i18nx.Get("systemConfig.support.navigationMenu.default.community"), URL: "/support/community/posts", SortNo: 30, Visible: true}, } } + +func defaultSupportAICustomerServiceConfig() response.SupportAICustomerServiceConfigResponse { + return response.SupportAICustomerServiceConfigResponse{} +} diff --git a/internal/services/system_config_support_validator_test.go b/internal/services/system_config_support_validator_test.go index b56df300..eb076d87 100644 --- a/internal/services/system_config_support_validator_test.go +++ b/internal/services/system_config_support_validator_test.go @@ -3,8 +3,16 @@ package services import ( "encoding/json" "testing" + "time" + "agent-desk/internal/models" + "agent-desk/internal/pkg/config" + "agent-desk/internal/pkg/dto/request" + "agent-desk/internal/pkg/enums" "agent-desk/internal/pkg/i18nx" + "agent-desk/internal/pkg/openidentity" + + "github.com/golang-jwt/jwt/v5" ) func TestSystemConfigValidationErrorLocalizesFieldErrors(t *testing.T) { @@ -28,3 +36,116 @@ func TestSystemConfigValidationErrorLocalizesFieldErrors(t *testing.T) { t.Fatalf("message key = %q", localized[0].MessageKey) } } + +func TestSupportAICustomerServiceConfigValidatesWebChannel(t *testing.T) { + db := setupChannelServiceTestDB(t) + if err := db.AutoMigrate(&models.SystemConfig{}); err != nil { + t.Fatalf("migrate system config: %v", err) + } + agent := createChannelServiceTestAgent(t, db, 1001) + channel, err := ChannelService.CreateChannel(request.CreateChannelRequest{ + ChannelType: enums.ChannelTypeWeb, + AIAgentID: agent.ID, + Name: "支持中心 AI 客服", + Status: int(enums.StatusOk), + }, channelServiceTestOperator()) + if err != nil { + t.Fatalf("create channel: %v", err) + } + + config, err := SystemConfigService.SaveSupportConfig(map[string]json.RawMessage{ + systemConfigKeySupportAICustomerService: json.RawMessage(`{"enabled":true,"channelId":"` + channel.ChannelID + `"}`), + }, channelServiceTestOperator()) + if err != nil { + t.Fatalf("SaveSupportConfig() error = %v", err) + } + if !config.AICustomerService.Enabled || config.AICustomerService.ChannelID != channel.ChannelID { + t.Fatalf("unexpected dashboard config: %#v", config.AICustomerService) + } + publicConfig := SystemConfigService.GetPublicSupportConfig() + if !publicConfig.AICustomerService.Enabled || publicConfig.AICustomerService.ChannelID != channel.ChannelID { + t.Fatalf("unexpected public config: %#v", publicConfig.AICustomerService) + } +} + +func TestPublicSupportAICustomerServiceHidesDisabledChannel(t *testing.T) { + db := setupChannelServiceTestDB(t) + if err := db.AutoMigrate(&models.SystemConfig{}); err != nil { + t.Fatalf("migrate system config: %v", err) + } + agent := createChannelServiceTestAgent(t, db, 1001) + channel, err := ChannelService.CreateChannel(request.CreateChannelRequest{ + ChannelType: enums.ChannelTypeWeb, + AIAgentID: agent.ID, + Name: "支持中心 AI 客服", + Status: int(enums.StatusOk), + }, channelServiceTestOperator()) + if err != nil { + t.Fatalf("create channel: %v", err) + } + if _, err := SystemConfigService.SaveSupportConfig(map[string]json.RawMessage{ + systemConfigKeySupportAICustomerService: json.RawMessage(`{"enabled":true,"channelId":"` + channel.ChannelID + `"}`), + }, channelServiceTestOperator()); err != nil { + t.Fatalf("SaveSupportConfig() error = %v", err) + } + if err := ChannelService.UpdateStatus(channel.ID, int(enums.StatusDisabled), channelServiceTestOperator()); err != nil { + t.Fatalf("disable channel: %v", err) + } + + publicConfig := SystemConfigService.GetPublicSupportConfig() + if publicConfig.AICustomerService.Enabled || publicConfig.AICustomerService.ChannelID != "" { + t.Fatalf("disabled channel should be hidden from public config: %#v", publicConfig.AICustomerService) + } +} + +func TestSupportAICustomerServiceConfigAllowsDisabledConfigWithStaleChannel(t *testing.T) { + _, fieldErrors, err := supportAICustomerServiceConfigValidator{}.Validate(json.RawMessage(`{"enabled":false,"channelId":"stale"}`)) + if err != nil { + t.Fatalf("Validate() error = %v", err) + } + if len(fieldErrors) != 0 { + t.Fatalf("disabled config should not validate stale channel: %#v", fieldErrors) + } +} + +func TestSignSupportUserTokenUsesInternalUserSource(t *testing.T) { + db := setupChannelServiceTestDB(t) + config.SetCurrent(&config.Config{ + CustomerSession: config.CustomerSessionConfig{Secret: "customer-session-secret"}, + }) + agent := createChannelServiceTestAgent(t, db, 1001) + channel, err := ChannelService.CreateChannel(request.CreateChannelRequest{ + ChannelType: enums.ChannelTypeWeb, + AIAgentID: agent.ID, + Name: "支持中心 AI 客服", + Status: int(enums.StatusOk), + }, channelServiceTestOperator()) + if err != nil { + t.Fatalf("create channel: %v", err) + } + user := &models.User{ID: 88, Username: "support-user", Nickname: "支持中心用户", Status: enums.StatusOk} + + result, err := CustomerSessionService.SignSupportUserToken(channel, user) + if err != nil { + t.Fatalf("SignSupportUserToken() error = %v", err) + } + claims := jwt.MapClaims{} + token, err := jwt.ParseWithClaims(result.UserToken, claims, func(token *jwt.Token) (any, error) { + return []byte(config.Current().CustomerSession.Secret), nil + }, jwt.WithExpirationRequired()) + if err != nil || token == nil || !token.Valid { + t.Fatalf("parse signed token: token=%#v err=%v", token, err) + } + if claims["typ"] != openidentity.SupportUserTokenType { + t.Fatalf("typ claim = %#v", claims["typ"]) + } + if claims["userId"] != "88" { + t.Fatalf("userId claim = %#v", claims["userId"]) + } + if claims["name"] != "支持中心用户" { + t.Fatalf("name claim = %#v", claims["name"]) + } + if expiresAt, err := time.Parse(time.DateTime, result.ExpiresAt); err != nil || time.Until(expiresAt) <= 0 { + t.Fatalf("invalid expiresAt %q: %v", result.ExpiresAt, err) + } +} diff --git a/internal/services/system_log_service.go b/internal/services/system_log_service.go new file mode 100644 index 00000000..aec8c0a6 --- /dev/null +++ b/internal/services/system_log_service.go @@ -0,0 +1,32 @@ +package services + +import ( + "time" + + "agent-desk/internal/models" + "agent-desk/internal/repositories" + + "github.com/mlogclub/simple/sqls" +) + +var SystemLogService = newSystemLogService() + +func newSystemLogService() *systemLogService { + return &systemLogService{} +} + +type systemLogService struct { +} + +func (s *systemLogService) Get(id int64) *models.SystemLog { + return repositories.SystemLogRepository.Get(sqls.DB(), id) +} + +func (s *systemLogService) FindPageByCnd(cnd *sqls.Cnd) (list []models.SystemLog, paging *sqls.Paging) { + return repositories.SystemLogRepository.FindPageByCnd(sqls.DB(), cnd) +} + +// DeleteOlderThan 清理指定时间之前的日志，返回受影响行数。用于 cron 定时清理。 +func (s *systemLogService) DeleteOlderThan(before time.Time) int64 { + return repositories.SystemLogRepository.DeleteOlderThan(sqls.DB(), before) +} diff --git a/internal/services/ws_realtime_types.go b/internal/services/ws_realtime_types.go index 14813840..7d2cd371 100644 --- a/internal/services/ws_realtime_types.go +++ b/internal/services/ws_realtime_types.go @@ -164,6 +164,19 @@ func (e RealtimeMessageCreatedEvent) EventPayload() RealtimeEventPayload { return e.Payload } +// RealtimeMessageUpdatedEvent 通知客户端某条消息内容已被更新（如 AI 占位回复被正式回复替换）。 +type RealtimeMessageUpdatedEvent struct { + Payload RealtimeMessageCreatedPayload +} + +func (e RealtimeMessageUpdatedEvent) EventType() string { + return enums.IMRealtimeEventMessageUpdated +} + +func (e RealtimeMessageUpdatedEvent) EventPayload() RealtimeEventPayload { + return e.Payload +} + type RealtimeMessageRecalledPayload struct { ConversationID int64 `json:"conversationId,omitempty"` MessageID int64 `json:"messageId,omitempty"` diff --git a/internal/services/ws_service.go b/internal/services/ws_service.go index 2f37acc2..7067b294 100644 --- a/internal/services/ws_service.go +++ b/internal/services/ws_service.go @@ -318,6 +318,32 @@ func (s *wsService) PublishMessageCreated(conversation *models.Conversation, mes s.PublishToTopics(s.routeConversationTopics(conversation), event) } +func (s *wsService) PublishMessageUpdated(conversation *models.Conversation, message *models.Message) { + if conversation == nil || message == nil { + return + } + content, payload := utils.BuildRenderableMessage(message) + + event := s.newEvent(s.conversationTopic(conversation.ID), RealtimeMessageUpdatedEvent{ + Payload: RealtimeMessageCreatedPayload{ + ConversationID: conversation.ID, + MessageID: message.ID, + RequestID: message.RequestID, + Message: s.buildRealtimeMessage(message), + Status: conversation.Status, + CurrentAssigneeID: conversation.CurrentAssigneeID, + SenderType: message.SenderType, + SenderID: message.SenderID, + MessageType: message.MessageType, + Content: content, + Payload: payload, + SendStatus: message.SendStatus, + SentAt: formatWsTime(message.SentAt), + }, + }) + s.PublishToTopics(s.routeConversationTopics(conversation), event) +} + func (s *wsService) buildRealtimeMessage(item *models.Message) response.MessageResponse { if item == nil { return response.MessageResponse{} @@ -364,7 +390,7 @@ func (s *wsService) fillRealtimeMessageSender(ret *response.MessageResponse, ite if displayName := strings.TrimSpace(profile.DisplayName); displayName != "" { ret.SenderName = displayName } - if avatar := strings.TrimSpace(profile.Avatar); avatar != "" { + if avatar := profile.AgentAvatar(); avatar != "" { ret.SenderAvatar = avatar } } diff --git a/internal/services/wxwork_kf_message_read_test_service.go b/internal/services/wxwork_kf_message_read_test_service.go new file mode 100644 index 00000000..993b63fa --- /dev/null +++ b/internal/services/wxwork_kf_message_read_test_service.go @@ -0,0 +1,332 @@ +package services + +import ( + "bytes" + "context" + "encoding/json" + "fmt" + "io" + "log/slog" + "net/http" + "net/url" + "strconv" + "strings" + "time" + + "agent-desk/internal/pkg/config" + "agent-desk/internal/pkg/dto/response" + "agent-desk/internal/pkg/enums" + "agent-desk/internal/pkg/utils" +) + +// 企业微信客服“测试读取消息”相关常量。 +// 说明：silenceper/wechat SDK 的 SyncMsg 在 errcode!=0 时只返回 errmsg 文本、丢失 errcode， +// 无法按错误码给出排查建议，因此该测试直接调用官方 API 并自行解析 errcode。 +const ( + wxWorkGetTokenURLTemplate = "https://qyapi.weixin.qq.com/cgi-bin/gettoken?corpid=%s&corpsecret=%s" + wxWorkSyncMsgURLTemplate = "https://qyapi.weixin.qq.com/cgi-bin/kf/sync_msg?access_token=%s" + + wxWorkReadTestStageGetToken = "gettoken" + wxWorkReadTestStageSyncMsg = "syncmsg" + + // 本地错误码（非企业微信返回），前端按这些码做本地化排查建议。 + wxWorkReadTestErrInvalidChannel = "INVALID_CHANNEL" + wxWorkReadTestErrOpenKFMissing = "OPENKFID_MISSING" + wxWorkReadTestErrConfigJSON = "INVALID_CONFIG_JSON" + wxWorkReadTestErrDisabled = "WXWORK_DISABLED" + wxWorkReadTestErrNetwork = "NETWORK_ERROR" + wxWorkReadTestErrBadResponse = "BAD_RESPONSE" + + wxWorkReadTestSyncLimit uint64 = 1000 // 单次 sync_msg 拉取条数（官方最大值） + wxWorkReadTestMaxPages = 5 // 最多翻页次数，限制测试请求耗时 + wxWorkReadTestSampleSize = 20 // 返回最近样例条数 + wxWorkReadTestMaxPreviewRunes = 500 // 文本样例最大字符数 + wxWorkReadTestHTTPTimeout = 10 * time.Second +) + +var wxWorkReadTestHTTPClient = &http.Client{Timeout: wxWorkReadTestHTTPTimeout} + +type wxWorkReadTestTokenResponse struct { + ErrCode int64 `json:"errcode"` + ErrMsg string `json:"errmsg"` + AccessToken string `json:"access_token"` + ExpiresIn int `json:"expires_in"` +} + +type wxWorkReadTestSyncRequest struct { + Cursor string `json:"cursor"` + Limit uint64 `json:"limit"` + OpenKfID string `json:"open_kfid"` +} + +type wxWorkReadTestSyncResponse struct { + ErrCode int64 `json:"errcode"` + ErrMsg string `json:"errmsg"` + NextCursor string `json:"next_cursor"` + HasMore uint32 `json:"has_more"` + MsgList []map[string]any `json:"msg_list"` +} + +// TestWxWorkKFReadMessages 对指定企微客服渠道执行只读消息拉取测试： +// 使用空游标从企业微信拉取该客服账号最近保留期（3 天）内的消息与事件， +// 不消费消息、不创建会话、不更新同步游标。返回结构化结果供前端展示与错误码排查。 +func (s *channelService) TestWxWorkKFReadMessages(channelID int64) (*response.WxWorkKFMessageReadTestResult, error) { + channel := s.Get(channelID) + if channel == nil || channel.Status == enums.StatusDeleted || channel.ChannelType != enums.ChannelTypeWxWorkKF { + return s.failReadTestResult("", wxWorkReadTestErrInvalidChannel, ""), nil + } + + openKfID := "" + if cfg, err := s.ParseWxWorkKFChannelConfig(channel.ConfigJSON); err != nil { + return s.failReadTestResult("", wxWorkReadTestErrConfigJSON, err.Error()), nil + } else if cfg != nil { + openKfID = cfg.OpenKfID + } + if openKfID == "" { + return s.failReadTestResult("", wxWorkReadTestErrOpenKFMissing, ""), nil + } + + wxConfig := config.Current().WxWork + corpID := strings.TrimSpace(wxConfig.CorpID) + corpSecret := strings.TrimSpace(wxConfig.CorpSecret) + if !wxConfig.Enabled || corpID == "" || corpSecret == "" { + return s.failReadTestResult("", wxWorkReadTestErrDisabled, ""), nil + } + + // 1. 获取 access_token（独立调用，不接触 SDK 令牌缓存；人工测试频率低，可接受） + accessToken, result := s.fetchReadTestAccessToken(corpID, corpSecret) + if result != nil { + return result, nil + } + + // 2. 从空游标开始分页拉取（空游标返回保留期内最早的消息，按时间升序） + scanned := make([]map[string]any, 0) + cursor := "" + truncated := false + for page := 0; page < wxWorkReadTestMaxPages; page++ { + resp, err := s.callReadTestSyncMsg(accessToken, openKfID, cursor) + if err != nil { + slog.Warn("wxwork kf read test sync_msg failed", + "channel_id", channelID, + "open_kfid", openKfID, + "error", err, + ) + return s.failReadTestResult(wxWorkReadTestStageSyncMsg, wxWorkReadTestErrNetwork, err.Error()), nil + } + if resp.ErrCode != 0 { + slog.Warn("wxwork kf read test sync_msg rejected", + "channel_id", channelID, + "open_kfid", openKfID, + "errcode", resp.ErrCode, + "errmsg", resp.ErrMsg, + ) + return s.failReadTestResult(wxWorkReadTestStageSyncMsg, strconv.FormatInt(resp.ErrCode, 10), resp.ErrMsg), nil + } + + scanned = append(scanned, resp.MsgList...) + if resp.HasMore != 1 || strings.TrimSpace(resp.NextCursor) == "" { + truncated = false + break + } + cursor = resp.NextCursor + if page == wxWorkReadTestMaxPages-1 { + truncated = true + } + } + + result2 := s.buildReadTestResult(openKfID, scanned, truncated) + slog.Info("wxwork kf read test succeeded", + "channel_id", channelID, + "open_kfid", openKfID, + "total_scanned", result2.TotalScanned, + "message_count", result2.MessageCount, + "event_count", result2.EventCount, + "truncated", result2.Truncated, + ) + return result2, nil +} + +func (s *channelService) fetchReadTestAccessToken(corpID, corpSecret string) (string, *response.WxWorkKFMessageReadTestResult) { + requestURL := fmt.Sprintf(wxWorkGetTokenURLTemplate, url.QueryEscape(corpID), url.QueryEscape(corpSecret)) + ctx, cancel := context.WithTimeout(context.Background(), wxWorkReadTestHTTPTimeout) + defer cancel() + req, err := http.NewRequestWithContext(ctx, http.MethodGet, requestURL, nil) + if err != nil { + return "", s.failReadTestResult(wxWorkReadTestStageGetToken, wxWorkReadTestErrNetwork, err.Error()) + } + resp, err := wxWorkReadTestHTTPClient.Do(req) + if err != nil { + return "", s.failReadTestResult(wxWorkReadTestStageGetToken, wxWorkReadTestErrNetwork, err.Error()) + } + defer resp.Body.Close() + body, err := io.ReadAll(io.LimitReader(resp.Body, 1<<20)) + if err != nil { + return "", s.failReadTestResult(wxWorkReadTestStageGetToken, wxWorkReadTestErrNetwork, err.Error()) + } + tokenResp := wxWorkReadTestTokenResponse{} + if err := json.Unmarshal(body, &tokenResp); err != nil { + return "", s.failReadTestResult(wxWorkReadTestStageGetToken, wxWorkReadTestErrBadResponse, truncateReadTestText(string(body), 300)) + } + if tokenResp.ErrCode != 0 || strings.TrimSpace(tokenResp.AccessToken) == "" { + code := strconv.FormatInt(tokenResp.ErrCode, 10) + if tokenResp.ErrCode == 0 { + code = wxWorkReadTestErrBadResponse + } + return "", s.failReadTestResult(wxWorkReadTestStageGetToken, code, tokenResp.ErrMsg) + } + return tokenResp.AccessToken, nil +} + +func (s *channelService) callReadTestSyncMsg(accessToken, openKfID, cursor string) (*wxWorkReadTestSyncResponse, error) { + payload, err := json.Marshal(wxWorkReadTestSyncRequest{ + Cursor: cursor, + Limit: wxWorkReadTestSyncLimit, + OpenKfID: openKfID, + }) + if err != nil { + return nil, err + } + ctx, cancel := context.WithTimeout(context.Background(), wxWorkReadTestHTTPTimeout) + defer cancel() + req, err := http.NewRequestWithContext(ctx, http.MethodPost, + fmt.Sprintf(wxWorkSyncMsgURLTemplate, url.QueryEscape(accessToken)), + bytes.NewReader(payload), + ) + if err != nil { + return nil, err + } + req.Header.Set("Content-Type", "application/json; charset=utf-8") + resp, err := wxWorkReadTestHTTPClient.Do(req) + if err != nil { + return nil, err + } + defer resp.Body.Close() + body, err := io.ReadAll(io.LimitReader(resp.Body, 8<<20)) + if err != nil { + return nil, err + } + syncResp := wxWorkReadTestSyncResponse{} + if err := json.Unmarshal(body, &syncResp); err != nil { + return nil, fmt.Errorf("invalid response: %s", truncateReadTestText(string(body), 300)) + } + return &syncResp, nil +} + +// buildReadTestResult 汇总扫描结果并抽取最近若干条样例（新消息在前）。 +func (s *channelService) buildReadTestResult(openKfID string, scanned []map[string]any, truncated bool) *response.WxWorkKFMessageReadTestResult { + result := &response.WxWorkKFMessageReadTestResult{ + Success: true, + OpenKfID: openKfID, + TotalScanned: len(scanned), + Samples: make([]response.WxWorkKFMessageReadSample, 0), + Truncated: truncated, + } + + var earliestUnix, latestUnix int64 + for _, raw := range scanned { + msgType := readTestAsString(raw["msgtype"]) + if msgType == "event" { + result.EventCount++ + } else { + result.MessageCount++ + } + sendTime := readTestAsInt64(raw["send_time"]) + if sendTime > 0 { + if earliestUnix == 0 || sendTime < earliestUnix { + earliestUnix = sendTime + } + if sendTime > latestUnix { + latestUnix = sendTime + } + } + } + if earliestUnix > 0 { + result.EarliestTime = utils.FormatTime(time.Unix(earliestUnix, 0)) + } + if latestUnix > 0 { + result.LatestTime = utils.FormatTime(time.Unix(latestUnix, 0)) + } + + // 接口按时间升序返回，取最后 N 条后反转为新消息在前 + start := len(scanned) - wxWorkReadTestSampleSize + if start < 0 { + start = 0 + } + for i := len(scanned) - 1; i >= start; i-- { + result.Samples = append(result.Samples, buildWxWorkReadSample(scanned[i])) + } + return result +} + +func buildWxWorkReadSample(raw map[string]any) response.WxWorkKFMessageReadSample { + sample := response.WxWorkKFMessageReadSample{ + MsgID: readTestAsString(raw["msgid"]), + Origin: int(readTestAsInt64(raw["origin"])), + MsgType: readTestAsString(raw["msgtype"]), + ExternalUserID: readTestAsString(raw["external_userid"]), + ServicerUserID: readTestAsString(raw["servicer_userid"]), + } + if sendTime := readTestAsInt64(raw["send_time"]); sendTime > 0 { + sample.SendTime = utils.FormatTime(time.Unix(sendTime, 0)) + } + if sample.MsgType == "text" { + if textMap, ok := raw["text"].(map[string]any); ok { + sample.TextContent = truncateReadTestText(strings.TrimSpace(readTestAsString(textMap["content"])), wxWorkReadTestMaxPreviewRunes) + } + } + if sample.MsgType == "event" { + if eventMap, ok := raw["event"].(map[string]any); ok { + sample.EventType = readTestAsString(eventMap["event_type"]) + // 事件消息的客户/客服账号在 event 对象内 + if sample.ExternalUserID == "" { + sample.ExternalUserID = readTestAsString(eventMap["external_userid"]) + } + if sample.ServicerUserID == "" { + sample.ServicerUserID = readTestAsString(eventMap["new_servicer_userid"]) + } + } + } + return sample +} + +func (s *channelService) failReadTestResult(stage, code, message string) *response.WxWorkKFMessageReadTestResult { + return &response.WxWorkKFMessageReadTestResult{ + Success: false, + Stage: stage, + ErrorCode: code, + ErrorMessage: truncateReadTestText(strings.TrimSpace(message), 1000), + Samples: make([]response.WxWorkKFMessageReadSample, 0), + } +} + +func readTestAsString(value any) string { + if value == nil { + return "" + } + if s, ok := value.(string); ok { + return strings.TrimSpace(s) + } + return "" +} + +func readTestAsInt64(value any) int64 { + switch v := value.(type) { + case float64: + return int64(v) + case int64: + return v + case json.Number: + n, _ := v.Int64() + return n + default: + return 0 + } +} + +func truncateReadTestText(value string, maxRunes int) string { + runes := []rune(value) + if len(runes) <= maxRunes { + return value + } + return string(runes[:maxRunes]) + "…" +} diff --git a/web/app/(dashboard)/dashboard/agents/_components/edit.tsx b/web/app/(dashboard)/dashboard/agents/_components/edit.tsx index 7b64494b..3ef5868b 100644 --- a/web/app/(dashboard)/dashboard/agents/_components/edit.tsx +++ b/web/app/(dashboard)/dashboard/agents/_components/edit.tsx @@ -122,7 +122,7 @@ function buildForm(item: AdminAgentProfile | null): EditForm { teamId: String(item.teamId), agentCode: item.agentCode, displayName: item.displayName, - avatar: item.avatar || "", + avatar: item.avatarAssetId || item.avatar || "", serviceStatus: String(item.serviceStatus) as EditForm["serviceStatus"], maxConcurrentCount: String(item.maxConcurrentCount), priorityLevel: String(item.priorityLevel), @@ -208,6 +208,7 @@ function AgentEditDialogBody({ const [users, setUsers] = useState{detail.post.content}
-{item.content}
{item.content}