From 3f8ef92b19bfd1710a940821b051769a00d653d7 Mon Sep 17 00:00:00 2001 From: akrike <1625167628@qq.com> Date: Sun, 1 Jun 2025 14:23:24 +0800 Subject: [PATCH] update --- internal/app/api/proc.go | 10 +++++++--- internal/app/model/process.go | 6 +++--- internal/app/model/ws_share.go | 1 + internal/app/repository/db.go | 2 +- 4 files changed, 12 insertions(+), 7 deletions(-) diff --git a/internal/app/api/proc.go b/internal/app/api/proc.go index c00d498..130ad0c 100644 --- a/internal/app/api/proc.go +++ b/internal/app/api/proc.go @@ -114,11 +114,15 @@ func (p *procApi) ProcessControl(ctx *gin.Context) { func (p *procApi) ProcessCreateShare(ctx *gin.Context) { req := bind[model.ProcessShare](ctx) + token := utils.UnwarpIgnore(uuid.NewRandom()).String() err := repository.WsShare.AddShareData(model.WsShare{ - ExpireTime: time.Now().Add(time.Minute * time.Duration(req.Minute)), + ExpireTime: time.Now().Add(time.Minute * time.Duration(req.Minutes)), Write: req.Write, - Token: utils.UnwarpIgnore(uuid.NewRandom()).String(), + Token: token, + CreateBy: getUserName(ctx), }) errCheck(ctx, err != nil, err) - rOk(ctx, "Operation successful!", nil) + rOk(ctx, "Operation successful!", gin.H{ + "token": token, + }) } diff --git a/internal/app/model/process.go b/internal/app/model/process.go index bd80d4e..d853d01 100644 --- a/internal/app/model/process.go +++ b/internal/app/model/process.go @@ -22,7 +22,7 @@ func (*Process) TableName() string { } type ProcessShare struct { - Minute int `json:"minute"` - Pid int `json:"pid"` - Write bool `json:"write"` + Minutes int `json:"minutes"` + Pid int `json:"pid"` + Write bool `json:"write"` } diff --git a/internal/app/model/ws_share.go b/internal/app/model/ws_share.go index 59934f5..6633e83 100644 --- a/internal/app/model/ws_share.go +++ b/internal/app/model/ws_share.go @@ -9,5 +9,6 @@ type WsShare struct { Pid int `gorm:"column:pid" json:"pid"` Write bool `gorm:"column:write" json:"write"` ExpireTime time.Time `gorm:"column:expire_time" json:"expireTime"` + CreateBy string `gorm:"column:create_by" json:"createBy"` Token string `gorm:"column:token" json:"token"` } diff --git a/internal/app/repository/db.go b/internal/app/repository/db.go index e3071e6..ba5d411 100644 --- a/internal/app/repository/db.go +++ b/internal/app/repository/db.go @@ -41,5 +41,5 @@ func InitDb() { sqlDB.SetConnMaxLifetime(time.Hour) db = gdb.Session(&defaultConfig) // db = gdb.Session(&defaultConfig).Debug() - db.AutoMigrate(&model.Process{}, &model.User{}, &model.Permission{}, &model.Push{}, &model.Config{}, &model.ProcessLog{}, &model.Task{}) + db.AutoMigrate(&model.Process{}, &model.User{}, &model.Permission{}, &model.Push{}, &model.Config{}, &model.ProcessLog{}, &model.Task{}, &model.WsShare{}) }