feat: now client part supports multiple channels for the same type (#50)
This commit is contained in:
+12
-2
@@ -94,8 +94,17 @@ func AddChannel(c *gin.Context) {
|
||||
return
|
||||
}
|
||||
cleanChannel := model.Channel{
|
||||
UserId: c.GetInt("id"),
|
||||
Name: channel_.Name,
|
||||
Type: channel_.Type,
|
||||
UserId: c.GetInt("id"),
|
||||
Name: channel_.Name,
|
||||
Description: channel_.Description,
|
||||
Status: common.ChannelStatusEnabled,
|
||||
Secret: channel_.Secret,
|
||||
AppId: channel_.AppId,
|
||||
AccountId: channel_.AccountId,
|
||||
URL: channel_.URL,
|
||||
Other: channel_.Other,
|
||||
CreatedTime: common.GetTimestamp(),
|
||||
}
|
||||
err = cleanChannel.Insert()
|
||||
if err != nil {
|
||||
@@ -159,6 +168,7 @@ func UpdateChannel(c *gin.Context) {
|
||||
// If you add more fields, please also update channel_.Update()
|
||||
cleanChannel.Type = channel_.Type
|
||||
cleanChannel.Name = channel_.Name
|
||||
cleanChannel.Description = channel_.Description
|
||||
cleanChannel.Secret = channel_.Secret
|
||||
cleanChannel.AppId = channel_.AppId
|
||||
cleanChannel.AccountId = channel_.AccountId
|
||||
|
||||
@@ -2,6 +2,7 @@ package controller
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"errors"
|
||||
"fmt"
|
||||
"github.com/gin-gonic/gin"
|
||||
"message-pusher/channel"
|
||||
@@ -136,6 +137,9 @@ func pushMessageHelper(c *gin.Context, message *model.Message) {
|
||||
}
|
||||
|
||||
func saveAndSendMessage(user *model.User, message *model.Message, channel_ *model.Channel) error {
|
||||
if channel_.Status != common.ChannelStatusEnabled {
|
||||
return errors.New("该渠道已被禁用")
|
||||
}
|
||||
message.Link = common.GetUUID()
|
||||
if message.URL == "" {
|
||||
message.URL = fmt.Sprintf("%s/message/%s", common.ServerAddress, message.Link)
|
||||
|
||||
Reference in New Issue
Block a user