From 40b8b6a8eab2a8dea33e7c5276b609a064d98805 Mon Sep 17 00:00:00 2001 From: zhx Date: Thu, 2 Jul 2026 11:11:57 +0800 Subject: [PATCH] fix admin dingtalk module import --- server/admin/cmd/server/main.go | 4 ++-- .../modules/financeapplication/dingtalk_notifier.go | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/server/admin/cmd/server/main.go b/server/admin/cmd/server/main.go index 487928c5..c6f78ad0 100644 --- a/server/admin/cmd/server/main.go +++ b/server/admin/cmd/server/main.go @@ -17,6 +17,7 @@ import ( "hyapp-admin-server/internal/cache" "hyapp-admin-server/internal/config" "hyapp-admin-server/internal/integration/activityclient" + dingtalkclient "hyapp-admin-server/internal/integration/dingtalk" "hyapp-admin-server/internal/integration/gameclient" "hyapp-admin-server/internal/integration/robotclient" "hyapp-admin-server/internal/integration/roomclient" @@ -93,7 +94,6 @@ import ( "gorm.io/gorm" "gorm.io/gorm/logger" walletv1 "hyapp.local/api/proto/wallet/v1" - "hyapp/pkg/dingtalkrobot" ) func main() { @@ -272,7 +272,7 @@ func main() { } var financeApplicationOptions []financeapplicationmodule.Option if cfg.FinanceNotifications.DingTalk.Enabled && strings.TrimSpace(cfg.FinanceNotifications.DingTalk.WebhookURL) != "" { - client, err := dingtalkrobot.New(dingtalkrobot.Config{ + client, err := dingtalkclient.New(dingtalkclient.Config{ WebhookURL: cfg.FinanceNotifications.DingTalk.WebhookURL, Secret: cfg.FinanceNotifications.DingTalk.Secret, AtMobiles: cfg.FinanceNotifications.DingTalk.AtMobiles, diff --git a/server/admin/internal/modules/financeapplication/dingtalk_notifier.go b/server/admin/internal/modules/financeapplication/dingtalk_notifier.go index a80c0e0c..5f4e5f43 100644 --- a/server/admin/internal/modules/financeapplication/dingtalk_notifier.go +++ b/server/admin/internal/modules/financeapplication/dingtalk_notifier.go @@ -6,14 +6,14 @@ import ( "strings" "time" - "hyapp/pkg/dingtalkrobot" + "hyapp-admin-server/internal/integration/dingtalk" ) type dingTalkNotifier struct { - client *dingtalkrobot.Client + client *dingtalk.Client } -func NewDingTalkNotifier(client *dingtalkrobot.Client) ApplicationNotifier { +func NewDingTalkNotifier(client *dingtalk.Client) ApplicationNotifier { if client == nil { return nil } @@ -24,7 +24,7 @@ func (n *dingTalkNotifier) NotifyApplicationCreated(ctx context.Context, applica if n == nil || n.client == nil { return nil } - return n.client.SendMarkdown(ctx, dingtalkrobot.MarkdownMessage{ + return n.client.SendMarkdown(ctx, dingtalk.MarkdownMessage{ Title: "财务申请待审核", Text: financeApplicationCreatedMarkdown(application), })