diff --git a/internal/biz/group_config.go b/internal/biz/group_config.go index e8c0d5a..c1e89a1 100644 --- a/internal/biz/group_config.go +++ b/internal/biz/group_config.go @@ -269,8 +269,8 @@ func (g *GroupConfigBiz) handleMatch(ctx context.Context, rec *entitys.Recognize return g.handleReport(ctx, rec, pointTask, groupConfig) case constants.TaskTypeCozeWorkflow: return g.handleCozeWorkflow(ctx, rec, pointTask) - case constants.TaskTypeKnowle: // 知识库V2版本 - return g.handleKnowledgeV2(ctx, rec, groupConfig, callback) + case constants.TaskTypeKnowle: // 知识库lightRAG版本 + return g.handleKnowledge(ctx, rec, groupConfig, callback) default: return g.otherTask(ctx, rec) } @@ -477,7 +477,7 @@ func (g *GroupConfigBiz) GetReportCache(ctx context.Context, day time.Time, tota } // handleKnowledgeV2 处理知识库V2版本 -func (g *GroupConfigBiz) handleKnowledgeV2(ctx context.Context, rec *entitys.Recognize, groupConfig *model.AiBotGroupConfig, callback *chatbot.BotCallbackDataModel) (err error) { +func (g *GroupConfigBiz) handleKnowledge(ctx context.Context, rec *entitys.Recognize, groupConfig *model.AiBotGroupConfig, callback *chatbot.BotCallbackDataModel) (err error) { // 请求知识库工具 knowledgeBase := knowledge_base.New(g.conf.KnowledgeConfig) knowledgeResp, err := knowledgeBase.Query(&knowledge_base.QueryRequest{ @@ -591,13 +591,14 @@ func (g *GroupConfigBiz) shouldCreateIssueHandlingGroup(ctx context.Context, rec } issueOwnerStr := strings.Join(userNames, "、") + // 获取机器人应用配置 botConfig, err := g.botConfigImpl.GetRobotConfig(callback.RobotCode) if err != nil { return fmt.Errorf("获取机器人配置失败,err: %v", err) } // 构建卡片 OutTrackId - outTrackId := constants.BuildCardOutTrackId(callback.ConversationId, botConfig.ClientId) + outTrackId := constants.BuildCardOutTrackId(callback.ConversationId, callback.RobotCode) // 发送钉钉卡片 _, err = g.dingtalkCardClient.CreateAndDeliver(dingtalk.AppKey{ diff --git a/internal/data/constants/dingtalk.go b/internal/data/constants/dingtalk.go index 037737d..6919771 100644 --- a/internal/data/constants/dingtalk.go +++ b/internal/data/constants/dingtalk.go @@ -137,4 +137,4 @@ var GroupTemplateRobotIdMap = map[string]string{ GroupTemplateRobotIdIssueHandling: "ding5wwvnf9hxeyjau7t", } -const CardDebugToolEntryShow string = "show" // 卡片调试工具 [show:展示 hide:隐藏] +const CardDebugToolEntryShow string = "hide" // 卡片调试工具 [show:展示 hide:隐藏] diff --git a/internal/server/ding_talk_bot.go b/internal/server/ding_talk_bot.go index 4453d17..d40fb3f 100644 --- a/internal/server/ding_talk_bot.go +++ b/internal/server/ding_talk_bot.go @@ -35,12 +35,17 @@ func NewDingTalkBotServer( for _, service := range services { serviceConfigs, err := service.GetServiceCfg() for _, serviceConf := range serviceConfigs { + // 配置不全 if serviceConf.ClientId == "" || serviceConf.ClientSecret == "" { continue } + // 非应用主机器人 pass ,防止重复 + if serviceConf.ClientId != serviceConf.BotIndex { + continue + } cli := DingBotServerInit(serviceConf.ClientId, serviceConf.ClientSecret, service) if cli == nil { - log.Info("%s客户端初始失败:%s", serviceConf.BotIndex, err.Error()) + log.Infof("%s客户端初始失败:%s", serviceConf.BotIndex, err.Error()) continue } clients[serviceConf.BotIndex] = cli @@ -53,11 +58,9 @@ func NewDingTalkBotServer( func ProvideAllDingBotServices( dingBotSvc *services.DingBotService, - // dingCardSvc *services.DingtalkCardService, ) []DingBotServiceInterface { return []DingBotServiceInterface{ dingBotSvc, - // dingCardSvc, } } diff --git a/internal/services/dingtalk_card.go b/internal/services/dingtalk_card.go deleted file mode 100644 index f549f37..0000000 --- a/internal/services/dingtalk_card.go +++ /dev/null @@ -1,37 +0,0 @@ -package services - -// 当前不用,后续切钉钉新sdk考虑使用 - -import ( - "ai_scheduler/internal/biz" - "ai_scheduler/internal/config" - "ai_scheduler/internal/entitys" - "context" - - "gitea.cdlsxd.cn/self-tools/l-dingtalk-stream-sdk-go/card" - "gitea.cdlsxd.cn/self-tools/l-dingtalk-stream-sdk-go/chatbot" -) - -type DingtalkCardService struct { - config *config.Config - dingtalkCardBiz *biz.DingTalkBotBiz -} - -func NewDingtalkCardService(config *config.Config, dingtalkCardBiz *biz.DingTalkBotBiz) *DingtalkCardService { - return &DingtalkCardService{ - config: config, - dingtalkCardBiz: dingtalkCardBiz, - } -} - -func (d *DingtalkCardService) GetServiceCfg() (config []entitys.DingTalkBot, err error) { - return -} - -func (d *DingtalkCardService) OnChatBotMessageReceived(ctx context.Context, data *chatbot.BotCallbackDataModel) (content []byte, err error) { - return -} - -func (d *DingtalkCardService) OnCardMessageReceived(ctx context.Context, data *card.CardRequest) (resp *card.CardResponse, err error) { - return -} diff --git a/internal/services/provider_set.go b/internal/services/provider_set.go index 4eac29c..55eed7a 100644 --- a/internal/services/provider_set.go +++ b/internal/services/provider_set.go @@ -15,5 +15,4 @@ var ProviderSetServices = wire.NewSet( NewHistoryService, NewCapabilityService, NewCronService, - // NewDingtalkCardService, )