diff --git a/config/config.yaml b/config/config.yaml index 99cd2b7..37e1d40 100644 --- a/config/config.yaml +++ b/config/config.yaml @@ -5,12 +5,12 @@ server: ollama: base_url: "http://172.17.0.1:11434" - # model: "qwen3:8b" - # generate_model: "qwen3:8b" - # mapping_model: "qwen3:8b" - model: "qwen3-coder:480b-cloud" - generate_model: "qwen3-coder:480b-cloud" - mapping_model: "deepseek-v3.2:cloud" + model: "qwen3:8b" + generate_model: "qwen3:8b" + mapping_model: "qwen3:8b" +# model: "qwen3-coder:480b-cloud" +# generate_model: "qwen3-coder:480b-cloud" +# mapping_model: "deepseek-v3.2:cloud" vl_model: "qwen2.5vl:3b" timeout: "120s" level: "info" diff --git a/internal/biz/do/handle.go b/internal/biz/do/handle.go index 81c70b7..e312d04 100644 --- a/internal/biz/do/handle.go +++ b/internal/biz/do/handle.go @@ -506,7 +506,7 @@ func handleCozeWorkflowEvents(ctx context.Context, resp coze.Stream[coze.Workflo case coze.WorkflowEventTypeMessage: entitys.ResStream(ch, index, event.Message.Content) case coze.WorkflowEventTypeError: - entitys.ResError(ch, index, fmt.Sprintf("工作流执行错误: %s", event.Error)) + entitys.ResError(ch, index, fmt.Sprintf("工作流执行错误: %v", event.Error)) case coze.WorkflowEventTypeDone: entitys.ResEnd(ch, index, "工作流执行完成") case coze.WorkflowEventTypeInterrupt: diff --git a/internal/biz/do/macro.go b/internal/biz/do/macro.go index fe1ffc5..0d99485 100644 --- a/internal/biz/do/macro.go +++ b/internal/biz/do/macro.go @@ -26,6 +26,7 @@ import ( type Macro struct { botGroupImpl *impl.BotGroupImpl + botGroupConfigImpl *impl.BotGroupConfigImpl reportDailyCacheImpl *impl.ReportDailyCacheImpl config *config.Config rdb *utils.Rdb @@ -36,12 +37,14 @@ func NewMacro( reportDailyCacheImpl *impl.ReportDailyCacheImpl, config *config.Config, rdb *utils.Rdb, + botGroupConfigImpl *impl.BotGroupConfigImpl, ) *Macro { return &Macro{ botGroupImpl: botGroupImpl, reportDailyCacheImpl: reportDailyCacheImpl, config: config, rdb: rdb, + botGroupConfigImpl: botGroupConfigImpl, } } @@ -193,7 +196,7 @@ func (m *Macro) ProductModify(ctx context.Context, content string, groupConfig * groupConfig.ProductName = itemInfo cond := builder.NewCond() cond = cond.And(builder.Eq{"config_id": groupConfig.ConfigID}) - err = m.botGroupImpl.UpdateByCond(&cond, groupConfig) + err = m.botGroupConfigImpl.UpdateByCond(&cond, groupConfig) if err != nil { err = fmt.Errorf("修改失败:%v", err) return diff --git a/internal/biz/do/macro_test.go b/internal/biz/do/macro_test.go new file mode 100644 index 0000000..80445be --- /dev/null +++ b/internal/biz/do/macro_test.go @@ -0,0 +1,32 @@ +package do + +import ( + "ai_scheduler/internal/config" + "ai_scheduler/internal/data/impl" + "ai_scheduler/internal/data/model" + + "ai_scheduler/utils" + "context" + "testing" +) + +func Test_report(t *testing.T) { + con := "[利润同比报表]商品修改:官方–优酷周卡,官方–优酷月卡,官方–优酷季卡,官方–优酷年卡,,官方–爱奇艺-月卡,官方–爱奇艺-季卡,官方–爱奇艺-年卡,官方–芒果-PC周卡,官方–芒果-PC月卡,官方–芒果-PC季卡,官方–QQ音乐-绿钻月卡,官方–饿了么超级会员月卡,官方–网易云黑胶vip月卡,官方–喜马拉雅巅峰会员月卡,剪映会员7天卡,剪映会员月卡,剪映会员年卡,剪映SVIP会员7天卡,剪映SVIP会员月卡,剪映SVIP会员年卡" + run() + + chatId, err, i := ma.ProductModify(context.Background(), con, &model.AiBotGroupConfig{ConfigID: 1, ToolList: "8,9,10,11,12,13,16"}) + t.Log(chatId, err, i) +} + +var ma *Macro + +func run() { + configConfig, _ := config.LoadConfigWithTest() + db, _ := utils.NewGormDb(configConfig) + + rdb := utils.NewRdb(configConfig) + reportDailyCacheImpl := impl.NewReportDailyCacheImpl(db) + botGroupImpl := impl.NewBotGroupImpl(db) + botGroupConfigImpl := impl.NewBotGroupConfigImpl(db) + ma = NewMacro(botGroupImpl, reportDailyCacheImpl, configConfig, rdb, botGroupConfigImpl) +} diff --git a/internal/tools/bbxt/bbxt_test.go b/internal/tools/bbxt/bbxt_test.go index 3d0f623..b2e58b1 100644 --- a/internal/tools/bbxt/bbxt_test.go +++ b/internal/tools/bbxt/bbxt_test.go @@ -106,7 +106,7 @@ var ( ) func run() { - configConfig, _ = config.LoadConfigWithTest() + configConfig, _ = config.LoadConfigWithEnv() // 初始化数据库连接 db, _ := utils.NewGormDb(configConfig) reportDailyCacheImpl = impl.NewReportDailyCacheImpl(db)