diff --git a/config/config.yaml b/config/config.yaml index c41dac1..99cd2b7 100644 --- a/config/config.yaml +++ b/config/config.yaml @@ -149,7 +149,7 @@ eino_tools: # == 通用工具 == # 表格转图片 excel2pic: - base_url: "http://excel2pic:8000/api/v1/convert" + base_url: "http://192.168.6.115:8010/api/v1/convert" dingtalk: api_key: "dingsbbntrkeiyazcfdg" diff --git a/internal/biz/group_config.go b/internal/biz/group_config.go index 38cbc01..ca0ccc5 100644 --- a/internal/biz/group_config.go +++ b/internal/biz/group_config.go @@ -103,7 +103,7 @@ func (g *GroupConfigBiz) GetReportLists(ctx context.Context, groupConfig *model. if err != nil || len(rechargeReports) == 0 { return } - reports = append(reports, rechargeReports...) + reports = append(rechargeReports, reports...) return } diff --git a/internal/config/config.go b/internal/config/config.go index 64857a9..6e9a2e6 100644 --- a/internal/config/config.go +++ b/internal/config/config.go @@ -309,7 +309,7 @@ func LoadConfigWithEnv() (*Config, error) { if err != nil { return nil, err } - viper.SetConfigFile(modularDir + "/config/config_env.yaml") + viper.SetConfigFile(modularDir + "/config/config.yaml") viper.SetConfigType("yaml") // 读取配置文件 if err := viper.ReadInConfig(); err != nil { diff --git a/tmpl/excel_temp/kshj_total_ana.xlsx b/tmpl/excel_temp/kshj_total_ana.xlsx index 73cb468..e4e7277 100644 Binary files a/tmpl/excel_temp/kshj_total_ana.xlsx and b/tmpl/excel_temp/kshj_total_ana.xlsx differ