优化代码

This commit is contained in:
GoEdgeLab
2023-06-30 18:54:45 +08:00
parent 9d220a8bc5
commit ad322ba8a7
5 changed files with 90 additions and 90 deletions

View File

@@ -3,19 +3,19 @@ package models
import "github.com/iwind/TeaGo/dbs"
const (
AdminFieldId dbs.FieldName = "id" // ID
AdminFieldIsOn dbs.FieldName = "isOn" // 是否启用
AdminFieldUsername dbs.FieldName = "username" // 用户名
AdminFieldPassword dbs.FieldName = "password" // 密码
AdminFieldFullname dbs.FieldName = "fullname" // 全名
AdminFieldIsSuper dbs.FieldName = "isSuper" // 是否为超级管理员
AdminFieldCreatedAt dbs.FieldName = "createdAt" // 创建时间
AdminFieldUpdatedAt dbs.FieldName = "updatedAt" // 修改时间
AdminFieldState dbs.FieldName = "state" // 状态
AdminFieldModules dbs.FieldName = "modules" // 允许的模块
AdminFieldCanLogin dbs.FieldName = "canLogin" // 是否可以登录
AdminFieldTheme dbs.FieldName = "theme" // 模板设置
AdminFieldLang dbs.FieldName = "lang" // 语言代号
AdminField_Id dbs.FieldName = "id" // ID
AdminField_IsOn dbs.FieldName = "isOn" // 是否启用
AdminField_Username dbs.FieldName = "username" // 用户名
AdminField_Password dbs.FieldName = "password" // 密码
AdminField_Fullname dbs.FieldName = "fullname" // 全名
AdminField_IsSuper dbs.FieldName = "isSuper" // 是否为超级管理员
AdminField_CreatedAt dbs.FieldName = "createdAt" // 创建时间
AdminField_UpdatedAt dbs.FieldName = "updatedAt" // 修改时间
AdminField_State dbs.FieldName = "state" // 状态
AdminField_Modules dbs.FieldName = "modules" // 允许的模块
AdminField_CanLogin dbs.FieldName = "canLogin" // 是否可以登录
AdminField_Theme dbs.FieldName = "theme" // 模板设置
AdminField_Lang dbs.FieldName = "lang" // 语言代号
)
// Admin 管理员

View File

@@ -62,7 +62,7 @@ func (this *LogDAO) CreateLog(tx *dbs.Tx, adminType string, adminId int64, level
if err != nil {
return err
}
op.LangMesageArgs = langMessageArgsJSON
op.LangMessageArgs = langMessageArgsJSON
}
op.Day = timeutil.Format("Ymd")

View File

