diff --git a/automation/server/internal/module/dangerous_rule/controller/dangerous_rule.go b/automation/server/internal/module/dangerous_rule/controller/dangerous_rule.go index 10ce3f4b2a0a010838ec27b8a8f5c357ef311ef9..b9dfe27c6c0a52e71d2148cfa6f32966ed690f8b 100644 --- a/automation/server/internal/module/dangerous_rule/controller/dangerous_rule.go +++ b/automation/server/internal/module/dangerous_rule/controller/dangerous_rule.go @@ -51,15 +51,16 @@ func UpdateDangerousRuleHandler(c *gin.Context) { } func ChangeDangerousRuleStatusHandler(c *gin.Context) { var rule struct { - ID int `json:"id"` - Status bool `json:"status"` + ID int `json:"id"` + User string `json:"modify_user"` + Status bool `json:"status"` } if err := c.ShouldBindJSON(&rule); err != nil { response.Fail(c, nil, err.Error()) return } - if err := service.ChangeDangerousRuleStatus(rule.ID, rule.Status); err != nil { + if err := service.ChangeDangerousRuleStatus(rule.ID, rule.User, rule.Status); err != nil { response.Fail(c, nil, err.Error()) return } diff --git a/automation/server/internal/module/dangerous_rule/model/dangerous_rule.go b/automation/server/internal/module/dangerous_rule/model/dangerous_rule.go index f8e46d26e192c3a34919b3b7497a7b135878e2b4..2f7ca9b9e60a19b3de3dcaaea1614b2c07553b53 100644 --- a/automation/server/internal/module/dangerous_rule/model/dangerous_rule.go +++ b/automation/server/internal/module/dangerous_rule/model/dangerous_rule.go @@ -6,8 +6,7 @@ type DangerousRule struct { Description string `json:"description" gorm:"type:varchar(255);comment:规则描述"` ScriptTypes string `json:"script_types" gorm:"comment:脚本类型"` Action string `json:"action" gorm:"comment:执行动作: 拦截(脚本不可保存、带参数时是否可执行), 警告(用户二次确认)"` - Creator string `json:"creator" gorm:"comment:创建人"` - CreatedAt string `json:"created_at" gorm:"comment:创建时间"` - UpdatedAt string `json:"updated_at" gorm:"comment:更新时间"` + ModifyUser string `json:"modify_user" gorm:"type:varchar(100);not null;comment:最后修改者"` + ModifyTime string `json:"modify_time" gorm:"comment:最后修改时间"` Status bool `json:"status" gorm:"comment:规则启用、禁用"` } diff --git a/automation/server/internal/module/dangerous_rule/service/dangerous_rule.go b/automation/server/internal/module/dangerous_rule/service/dangerous_rule.go index 9a9dfb5a0dea296ecae4f7a84d261342245dd6d3..9a1bcdfc52059fb63575730a26eb022fcd2da258 100644 --- a/automation/server/internal/module/dangerous_rule/service/dangerous_rule.go +++ b/automation/server/internal/module/dangerous_rule/service/dangerous_rule.go @@ -17,9 +17,8 @@ func AddDangerousRule(rule *model.DangerousRule) error { Description: rule.Description, ScriptTypes: rule.ScriptTypes, Action: rule.Action, - Creator: rule.Creator, - CreatedAt: time.Now().Format("2006-01-02 15:04:05"), - UpdatedAt: time.Now().Format("2006-01-02 15:04:05"), + ModifyUser: rule.ModifyUser, + ModifyTime: time.Now().Format("2006-01-02 15:04:05"), Status: rule.Status, }); err != nil { if mysqlErr, ok := err.(*mysql.MySQLError); ok { @@ -43,7 +42,8 @@ func UpdateDangerousRule(rule *model.DangerousRule) error { Description: rule.Description, ScriptTypes: rule.ScriptTypes, Action: rule.Action, - UpdatedAt: time.Now().Format("2006-01-02 15:04:05"), + ModifyUser: rule.ModifyUser, + ModifyTime: time.Now().Format("2006-01-02 15:04:05"), Status: rule.Status, }); err != nil { if mysqlErr, ok := err.(*mysql.MySQLError); ok { @@ -56,13 +56,14 @@ func UpdateDangerousRule(rule *model.DangerousRule) error { return LoadFromDB() } -func ChangeDangerousRuleStatus(id int, status bool) error { +func ChangeDangerousRuleStatus(id int, modify_user string, status bool) error { if id == 0 { return fmt.Errorf("ID is required") } err := dao.ChangeDangerousRuleStatus(id, map[string]interface{}{ - "updated_at": time.Now().Format("2006-01-02 15:04:05"), - "status": status, + "modify_user": modify_user, + "modify_time": time.Now().Format("2006-01-02 15:04:05"), + "status": status, }) if err != nil { return err