Hass/Message-Push-Nest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: add feishu and aliyunsms

Browse Source
This commit is contained in:
engigu
2025-12-17 21:51:21 +08:00
parent f520dbf746
commit 64f746a7ec
16 changed files with 537 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files
service/send_ins_service/send_ins.go
+28 -7
View File
@@ -5,6 +5,7 @@ import (
"fmt"
"message-nest/models"
"message-nest/pkg/app"
"message-nest/pkg/constant"
)
type SendTaskInsService struct {
@@ -22,7 +23,7 @@ type SendTaskInsService struct {
// ValidateDiffWay 各种发信渠道具体字段校验
func (sw *SendTaskInsService) ValidateDiffIns(ins models.SendTasksIns) (string, interface{}) {
var empty interface{}
if ins.WayType == "Email" {
if ins.WayType == constant.MessageTypeEmail {
var emailConfig models.InsEmailConfig
err := json.Unmarshal([]byte(ins.Config), &emailConfig)
if err != nil {
@@ -45,19 +46,23 @@ func (sw *SendTaskInsService) ValidateDiffIns(ins models.SendTasksIns) (string,
_, Msg := app.CommonPlaygroundValid(emailConfig)
return Msg, emailConfig
}
if ins.WayType == "Dtalk" {
if ins.WayType == constant.MessageTypeDtalk {
var Config models.InsDtalkConfig
return "", Config
}
if ins.WayType == "QyWeiXin" {
if ins.WayType == constant.MessageTypeQyWeiXin {
var Config models.InsQyWeiXinConfig
return "", Config
}
if ins.WayType == "MessageNest" {
if ins.WayType == constant.MessageTypeFeishu {
var Config models.InsFeishuConfig
return "", Config
}
if ins.WayType == constant.MessageTypeMessageNest {
var Config models.InsQyWeiXinConfig
return "", Config
}
if ins.WayType == "Custom" {
if ins.WayType == constant.MessageTypeCustom {
var Config models.InsCustomConfig
err := json.Unmarshal([]byte(ins.Config), &Config)
if err != nil {
@@ -66,7 +71,7 @@ func (sw *SendTaskInsService) ValidateDiffIns(ins models.SendTasksIns) (string,
_, Msg := app.CommonPlaygroundValid(Config)
return Msg, Config
}
if ins.WayType == "WeChatOFAccount" {
if ins.WayType == constant.MessageTypeWeChatOFAccount {
var Config models.InsWeChatAccountConfig
err := json.Unmarshal([]byte(ins.Config), &Config)
if err != nil {
@@ -89,12 +94,28 @@ func (sw *SendTaskInsService) ValidateDiffIns(ins models.SendTasksIns) (string,
_, Msg := app.CommonPlaygroundValid(Config)
return Msg, Config
}
if ins.WayType == "AliyunSMS" {
if ins.WayType == constant.MessageTypeAliyunSMS {
var Config models.InsAliyunSMSConfig
err := json.Unmarshal([]byte(ins.Config), &Config)
if err != nil {
return "阿里云短信配置反序列化失败！", empty
}
// 检查是否为动态接收者模式
var configMap map[string]interface{}
json.Unmarshal([]byte(ins.Config), &configMap)
allowMultiRecip, exists := configMap["allowMultiRecip"].(bool)
// allowMultiRecip=true为动态模式，phone_number可以为空，但template_code仍需验证
if exists && allowMultiRecip && Config.PhoneNumber == "" {
// 动态模式，只验证template_code
if Config.TemplateCode == "" {
return "短信模板CODE不能为空", empty
}
return "", Config
}
// 固定模式或有phone_number时，进行常规验证
_, Msg := app.CommonPlaygroundValid(Config)
return Msg, Config
}
service/send_message_service/send_message.go
+3 -2
View File
@@ -397,8 +397,9 @@ func (sm *SendMessageService) BuildTemplateContent(ins models.SendTasksIns) *uni
func (sm *SendMessageService) supportsDynamicRecipient(wayType string) bool {
// 支持动态接收者的渠道类型
supportedTypes := map[string]bool{
unified.MessageTypeEmail: true,
unified.MessageTypeWeChatOFAccount: true,
constant.MessageTypeEmail: true,
constant.MessageTypeWeChatOFAccount: true,
constant.MessageTypeAliyunSMS: true,
// 可以继续添加其他支持动态接收者的渠道
}
return supportedTypes[wayType]
service/send_message_service/unified/channel_registry.go
+2
View File
@@ -21,6 +21,7 @@ const (
MessageTypeEmail = channels.MessageTypeEmail
MessageTypeDtalk = channels.MessageTypeDtalk
MessageTypeQyWeiXin = channels.MessageTypeQyWeiXin
MessageTypeFeishu = channels.MessageTypeFeishu
MessageTypeCustom = channels.MessageTypeCustom
MessageTypeWeChatOFAccount = channels.MessageTypeWeChatOFAccount
MessageTypeMessageNest = channels.MessageTypeMessageNest
@@ -93,6 +94,7 @@ func GetGlobalChannelRegistry() *ChannelRegistry {
globalChannelRegistry.Register(channels.NewEmailChannel())
globalChannelRegistry.Register(channels.NewDtalkChannel())
globalChannelRegistry.Register(channels.NewQyWeiXinChannel())
globalChannelRegistry.Register(channels.NewFeishuChannel())
globalChannelRegistry.Register(channels.NewCustomChannel())
globalChannelRegistry.Register(channels.NewWeChatOFAccountChannel())
globalChannelRegistry.Register(channels.NewMessageNestChannel())
service/send_message_service/unified/channels/feishu.go
+59
View File
@@ -0,0 +1,59 @@
package channels
import (
"fmt"
"message-nest/models"
"message-nest/pkg/message"
"message-nest/service/send_ins_service"
"message-nest/service/send_way_service"
)
type FeishuChannel struct{ *BaseChannel }
func NewFeishuChannel() *FeishuChannel {
return &FeishuChannel{BaseChannel: NewBaseChannel(MessageTypeFeishu, []string{FormatTypeMarkdown, FormatTypeText})}
}
func (c *FeishuChannel) SendUnified(msgObj interface{}, ins models.SendTasksIns, content *UnifiedMessageContent) (string, string) {
auth, ok := msgObj.(send_way_service.WayDetailFeishu)
if !ok {
return "", "类型转换失败"
}
insService := send_ins_service.SendTaskInsService{}
errStr, configInterface := insService.ValidateDiffIns(ins)
if errStr != "" {
return errStr, ""
}
_, ok = configInterface.(models.InsFeishuConfig)
if !ok {
return "飞书config校验失败", ""
}
contentType, formattedContent, err := c.FormatContent(content)
if err != nil {
return "", err.Error()
}
atMobiles := content.GetAtMobiles()
atUserIds := content.GetAtUserIds()
// 合并 @ 人员列表
atList := append(atMobiles, atUserIds...)
if content.IsAtAll() {
atList = append(atList, "all")
}
cli := message.Feishu{AccessToken: auth.AccessToken, Secret: auth.Secret}
var res []byte
var errMsg string
if contentType == FormatTypeText {
res, err = cli.SendMessageText(formattedContent, atList...)
if err != nil {
errMsg = fmt.Sprintf("发送失败：%s", err.Error())
}
} else if contentType == FormatTypeMarkdown {
res, err = cli.SendMessageMarkdown(content.Title, formattedContent, atList...)
if err != nil {
errMsg = fmt.Sprintf("发送失败：%s", err.Error())
}
} else {
errMsg = fmt.Sprintf("未知的飞书发送内容类型：%s", contentType)
}
return string(res), errMsg
}
service/send_message_service/unified/channels/types.go
+14 -12
View File
@@ -1,21 +1,23 @@
package channels
// 消息格式类型常量
import "message-nest/pkg/constant"
// 重导出常量，保持向后兼容
const (
FormatTypeText = "text"
FormatTypeHTML = "html"
FormatTypeMarkdown = "markdown"
FormatTypeText = constant.FormatTypeText
FormatTypeHTML = constant.FormatTypeHTML
FormatTypeMarkdown = constant.FormatTypeMarkdown
)
// 消息类型常量
const (
MessageTypeEmail = "Email"
MessageTypeDtalk = "Dtalk"
MessageTypeQyWeiXin = "QyWeiXin"
MessageTypeCustom = "Custom"
MessageTypeWeChatOFAccount = "WeChatOFAccount"
MessageTypeMessageNest = "MessageNest"
MessageTypeAliyunSMS = "AliyunSMS"
MessageTypeEmail = constant.MessageTypeEmail
MessageTypeDtalk = constant.MessageTypeDtalk
MessageTypeQyWeiXin = constant.MessageTypeQyWeiXin
MessageTypeFeishu = constant.MessageTypeFeishu
MessageTypeCustom = constant.MessageTypeCustom
MessageTypeWeChatOFAccount = constant.MessageTypeWeChatOFAccount
MessageTypeMessageNest = constant.MessageTypeMessageNest
MessageTypeAliyunSMS = constant.MessageTypeAliyunSMS
)
// UnifiedMessageContent 统一的消息内容结构
service/send_way_service/send_way.go
+202 -100
View File
@@ -6,6 +6,7 @@ import (
"fmt"
"message-nest/models"
"message-nest/pkg/app"
"message-nest/pkg/constant"
"message-nest/pkg/message"
"strings"
)
@@ -23,6 +24,40 @@ type SendWay struct {
PageSize int
}
// WayValidator 渠道验证接口
type WayValidator interface {
Validate(authJson string) (string, interface{})
}
// WayTester 渠道测试接口
type WayTester interface {
Test() (string, string)
}
// 渠道注册表
var (
validatorRegistry = map[string]func() WayValidator{
constant.MessageTypeEmail: func() WayValidator { return &WayDetailEmail{} },
constant.MessageTypeDtalk: func() WayValidator { return &WayDetailDTalk{} },
constant.MessageTypeQyWeiXin: func() WayValidator { return &WayDetailQyWeiXin{} },
constant.MessageTypeFeishu: func() WayValidator { return &WayDetailFeishu{} },
constant.MessageTypeCustom: func() WayValidator { return &WayDetailCustom{} },
constant.MessageTypeWeChatOFAccount: func() WayValidator { return &WeChatOFAccount{} },
constant.MessageTypeMessageNest: func() WayValidator { return &MessageNest{} },
constant.MessageTypeAliyunSMS: func() WayValidator { return &WayDetailAliyunSMS{} },
}
testerRegistry = map[string]func(interface{}) WayTester{
constant.MessageTypeEmail: func(m interface{}) WayTester { return m.(*WayDetailEmail) },
constant.MessageTypeDtalk: func(m interface{}) WayTester { return m.(*WayDetailDTalk) },
constant.MessageTypeQyWeiXin: func(m interface{}) WayTester { return m.(*WayDetailQyWeiXin) },
constant.MessageTypeFeishu: func(m interface{}) WayTester { return m.(*WayDetailFeishu) },
constant.MessageTypeCustom: func(m interface{}) WayTester { return m.(*WayDetailCustom) },
constant.MessageTypeWeChatOFAccount: func(m interface{}) WayTester { return m.(*WeChatOFAccount) },
constant.MessageTypeMessageNest: func(m interface{}) WayTester { return m.(*MessageNest) },
constant.MessageTypeAliyunSMS: func(m interface{}) WayTester { return m.(*WayDetailAliyunSMS) },
}
)
// WayDetailEmail 邮箱渠道明细字段
type WayDetailEmail struct {
Server string `validate:"required,max=50" label:"SMTP服务地址"`
@@ -31,6 +66,24 @@ type WayDetailEmail struct {
Passwd string `validate:"required,max=50" label:"邮箱密码"`
}
func (w *WayDetailEmail) Validate(authJson string) (string, interface{}) {
var empty interface{}
err := json.Unmarshal([]byte(authJson), w)
if err != nil {
return "邮箱auth反序列化失败！", empty
}
_, msg := app.CommonPlaygroundValid(*w)
return msg, *w
}
func (w *WayDetailEmail) Test() (string, string) {
testMsg := "This is a test message from message-nest."
var emailer message.EmailMessage
emailer.Init(w.Server, 465, w.Account, w.Passwd)
errMsg := emailer.SendTextMessage(w.Account, "test email", testMsg)
return errMsg, ""
}
// WayDetailDTalk 钉钉渠道明细字段
type WayDetailDTalk struct {
AccessToken string `json:"access_token" validate:"required,max=100" label:"钉钉access_token"`
@@ -38,17 +91,106 @@ type WayDetailDTalk struct {
Secret string `json:"secret" validate:"max=100" label:"钉钉加签秘钥"`
}
func (w *WayDetailDTalk) Validate(authJson string) (string, interface{}) {
var empty interface{}
err := json.Unmarshal([]byte(authJson), w)
if err != nil {
return "钉钉auth反序列化失败！", empty
}
_, msg := app.CommonPlaygroundValid(*w)
return msg, *w
}
func (w *WayDetailDTalk) Test() (string, string) {
testMsg := "This is a test message from message-nest."
var cli = message.Dtalk{
AccessToken: w.AccessToken,
Secret: w.Secret,
}
res, err := cli.SendMessageText(testMsg + w.Keys)
if err != nil {
return fmt.Sprintf("发送失败：%s", err), string(res)
}
return "", string(res)
}
// WayDetailQyWeiXin 企业微信渠道明细字段
type WayDetailQyWeiXin struct {
AccessToken string `json:"access_token" validate:"required,max=100" label:"企业微信access_token"`
}
func (w *WayDetailQyWeiXin) Validate(authJson string) (string, interface{}) {
var empty interface{}
err := json.Unmarshal([]byte(authJson), w)
if err != nil {
return "企业微信auth反序列化失败！", empty
}
_, msg := app.CommonPlaygroundValid(*w)
return msg, *w
}
func (w *WayDetailQyWeiXin) Test() (string, string) {
testMsg := "This is a test message from message-nest."
var cli = message.QyWeiXin{
AccessToken: w.AccessToken,
}
res, err := cli.SendMessageText(testMsg)
if err != nil {
return fmt.Sprintf("发送失败：%s", err), string(res)
}
return "", string(res)
}
// WayDetailFeishu 飞书渠道明细字段
type WayDetailFeishu struct {
AccessToken string `json:"access_token" validate:"required,max=100" label:"飞书access_token"`
Keys string `json:"keys" validate:"max=200" label:"飞书关键字"`
Secret string `json:"secret" validate:"max=100" label:"飞书加签秘钥"`
}
func (w *WayDetailFeishu) Validate(authJson string) (string, interface{}) {
var empty interface{}
err := json.Unmarshal([]byte(authJson), w)
if err != nil {
return "飞书auth反序列化失败！", empty
}
_, msg := app.CommonPlaygroundValid(*w)
return msg, *w
}
func (w *WayDetailFeishu) Test() (string, string) {
testMsg := "This is a test message from message-nest."
var cli = message.Feishu{
AccessToken: w.AccessToken,
Secret: w.Secret,
}
res, err := cli.SendMessageText(testMsg + w.Keys)
if err != nil {
return fmt.Sprintf("发送失败：%s", err), string(res)
}
return "", string(res)
}
// WayDetailCustom 自定义渠道
type WayDetailCustom struct {
Webhook string `json:"webhook" validate:"required,max=200" label:"自定义的webhook地址"`
Body string `json:"body" validate:"max=2000" label:"自定义的请求体"`
}
func (w *WayDetailCustom) Validate(authJson string) (string, interface{}) {
var empty interface{}
err := json.Unmarshal([]byte(authJson), w)
if err != nil {
return "自定义参数反序列化失败！", empty
}
_, msg := app.CommonPlaygroundValid(*w)
return msg, *w
}
func (w *WayDetailCustom) Test() (string, string) {
return "自定义webhook不用测试运行，请直接添加", ""
}
// WeChatOFAccount 微信公众号
type WeChatOFAccount struct {
AppID string `json:"appID" validate:"required,max=200" label:"微信公众号id"`
@@ -56,6 +198,20 @@ type WeChatOFAccount struct {
TempID string `json:"tempid" validate:"max=2000" label:"模板消息id"`
}
func (w *WeChatOFAccount) Validate(authJson string) (string, interface{}) {
var empty interface{}
err := json.Unmarshal([]byte(authJson), w)
if err != nil {
return "微信公众号反序列化失败！", empty
}
_, msg := app.CommonPlaygroundValid(*w)
return msg, *w
}
func (w *WeChatOFAccount) Test() (string, string) {
return "微信公众号模板消息不用测试运行，请直接添加", ""
}
// WayDetailAliyunSMS 阿里云短信渠道明细字段
type WayDetailAliyunSMS struct {
AccessKeyId string `json:"access_key_id" validate:"required,max=100" label:"AccessKeyId"`
@@ -63,10 +219,38 @@ type WayDetailAliyunSMS struct {
SignName string `json:"sign_name" validate:"required,max=50" label:"短信签名"`
}
func (w *WayDetailAliyunSMS) Validate(authJson string) (string, interface{}) {
var empty interface{}
err := json.Unmarshal([]byte(authJson), w)
if err != nil {
return "阿里云短信auth反序列化失败！", empty
}
_, msg := app.CommonPlaygroundValid(*w)
return msg, *w
}
func (w *WayDetailAliyunSMS) Test() (string, string) {
return "阿里云短信不用测试运行，请直接添加", ""
}
// MessageNest 自托管消息
type MessageNest struct {
}
func (w *MessageNest) Validate(authJson string) (string, interface{}) {
var empty interface{}
err := json.Unmarshal([]byte(authJson), w)
if err != nil {
return "自托管消息反序列化失败！", empty
}
_, msg := app.CommonPlaygroundValid(*w)
return msg, *w
}
func (w *MessageNest) Test() (string, string) {
return "自托管消息不用测试运行，请直接添加", ""
}
func (sw *SendWay) GetByID() (interface{}, error) {
return models.GetWayByID(sw.ID)
}
@@ -138,113 +322,31 @@ func (sw *SendWay) getMaps() map[string]interface{} {
return maps
}
// getValidator 根据渠道类型获取对应的验证器
func (sw *SendWay) getValidator() WayValidator {
factory, exists := validatorRegistry[sw.Type]
if !exists {
return nil
}
return factory()
}
// ValidateDiffWay 各种发信渠道具体字段校验
func (sw *SendWay) ValidateDiffWay() (string, interface{}) {
var empty interface{}
if sw.Type == "Email" {
var email WayDetailEmail
err := json.Unmarshal([]byte(sw.Auth), &email)
if err != nil {
return "邮箱auth反序列化失败！", empty
}
_, Msg := app.CommonPlaygroundValid(email)
return Msg, email
} else if sw.Type == "Dtalk" {
var dtalk WayDetailDTalk
err := json.Unmarshal([]byte(sw.Auth), &dtalk)
if err != nil {
return "钉钉auth反序列化失败！", empty
}
_, Msg := app.CommonPlaygroundValid(dtalk)
return Msg, dtalk
} else if sw.Type == "QyWeiXin" {
var config WayDetailQyWeiXin
err := json.Unmarshal([]byte(sw.Auth), &config)
if err != nil {
return "企业微信auth反序列化失败！", empty
}
_, Msg := app.CommonPlaygroundValid(config)
return Msg, config
} else if sw.Type == "Custom" {
var custom WayDetailCustom
err := json.Unmarshal([]byte(sw.Auth), &custom)
if err != nil {
return "自定义参数反序列化失败！", empty
}
_, Msg := app.CommonPlaygroundValid(custom)
return Msg, custom
} else if sw.Type == "WeChatOFAccount" {
var wca WeChatOFAccount
err := json.Unmarshal([]byte(sw.Auth), &wca)
if err != nil {
return "微信公众号反序列化失败！", empty
}
_, Msg := app.CommonPlaygroundValid(wca)
return Msg, wca
} else if sw.Type == "MessageNest" {
var wca MessageNest
err := json.Unmarshal([]byte(sw.Auth), &wca)
if err != nil {
return "自托管消息反序列化失败！", empty
}
_, Msg := app.CommonPlaygroundValid(wca)
return Msg, wca
} else if sw.Type == "AliyunSMS" {
var aliyunSMS WayDetailAliyunSMS
err := json.Unmarshal([]byte(sw.Auth), &aliyunSMS)
if err != nil {
return "阿里云短信auth反序列化失败！", empty
}
_, Msg := app.CommonPlaygroundValid(aliyunSMS)
return Msg, aliyunSMS
validator := sw.getValidator()
if validator == nil {
return fmt.Sprintf("未知的发信渠道校验: %s", sw.Type), empty
}
return fmt.Sprintf("未知的发信渠道校验: %s", sw.Type), empty
return validator.Validate(sw.Auth)
}
// TestSendWay 尝试带发信测试连通性
func (sw *SendWay) TestSendWay(msgObj interface{}) (string, string) {
testMsg := "This is a test message from message-nest."
emailAuth, ok := msgObj.(WayDetailEmail)
if ok {
var emailer message.EmailMessage
emailer.Init(emailAuth.Server, 465, emailAuth.Account, emailAuth.Passwd)
errMsg := emailer.SendTextMessage(emailAuth.Account, "test email", testMsg)
return errMsg, ""
factory, exists := testerRegistry[sw.Type]
if !exists {
return fmt.Sprintf("未知的发信渠道测试: %s", sw.Type), ""
}
dtalkAuth, ok := msgObj.(WayDetailDTalk)
if ok {
var cli = message.Dtalk{
AccessToken: dtalkAuth.AccessToken,
Secret: dtalkAuth.Secret,
}
res, err := cli.SendMessageText(testMsg + dtalkAuth.Keys)
if err != nil {
return fmt.Sprintf("发送失败：%s", err), string(res)
}
return "", string(res)
}
qywxAuth, ok := msgObj.(WayDetailQyWeiXin)
if ok {
var cli = message.QyWeiXin{
AccessToken: qywxAuth.AccessToken,
}
res, err := cli.SendMessageText(testMsg)
if err != nil {
return fmt.Sprintf("发送失败：%s", err), string(res)
}
return "", string(res)
}
_, ok = msgObj.(WeChatOFAccount)
if ok {
return "微信公众号模板消息不用测试运行，请直接添加", ""
}
_, ok = msgObj.(MessageNest)
if ok {
return "自托管消息不用测试运行，请直接添加", ""
}
_, ok = msgObj.(WayDetailAliyunSMS)
if ok {
return "阿里云短信不用测试运行，请直接添加", ""
}
return fmt.Sprintf("未知的发信渠道校验: %s", sw.Type), ""
tester := factory(msgObj)
return tester.Test()
}