@@ -3,21 +3,21 @@ package models
import "github.com/iwind/TeaGo/dbs"
const (
LogFieldId dbs.FieldName = "id" // ID
LogFieldLevel dbs.FieldName = "level" // 级别
LogFieldDescription dbs.FieldName = "description" // 描述
LogFieldCreatedAt dbs.FieldName = "createdAt" // 创建时间
LogFieldAction dbs.FieldName = "action" // 动作
LogFieldUserId dbs.FieldName = "userId" // 用户ID
LogFieldAdminId dbs.FieldName = "adminId" // 管理员ID
LogFieldProviderId dbs.FieldName = "providerId" // 供应商ID
LogFieldIp dbs.FieldName = "ip" // IP地址
LogFieldType dbs.FieldName = "type" // 类型admin, user
LogFieldDay dbs.FieldName = "day" // 日期
LogFieldBillId dbs.FieldName = "billId" // 账单ID
LogFieldLangMessageCode dbs.FieldName = "langMessageCode" // 多语言消息代号
LogFieldLangMesageArgs dbs.FieldName = "langMesageArgs" // 多语言参数
LogFieldParams dbs.FieldName = "params" // 关联对象参数
LogField_Id dbs.FieldName = "id" // ID
LogField_Level dbs.FieldName = "level" // 级别
LogField_Description dbs.FieldName = "description" // 描述
LogField_CreatedAt dbs.FieldName = "createdAt" // 创建时间
LogField_Action dbs.FieldName = "action" // 动作
LogField_UserId dbs.FieldName = "userId" // 用户ID
LogField_AdminId dbs.FieldName = "adminId" // 管理员ID
LogField_ProviderId dbs.FieldName = "providerId" // 供应商ID
LogField_Ip dbs.FieldName = "ip" // IP地址
LogField_Type dbs.FieldName = "type" // 类型admin, user
LogField_Day dbs.FieldName = "day" // 日期
LogField_BillId dbs.FieldName = "billId" // 账单ID
LogField_LangMessageCode dbs.FieldName = "langMessageCode" // 多语言消息代号
LogField_LangMessageArgs dbs.FieldName = "langMessageArgs" // 多语言参数
LogField_Params dbs.FieldName = "params" // 关联对象参数
)
// Log 操作日志
@@ -35,7 +35,7 @@ type Log struct {
Day string `field:"day"` // 日期
BillId uint32 `field:"billId"` // 账单ID
LangMessageCode string `field:"langMessageCode"` // 多语言消息代号
LangMesageArgs dbs.JSON `field:"langMesageArgs"` // 多语言参数
LangMessageArgs dbs.JSON `field:"langMessageArgs"` // 多语言参数
Params dbs.JSON `field:"params"` // 关联对象参数
}
@@ -53,7 +53,7 @@ type LogOperator struct {
Day any // 日期
BillId any // 账单ID
LangMessageCode any // 多语言消息代号
LangMesageArgs any // 多语言参数
LangMessageArgs any // 多语言参数
Params any // 关联对象参数
}

View File

