优化表结构，重构模型，重新实现基于白银网关的提取节点流程
This commit is contained in:
@@ -28,16 +28,32 @@ func newLogsRequest(db *gorm.DB, opts ...gen.DOOption) logsRequest {
|
||||
tableName := _logsRequest.logsRequestDo.TableName()
|
||||
_logsRequest.ALL = field.NewAsterisk(tableName)
|
||||
_logsRequest.ID = field.NewInt32(tableName, "id")
|
||||
_logsRequest.IP = field.NewString(tableName, "ip")
|
||||
_logsRequest.IP = field.NewField(tableName, "ip")
|
||||
_logsRequest.UA = field.NewString(tableName, "ua")
|
||||
_logsRequest.UserID = field.NewInt32(tableName, "user_id")
|
||||
_logsRequest.ClientID = field.NewInt32(tableName, "client_id")
|
||||
_logsRequest.Method = field.NewString(tableName, "method")
|
||||
_logsRequest.Path = field.NewString(tableName, "path")
|
||||
_logsRequest.Status = field.NewInt32(tableName, "status")
|
||||
_logsRequest.Status = field.NewInt16(tableName, "status")
|
||||
_logsRequest.Error = field.NewString(tableName, "error")
|
||||
_logsRequest.Time = field.NewField(tableName, "time")
|
||||
_logsRequest.Time = field.NewTime(tableName, "time")
|
||||
_logsRequest.Latency = field.NewString(tableName, "latency")
|
||||
_logsRequest.Client = logsRequestHasOneClient{
|
||||
db: db.Session(&gorm.Session{}),
|
||||
|
||||
RelationField: field.NewRelation("Client", "models.Client"),
|
||||
}
|
||||
|
||||
_logsRequest.User = logsRequestBelongsToUser{
|
||||
db: db.Session(&gorm.Session{}),
|
||||
|
||||
RelationField: field.NewRelation("User", "models.User"),
|
||||
Admin: struct {
|
||||
field.RelationField
|
||||
}{
|
||||
RelationField: field.NewRelation("User.Admin", "models.Admin"),
|
||||
},
|
||||
}
|
||||
|
||||
_logsRequest.fillFieldMap()
|
||||
|
||||
@@ -48,17 +64,20 @@ type logsRequest struct {
|
||||
logsRequestDo
|
||||
|
||||
ALL field.Asterisk
|
||||
ID field.Int32 // 访问日志ID
|
||||
IP field.String // IP地址
|
||||
UA field.String // 用户代理
|
||||
UserID field.Int32 // 用户ID
|
||||
ClientID field.Int32 // 客户端ID
|
||||
Method field.String // 请求方法
|
||||
Path field.String // 请求路径
|
||||
Status field.Int32 // 响应状态码
|
||||
Error field.String // 错误信息
|
||||
Time field.Field // 请求时间
|
||||
Latency field.String // 请求延迟
|
||||
ID field.Int32
|
||||
IP field.Field
|
||||
UA field.String
|
||||
UserID field.Int32
|
||||
ClientID field.Int32
|
||||
Method field.String
|
||||
Path field.String
|
||||
Status field.Int16
|
||||
Error field.String
|
||||
Time field.Time
|
||||
Latency field.String
|
||||
Client logsRequestHasOneClient
|
||||
|
||||
User logsRequestBelongsToUser
|
||||
|
||||
fieldMap map[string]field.Expr
|
||||
}
|
||||
@@ -76,15 +95,15 @@ func (l logsRequest) As(alias string) *logsRequest {
|
||||
func (l *logsRequest) updateTableName(table string) *logsRequest {
|
||||
l.ALL = field.NewAsterisk(table)
|
||||
l.ID = field.NewInt32(table, "id")
|
||||
l.IP = field.NewString(table, "ip")
|
||||
l.IP = field.NewField(table, "ip")
|
||||
l.UA = field.NewString(table, "ua")
|
||||
l.UserID = field.NewInt32(table, "user_id")
|
||||
l.ClientID = field.NewInt32(table, "client_id")
|
||||
l.Method = field.NewString(table, "method")
|
||||
l.Path = field.NewString(table, "path")
|
||||
l.Status = field.NewInt32(table, "status")
|
||||
l.Status = field.NewInt16(table, "status")
|
||||
l.Error = field.NewString(table, "error")
|
||||
l.Time = field.NewField(table, "time")
|
||||
l.Time = field.NewTime(table, "time")
|
||||
l.Latency = field.NewString(table, "latency")
|
||||
|
||||
l.fillFieldMap()
|
||||
@@ -102,7 +121,7 @@ func (l *logsRequest) GetFieldByName(fieldName string) (field.OrderExpr, bool) {
|
||||
}
|
||||
|
||||
func (l *logsRequest) fillFieldMap() {
|
||||
l.fieldMap = make(map[string]field.Expr, 11)
|
||||
l.fieldMap = make(map[string]field.Expr, 13)
|
||||
l.fieldMap["id"] = l.ID
|
||||
l.fieldMap["ip"] = l.IP
|
||||
l.fieldMap["ua"] = l.UA
|
||||
@@ -114,18 +133,191 @@ func (l *logsRequest) fillFieldMap() {
|
||||
l.fieldMap["error"] = l.Error
|
||||
l.fieldMap["time"] = l.Time
|
||||
l.fieldMap["latency"] = l.Latency
|
||||
|
||||
}
|
||||
|
||||
func (l logsRequest) clone(db *gorm.DB) logsRequest {
|
||||
l.logsRequestDo.ReplaceConnPool(db.Statement.ConnPool)
|
||||
l.Client.db = db.Session(&gorm.Session{Initialized: true})
|
||||
l.Client.db.Statement.ConnPool = db.Statement.ConnPool
|
||||
l.User.db = db.Session(&gorm.Session{Initialized: true})
|
||||
l.User.db.Statement.ConnPool = db.Statement.ConnPool
|
||||
return l
|
||||
}
|
||||
|
||||
func (l logsRequest) replaceDB(db *gorm.DB) logsRequest {
|
||||
l.logsRequestDo.ReplaceDB(db)
|
||||
l.Client.db = db.Session(&gorm.Session{})
|
||||
l.User.db = db.Session(&gorm.Session{})
|
||||
return l
|
||||
}
|
||||
|
||||
type logsRequestHasOneClient struct {
|
||||
db *gorm.DB
|
||||
|
||||
field.RelationField
|
||||
}
|
||||
|
||||
func (a logsRequestHasOneClient) Where(conds ...field.Expr) *logsRequestHasOneClient {
|
||||
if len(conds) == 0 {
|
||||
return &a
|
||||
}
|
||||
|
||||
exprs := make([]clause.Expression, 0, len(conds))
|
||||
for _, cond := range conds {
|
||||
exprs = append(exprs, cond.BeCond().(clause.Expression))
|
||||
}
|
||||
a.db = a.db.Clauses(clause.Where{Exprs: exprs})
|
||||
return &a
|
||||
}
|
||||
|
||||
func (a logsRequestHasOneClient) WithContext(ctx context.Context) *logsRequestHasOneClient {
|
||||
a.db = a.db.WithContext(ctx)
|
||||
return &a
|
||||
}
|
||||
|
||||
func (a logsRequestHasOneClient) Session(session *gorm.Session) *logsRequestHasOneClient {
|
||||
a.db = a.db.Session(session)
|
||||
return &a
|
||||
}
|
||||
|
||||
func (a logsRequestHasOneClient) Model(m *models.LogsRequest) *logsRequestHasOneClientTx {
|
||||
return &logsRequestHasOneClientTx{a.db.Model(m).Association(a.Name())}
|
||||
}
|
||||
|
||||
func (a logsRequestHasOneClient) Unscoped() *logsRequestHasOneClient {
|
||||
a.db = a.db.Unscoped()
|
||||
return &a
|
||||
}
|
||||
|
||||
type logsRequestHasOneClientTx struct{ tx *gorm.Association }
|
||||
|
||||
func (a logsRequestHasOneClientTx) Find() (result *models.Client, err error) {
|
||||
return result, a.tx.Find(&result)
|
||||
}
|
||||
|
||||
func (a logsRequestHasOneClientTx) Append(values ...*models.Client) (err error) {
|
||||
targetValues := make([]interface{}, len(values))
|
||||
for i, v := range values {
|
||||
targetValues[i] = v
|
||||
}
|
||||
return a.tx.Append(targetValues...)
|
||||
}
|
||||
|
||||
func (a logsRequestHasOneClientTx) Replace(values ...*models.Client) (err error) {
|
||||
targetValues := make([]interface{}, len(values))
|
||||
for i, v := range values {
|
||||
targetValues[i] = v
|
||||
}
|
||||
return a.tx.Replace(targetValues...)
|
||||
}
|
||||
|
||||
func (a logsRequestHasOneClientTx) Delete(values ...*models.Client) (err error) {
|
||||
targetValues := make([]interface{}, len(values))
|
||||
for i, v := range values {
|
||||
targetValues[i] = v
|
||||
}
|
||||
return a.tx.Delete(targetValues...)
|
||||
}
|
||||
|
||||
func (a logsRequestHasOneClientTx) Clear() error {
|
||||
return a.tx.Clear()
|
||||
}
|
||||
|
||||
func (a logsRequestHasOneClientTx) Count() int64 {
|
||||
return a.tx.Count()
|
||||
}
|
||||
|
||||
func (a logsRequestHasOneClientTx) Unscoped() *logsRequestHasOneClientTx {
|
||||
a.tx = a.tx.Unscoped()
|
||||
return &a
|
||||
}
|
||||
|
||||
type logsRequestBelongsToUser struct {
|
||||
db *gorm.DB
|
||||
|
||||
field.RelationField
|
||||
|
||||
Admin struct {
|
||||
field.RelationField
|
||||
}
|
||||
}
|
||||
|
||||
func (a logsRequestBelongsToUser) Where(conds ...field.Expr) *logsRequestBelongsToUser {
|
||||
if len(conds) == 0 {
|
||||
return &a
|
||||
}
|
||||
|
||||
exprs := make([]clause.Expression, 0, len(conds))
|
||||
for _, cond := range conds {
|
||||
exprs = append(exprs, cond.BeCond().(clause.Expression))
|
||||
}
|
||||
a.db = a.db.Clauses(clause.Where{Exprs: exprs})
|
||||
return &a
|
||||
}
|
||||
|
||||
func (a logsRequestBelongsToUser) WithContext(ctx context.Context) *logsRequestBelongsToUser {
|
||||
a.db = a.db.WithContext(ctx)
|
||||
return &a
|
||||
}
|
||||
|
||||
func (a logsRequestBelongsToUser) Session(session *gorm.Session) *logsRequestBelongsToUser {
|
||||
a.db = a.db.Session(session)
|
||||
return &a
|
||||
}
|
||||
|
||||
func (a logsRequestBelongsToUser) Model(m *models.LogsRequest) *logsRequestBelongsToUserTx {
|
||||
return &logsRequestBelongsToUserTx{a.db.Model(m).Association(a.Name())}
|
||||
}
|
||||
|
||||
func (a logsRequestBelongsToUser) Unscoped() *logsRequestBelongsToUser {
|
||||
a.db = a.db.Unscoped()
|
||||
return &a
|
||||
}
|
||||
|
||||
type logsRequestBelongsToUserTx struct{ tx *gorm.Association }
|
||||
|
||||
func (a logsRequestBelongsToUserTx) Find() (result *models.User, err error) {
|
||||
return result, a.tx.Find(&result)
|
||||
}
|
||||
|
||||
func (a logsRequestBelongsToUserTx) Append(values ...*models.User) (err error) {
|
||||
targetValues := make([]interface{}, len(values))
|
||||
for i, v := range values {
|
||||
targetValues[i] = v
|
||||
}
|
||||
return a.tx.Append(targetValues...)
|
||||
}
|
||||
|
||||
func (a logsRequestBelongsToUserTx) Replace(values ...*models.User) (err error) {
|
||||
targetValues := make([]interface{}, len(values))
|
||||
for i, v := range values {
|
||||
targetValues[i] = v
|
||||
}
|
||||
return a.tx.Replace(targetValues...)
|
||||
}
|
||||
|
||||
func (a logsRequestBelongsToUserTx) Delete(values ...*models.User) (err error) {
|
||||
targetValues := make([]interface{}, len(values))
|
||||
for i, v := range values {
|
||||
targetValues[i] = v
|
||||
}
|
||||
return a.tx.Delete(targetValues...)
|
||||
}
|
||||
|
||||
func (a logsRequestBelongsToUserTx) Clear() error {
|
||||
return a.tx.Clear()
|
||||
}
|
||||
|
||||
func (a logsRequestBelongsToUserTx) Count() int64 {
|
||||
return a.tx.Count()
|
||||
}
|
||||
|
||||
func (a logsRequestBelongsToUserTx) Unscoped() *logsRequestBelongsToUserTx {
|
||||
a.tx = a.tx.Unscoped()
|
||||
return &a
|
||||
}
|
||||
|
||||
type logsRequestDo struct{ gen.DO }
|
||||
|
||||
func (l logsRequestDo) Debug() *logsRequestDo {
|
||||
|
||||
Reference in New Issue
Block a user