Havoc420/catface_backend_go
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge dif

Browse Source
This commit is contained in:
Havoc412 2024-10-20 17:37:44 +08:00
parent 24d7535a9c
commit fec18facd8
2 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/http/controller/web/encounter_controller.go
View File

@ -37,10 +37,6 @@ func (e *Encounters) Create(context *gin.Context) {
context.Set(consts.ValidatorPrefix+"avatar_width", int(avatarWidth)) context.Set(consts.ValidatorPrefix+"avatar_width", int(avatarWidth))
} }
// 将 Array 转化为 string 类型 // 将 Array 转化为 string 类型
<<<<<<< HEAD
=======
animals_id := data_transfer.GetIntSlice(context, "animals_id")
>>>>>>> 1f88b110bfca3168fbb371e7fdb316cb53ee0cd0
if res, err := data_transfer.ConvertSliceToString(animals_id); err == nil { if res, err := data_transfer.ConvertSliceToString(animals_id); err == nil {
context.Set(consts.ValidatorPrefix+"animals_id", res) context.Set(consts.ValidatorPrefix+"animals_id", res)
} else { } else {

8
app/model/encounter.go
View File

@ -6,6 +6,7 @@ import (
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
"go.uber.org/zap" "go.uber.org/zap"
) )
func CreateEncounterFactory(sqlType string) *Encounter { func CreateEncounterFactory(sqlType string) *Encounter {
@ -17,17 +18,10 @@ type Encounter struct { // Encounter 或者称为 post，指的就是 Human 单
// TAG 外键关联 // TAG 外键关联
UsersModelId int `gorm:"column:user_id" json:"user_id"` UsersModelId int `gorm:"column:user_id" json:"user_id"`
UsersModel UsersModel UsersModel UsersModel
<<<<<<< HEAD
AnimalsId string `gorm:"size:20" json:"animals_id"` // TODO 关联对象存在上限 AnimalsId string `gorm:"size:20" json:"animals_id"` // TODO 关联对象存在上限
Title string `gorm:"size:20;column:title" json:"title"` Title string `gorm:"size:20;column:title" json:"title"`
Content string `json:"content"` Content string `json:"content"`
=======
AnimalsId string `gorm:"size:20"` // TODO 关联对象存在上限
Title string `gorm:"size:20;column:title"`
Content string
>>>>>>> 1f88b110bfca3168fbb371e7fdb316cb53ee0cd0
// Time 从 CreatedAt 中解析 // Time 从 CreatedAt 中解析
// TAG Avatar 最好是压缩后的备份图像 // TAG Avatar 最好是压缩后的备份图像