@@ -100,7 +100,7 @@ func (this *NodeClusterDAO) FindNodeClusterName(tx *dbs.Tx, clusterId int64) (st
// FindAllEnableClusters 查找所有可用的集群
func (this *NodeClusterDAO) FindAllEnableClusters(tx *dbs.Tx) (result []*NodeCluster, err error) {
_, err = this.Query(tx).
Result(NodeClusterFieldId, NodeClusterFieldName, NodeClusterFieldIsOn, NodeClusterFieldHealthCheck, NodeClusterFieldAutoRemoteStart, NodeClusterFieldAutoRegister, NodeClusterFieldCreatedAt, NodeClusterFieldUniqueId, NodeClusterFieldSecret).
Result(NodeClusterField_Id, NodeClusterField_Name, NodeClusterField_IsOn, NodeClusterField_HealthCheck, NodeClusterField_AutoRemoteStart, NodeClusterField_AutoRegister, NodeClusterField_CreatedAt, NodeClusterField_UniqueId, NodeClusterField_Secret).
State(NodeClusterStateEnabled).
Slice(&result).
Desc("isPinned").
@@ -271,24 +271,24 @@ func (this *NodeClusterDAO) ListEnabledClusters(tx *dbs.Tx, keyword string, offs
}
_, err = query.
Result(
NodeClusterFieldId,
NodeClusterFieldName,
NodeClusterFieldIsOn,
NodeClusterFieldIsPinned,
NodeClusterFieldInstallDir,
NodeClusterFieldHttpFirewallPolicyId,
NodeClusterFieldAdminId,
NodeClusterFieldIsOn,
NodeClusterFieldIsAD,
NodeClusterFieldUserId,
NodeClusterFieldDnsName,
NodeClusterFieldDnsDomainId,
NodeClusterFieldDns,
NodeClusterFieldCreatedAt,
NodeClusterFieldUniqueId,
NodeClusterFieldSecret,
NodeClusterFieldGrantId,
NodeClusterFieldTimeZone,
NodeClusterField_Id,
NodeClusterField_Name,
NodeClusterField_IsOn,
NodeClusterField_IsPinned,
NodeClusterField_InstallDir,
NodeClusterField_HttpFirewallPolicyId,
NodeClusterField_AdminId,
NodeClusterField_IsOn,
NodeClusterField_IsAD,
NodeClusterField_UserId,
NodeClusterField_DnsName,
NodeClusterField_DnsDomainId,
NodeClusterField_Dns,
NodeClusterField_CreatedAt,
NodeClusterField_UniqueId,
NodeClusterField_Secret,
NodeClusterField_GrantId,
NodeClusterField_TimeZone,
).
Offset(offset).
Limit(size).

View File

@@ -3,46 +3,46 @@ package models
import "github.com/iwind/TeaGo/dbs"
const (
NodeClusterFieldId dbs.FieldName = "id" // ID
NodeClusterFieldAdminId dbs.FieldName = "adminId" // 管理员ID
NodeClusterFieldUserId dbs.FieldName = "userId" // 用户ID
NodeClusterFieldIsOn dbs.FieldName = "isOn" // 是否启用
NodeClusterFieldName dbs.FieldName = "name" // 名称
NodeClusterFieldUseAllAPINodes dbs.FieldName = "useAllAPINodes" // 是否使用所有API节点
NodeClusterFieldApiNodes dbs.FieldName = "apiNodes" // 使用的API节点
NodeClusterFieldInstallDir dbs.FieldName = "installDir" // 安装目录
NodeClusterFieldOrder dbs.FieldName = "order" // 排序
NodeClusterFieldCreatedAt dbs.FieldName = "createdAt" // 创建时间
NodeClusterFieldGrantId dbs.FieldName = "grantId" // 默认认证方式
NodeClusterFieldSshParams dbs.FieldName = "sshParams" // SSH默认参数
NodeClusterFieldState dbs.FieldName = "state" // 状态
NodeClusterFieldAutoRegister dbs.FieldName = "autoRegister" // 是否开启自动注册
NodeClusterFieldUniqueId dbs.FieldName = "uniqueId" // 唯一ID
NodeClusterFieldSecret dbs.FieldName = "secret" // 密钥
NodeClusterFieldHealthCheck dbs.FieldName = "healthCheck" // 健康检查
NodeClusterFieldDnsName dbs.FieldName = "dnsName" // DNS名称
NodeClusterFieldDnsDomainId dbs.FieldName = "dnsDomainId" // 域名ID
NodeClusterFieldDns dbs.FieldName = "dns" // DNS配置
NodeClusterFieldToa dbs.FieldName = "toa" // TOA配置
NodeClusterFieldCachePolicyId dbs.FieldName = "cachePolicyId" // 缓存策略ID
NodeClusterFieldHttpFirewallPolicyId dbs.FieldName = "httpFirewallPolicyId" // WAF策略ID
NodeClusterFieldAccessLog dbs.FieldName = "accessLog" // 访问日志设置
NodeClusterFieldSystemServices dbs.FieldName = "systemServices" // 系统服务设置
NodeClusterFieldTimeZone dbs.FieldName = "timeZone" // 时区
NodeClusterFieldNodeMaxThreads dbs.FieldName = "nodeMaxThreads" // 节点最大线程数
NodeClusterFieldDdosProtection dbs.FieldName = "ddosProtection" // DDoS防护设置
NodeClusterFieldAutoOpenPorts dbs.FieldName = "autoOpenPorts" // 是否自动尝试开放端口
NodeClusterFieldIsPinned dbs.FieldName = "isPinned" // 是否置顶
NodeClusterFieldWebp dbs.FieldName = "webp" // WebP设置
NodeClusterFieldUam dbs.FieldName = "uam" // UAM设置
NodeClusterFieldClock dbs.FieldName = "clock" // 时钟配置
NodeClusterFieldGlobalServerConfig dbs.FieldName = "globalServerConfig" // 全局服务配置
NodeClusterFieldAutoRemoteStart dbs.FieldName = "autoRemoteStart" // 自动远程启动
NodeClusterFieldAutoInstallNftables dbs.FieldName = "autoInstallNftables" // 自动安装nftables
NodeClusterFieldIsAD dbs.FieldName = "isAD" // 是否为高防集群
NodeClusterFieldHttpPages dbs.FieldName = "httpPages" // 自定义页面设置
NodeClusterFieldCc dbs.FieldName = "cc" // CC设置
NodeClusterFieldHttp3 dbs.FieldName = "http3" // HTTP3设置
NodeClusterField_Id dbs.FieldName = "id" // ID
NodeClusterField_AdminId dbs.FieldName = "adminId" // 管理员ID
NodeClusterField_UserId dbs.FieldName = "userId" // 用户ID
NodeClusterField_IsOn dbs.FieldName = "isOn" // 是否启用
NodeClusterField_Name dbs.FieldName = "name" // 名称
NodeClusterField_UseAllAPINodes dbs.FieldName = "useAllAPINodes" // 是否使用所有API节点
NodeClusterField_ApiNodes dbs.FieldName = "apiNodes" // 使用的API节点
NodeClusterField_InstallDir dbs.FieldName = "installDir" // 安装目录
NodeClusterField_Order dbs.FieldName = "order" // 排序
NodeClusterField_CreatedAt dbs.FieldName = "createdAt" // 创建时间
NodeClusterField_GrantId dbs.FieldName = "grantId" // 默认认证方式
NodeClusterField_SshParams dbs.FieldName = "sshParams" // SSH默认参数
NodeClusterField_State dbs.FieldName = "state" // 状态
NodeClusterField_AutoRegister dbs.FieldName = "autoRegister" // 是否开启自动注册
NodeClusterField_UniqueId dbs.FieldName = "uniqueId" // 唯一ID
NodeClusterField_Secret dbs.FieldName = "secret" // 密钥
NodeClusterField_HealthCheck dbs.FieldName = "healthCheck" // 健康检查
NodeClusterField_DnsName dbs.FieldName = "dnsName" // DNS名称
NodeClusterField_DnsDomainId dbs.FieldName = "dnsDomainId" // 域名ID
NodeClusterField_Dns dbs.FieldName = "dns" // DNS配置
NodeClusterField_Toa dbs.FieldName = "toa" // TOA配置
NodeClusterField_CachePolicyId dbs.FieldName = "cachePolicyId" // 缓存策略ID
NodeClusterField_HttpFirewallPolicyId dbs.FieldName = "httpFirewallPolicyId" // WAF策略ID
NodeClusterField_AccessLog dbs.FieldName = "accessLog" // 访问日志设置
NodeClusterField_SystemServices dbs.FieldName = "systemServices" // 系统服务设置
NodeClusterField_TimeZone dbs.FieldName = "timeZone" // 时区
NodeClusterField_NodeMaxThreads dbs.FieldName = "nodeMaxThreads" // 节点最大线程数
NodeClusterField_DdosProtection dbs.FieldName = "ddosProtection" // DDoS防护设置
NodeClusterField_AutoOpenPorts dbs.FieldName = "autoOpenPorts" // 是否自动尝试开放端口
NodeClusterField_IsPinned dbs.FieldName = "isPinned" // 是否置顶
NodeClusterField_Webp dbs.FieldName = "webp" // WebP设置
NodeClusterField_Uam dbs.FieldName = "uam" // UAM设置
NodeClusterField_Clock dbs.FieldName = "clock" // 时钟配置
NodeClusterField_GlobalServerConfig dbs.FieldName = "globalServerConfig" // 全局服务配置
NodeClusterField_AutoRemoteStart dbs.FieldName = "autoRemoteStart" // 自动远程启动
NodeClusterField_AutoInstallNftables dbs.FieldName = "autoInstallNftables" // 自动安装nftables
NodeClusterField_IsAD dbs.FieldName = "isAD" // 是否为高防集群
NodeClusterField_HttpPages dbs.FieldName = "httpPages" // 自定义页面设置
NodeClusterField_Cc dbs.FieldName = "cc" // CC设置
NodeClusterField_Http3 dbs.FieldName = "http3" // HTTP3设置
)
// NodeCluster 节点集群