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

feat: adjust id format

Browse Source
This commit is contained in:
engigu
2024-01-20 13:21:38 +08:00
parent f16002573e
commit 1e0e745fea
19 changed files with 100 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files
routers/api/v1/send_ins.go
+8 -11
View File
@@ -3,7 +3,6 @@ package v1
import (
"fmt"
"github.com/gin-gonic/gin"
"github.com/google/uuid"
"message-nest/models"
"message-nest/pkg/app"
"message-nest/pkg/e"
@@ -13,7 +12,7 @@ import (
)
type DeleteMsgTaskInsReq struct {
ID string `json:"id" validate:"required,len=36" label:"实例id"`
ID string `json:"id" validate:"required,len=12" label:"实例id"`
}
// DeleteMsgSendWay 删除消息渠道
@@ -65,9 +64,9 @@ func GetMsgSendWayIns(c *gin.Context) {
}
type SendTasksInsReq struct {
ID string `json:"id" validate:"required,len=36" label:"实例id"`
TaskId string `json:"task_id" validate:"required,len=36" label:"ins任务id"`
WayID string `json:"way_id" validate:"required,len=36" label:"渠道id"`
ID string `json:"id" validate:"required,len=12" label:"实例id"`
TaskId string `json:"task_id" validate:"required,len=12" label:"ins任务id"`
WayID string `json:"way_id" validate:"required,len=12" label:"渠道id"`
ContentType string `json:"content_type" validate:"required,max=100" label:"实例内容类型"`
Config string `json:"config" validate:"" label:"任务配置"`
Extra string `json:"extra" validate:"" label:"任务额外信息"`
@@ -76,7 +75,7 @@ type SendTasksInsReq struct {
}
type AddManyTasksInsReq struct {
TaskId string `json:"id" validate:"required,len=36" label:"任务id"`
TaskId string `json:"id" validate:"required,len=12" label:"任务id"`
TaskName string `json:"name" validate:"required,max=100" label:"任务名"`
InsData []SendTasksInsReq `json:"ins_data"`
}
@@ -104,10 +103,9 @@ func AddManyTasksIns(c *gin.Context) {
appG.CResponse(code, dataErrStr, nil)
return
}
uuidObj, _ := uuid.Parse(data.ID)
taskIns = append(taskIns, models.SendTasksIns{
UUIDModel: models.UUIDModel{
ID: uuidObj,
ID: data.ID,
CreatedBy: currentUser,
ModifiedBy: currentUser,
},
@@ -158,9 +156,8 @@ func AddTasksIns(c *gin.Context) {
}
sendTaskInsService := send_ins_service.SendTaskInsService{}
uuidObj, _ := uuid.Parse(req.ID)
err := sendTaskInsService.AddOne(models.SendTasksIns{
UUIDModel: models.UUIDModel{ID: uuidObj},
UUIDModel: models.UUIDModel{ID: req.ID},
TaskID: req.TaskId,
WayID: req.WayID,
WayType: req.WayType,
@@ -179,7 +176,7 @@ func AddTasksIns(c *gin.Context) {
}
type UpdateMsgTaskInsEnableReq struct {
ID string `json:"ins_id" validate:"required,len=36" label:"实例id"`
ID string `json:"ins_id" validate:"required,len=12" label:"实例id"`
Enable int `json:"status" validate:"" label:"实例开启状态"`
}
routers/api/v1/send_message.go
+1 -1
View File
@@ -9,7 +9,7 @@ import (
)
type SendMessageReq struct {
TaskID string `json:"task_id" validate:"required,len=36" label:"任务id"`
TaskID string `json:"task_id" validate:"required,len=12" label:"任务id"`
Text string `json:"text" validate:"required" label:"文本内容"`
Title string `json:"title" label:"消息标题"`
HTML string `json:"html" label:"html内容"`
routers/api/v1/send_task.go
+2 -2
View File
@@ -11,7 +11,7 @@ import (
)
type DeleteMsgSendTaskReq struct {
ID string `json:"id" validate:"required,len=36" label:"任务id"`
ID string `json:"id" validate:"required,len=12" label:"任务id"`
}
// DeleteMsgSendTask 删除消息任务
@@ -103,7 +103,7 @@ func AddMsgSendTask(c *gin.Context) {
}
type EditMsgSendTaskReq struct {
ID string `json:"id" validate:"required,len=36" label:"任务id"`
ID string `json:"id" validate:"required,len=12" label:"任务id"`
TaskName string `json:"name" validate:"required,max=100,min=1" label:"任务任务名"`
}
routers/api/v1/send_ways.go
+2 -2
View File
@@ -12,7 +12,7 @@ import (
)
type DeleteMsgSendWayReq struct {
ID string `json:"id" validate:"required,len=36" label:"渠道id"`
ID string `json:"id" validate:"required,len=12" label:"渠道id"`
}
// DeleteMsgSendWay 删除消息渠道
@@ -138,7 +138,7 @@ func AddMsgSendWay(c *gin.Context) {
}
type EditSendWayReq struct {
ID string `json:"id" validate:"required,len=36" label:"渠道id"`
ID string `json:"id" validate:"required,len=12" label:"渠道id"`
Name string `json:"name" validate:"required,max=100,min=1" label:"渠道名"`
Type string `json:"type" validate:"required,max=100,min=1" label:"渠道类型"`
Auth string `json:"auth" validate:"required" label:"渠道认证信息"`