From f33e36803a67141ef472223e85045db03590eb60 Mon Sep 17 00:00:00 2001 From: mh-swift Date: Thu, 11 Jul 2024 18:50:45 +0800 Subject: [PATCH] =?UTF-8?q?fix(logic/sys):=20syncUpdate=E6=96=B9=E6=B3=95?= =?UTF-8?q?=E5=86=85=E7=9F=AD=E5=8F=98=E9=87=8F=E5=A3=B0=E6=98=8E=E5=AF=BC?= =?UTF-8?q?=E8=87=B4=E5=A4=96=E9=83=A8err=E8=A2=AB=E5=B1=8F=E8=94=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/internal/logic/sys/config.go | 30 +++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/server/internal/logic/sys/config.go b/server/internal/logic/sys/config.go index 8d173b3..e2eb290 100644 --- a/server/internal/logic/sys/config.go +++ b/server/internal/logic/sys/config.go @@ -8,12 +8,6 @@ package sys import ( "context" "fmt" - "github.com/gogf/gf/v2/database/gdb" - "github.com/gogf/gf/v2/database/gredis" - "github.com/gogf/gf/v2/errors/gerror" - "github.com/gogf/gf/v2/frame/g" - "github.com/gogf/gf/v2/os/gtime" - "github.com/gogf/gf/v2/util/gconv" "hotgo/internal/consts" "hotgo/internal/dao" "hotgo/internal/global" @@ -27,6 +21,13 @@ import ( "hotgo/internal/model/input/sysin" "hotgo/internal/service" "hotgo/utility/simple" + + "github.com/gogf/gf/v2/database/gdb" + "github.com/gogf/gf/v2/database/gredis" + "github.com/gogf/gf/v2/errors/gerror" + "github.com/gogf/gf/v2/frame/g" + "github.com/gogf/gf/v2/os/gtime" + "github.com/gogf/gf/v2/util/gconv" ) type sSysConfig struct{} @@ -292,26 +293,27 @@ func (s *sSysConfig) getConfigByKey(key string, models []*entity.SysConfig) *ent // syncUpdate 同步更新一些加载配置 func (s *sSysConfig) syncUpdate(ctx context.Context, in *sysin.UpdateConfigInp) (err error) { + var cfg any switch in.Group { case "wechat": - wx, err := s.GetWechat(ctx) + cfg, err = s.GetWechat(ctx) if err == nil { - wechat.SetConfig(wx) + wechat.SetConfig(cfg.(*model.WechatConfig)) } case "pay": - pay, err := s.GetPay(ctx) + cfg, err = s.GetPay(ctx) if err == nil { - payment.SetConfig(pay) + payment.SetConfig(cfg.(*model.PayConfig)) } case "upload": - upload, err := s.GetUpload(ctx) + cfg, err = s.GetUpload(ctx) if err == nil { - storager.SetConfig(upload) + storager.SetConfig(cfg.(*model.UploadConfig)) } case "sms": - sm, err := s.GetSms(ctx) + cfg, err = s.GetSms(ctx) if err == nil { - sms.SetConfig(sm) + sms.SetConfig(cfg.(*model.SmsConfig)) } }