JSON转换放在内置函数里
This commit is contained in:
@@ -2,14 +2,12 @@
|
|||||||
package audit
|
package audit
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"encoding/json"
|
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"git.huangwc.com/pig/pig-farm-controller/internal/infra/logs"
|
"git.huangwc.com/pig/pig-farm-controller/internal/infra/logs"
|
||||||
"git.huangwc.com/pig/pig-farm-controller/internal/infra/models"
|
"git.huangwc.com/pig/pig-farm-controller/internal/infra/models"
|
||||||
"git.huangwc.com/pig/pig-farm-controller/internal/infra/repository"
|
"git.huangwc.com/pig/pig-farm-controller/internal/infra/repository"
|
||||||
"github.com/gin-gonic/gin"
|
"github.com/gin-gonic/gin"
|
||||||
"gorm.io/datatypes"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
const (
|
const (
|
||||||
@@ -49,24 +47,12 @@ func (s *service) LogAction(c *gin.Context, actionType, description string, targ
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
// 将 targetResource 转换为 JSONB,如果失败则记录错误但继续
|
|
||||||
var targetResourceJSON datatypes.JSON
|
|
||||||
if targetResource != nil {
|
|
||||||
bytes, err := json.Marshal(targetResource)
|
|
||||||
if err != nil {
|
|
||||||
s.logger.Errorw("无法记录审计日志:序列化 targetResource 失败", "error", err)
|
|
||||||
} else {
|
|
||||||
targetResourceJSON = bytes
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
log := &models.UserActionLog{
|
log := &models.UserActionLog{
|
||||||
Time: time.Now(),
|
Time: time.Now(),
|
||||||
UserID: user.ID,
|
UserID: user.ID,
|
||||||
Username: user.Username, // 用户名快照
|
Username: user.Username, // 用户名快照
|
||||||
SourceIP: c.ClientIP(),
|
SourceIP: c.ClientIP(),
|
||||||
ActionType: actionType,
|
ActionType: actionType,
|
||||||
TargetResource: targetResourceJSON,
|
|
||||||
Description: description,
|
Description: description,
|
||||||
Status: status,
|
Status: status,
|
||||||
HTTPPath: c.Request.URL.Path,
|
HTTPPath: c.Request.URL.Path,
|
||||||
@@ -74,6 +60,12 @@ func (s *service) LogAction(c *gin.Context, actionType, description string, targ
|
|||||||
ResultDetails: resultDetails,
|
ResultDetails: resultDetails,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// 使用模型提供的方法来设置 TargetResource
|
||||||
|
if err := log.SetTargetResource(targetResource); err != nil {
|
||||||
|
s.logger.Errorw("无法记录审计日志:序列化 targetResource 失败", "error", err)
|
||||||
|
// 即使序列化失败,我们可能仍然希望记录操作本身,所以不在此处 return
|
||||||
|
}
|
||||||
|
|
||||||
// 异步写入数据库,不阻塞当前请求
|
// 异步写入数据库,不阻塞当前请求
|
||||||
go func() {
|
go func() {
|
||||||
if err := s.userActionLogRepository.Create(log); err != nil {
|
if err := s.userActionLogRepository.Create(log); err != nil {
|
||||||
|
|||||||
@@ -1,6 +1,8 @@
|
|||||||
package models
|
package models
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"encoding/json"
|
||||||
|
"errors"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"gorm.io/datatypes"
|
"gorm.io/datatypes"
|
||||||
@@ -170,3 +172,26 @@ type UserActionLog struct {
|
|||||||
func (UserActionLog) TableName() string {
|
func (UserActionLog) TableName() string {
|
||||||
return "user_action_logs"
|
return "user_action_logs"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// ParseTargetResource 解析 JSON 属性到一个具体的结构体中。
|
||||||
|
// 调用方需要传入一个指向目标结构体实例的指针。
|
||||||
|
func (l *UserActionLog) ParseTargetResource(v interface{}) error {
|
||||||
|
if l.TargetResource == nil {
|
||||||
|
return errors.New("目标资源为空,无法解析")
|
||||||
|
}
|
||||||
|
return json.Unmarshal(l.TargetResource, v)
|
||||||
|
}
|
||||||
|
|
||||||
|
// SetTargetResource 将任意结构体序列化为 JSON 并设置到 TargetResource 字段
|
||||||
|
func (l *UserActionLog) SetTargetResource(data interface{}) error {
|
||||||
|
if data == nil {
|
||||||
|
l.TargetResource = nil
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
bytes, err := json.Marshal(data)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
l.TargetResource = bytes
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user