重构代码结构与认证体系，集成异步任务消费者

2025-11-17 18:38:10 +08:00
parent a97c970166
commit a245229bc2
70 changed files with 2000 additions and 2334 deletions
--- a/web/queries/channel.gen.go
+++ b/web/queries/channel.gen.go
@@ -30,10 +30,14 @@ func newChannel(db *gorm.DB, opts ...gen.DOOption) channel {
 	_channel.ID = field.NewInt32(tableName, "id")
 	_channel.UserID = field.NewInt32(tableName, "user_id")
 	_channel.ProxyID = field.NewInt32(tableName, "proxy_id")
+	_channel.EdgeID = field.NewInt32(tableName, "edge_id")
+	_channel.ResourceID = field.NewInt32(tableName, "resource_id")
 	_channel.ProxyHost = field.NewString(tableName, "proxy_host")
 	_channel.ProxyPort = field.NewInt32(tableName, "proxy_port")
+	_channel.EdgeHost = field.NewString(tableName, "edge_host")
 	_channel.Protocol = field.NewInt32(tableName, "protocol")
 	_channel.AuthIP = field.NewBool(tableName, "auth_ip")
+	_channel.Whitelists = field.NewString(tableName, "whitelists")
 	_channel.AuthPass = field.NewBool(tableName, "auth_pass")
 	_channel.Username = field.NewString(tableName, "username")
 	_channel.Password = field.NewString(tableName, "password")
@@ -41,10 +45,6 @@ func newChannel(db *gorm.DB, opts ...gen.DOOption) channel {
 	_channel.CreatedAt = field.NewField(tableName, "created_at")
 	_channel.UpdatedAt = field.NewField(tableName, "updated_at")
 	_channel.DeletedAt = field.NewField(tableName, "deleted_at")
-	_channel.EdgeHost = field.NewString(tableName, "edge_host")
-	_channel.EdgeID = field.NewInt32(tableName, "edge_id")
-	_channel.Whitelists = field.NewString(tableName, "whitelists")
-	_channel.ResourceID = field.NewInt32(tableName, "resource_id")

 	_channel.fillFieldMap()

@@ -58,10 +58,14 @@ type channel struct {
 	ID         field.Int32  // 通道ID
 	UserID     field.Int32  // 用户ID
 	ProxyID    field.Int32  // 代理ID
+	EdgeID     field.Int32  // 节点ID
+	ResourceID field.Int32  // 套餐ID
 	ProxyHost  field.String // 代理地址
 	ProxyPort  field.Int32  // 转发端口
+	EdgeHost   field.String // 节点地址
 	Protocol   field.Int32  // 协议类型：1-http，2-https，3-socks5
 	AuthIP     field.Bool   // IP认证
+	Whitelists field.String // IP白名单，逗号分隔
 	AuthPass   field.Bool   // 密码认证
 	Username   field.String // 用户名
 	Password   field.String // 密码
@@ -69,10 +73,6 @@ type channel struct {
 	CreatedAt  field.Field  // 创建时间
 	UpdatedAt  field.Field  // 更新时间
 	DeletedAt  field.Field  // 删除时间
-	EdgeHost   field.String // 节点地址
-	EdgeID     field.Int32  // 节点ID
-	Whitelists field.String // IP白名单，逗号分隔
-	ResourceID field.Int32  // 套餐ID

 	fieldMap map[string]field.Expr
 }
@@ -92,10 +92,14 @@ func (c *channel) updateTableName(table string) *channel {
 	c.ID = field.NewInt32(table, "id")
 	c.UserID = field.NewInt32(table, "user_id")
 	c.ProxyID = field.NewInt32(table, "proxy_id")
+	c.EdgeID = field.NewInt32(table, "edge_id")
+	c.ResourceID = field.NewInt32(table, "resource_id")
 	c.ProxyHost = field.NewString(table, "proxy_host")
 	c.ProxyPort = field.NewInt32(table, "proxy_port")
+	c.EdgeHost = field.NewString(table, "edge_host")
 	c.Protocol = field.NewInt32(table, "protocol")
 	c.AuthIP = field.NewBool(table, "auth_ip")
+	c.Whitelists = field.NewString(table, "whitelists")
 	c.AuthPass = field.NewBool(table, "auth_pass")
 	c.Username = field.NewString(table, "username")
 	c.Password = field.NewString(table, "password")
@@ -103,10 +107,6 @@ func (c *channel) updateTableName(table string) *channel {
 	c.CreatedAt = field.NewField(table, "created_at")
 	c.UpdatedAt = field.NewField(table, "updated_at")
 	c.DeletedAt = field.NewField(table, "deleted_at")
-	c.EdgeHost = field.NewString(table, "edge_host")
-	c.EdgeID = field.NewInt32(table, "edge_id")
-	c.Whitelists = field.NewString(table, "whitelists")
-	c.ResourceID = field.NewInt32(table, "resource_id")

 	c.fillFieldMap()

@@ -127,10 +127,14 @@ func (c *channel) fillFieldMap() {
 	c.fieldMap["id"] = c.ID
 	c.fieldMap["user_id"] = c.UserID
 	c.fieldMap["proxy_id"] = c.ProxyID
+	c.fieldMap["edge_id"] = c.EdgeID
+	c.fieldMap["resource_id"] = c.ResourceID
 	c.fieldMap["proxy_host"] = c.ProxyHost
 	c.fieldMap["proxy_port"] = c.ProxyPort
+	c.fieldMap["edge_host"] = c.EdgeHost
 	c.fieldMap["protocol"] = c.Protocol
 	c.fieldMap["auth_ip"] = c.AuthIP
+	c.fieldMap["whitelists"] = c.Whitelists
 	c.fieldMap["auth_pass"] = c.AuthPass
 	c.fieldMap["username"] = c.Username
 	c.fieldMap["password"] = c.Password
@@ -138,10 +142,6 @@ func (c *channel) fillFieldMap() {
 	c.fieldMap["created_at"] = c.CreatedAt
 	c.fieldMap["updated_at"] = c.UpdatedAt
 	c.fieldMap["deleted_at"] = c.DeletedAt
-	c.fieldMap["edge_host"] = c.EdgeHost
-	c.fieldMap["edge_id"] = c.EdgeID
-	c.fieldMap["whitelists"] = c.Whitelists
-	c.fieldMap["resource_id"] = c.ResourceID
 }

 func (c channel) clone(db *gorm.DB) channel {
--- a/web/queries/client.gen.go
+++ b/web/queries/client.gen.go
@@ -31,14 +31,11 @@ func newClient(db *gorm.DB, opts ...gen.DOOption) client {
 	_client.ClientID = field.NewString(tableName, "client_id")
 	_client.ClientSecret = field.NewString(tableName, "client_secret")
 	_client.RedirectURI = field.NewString(tableName, "redirect_uri")
-	_client.GrantCode = field.NewBool(tableName, "grant_code")
-	_client.GrantClient = field.NewBool(tableName, "grant_client")
-	_client.GrantRefresh = field.NewBool(tableName, "grant_refresh")
-	_client.GrantPassword = field.NewBool(tableName, "grant_password")
 	_client.Spec = field.NewInt32(tableName, "spec")
 	_client.Name = field.NewString(tableName, "name")
 	_client.Icon = field.NewString(tableName, "icon")
 	_client.Status = field.NewInt32(tableName, "status")
+	_client.Type = field.NewInt32(tableName, "type")
 	_client.CreatedAt = field.NewField(tableName, "created_at")
 	_client.UpdatedAt = field.NewField(tableName, "updated_at")
 	_client.DeletedAt = field.NewField(tableName, "deleted_at")
@@ -51,22 +48,19 @@ func newClient(db *gorm.DB, opts ...gen.DOOption) client {
 type client struct {
 	clientDo

-	ALL           field.Asterisk
-	ID            field.Int32  // 客户端ID
-	ClientID      field.String // OAuth2客户端标识符
-	ClientSecret  field.String // OAuth2客户端密钥
-	RedirectURI   field.String // OAuth2 重定向URI
-	GrantCode     field.Bool   // 允许授权码授予
-	GrantClient   field.Bool   // 允许客户端凭证授予
-	GrantRefresh  field.Bool   // 允许刷新令牌授予
-	GrantPassword field.Bool   // 允许密码授予
-	Spec          field.Int32  // 安全规范：1-native，2-browser，3-web，4-trusted
-	Name          field.String // 名称
-	Icon          field.String // 图标URL
-	Status        field.Int32  // 状态：0-禁用，1-正常
-	CreatedAt     field.Field  // 创建时间
-	UpdatedAt     field.Field  // 更新时间
-	DeletedAt     field.Field  // 删除时间
+	ALL          field.Asterisk
+	ID           field.Int32  // 客户端ID
+	ClientID     field.String // OAuth2客户端标识符
+	ClientSecret field.String // OAuth2客户端密钥
+	RedirectURI  field.String // OAuth2 重定向URI
+	Spec         field.Int32  // 安全规范：1-native，2-browser，3-web，4-api
+	Name         field.String // 名称
+	Icon         field.String // 图标URL
+	Status       field.Int32  // 状态：0-禁用，1-正常
+	Type         field.Int32  // 类型：0-普通，1-官方
+	CreatedAt    field.Field  // 创建时间
+	UpdatedAt    field.Field  // 更新时间
+	DeletedAt    field.Field  // 删除时间

 	fieldMap map[string]field.Expr
 }
@@ -87,14 +81,11 @@ func (c *client) updateTableName(table string) *client {
 	c.ClientID = field.NewString(table, "client_id")
 	c.ClientSecret = field.NewString(table, "client_secret")
 	c.RedirectURI = field.NewString(table, "redirect_uri")
-	c.GrantCode = field.NewBool(table, "grant_code")
-	c.GrantClient = field.NewBool(table, "grant_client")
-	c.GrantRefresh = field.NewBool(table, "grant_refresh")
-	c.GrantPassword = field.NewBool(table, "grant_password")
 	c.Spec = field.NewInt32(table, "spec")
 	c.Name = field.NewString(table, "name")
 	c.Icon = field.NewString(table, "icon")
 	c.Status = field.NewInt32(table, "status")
+	c.Type = field.NewInt32(table, "type")
 	c.CreatedAt = field.NewField(table, "created_at")
 	c.UpdatedAt = field.NewField(table, "updated_at")
 	c.DeletedAt = field.NewField(table, "deleted_at")
@@ -114,19 +105,16 @@ func (c *client) GetFieldByName(fieldName string) (field.OrderExpr, bool) {
 }

 func (c *client) fillFieldMap() {
-	c.fieldMap = make(map[string]field.Expr, 15)
+	c.fieldMap = make(map[string]field.Expr, 12)
 	c.fieldMap["id"] = c.ID
 	c.fieldMap["client_id"] = c.ClientID
 	c.fieldMap["client_secret"] = c.ClientSecret
 	c.fieldMap["redirect_uri"] = c.RedirectURI
-	c.fieldMap["grant_code"] = c.GrantCode
-	c.fieldMap["grant_client"] = c.GrantClient
-	c.fieldMap["grant_refresh"] = c.GrantRefresh
-	c.fieldMap["grant_password"] = c.GrantPassword
 	c.fieldMap["spec"] = c.Spec
 	c.fieldMap["name"] = c.Name
 	c.fieldMap["icon"] = c.Icon
 	c.fieldMap["status"] = c.Status
+	c.fieldMap["type"] = c.Type
 	c.fieldMap["created_at"] = c.CreatedAt
 	c.fieldMap["updated_at"] = c.UpdatedAt
 	c.fieldMap["deleted_at"] = c.DeletedAt
--- a/web/queries/logs_login.gen.go
+++ b/web/queries/logs_login.gen.go
@@ -29,12 +29,12 @@ func newLogsLogin(db *gorm.DB, opts ...gen.DOOption) logsLogin {
 	_logsLogin.ALL = field.NewAsterisk(tableName)
 	_logsLogin.ID = field.NewInt32(tableName, "id")
 	_logsLogin.IP = field.NewString(tableName, "ip")
-	_logsLogin.Ua = field.NewString(tableName, "ua")
+	_logsLogin.UA = field.NewString(tableName, "ua")
 	_logsLogin.GrantType = field.NewString(tableName, "grant_type")
 	_logsLogin.PasswordGrantType = field.NewString(tableName, "password_grant_type")
 	_logsLogin.Success = field.NewBool(tableName, "success")
-	_logsLogin.Time = field.NewField(tableName, "time")
 	_logsLogin.UserID = field.NewInt32(tableName, "user_id")
+	_logsLogin.Time = field.NewField(tableName, "time")

 	_logsLogin.fillFieldMap()

@@ -47,12 +47,12 @@ type logsLogin struct {
 	ALL               field.Asterisk
 	ID                field.Int32  // 登录日志ID
 	IP                field.String // IP地址
-	Ua                field.String // 用户代理
+	UA                field.String // 用户代理
 	GrantType         field.String // 授权类型：authorization_code-授权码模式，client_credentials-客户端凭证模式，refresh_token-刷新令牌模式，password-密码模式
 	PasswordGrantType field.String // 密码模式子授权类型：password-账号密码，phone_code-手机验证码，email_code-邮箱验证码
 	Success           field.Bool   // 登录是否成功
-	Time              field.Field  // 登录时间
 	UserID            field.Int32  // 用户ID
+	Time              field.Field  // 登录时间

 	fieldMap map[string]field.Expr
 }
@@ -71,12 +71,12 @@ func (l *logsLogin) updateTableName(table string) *logsLogin {
 	l.ALL = field.NewAsterisk(table)
 	l.ID = field.NewInt32(table, "id")
 	l.IP = field.NewString(table, "ip")
-	l.Ua = field.NewString(table, "ua")
+	l.UA = field.NewString(table, "ua")
 	l.GrantType = field.NewString(table, "grant_type")
 	l.PasswordGrantType = field.NewString(table, "password_grant_type")
 	l.Success = field.NewBool(table, "success")
-	l.Time = field.NewField(table, "time")
 	l.UserID = field.NewInt32(table, "user_id")
+	l.Time = field.NewField(table, "time")

 	l.fillFieldMap()

@@ -96,12 +96,12 @@ func (l *logsLogin) fillFieldMap() {
 	l.fieldMap = make(map[string]field.Expr, 8)
 	l.fieldMap["id"] = l.ID
 	l.fieldMap["ip"] = l.IP
-	l.fieldMap["ua"] = l.Ua
+	l.fieldMap["ua"] = l.UA
 	l.fieldMap["grant_type"] = l.GrantType
 	l.fieldMap["password_grant_type"] = l.PasswordGrantType
 	l.fieldMap["success"] = l.Success
-	l.fieldMap["time"] = l.Time
 	l.fieldMap["user_id"] = l.UserID
+	l.fieldMap["time"] = l.Time
 }

 func (l logsLogin) clone(db *gorm.DB) logsLogin {
--- a/web/queries/logs_request.gen.go
+++ b/web/queries/logs_request.gen.go
@@ -28,16 +28,16 @@ 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.Identity = field.NewInt32(tableName, "identity")
-	_logsRequest.Visitor = field.NewInt32(tableName, "visitor")
 	_logsRequest.IP = field.NewString(tableName, "ip")
-	_logsRequest.Ua = field.NewString(tableName, "ua")
+	_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.Latency = field.NewString(tableName, "latency")
 	_logsRequest.Status = field.NewInt32(tableName, "status")
 	_logsRequest.Error = field.NewString(tableName, "error")
 	_logsRequest.Time = field.NewField(tableName, "time")
+	_logsRequest.Latency = field.NewString(tableName, "latency")

 	_logsRequest.fillFieldMap()

@@ -49,16 +49,16 @@ type logsRequest struct {

 	ALL      field.Asterisk
 	ID       field.Int32  // 访问日志ID
-	Identity field.Int32  // 访客身份：0-游客，1-用户，2-管理员，3-公共服务，4-安全服务，5-内部服务
-	Visitor  field.Int32  // 访客ID
 	IP       field.String // IP地址
-	Ua       field.String // 用户代理
+	UA       field.String // 用户代理
+	UserID   field.Int32  // 用户ID
+	ClientID field.Int32  // 客户端ID
 	Method   field.String // 请求方法
 	Path     field.String // 请求路径
-	Latency  field.String // 请求延迟
 	Status   field.Int32  // 响应状态码
 	Error    field.String // 错误信息
 	Time     field.Field  // 请求时间
+	Latency  field.String // 请求延迟

 	fieldMap map[string]field.Expr
 }
@@ -76,16 +76,16 @@ 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.Identity = field.NewInt32(table, "identity")
-	l.Visitor = field.NewInt32(table, "visitor")
 	l.IP = field.NewString(table, "ip")
-	l.Ua = field.NewString(table, "ua")
+	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.Latency = field.NewString(table, "latency")
 	l.Status = field.NewInt32(table, "status")
 	l.Error = field.NewString(table, "error")
 	l.Time = field.NewField(table, "time")
+	l.Latency = field.NewString(table, "latency")

 	l.fillFieldMap()

@@ -104,16 +104,16 @@ func (l *logsRequest) GetFieldByName(fieldName string) (field.OrderExpr, bool) {
 func (l *logsRequest) fillFieldMap() {
 	l.fieldMap = make(map[string]field.Expr, 11)
 	l.fieldMap["id"] = l.ID
-	l.fieldMap["identity"] = l.Identity
-	l.fieldMap["visitor"] = l.Visitor
 	l.fieldMap["ip"] = l.IP
-	l.fieldMap["ua"] = l.Ua
+	l.fieldMap["ua"] = l.UA
+	l.fieldMap["user_id"] = l.UserID
+	l.fieldMap["client_id"] = l.ClientID
 	l.fieldMap["method"] = l.Method
 	l.fieldMap["path"] = l.Path
-	l.fieldMap["latency"] = l.Latency
 	l.fieldMap["status"] = l.Status
 	l.fieldMap["error"] = l.Error
 	l.fieldMap["time"] = l.Time
+	l.fieldMap["latency"] = l.Latency
 }

 func (l logsRequest) clone(db *gorm.DB) logsRequest {
--- a/web/queries/proxy.gen.go
+++ b/web/queries/proxy.gen.go
@@ -31,12 +31,12 @@ func newProxy(db *gorm.DB, opts ...gen.DOOption) proxy {
 	_proxy.Version = field.NewInt32(tableName, "version")
 	_proxy.Name = field.NewString(tableName, "name")
 	_proxy.Host = field.NewString(tableName, "host")
-	_proxy.Type = field.NewInt32(tableName, "type")
 	_proxy.Secret = field.NewString(tableName, "secret")
+	_proxy.Type = field.NewInt32(tableName, "type")
+	_proxy.Status = field.NewInt32(tableName, "status")
 	_proxy.CreatedAt = field.NewField(tableName, "created_at")
 	_proxy.UpdatedAt = field.NewField(tableName, "updated_at")
 	_proxy.DeletedAt = field.NewField(tableName, "deleted_at")
-	_proxy.Status = field.NewInt32(tableName, "status")
 	_proxy.Edges = proxyHasManyEdges{
 		db: db.Session(&gorm.Session{}),

@@ -56,12 +56,12 @@ type proxy struct {
 	Version   field.Int32  // 代理服务版本
 	Name      field.String // 代理服务名称
 	Host      field.String // 代理服务地址
-	Type      field.Int32  // 代理服务类型：1-三方，2-自有
 	Secret    field.String // 代理服务密钥
+	Type      field.Int32  // 代理服务类型：1-三方，2-自有
+	Status    field.Int32  // 代理服务状态：0-离线，1-在线
 	CreatedAt field.Field  // 创建时间
 	UpdatedAt field.Field  // 更新时间
 	DeletedAt field.Field  // 删除时间
-	Status    field.Int32  // 代理服务状态：0-离线，1-在线
 	Edges     proxyHasManyEdges

 	fieldMap map[string]field.Expr
@@ -83,12 +83,12 @@ func (p *proxy) updateTableName(table string) *proxy {
 	p.Version = field.NewInt32(table, "version")
 	p.Name = field.NewString(table, "name")
 	p.Host = field.NewString(table, "host")
-	p.Type = field.NewInt32(table, "type")
 	p.Secret = field.NewString(table, "secret")
+	p.Type = field.NewInt32(table, "type")
+	p.Status = field.NewInt32(table, "status")
 	p.CreatedAt = field.NewField(table, "created_at")
 	p.UpdatedAt = field.NewField(table, "updated_at")
 	p.DeletedAt = field.NewField(table, "deleted_at")
-	p.Status = field.NewInt32(table, "status")

 	p.fillFieldMap()

@@ -110,12 +110,12 @@ func (p *proxy) fillFieldMap() {
 	p.fieldMap["version"] = p.Version
 	p.fieldMap["name"] = p.Name
 	p.fieldMap["host"] = p.Host
-	p.fieldMap["type"] = p.Type
 	p.fieldMap["secret"] = p.Secret
+	p.fieldMap["type"] = p.Type
+	p.fieldMap["status"] = p.Status
 	p.fieldMap["created_at"] = p.CreatedAt
 	p.fieldMap["updated_at"] = p.UpdatedAt
 	p.fieldMap["deleted_at"] = p.DeletedAt
-	p.fieldMap["status"] = p.Status

 }

--- a/web/queries/session.gen.go
+++ b/web/queries/session.gen.go
@@ -29,10 +29,10 @@ func newSession(db *gorm.DB, opts ...gen.DOOption) session {
 	_session.ALL = field.NewAsterisk(tableName)
 	_session.ID = field.NewInt32(tableName, "id")
 	_session.UserID = field.NewInt32(tableName, "user_id")
+	_session.AdminID = field.NewInt32(tableName, "admin_id")
 	_session.ClientID = field.NewInt32(tableName, "client_id")
 	_session.IP = field.NewString(tableName, "ip")
-	_session.Ua = field.NewString(tableName, "ua")
-	_session.GrantType = field.NewString(tableName, "grant_type")
+	_session.UA = field.NewString(tableName, "ua")
 	_session.AccessToken = field.NewString(tableName, "access_token")
 	_session.AccessTokenExpires = field.NewField(tableName, "access_token_expires")
 	_session.RefreshToken = field.NewString(tableName, "refresh_token")
@@ -41,6 +41,23 @@ func newSession(db *gorm.DB, opts ...gen.DOOption) session {
 	_session.CreatedAt = field.NewField(tableName, "created_at")
 	_session.UpdatedAt = field.NewField(tableName, "updated_at")
 	_session.DeletedAt = field.NewField(tableName, "deleted_at")
+	_session.User = sessionBelongsToUser{
+		db: db.Session(&gorm.Session{}),
+
+		RelationField: field.NewRelation("User", "models.User"),
+	}
+
+	_session.Admin = sessionBelongsToAdmin{
+		db: db.Session(&gorm.Session{}),
+
+		RelationField: field.NewRelation("Admin", "models.Admin"),
+	}
+
+	_session.Client = sessionBelongsToClient{
+		db: db.Session(&gorm.Session{}),
+
+		RelationField: field.NewRelation("Client", "models.Client"),
+	}

 	_session.fillFieldMap()

@@ -53,10 +70,10 @@ type session struct {
 	ALL                 field.Asterisk
 	ID                  field.Int32  // 会话ID
 	UserID              field.Int32  // 用户ID
+	AdminID             field.Int32  // 管理员ID
 	ClientID            field.Int32  // 客户端ID
 	IP                  field.String // IP地址
-	Ua                  field.String // 用户代理
-	GrantType           field.String // 授权类型：authorization_code-授权码模式，client_credentials-客户端凭证模式，refresh_token-刷新令牌模式，password-密码模式
+	UA                  field.String // 用户代理
 	AccessToken         field.String // 访问令牌
 	AccessTokenExpires  field.Field  // 访问令牌过期时间
 	RefreshToken        field.String // 刷新令牌
@@ -65,6 +82,11 @@ type session struct {
 	CreatedAt           field.Field  // 创建时间
 	UpdatedAt           field.Field  // 更新时间
 	DeletedAt           field.Field  // 删除时间
+	User                sessionBelongsToUser
+
+	Admin sessionBelongsToAdmin
+
+	Client sessionBelongsToClient

 	fieldMap map[string]field.Expr
 }
@@ -83,10 +105,10 @@ func (s *session) updateTableName(table string) *session {
 	s.ALL = field.NewAsterisk(table)
 	s.ID = field.NewInt32(table, "id")
 	s.UserID = field.NewInt32(table, "user_id")
+	s.AdminID = field.NewInt32(table, "admin_id")
 	s.ClientID = field.NewInt32(table, "client_id")
 	s.IP = field.NewString(table, "ip")
-	s.Ua = field.NewString(table, "ua")
-	s.GrantType = field.NewString(table, "grant_type")
+	s.UA = field.NewString(table, "ua")
 	s.AccessToken = field.NewString(table, "access_token")
 	s.AccessTokenExpires = field.NewField(table, "access_token_expires")
 	s.RefreshToken = field.NewString(table, "refresh_token")
@@ -111,13 +133,13 @@ func (s *session) GetFieldByName(fieldName string) (field.OrderExpr, bool) {
 }

 func (s *session) fillFieldMap() {
-	s.fieldMap = make(map[string]field.Expr, 14)
+	s.fieldMap = make(map[string]field.Expr, 17)
 	s.fieldMap["id"] = s.ID
 	s.fieldMap["user_id"] = s.UserID
+	s.fieldMap["admin_id"] = s.AdminID
 	s.fieldMap["client_id"] = s.ClientID
 	s.fieldMap["ip"] = s.IP
-	s.fieldMap["ua"] = s.Ua
-	s.fieldMap["grant_type"] = s.GrantType
+	s.fieldMap["ua"] = s.UA
 	s.fieldMap["access_token"] = s.AccessToken
 	s.fieldMap["access_token_expires"] = s.AccessTokenExpires
 	s.fieldMap["refresh_token"] = s.RefreshToken
@@ -126,18 +148,271 @@ func (s *session) fillFieldMap() {
 	s.fieldMap["created_at"] = s.CreatedAt
 	s.fieldMap["updated_at"] = s.UpdatedAt
 	s.fieldMap["deleted_at"] = s.DeletedAt
+
 }

 func (s session) clone(db *gorm.DB) session {
 	s.sessionDo.ReplaceConnPool(db.Statement.ConnPool)
+	s.User.db = db.Session(&gorm.Session{Initialized: true})
+	s.User.db.Statement.ConnPool = db.Statement.ConnPool
+	s.Admin.db = db.Session(&gorm.Session{Initialized: true})
+	s.Admin.db.Statement.ConnPool = db.Statement.ConnPool
+	s.Client.db = db.Session(&gorm.Session{Initialized: true})
+	s.Client.db.Statement.ConnPool = db.Statement.ConnPool
 	return s
 }

 func (s session) replaceDB(db *gorm.DB) session {
 	s.sessionDo.ReplaceDB(db)
+	s.User.db = db.Session(&gorm.Session{})
+	s.Admin.db = db.Session(&gorm.Session{})
+	s.Client.db = db.Session(&gorm.Session{})
 	return s
 }

+type sessionBelongsToUser struct {
+	db *gorm.DB
+
+	field.RelationField
+}
+
+func (a sessionBelongsToUser) Where(conds ...field.Expr) *sessionBelongsToUser {
+	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 sessionBelongsToUser) WithContext(ctx context.Context) *sessionBelongsToUser {
+	a.db = a.db.WithContext(ctx)
+	return &a
+}
+
+func (a sessionBelongsToUser) Session(session *gorm.Session) *sessionBelongsToUser {
+	a.db = a.db.Session(session)
+	return &a
+}
+
+func (a sessionBelongsToUser) Model(m *models.Session) *sessionBelongsToUserTx {
+	return &sessionBelongsToUserTx{a.db.Model(m).Association(a.Name())}
+}
+
+func (a sessionBelongsToUser) Unscoped() *sessionBelongsToUser {
+	a.db = a.db.Unscoped()
+	return &a
+}
+
+type sessionBelongsToUserTx struct{ tx *gorm.Association }
+
+func (a sessionBelongsToUserTx) Find() (result *models.User, err error) {
+	return result, a.tx.Find(&result)
+}
+
+func (a sessionBelongsToUserTx) 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 sessionBelongsToUserTx) 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 sessionBelongsToUserTx) 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 sessionBelongsToUserTx) Clear() error {
+	return a.tx.Clear()
+}
+
+func (a sessionBelongsToUserTx) Count() int64 {
+	return a.tx.Count()
+}
+
+func (a sessionBelongsToUserTx) Unscoped() *sessionBelongsToUserTx {
+	a.tx = a.tx.Unscoped()
+	return &a
+}
+
+type sessionBelongsToAdmin struct {
+	db *gorm.DB
+
+	field.RelationField
+}
+
+func (a sessionBelongsToAdmin) Where(conds ...field.Expr) *sessionBelongsToAdmin {
+	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 sessionBelongsToAdmin) WithContext(ctx context.Context) *sessionBelongsToAdmin {
+	a.db = a.db.WithContext(ctx)
+	return &a
+}
+
+func (a sessionBelongsToAdmin) Session(session *gorm.Session) *sessionBelongsToAdmin {
+	a.db = a.db.Session(session)
+	return &a
+}
+
+func (a sessionBelongsToAdmin) Model(m *models.Session) *sessionBelongsToAdminTx {
+	return &sessionBelongsToAdminTx{a.db.Model(m).Association(a.Name())}
+}
+
+func (a sessionBelongsToAdmin) Unscoped() *sessionBelongsToAdmin {
+	a.db = a.db.Unscoped()
+	return &a
+}
+
+type sessionBelongsToAdminTx struct{ tx *gorm.Association }
+
+func (a sessionBelongsToAdminTx) Find() (result *models.Admin, err error) {
+	return result, a.tx.Find(&result)
+}
+
+func (a sessionBelongsToAdminTx) Append(values ...*models.Admin) (err error) {
+	targetValues := make([]interface{}, len(values))
+	for i, v := range values {
+		targetValues[i] = v
+	}
+	return a.tx.Append(targetValues...)
+}
+
+func (a sessionBelongsToAdminTx) Replace(values ...*models.Admin) (err error) {
+	targetValues := make([]interface{}, len(values))
+	for i, v := range values {
+		targetValues[i] = v
+	}
+	return a.tx.Replace(targetValues...)
+}
+
+func (a sessionBelongsToAdminTx) Delete(values ...*models.Admin) (err error) {
+	targetValues := make([]interface{}, len(values))
+	for i, v := range values {
+		targetValues[i] = v
+	}
+	return a.tx.Delete(targetValues...)
+}
+
+func (a sessionBelongsToAdminTx) Clear() error {
+	return a.tx.Clear()
+}
+
+func (a sessionBelongsToAdminTx) Count() int64 {
+	return a.tx.Count()
+}
+
+func (a sessionBelongsToAdminTx) Unscoped() *sessionBelongsToAdminTx {
+	a.tx = a.tx.Unscoped()
+	return &a
+}
+
+type sessionBelongsToClient struct {
+	db *gorm.DB
+
+	field.RelationField
+}
+
+func (a sessionBelongsToClient) Where(conds ...field.Expr) *sessionBelongsToClient {
+	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 sessionBelongsToClient) WithContext(ctx context.Context) *sessionBelongsToClient {
+	a.db = a.db.WithContext(ctx)
+	return &a
+}
+
+func (a sessionBelongsToClient) Session(session *gorm.Session) *sessionBelongsToClient {
+	a.db = a.db.Session(session)
+	return &a
+}
+
+func (a sessionBelongsToClient) Model(m *models.Session) *sessionBelongsToClientTx {
+	return &sessionBelongsToClientTx{a.db.Model(m).Association(a.Name())}
+}
+
+func (a sessionBelongsToClient) Unscoped() *sessionBelongsToClient {
+	a.db = a.db.Unscoped()
+	return &a
+}
+
+type sessionBelongsToClientTx struct{ tx *gorm.Association }
+
+func (a sessionBelongsToClientTx) Find() (result *models.Client, err error) {
+	return result, a.tx.Find(&result)
+}
+
+func (a sessionBelongsToClientTx) 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 sessionBelongsToClientTx) 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 sessionBelongsToClientTx) 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 sessionBelongsToClientTx) Clear() error {
+	return a.tx.Clear()
+}
+
+func (a sessionBelongsToClientTx) Count() int64 {
+	return a.tx.Count()
+}
+
+func (a sessionBelongsToClientTx) Unscoped() *sessionBelongsToClientTx {
+	a.tx = a.tx.Unscoped()
+	return &a
+}
+
 type sessionDo struct{ gen.DO }

 func (s sessionDo) Debug() *sessionDo {
--- a/web/queries/trade.gen.go
+++ b/web/queries/trade.gen.go
@@ -37,16 +37,16 @@ func newTrade(db *gorm.DB, opts ...gen.DOOption) trade {
 	_trade.Amount = field.NewField(tableName, "amount")
 	_trade.Payment = field.NewField(tableName, "payment")
 	_trade.Method = field.NewInt32(tableName, "method")
-	_trade.Status = field.NewInt32(tableName, "status")
-	_trade.CreatedAt = field.NewField(tableName, "created_at")
-	_trade.UpdatedAt = field.NewField(tableName, "updated_at")
-	_trade.DeletedAt = field.NewField(tableName, "deleted_at")
-	_trade.Acquirer = field.NewInt32(tableName, "acquirer")
 	_trade.Platform = field.NewInt32(tableName, "platform")
+	_trade.Acquirer = field.NewInt32(tableName, "acquirer")
+	_trade.Status = field.NewInt32(tableName, "status")
+	_trade.Refunded = field.NewBool(tableName, "refunded")
 	_trade.PaymentURL = field.NewString(tableName, "payment_url")
 	_trade.CompletedAt = field.NewField(tableName, "completed_at")
 	_trade.CanceledAt = field.NewField(tableName, "canceled_at")
-	_trade.Refunded = field.NewBool(tableName, "refunded")
+	_trade.CreatedAt = field.NewField(tableName, "created_at")
+	_trade.UpdatedAt = field.NewField(tableName, "updated_at")
+	_trade.DeletedAt = field.NewField(tableName, "deleted_at")

 	_trade.fillFieldMap()

@@ -65,18 +65,18 @@ type trade struct {
 	Subject     field.String // 订单主题
 	Remark      field.String // 订单备注
 	Amount      field.Field  // 订单总金额
-	Payment     field.Field  // 支付金额
-	Method      field.Int32  // 支付方式：1-支付宝，2-微信，3-商福通渠道支付宝，4-商福通渠道微信
-	Status      field.Int32  // 订单状态：0-待支付，1-已支付，2-已取消
-	CreatedAt   field.Field  // 创建时间
-	UpdatedAt   field.Field  // 更新时间
-	DeletedAt   field.Field  // 删除时间
-	Acquirer    field.Int32  // 收单机构：1-支付宝，2-微信，3-银联
+	Payment     field.Field  // 实际支付金额
+	Method      field.Int32  // 支付方式：1-支付宝，2-微信，3-商福通，4-商福通渠道支付宝，5-商福通渠道微信
 	Platform    field.Int32  // 支付平台：1-电脑网站，2-手机网站
+	Acquirer    field.Int32  // 收单机构：1-支付宝，2-微信，3-银联
+	Status      field.Int32  // 订单状态：0-待支付，1-已支付，2-已取消
+	Refunded    field.Bool
 	PaymentURL  field.String // 支付链接
 	CompletedAt field.Field  // 支付时间
 	CanceledAt  field.Field  // 取消时间
-	Refunded    field.Bool
+	CreatedAt   field.Field  // 创建时间
+	UpdatedAt   field.Field  // 更新时间
+	DeletedAt   field.Field  // 删除时间

 	fieldMap map[string]field.Expr
 }
@@ -103,16 +103,16 @@ func (t *trade) updateTableName(table string) *trade {
 	t.Amount = field.NewField(table, "amount")
 	t.Payment = field.NewField(table, "payment")
 	t.Method = field.NewInt32(table, "method")
-	t.Status = field.NewInt32(table, "status")
-	t.CreatedAt = field.NewField(table, "created_at")
-	t.UpdatedAt = field.NewField(table, "updated_at")
-	t.DeletedAt = field.NewField(table, "deleted_at")
-	t.Acquirer = field.NewInt32(table, "acquirer")
 	t.Platform = field.NewInt32(table, "platform")
+	t.Acquirer = field.NewInt32(table, "acquirer")
+	t.Status = field.NewInt32(table, "status")
+	t.Refunded = field.NewBool(table, "refunded")
 	t.PaymentURL = field.NewString(table, "payment_url")
 	t.CompletedAt = field.NewField(table, "completed_at")
 	t.CanceledAt = field.NewField(table, "canceled_at")
-	t.Refunded = field.NewBool(table, "refunded")
+	t.CreatedAt = field.NewField(table, "created_at")
+	t.UpdatedAt = field.NewField(table, "updated_at")
+	t.DeletedAt = field.NewField(table, "deleted_at")

 	t.fillFieldMap()

@@ -140,16 +140,16 @@ func (t *trade) fillFieldMap() {
 	t.fieldMap["amount"] = t.Amount
 	t.fieldMap["payment"] = t.Payment
 	t.fieldMap["method"] = t.Method
-	t.fieldMap["status"] = t.Status
-	t.fieldMap["created_at"] = t.CreatedAt
-	t.fieldMap["updated_at"] = t.UpdatedAt
-	t.fieldMap["deleted_at"] = t.DeletedAt
-	t.fieldMap["acquirer"] = t.Acquirer
 	t.fieldMap["platform"] = t.Platform
+	t.fieldMap["acquirer"] = t.Acquirer
+	t.fieldMap["status"] = t.Status
+	t.fieldMap["refunded"] = t.Refunded
 	t.fieldMap["payment_url"] = t.PaymentURL
 	t.fieldMap["completed_at"] = t.CompletedAt
 	t.fieldMap["canceled_at"] = t.CanceledAt
-	t.fieldMap["refunded"] = t.Refunded
+	t.fieldMap["created_at"] = t.CreatedAt
+	t.fieldMap["updated_at"] = t.UpdatedAt
+	t.fieldMap["deleted_at"] = t.DeletedAt
 }

 func (t trade) clone(db *gorm.DB) trade {