From 229d3585ba55356e7e2945559a75cf31c4647b43 Mon Sep 17 00:00:00 2001 From: renzhiyuan <465386466@qq.com> Date: Mon, 9 Feb 2026 16:10:15 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E8=B7=AF=E5=BE=84=E5=92=8C=E6=8A=A5=E8=A1=A8?= =?UTF-8?q?=E5=90=88=E5=B9=B6=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/config.yaml | 2 +- internal/biz/group_config.go | 2 +- internal/config/config.go | 2 +- tmpl/excel_temp/kshj_total_ana.xlsx | Bin 10363 -> 10362 bytes 4 files changed, 3 insertions(+), 3 deletions(-) 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 73cb4683bde31b53d2a388e343d4419f23077034..e4e7277df86919133fdd87e74fc9817578319383 100644 GIT binary patch delta 4735 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 CFd-5E