diff --git a/internal/accesslogs/storage_manager.go b/internal/accesslogs/storage_manager.go index f55e016c..15108da8 100644 --- a/internal/accesslogs/storage_manager.go +++ b/internal/accesslogs/storage_manager.go @@ -58,7 +58,7 @@ func (this *StorageManager) Loop() error { } var policyIds = []int64{} for _, policy := range policies { - if policy.IsOn == 1 { + if policy.IsOn { policyIds = append(policyIds, int64(policy.Id)) } } diff --git a/internal/db/models/acme/acme_provider_account_model.go b/internal/db/models/acme/acme_provider_account_model.go index bf697e0d..3e872bd0 100644 --- a/internal/db/models/acme/acme_provider_account_model.go +++ b/internal/db/models/acme/acme_provider_account_model.go @@ -3,7 +3,7 @@ package acme // ACMEProviderAccount ACME提供商 type ACMEProviderAccount struct { Id uint64 `field:"id"` // ID - IsOn uint8 `field:"isOn"` // 是否启用 + IsOn bool `field:"isOn"` // 是否启用 Name string `field:"name"` // 名称 ProviderCode string `field:"providerCode"` // 代号 Error string `field:"error"` // 最后一条错误信息 diff --git a/internal/db/models/acme/acme_task_dao.go b/internal/db/models/acme/acme_task_dao.go index 970cbd51..07cb4268 100644 --- a/internal/db/models/acme/acme_task_dao.go +++ b/internal/db/models/acme/acme_task_dao.go @@ -271,7 +271,7 @@ func (this *ACMETaskDAO) runTaskWithoutLog(tx *dbs.Tx, taskId int64) (isOk bool, errMsg = "找不到要执行的任务" return } - if task.IsOn != 1 { + if !task.IsOn { errMsg = "任务没有启用" return } @@ -453,7 +453,7 @@ func (this *ACMETaskDAO) runTaskWithoutLog(tx *dbs.Tx, taskId int64) (isOk bool, return } - err = models.SharedSSLCertDAO.UpdateCert(tx, resultCertId, cert.IsOn == 1, cert.Name, cert.Description, cert.ServerName, cert.IsCA == 1, certData, keyData, sslConfig.TimeBeginAt, sslConfig.TimeEndAt, sslConfig.DNSNames, sslConfig.CommonNames) + err = models.SharedSSLCertDAO.UpdateCert(tx, resultCertId, cert.IsOn, cert.Name, cert.Description, cert.ServerName, cert.IsCA == 1, certData, keyData, sslConfig.TimeBeginAt, sslConfig.TimeEndAt, sslConfig.DNSNames, sslConfig.CommonNames) if err != nil { errMsg = "证书生成成功，但是修改数据库中的证书信息时出错：" + err.Error() return diff --git a/internal/db/models/acme/acme_task_model.go b/internal/db/models/acme/acme_task_model.go index 22ce59de..b298cb7b 100644 --- a/internal/db/models/acme/acme_task_model.go +++ b/internal/db/models/acme/acme_task_model.go @@ -7,7 +7,7 @@ type ACMETask struct { Id uint64 `field:"id"` // ID AdminId uint32 `field:"adminId"` // 管理员ID UserId uint32 `field:"userId"` // 用户ID - IsOn uint8 `field:"isOn"` // 是否启用 + IsOn bool `field:"isOn"` // 是否启用 AcmeUserId uint32 `field:"acmeUserId"` // ACME用户ID DnsDomain string `field:"dnsDomain"` // DNS主域名 DnsProviderId uint64 `field:"dnsProviderId"` // DNS服务商 diff --git a/internal/db/models/admin_model.go b/internal/db/models/admin_model.go index 428909f9..13e101c9 100644 --- a/internal/db/models/admin_model.go +++ b/internal/db/models/admin_model.go @@ -5,7 +5,7 @@ import "github.com/iwind/TeaGo/dbs" // Admin 管理员 type Admin struct { Id uint32 `field:"id"` // ID - IsOn uint8 `field:"isOn"` // 是否启用 + IsOn bool `field:"isOn"` // 是否启用 Username string `field:"username"` // 用户名 Password string `field:"password"` // 密码 Fullname string `field:"fullname"` // 全名 diff --git a/internal/db/models/api_node_model.go b/internal/db/models/api_node_model.go index a4767909..609b2bb4 100644 --- a/internal/db/models/api_node_model.go +++ b/internal/db/models/api_node_model.go @@ -2,10 +2,10 @@ package models import "github.com/iwind/TeaGo/dbs" -// API节点 +// APINode API节点 type APINode struct { Id uint32 `field:"id"` // ID - IsOn uint8 `field:"isOn"` // 是否启用 + IsOn bool `field:"isOn"` // 是否启用 ClusterId uint32 `field:"clusterId"` // 专用集群ID UniqueId string `field:"uniqueId"` // 唯一ID Secret string `field:"secret"` // 密钥 diff --git a/internal/db/models/authority/authority_node_model.go b/internal/db/models/authority/authority_node_model.go index 7bd7cc9a..eda2940f 100644 --- a/internal/db/models/authority/authority_node_model.go +++ b/internal/db/models/authority/authority_node_model.go @@ -5,7 +5,7 @@ import "github.com/iwind/TeaGo/dbs" // AuthorityNode 监控节点 type AuthorityNode struct { Id uint32 `field:"id"` // ID - IsOn uint8 `field:"isOn"` // 是否启用 + IsOn bool `field:"isOn"` // 是否启用 UniqueId string `field:"uniqueId"` // 唯一ID Secret string `field:"secret"` // 密钥 Name string `field:"name"` // 名称 diff --git a/internal/db/models/db_node_model.go b/internal/db/models/db_node_model.go index be90cc20..709ce622 100644 --- a/internal/db/models/db_node_model.go +++ b/internal/db/models/db_node_model.go @@ -1,9 +1,9 @@ package models -// 数据库节点 +// DBNode 数据库节点 type DBNode struct { Id uint32 `field:"id"` // ID - IsOn uint8 `field:"isOn"` // 是否启用 + IsOn bool `field:"isOn"` // 是否启用 Role string `field:"role"` // 数据库角色 Name string `field:"name"` // 名称 Description string `field:"description"` // 描述 diff --git a/internal/db/models/dns/dns_domain_model.go b/internal/db/models/dns/dns_domain_model.go index a1edff4e..cebe8c2d 100644 --- a/internal/db/models/dns/dns_domain_model.go +++ b/internal/db/models/dns/dns_domain_model.go @@ -8,7 +8,7 @@ type DNSDomain struct { AdminId uint32 `field:"adminId"` // 管理员ID UserId uint32 `field:"userId"` // 用户ID ProviderId uint32 `field:"providerId"` // 服务商ID - IsOn uint8 `field:"isOn"` // 是否可用 + IsOn bool `field:"isOn"` // 是否可用 Name string `field:"name"` // 域名 CreatedAt uint64 `field:"createdAt"` // 创建时间 DataUpdatedAt uint64 `field:"dataUpdatedAt"` // 数据更新时间 diff --git a/internal/db/models/http_access_log_policy_model.go b/internal/db/models/http_access_log_policy_model.go index f770f631..9aed352e 100644 --- a/internal/db/models/http_access_log_policy_model.go +++ b/internal/db/models/http_access_log_policy_model.go @@ -11,7 +11,7 @@ type HTTPAccessLogPolicy struct { State uint8 `field:"state"` // 状态 CreatedAt uint64 `field:"createdAt"` // 创建时间 Name string `field:"name"` // 名称 - IsOn uint8 `field:"isOn"` // 是否启用 + IsOn bool `field:"isOn"` // 是否启用 Type string `field:"type"` // 存储类型 Options dbs.JSON `field:"options"` // 存储选项 Conds dbs.JSON `field:"conds"` // 请求条件 diff --git a/internal/db/models/http_auth_policy_dao.go b/internal/db/models/http_auth_policy_dao.go index a29bcf9b..7d1b319b 100644 --- a/internal/db/models/http_auth_policy_dao.go +++ b/internal/db/models/http_auth_policy_dao.go @@ -116,7 +116,7 @@ func (this *HTTPAuthPolicyDAO) ComposePolicyConfig(tx *dbs.Tx, policyId int64, c var config = &serverconfigs.HTTPAuthPolicy{ Id: int64(policy.Id), Name: policy.Name, - IsOn: policy.IsOn == 1, + IsOn: policy.IsOn, Type: policy.Type, } diff --git a/internal/db/models/http_auth_policy_model.go b/internal/db/models/http_auth_policy_model.go index 641f2310..aab9fe33 100644 --- a/internal/db/models/http_auth_policy_model.go +++ b/internal/db/models/http_auth_policy_model.go @@ -7,7 +7,7 @@ type HTTPAuthPolicy struct { Id uint64 `field:"id"` // ID AdminId uint32 `field:"adminId"` // 管理员ID UserId uint32 `field:"userId"` // 用户ID - IsOn uint8 `field:"isOn"` // 是否启用 + IsOn bool `field:"isOn"` // 是否启用 Name string `field:"name"` // 名称 Type string `field:"type"` // 类型 Params dbs.JSON `field:"params"` // 参数 diff --git a/internal/db/models/http_brotli_policy_dao.go b/internal/db/models/http_brotli_policy_dao.go index bc2b04a0..d1389e5b 100644 --- a/internal/db/models/http_brotli_policy_dao.go +++ b/internal/db/models/http_brotli_policy_dao.go @@ -80,7 +80,7 @@ func (this *HTTPBrotliPolicyDAO) ComposeBrotliConfig(tx *dbs.Tx, policyId int64) config := &serverconfigs.HTTPBrotliCompressionConfig{} config.Id = int64(policy.Id) - config.IsOn = policy.IsOn == 1 + config.IsOn = policy.IsOn if IsNotNull(policy.MinLength) { minLengthConfig := &shared.SizeCapacity{} err = json.Unmarshal(policy.MinLength, minLengthConfig) diff --git a/internal/db/models/http_brotli_policy_model.go b/internal/db/models/http_brotli_policy_model.go index a178a110..fbd25045 100644 --- a/internal/db/models/http_brotli_policy_model.go +++ b/internal/db/models/http_brotli_policy_model.go @@ -7,7 +7,7 @@ type HTTPBrotliPolicy struct { Id uint32 `field:"id"` // ID AdminId uint32 `field:"adminId"` // 管理员ID UserId uint32 `field:"userId"` // 用户ID - IsOn uint8 `field:"isOn"` // 是否启用 + IsOn bool `field:"isOn"` // 是否启用 Level uint32 `field:"level"` // 压缩级别 MinLength dbs.JSON `field:"minLength"` // 可压缩最小值 MaxLength dbs.JSON `field:"maxLength"` // 可压缩最大值 diff --git a/internal/db/models/http_cache_policy_dao.go b/internal/db/models/http_cache_policy_dao.go index 76d7e457..dea757c0 100644 --- a/internal/db/models/http_cache_policy_dao.go +++ b/internal/db/models/http_cache_policy_dao.go @@ -252,7 +252,7 @@ func (this *HTTPCachePolicyDAO) ComposeCachePolicy(tx *dbs.Tx, policyId int64, c } config := &serverconfigs.HTTPCachePolicy{} config.Id = int64(policy.Id) - config.IsOn = policy.IsOn == 1 + config.IsOn = policy.IsOn config.Name = policy.Name config.Description = policy.Description config.SyncCompressionCache = policy.SyncCompressionCache == 1 diff --git a/internal/db/models/http_cache_policy_model.go b/internal/db/models/http_cache_policy_model.go index 3e561feb..2385fd75 100644 --- a/internal/db/models/http_cache_policy_model.go +++ b/internal/db/models/http_cache_policy_model.go @@ -8,7 +8,7 @@ type HTTPCachePolicy struct { AdminId uint32 `field:"adminId"` // 管理员ID UserId uint32 `field:"userId"` // 用户ID TemplateId uint32 `field:"templateId"` // 模版ID - IsOn uint8 `field:"isOn"` // 是否启用 + IsOn bool `field:"isOn"` // 是否启用 Name string `field:"name"` // 名称 Capacity dbs.JSON `field:"capacity"` // 容量数据 MaxKeys uint64 `field:"maxKeys"` // 最多Key值 diff --git a/internal/db/models/http_deflate_policy_dao.go b/internal/db/models/http_deflate_policy_dao.go index aa426477..f0442bdd 100644 --- a/internal/db/models/http_deflate_policy_dao.go +++ b/internal/db/models/http_deflate_policy_dao.go @@ -80,7 +80,7 @@ func (this *HTTPDeflatePolicyDAO) ComposeDeflateConfig(tx *dbs.Tx, policyId int6 config := &serverconfigs.HTTPDeflateCompressionConfig{} config.Id = int64(policy.Id) - config.IsOn = policy.IsOn == 1 + config.IsOn = policy.IsOn if IsNotNull(policy.MinLength) { minLengthConfig := &shared.SizeCapacity{} err = json.Unmarshal(policy.MinLength, minLengthConfig) diff --git a/internal/db/models/http_deflate_policy_model.go b/internal/db/models/http_deflate_policy_model.go index ceb5ef12..0175b32c 100644 --- a/internal/db/models/http_deflate_policy_model.go +++ b/internal/db/models/http_deflate_policy_model.go @@ -7,7 +7,7 @@ type HTTPDeflatePolicy struct { Id uint32 `field:"id"` // ID AdminId uint32 `field:"adminId"` // 管理员ID UserId uint32 `field:"userId"` // 用户ID - IsOn uint8 `field:"isOn"` // 是否启用 + IsOn bool `field:"isOn"` // 是否启用 Level uint32 `field:"level"` // 压缩级别 MinLength dbs.JSON `field:"minLength"` // 可压缩最小值 MaxLength dbs.JSON `field:"maxLength"` // 可压缩最大值 diff --git a/internal/db/models/http_fastcgi_dao.go b/internal/db/models/http_fastcgi_dao.go index 410d3a90..cee54696 100644 --- a/internal/db/models/http_fastcgi_dao.go +++ b/internal/db/models/http_fastcgi_dao.go @@ -81,7 +81,7 @@ func (this *HTTPFastcgiDAO) ComposeFastcgiConfig(tx *dbs.Tx, fastcgiId int64) (* } config := &serverconfigs.HTTPFastcgiConfig{} config.Id = int64(fastcgi.Id) - config.IsOn = fastcgi.IsOn == 1 + config.IsOn = fastcgi.IsOn config.Address = fastcgi.Address if IsNotNull(fastcgi.Params) { diff --git a/internal/db/models/http_fastcgi_model.go b/internal/db/models/http_fastcgi_model.go index c5793658..b5037645 100644 --- a/internal/db/models/http_fastcgi_model.go +++ b/internal/db/models/http_fastcgi_model.go @@ -7,7 +7,7 @@ type HTTPFastcgi struct { Id uint64 `field:"id"` // ID AdminId uint32 `field:"adminId"` // 管理员ID UserId uint32 `field:"userId"` // 用户ID - IsOn uint8 `field:"isOn"` // 是否启用 + IsOn bool `field:"isOn"` // 是否启用 Address string `field:"address"` // 地址 Params dbs.JSON `field:"params"` // 参数 ReadTimeout dbs.JSON `field:"readTimeout"` // 读取超时 diff --git a/internal/db/models/http_firewall_policy_dao.go b/internal/db/models/http_firewall_policy_dao.go index 4dc26cc0..2c608aac 100644 --- a/internal/db/models/http_firewall_policy_dao.go +++ b/internal/db/models/http_firewall_policy_dao.go @@ -366,7 +366,7 @@ func (this *HTTPFirewallPolicyDAO) ComposeFirewallPolicy(tx *dbs.Tx, policyId in config := &firewallconfigs.HTTPFirewallPolicy{} config.Id = int64(policy.Id) - config.IsOn = policy.IsOn == 1 + config.IsOn = policy.IsOn config.Name = policy.Name config.Description = policy.Description config.UseLocalFirewall = policy.UseLocalFirewall == 1 diff --git a/internal/db/models/http_firewall_policy_model.go b/internal/db/models/http_firewall_policy_model.go index 3053655c..5bf842f0 100644 --- a/internal/db/models/http_firewall_policy_model.go +++ b/internal/db/models/http_firewall_policy_model.go @@ -4,22 +4,22 @@ import "github.com/iwind/TeaGo/dbs" // HTTPFirewallPolicy HTTP防火墙 type HTTPFirewallPolicy struct { - Id uint32 `field:"id"` // ID - TemplateId uint32 `field:"templateId"` // 模版ID - AdminId uint32 `field:"adminId"` // 管理员ID - UserId uint32 `field:"userId"` // 用户ID - ServerId uint32 `field:"serverId"` // 服务ID - GroupId uint32 `field:"groupId"` // 服务分组ID - State uint8 `field:"state"` // 状态 - CreatedAt uint64 `field:"createdAt"` // 创建时间 - IsOn uint8 `field:"isOn"` // 是否启用 - Name string `field:"name"` // 名称 - Description string `field:"description"` // 描述 + Id uint32 `field:"id"` // ID + TemplateId uint32 `field:"templateId"` // 模版ID + AdminId uint32 `field:"adminId"` // 管理员ID + UserId uint32 `field:"userId"` // 用户ID + ServerId uint32 `field:"serverId"` // 服务ID + GroupId uint32 `field:"groupId"` // 服务分组ID + State uint8 `field:"state"` // 状态 + CreatedAt uint64 `field:"createdAt"` // 创建时间 + IsOn bool `field:"isOn"` // 是否启用 + Name string `field:"name"` // 名称 + Description string `field:"description"` // 描述 Inbound dbs.JSON `field:"inbound"` // 入站规则 Outbound dbs.JSON `field:"outbound"` // 出站规则 BlockOptions dbs.JSON `field:"blockOptions"` // BLOCK选项 - Mode string `field:"mode"` // 模式 - UseLocalFirewall uint8 `field:"useLocalFirewall"` // 是否自动使用本地防火墙 + Mode string `field:"mode"` // 模式 + UseLocalFirewall uint8 `field:"useLocalFirewall"` // 是否自动使用本地防火墙 SynFlood dbs.JSON `field:"synFlood"` // SynFlood防御设置 } diff --git a/internal/db/models/http_firewall_rule_dao.go b/internal/db/models/http_firewall_rule_dao.go index f493dd1f..805b11f9 100644 --- a/internal/db/models/http_firewall_rule_dao.go +++ b/internal/db/models/http_firewall_rule_dao.go @@ -84,7 +84,7 @@ func (this *HTTPFirewallRuleDAO) ComposeFirewallRule(tx *dbs.Tx, ruleId int64) ( } config := &firewallconfigs.HTTPFirewallRule{} config.Id = int64(rule.Id) - config.IsOn = rule.IsOn == 1 + config.IsOn = rule.IsOn config.Param = rule.Param paramFilters := []*firewallconfigs.ParamFilter{} diff --git a/internal/db/models/http_firewall_rule_group_dao.go b/internal/db/models/http_firewall_rule_group_dao.go index 6e898214..d2db3903 100644 --- a/internal/db/models/http_firewall_rule_group_dao.go +++ b/internal/db/models/http_firewall_rule_group_dao.go @@ -91,7 +91,7 @@ func (this *HTTPFirewallRuleGroupDAO) ComposeFirewallRuleGroup(tx *dbs.Tx, group } config := &firewallconfigs.HTTPFirewallRuleGroup{} config.Id = int64(group.Id) - config.IsOn = group.IsOn == 1 + config.IsOn = group.IsOn config.Name = group.Name config.Description = group.Description config.Code = group.Code diff --git a/internal/db/models/http_firewall_rule_group_model.go b/internal/db/models/http_firewall_rule_group_model.go index fb09245f..d951fd1f 100644 --- a/internal/db/models/http_firewall_rule_group_model.go +++ b/internal/db/models/http_firewall_rule_group_model.go @@ -5,7 +5,7 @@ import "github.com/iwind/TeaGo/dbs" // HTTPFirewallRuleGroup 防火墙规则分组 type HTTPFirewallRuleGroup struct { Id uint32 `field:"id"` // ID - IsOn uint8 `field:"isOn"` // 是否启用 + IsOn bool `field:"isOn"` // 是否启用 Name string `field:"name"` // 名称 Description string `field:"description"` // 描述 Code string `field:"code"` // 代号 diff --git a/internal/db/models/http_firewall_rule_model.go b/internal/db/models/http_firewall_rule_model.go index 5ffb92ea..7007ac4c 100644 --- a/internal/db/models/http_firewall_rule_model.go +++ b/internal/db/models/http_firewall_rule_model.go @@ -5,7 +5,7 @@ import "github.com/iwind/TeaGo/dbs" // HTTPFirewallRule 防火墙规则 type HTTPFirewallRule struct { Id uint32 `field:"id"` // ID - IsOn uint8 `field:"isOn"` // 是否启用 + IsOn bool `field:"isOn"` // 是否启用 Description string `field:"description"` // 说明 Param string `field:"param"` // 参数 ParamFilters dbs.JSON `field:"paramFilters"` // 处理器 diff --git a/internal/db/models/http_firewall_rule_set_dao.go b/internal/db/models/http_firewall_rule_set_dao.go index 7adacb44..a0cea61f 100644 --- a/internal/db/models/http_firewall_rule_set_dao.go +++ b/internal/db/models/http_firewall_rule_set_dao.go @@ -94,7 +94,7 @@ func (this *HTTPFirewallRuleSetDAO) ComposeFirewallRuleSet(tx *dbs.Tx, setId int } config := &firewallconfigs.HTTPFirewallRuleSet{} config.Id = int64(set.Id) - config.IsOn = set.IsOn == 1 + config.IsOn = set.IsOn config.Name = set.Name config.Description = set.Description config.Code = set.Code diff --git a/internal/db/models/http_firewall_rule_set_model.go b/internal/db/models/http_firewall_rule_set_model.go index dcdfb2e8..0c825f8a 100644 --- a/internal/db/models/http_firewall_rule_set_model.go +++ b/internal/db/models/http_firewall_rule_set_model.go @@ -5,7 +5,7 @@ import "github.com/iwind/TeaGo/dbs" // HTTPFirewallRuleSet 防火墙规则集 type HTTPFirewallRuleSet struct { Id uint32 `field:"id"` // ID - IsOn uint8 `field:"isOn"` // 是否启用 + IsOn bool `field:"isOn"` // 是否启用 Code string `field:"code"` // 代号 Name string `field:"name"` // 名称 Description string `field:"description"` // 描述 diff --git a/internal/db/models/http_gzip_dao.go b/internal/db/models/http_gzip_dao.go index a5a642b8..5b45d99e 100644 --- a/internal/db/models/http_gzip_dao.go +++ b/internal/db/models/http_gzip_dao.go @@ -88,7 +88,7 @@ func (this *HTTPGzipDAO) ComposeGzipConfig(tx *dbs.Tx, gzipId int64) (*servercon config := &serverconfigs.HTTPGzipCompressionConfig{} config.Id = int64(gzip.Id) - config.IsOn = gzip.IsOn == 1 + config.IsOn = gzip.IsOn if IsNotNull(gzip.MinLength) { minLengthConfig := &shared.SizeCapacity{} err = json.Unmarshal(gzip.MinLength, minLengthConfig) diff --git a/internal/db/models/http_gzip_model.go b/internal/db/models/http_gzip_model.go index 904e3408..c8c1deb0 100644 --- a/internal/db/models/http_gzip_model.go +++ b/internal/db/models/http_gzip_model.go @@ -7,7 +7,7 @@ type HTTPGzip struct { Id uint32 `field:"id"` // ID AdminId uint32 `field:"adminId"` // 管理员ID UserId uint32 `field:"userId"` // 用户ID - IsOn uint8 `field:"isOn"` // 是否启用 + IsOn bool `field:"isOn"` // 是否启用 Level uint32 `field:"level"` // 压缩级别 MinLength dbs.JSON `field:"minLength"` // 可压缩最小值 MaxLength dbs.JSON `field:"maxLength"` // 可压缩最大值 diff --git a/internal/db/models/http_header_dao.go b/internal/db/models/http_header_dao.go index 57eda118..6c3501ce 100644 --- a/internal/db/models/http_header_dao.go +++ b/internal/db/models/http_header_dao.go @@ -236,7 +236,7 @@ func (this *HTTPHeaderDAO) ComposeHeaderConfig(tx *dbs.Tx, headerId int64) (*sha config := &shared.HTTPHeaderConfig{} config.Id = int64(header.Id) - config.IsOn = header.IsOn == 1 + config.IsOn = header.IsOn config.Name = header.Name config.Value = header.Value config.DisableRedirect = header.DisableRedirect == 1 diff --git a/internal/db/models/http_header_model.go b/internal/db/models/http_header_model.go index fc49ee61..baa09e23 100644 --- a/internal/db/models/http_header_model.go +++ b/internal/db/models/http_header_model.go @@ -8,7 +8,7 @@ type HTTPHeader struct { AdminId uint32 `field:"adminId"` // 管理员ID UserId uint32 `field:"userId"` // 用户ID TemplateId uint32 `field:"templateId"` // 模版ID - IsOn uint8 `field:"isOn"` // 是否启用 + IsOn bool `field:"isOn"` // 是否启用 Name string `field:"name"` // 名称 Value string `field:"value"` // 值 Order uint32 `field:"order"` // 排序 diff --git a/internal/db/models/http_header_policy_dao.go b/internal/db/models/http_header_policy_dao.go index b05abbe5..ea05b1ac 100644 --- a/internal/db/models/http_header_policy_dao.go +++ b/internal/db/models/http_header_policy_dao.go @@ -184,7 +184,7 @@ func (this *HTTPHeaderPolicyDAO) ComposeHeaderPolicyConfig(tx *dbs.Tx, headerPol config := &shared.HTTPHeaderPolicy{} config.Id = int64(policy.Id) - config.IsOn = policy.IsOn == 1 + config.IsOn = policy.IsOn // SetHeaders if IsNotNull(policy.SetHeaders) { diff --git a/internal/db/models/http_header_policy_model.go b/internal/db/models/http_header_policy_model.go index 3b9bc157..8ee90030 100644 --- a/internal/db/models/http_header_policy_model.go +++ b/internal/db/models/http_header_policy_model.go @@ -5,7 +5,7 @@ import "github.com/iwind/TeaGo/dbs" // type HTTPHeaderPolicy struct { Id uint32 `field:"id"` // ID - IsOn uint8 `field:"isOn"` // 是否启用 + IsOn bool `field:"isOn"` // 是否启用 State uint8 `field:"state"` // 状态 AdminId uint32 `field:"adminId"` // 管理员ID UserId uint32 `field:"userId"` // 用户ID diff --git a/internal/db/models/http_location_dao.go b/internal/db/models/http_location_dao.go index 94c2cc6d..825b57b5 100644 --- a/internal/db/models/http_location_dao.go +++ b/internal/db/models/http_location_dao.go @@ -170,7 +170,7 @@ func (this *HTTPLocationDAO) ComposeLocationConfig(tx *dbs.Tx, locationId int64, config := &serverconfigs.HTTPLocationConfig{} config.Id = int64(location.Id) - config.IsOn = location.IsOn == 1 + config.IsOn = location.IsOn config.Description = location.Description config.Name = location.Name config.Pattern = location.Pattern diff --git a/internal/db/models/http_location_model.go b/internal/db/models/http_location_model.go index ab35f434..ab59d2ae 100644 --- a/internal/db/models/http_location_model.go +++ b/internal/db/models/http_location_model.go @@ -12,7 +12,7 @@ type HTTPLocation struct { State uint8 `field:"state"` // 状态 CreatedAt uint64 `field:"createdAt"` // 创建时间 Pattern string `field:"pattern"` // 匹配规则 - IsOn uint8 `field:"isOn"` // 是否启用 + IsOn bool `field:"isOn"` // 是否启用 Name string `field:"name"` // 名称 Description string `field:"description"` // 描述 WebId uint32 `field:"webId"` // Web配置ID diff --git a/internal/db/models/http_page_dao.go b/internal/db/models/http_page_dao.go index 1156966e..b781dd38 100644 --- a/internal/db/models/http_page_dao.go +++ b/internal/db/models/http_page_dao.go @@ -154,7 +154,7 @@ func (this *HTTPPageDAO) ComposePageConfig(tx *dbs.Tx, pageId int64, cacheMap *u config := &serverconfigs.HTTPPageConfig{} config.Id = int64(page.Id) - config.IsOn = page.IsOn == 1 + config.IsOn = page.IsOn config.NewStatus = int(page.NewStatus) config.URL = page.Url config.Body = page.Body diff --git a/internal/db/models/http_page_model.go b/internal/db/models/http_page_model.go index 299a5448..1add71a1 100644 --- a/internal/db/models/http_page_model.go +++ b/internal/db/models/http_page_model.go @@ -7,7 +7,7 @@ type HTTPPage struct { Id uint32 `field:"id"` // ID AdminId uint32 `field:"adminId"` // 管理员ID UserId uint32 `field:"userId"` // 用户ID - IsOn uint8 `field:"isOn"` // 是否启用 + IsOn bool `field:"isOn"` // 是否启用 StatusList dbs.JSON `field:"statusList"` // 状态列表 Url string `field:"url"` // 页面URL NewStatus int32 `field:"newStatus"` // 新状态码 diff --git a/internal/db/models/http_rewrite_rule_dao.go b/internal/db/models/http_rewrite_rule_dao.go index 5a83f860..e7748fff 100644 --- a/internal/db/models/http_rewrite_rule_dao.go +++ b/internal/db/models/http_rewrite_rule_dao.go @@ -97,7 +97,7 @@ func (this *HTTPRewriteRuleDAO) ComposeRewriteRule(tx *dbs.Tx, rewriteRuleId int config := &serverconfigs.HTTPRewriteRule{} config.Id = int64(rule.Id) - config.IsOn = rule.IsOn == 1 + config.IsOn = rule.IsOn config.Pattern = rule.Pattern config.Replace = rule.Replace config.Mode = rule.Mode diff --git a/internal/db/models/http_rewrite_rule_model.go b/internal/db/models/http_rewrite_rule_model.go index 511be705..63d07ad2 100644 --- a/internal/db/models/http_rewrite_rule_model.go +++ b/internal/db/models/http_rewrite_rule_model.go @@ -8,7 +8,7 @@ type HTTPRewriteRule struct { AdminId uint32 `field:"adminId"` // 管理员ID UserId uint32 `field:"userId"` // 用户ID TemplateId uint32 `field:"templateId"` // 模版ID - IsOn uint8 `field:"isOn"` // 是否启用 + IsOn bool `field:"isOn"` // 是否启用 State uint8 `field:"state"` // 状态 CreatedAt uint64 `field:"createdAt"` // 创建时间 Pattern string `field:"pattern"` // 匹配规则 diff --git a/internal/db/models/http_web_dao.go b/internal/db/models/http_web_dao.go index d1e042cc..2ebd8e93 100644 --- a/internal/db/models/http_web_dao.go +++ b/internal/db/models/http_web_dao.go @@ -96,7 +96,7 @@ func (this *HTTPWebDAO) ComposeWebConfig(tx *dbs.Tx, webId int64, cacheMap *util config := &serverconfigs.HTTPWebConfig{} config.Id = webId - config.IsOn = web.IsOn == 1 + config.IsOn = web.IsOn // root if IsNotNull(web.Root) { diff --git a/internal/db/models/http_web_model.go b/internal/db/models/http_web_model.go index 7b43a5a7..aff2c221 100644 --- a/internal/db/models/http_web_model.go +++ b/internal/db/models/http_web_model.go @@ -5,7 +5,7 @@ import "github.com/iwind/TeaGo/dbs" // HTTPWeb HTTP Web type HTTPWeb struct { Id uint32 `field:"id"` // ID - IsOn uint8 `field:"isOn"` // 是否启用 + IsOn bool `field:"isOn"` // 是否启用 TemplateId uint32 `field:"templateId"` // 模版ID AdminId uint32 `field:"adminId"` // 管理员ID UserId uint32 `field:"userId"` // 用户ID diff --git a/internal/db/models/http_websocket_dao.go b/internal/db/models/http_websocket_dao.go index 3c9ee66e..571fd0af 100644 --- a/internal/db/models/http_websocket_dao.go +++ b/internal/db/models/http_websocket_dao.go @@ -81,7 +81,7 @@ func (this *HTTPWebsocketDAO) ComposeWebsocketConfig(tx *dbs.Tx, websocketId int } config := &serverconfigs.HTTPWebsocketConfig{} config.Id = int64(websocket.Id) - config.IsOn = websocket.IsOn == 1 + config.IsOn = websocket.IsOn config.AllowAllOrigins = websocket.AllowAllOrigins == 1 if IsNotNull(websocket.AllowedOrigins) { diff --git a/internal/db/models/http_websocket_model.go b/internal/db/models/http_websocket_model.go index 5261ceba..d88930be 100644 --- a/internal/db/models/http_websocket_model.go +++ b/internal/db/models/http_websocket_model.go @@ -9,7 +9,7 @@ type HTTPWebsocket struct { UserId uint32 `field:"userId"` // 用户ID CreatedAt uint64 `field:"createdAt"` // 创建时间 State uint8 `field:"state"` // 状态 - IsOn uint8 `field:"isOn"` // 是否启用 + IsOn bool `field:"isOn"` // 是否启用 HandshakeTimeout dbs.JSON `field:"handshakeTimeout"` // 握手超时时间 AllowAllOrigins uint8 `field:"allowAllOrigins"` // 是否支持所有源 AllowedOrigins dbs.JSON `field:"allowedOrigins"` // 支持的源域名列表 diff --git a/internal/db/models/ip_list_dao.go b/internal/db/models/ip_list_dao.go index 8770bef3..f4031c3d 100644 --- a/internal/db/models/ip_list_dao.go +++ b/internal/db/models/ip_list_dao.go @@ -26,7 +26,7 @@ var DefaultGlobalIPList = &IPList{ IsGlobal: 1, Type: "black", State: IPListStateEnabled, - IsOn: 1, + IsOn: true, } type IPListDAO dbs.DAO diff --git a/internal/db/models/ip_list_model.go b/internal/db/models/ip_list_model.go index a40b7b6d..3274fab5 100644 --- a/internal/db/models/ip_list_model.go +++ b/internal/db/models/ip_list_model.go @@ -5,7 +5,7 @@ import "github.com/iwind/TeaGo/dbs" // IPList IP名单 type IPList struct { Id uint32 `field:"id"` // ID - IsOn uint8 `field:"isOn"` // 是否启用 + IsOn bool `field:"isOn"` // 是否启用 Type string `field:"type"` // 类型 AdminId uint32 `field:"adminId"` // 用户ID UserId uint32 `field:"userId"` // 用户ID diff --git a/internal/db/models/login_model.go b/internal/db/models/login_model.go index 6e0bbe77..09b1dc8d 100644 --- a/internal/db/models/login_model.go +++ b/internal/db/models/login_model.go @@ -7,7 +7,7 @@ type Login struct { Id uint32 `field:"id"` // ID AdminId uint32 `field:"adminId"` // 管理员ID UserId uint32 `field:"userId"` // 用户ID - IsOn uint8 `field:"isOn"` // 是否启用 + IsOn bool `field:"isOn"` // 是否启用 Type string `field:"type"` // 认证方式 Params dbs.JSON `field:"params"` // 参数 State uint8 `field:"state"` // 状态 diff --git a/internal/db/models/message_media_instance_model.go b/internal/db/models/message_media_instance_model.go index 52c8b784..2363f4f3 100644 --- a/internal/db/models/message_media_instance_model.go +++ b/internal/db/models/message_media_instance_model.go @@ -6,7 +6,7 @@ import "github.com/iwind/TeaGo/dbs" type MessageMediaInstance struct { Id uint32 `field:"id"` // ID Name string `field:"name"` // 名称 - IsOn uint8 `field:"isOn"` // 是否启用 + IsOn bool `field:"isOn"` // 是否启用 MediaType string `field:"mediaType"` // 媒介类型 Params dbs.JSON `field:"params"` // 媒介参数 Description string `field:"description"` // 备注 diff --git a/internal/db/models/message_media_model.go b/internal/db/models/message_media_model.go index f4d25b12..3c133907 100644 --- a/internal/db/models/message_media_model.go +++ b/internal/db/models/message_media_model.go @@ -1,13 +1,13 @@ package models -// 消息媒介 +// MessageMedia 消息媒介 type MessageMedia struct { Id uint32 `field:"id"` // ID Name string `field:"name"` // 名称 Type string `field:"type"` // 类型 Description string `field:"description"` // 描述 UserDescription string `field:"userDescription"` // 用户描述 - IsOn uint8 `field:"isOn"` // 是否启用 + IsOn bool `field:"isOn"` // 是否启用 Order uint32 `field:"order"` // 排序 State uint8 `field:"state"` // 状态 } diff --git a/internal/db/models/message_recipient_group_model.go b/internal/db/models/message_recipient_group_model.go index ddcf64c4..30b0659f 100644 --- a/internal/db/models/message_recipient_group_model.go +++ b/internal/db/models/message_recipient_group_model.go @@ -1,11 +1,11 @@ package models -// 消息接收人分组 +// MessageRecipientGroup 消息接收人分组 type MessageRecipientGroup struct { Id uint32 `field:"id"` // ID Name string `field:"name"` // 分组名 Order uint32 `field:"order"` // 排序 - IsOn uint8 `field:"isOn"` // 是否启用 + IsOn bool `field:"isOn"` // 是否启用 State uint8 `field:"state"` // 状态 } diff --git a/internal/db/models/message_recipient_model.go b/internal/db/models/message_recipient_model.go index 16289cc6..d350f45c 100644 --- a/internal/db/models/message_recipient_model.go +++ b/internal/db/models/message_recipient_model.go @@ -6,7 +6,7 @@ import "github.com/iwind/TeaGo/dbs" type MessageRecipient struct { Id uint32 `field:"id"` // ID AdminId uint32 `field:"adminId"` // 管理员ID - IsOn uint8 `field:"isOn"` // 是否启用 + IsOn bool `field:"isOn"` // 是否启用 InstanceId uint32 `field:"instanceId"` // 实例ID User string `field:"user"` // 接收人信息 GroupIds dbs.JSON `field:"groupIds"` // 分组ID diff --git a/internal/db/models/metric_chart_model.go b/internal/db/models/metric_chart_model.go index 65168ada..4b02a61f 100644 --- a/internal/db/models/metric_chart_model.go +++ b/internal/db/models/metric_chart_model.go @@ -12,7 +12,7 @@ type MetricChart struct { WidthDiv int32 `field:"widthDiv"` // 宽度划分 Params dbs.JSON `field:"params"` // 图形参数 Order uint32 `field:"order"` // 排序 - IsOn uint8 `field:"isOn"` // 是否启用 + IsOn bool `field:"isOn"` // 是否启用 State uint8 `field:"state"` // 状态 MaxItems uint32 `field:"maxItems"` // 最多条目 IgnoreEmptyKeys uint8 `field:"ignoreEmptyKeys"` // 忽略空的键值 diff --git a/internal/db/models/metric_item_dao.go b/internal/db/models/metric_item_dao.go index 279900d4..0937a7ff 100644 --- a/internal/db/models/metric_item_dao.go +++ b/internal/db/models/metric_item_dao.go @@ -194,7 +194,7 @@ func (this *MetricItemDAO) UpdateItem(tx *dbs.Tx, itemId int64, name string, key } // 通知更新 - if versionChanged || (oldItem.IsOn == 0 && isOn) || (oldItem.IsOn == 1 && !isOn) || oldIsPublic != isPublic { + if versionChanged || (!oldItem.IsOn && isOn) || (oldItem.IsOn && !isOn) || oldIsPublic != isPublic { err := this.NotifyUpdate(tx, itemId, isPublic || oldIsPublic) if err != nil { return err @@ -283,7 +283,7 @@ func (this *MetricItemDAO) ComposeItemConfig(tx *dbs.Tx, itemId int64) (*serverc var item = one.(*MetricItem) var config = &serverconfigs.MetricItemConfig{ Id: int64(item.Id), - IsOn: item.IsOn == 1, + IsOn: item.IsOn, Period: types.Int(item.Period), PeriodUnit: item.PeriodUnit, Category: item.Category, @@ -302,7 +302,7 @@ func (this *MetricItemDAO) ComposeItemConfigWithItem(item *MetricItem) *serverco } var config = &serverconfigs.MetricItemConfig{ Id: int64(item.Id), - IsOn: item.IsOn == 1, + IsOn: item.IsOn, Period: types.Int(item.Period), PeriodUnit: item.PeriodUnit, Category: item.Category, diff --git a/internal/db/models/metric_item_model.go b/internal/db/models/metric_item_model.go index 0ee3c98e..f98c619a 100644 --- a/internal/db/models/metric_item_model.go +++ b/internal/db/models/metric_item_model.go @@ -5,7 +5,7 @@ import "github.com/iwind/TeaGo/dbs" // MetricItem 指标定义 type MetricItem struct { Id uint64 `field:"id"` // ID - IsOn uint8 `field:"isOn"` // 是否启用 + IsOn bool `field:"isOn"` // 是否启用 Code string `field:"code"` // 代号（用来区分是否内置） Category string `field:"category"` // 类型，比如http, tcp等 AdminId uint32 `field:"adminId"` // 管理员ID diff --git a/internal/db/models/monitor_node_model.go b/internal/db/models/monitor_node_model.go index 9ce8a3e7..357c1a2d 100644 --- a/internal/db/models/monitor_node_model.go +++ b/internal/db/models/monitor_node_model.go @@ -2,10 +2,10 @@ package models import "github.com/iwind/TeaGo/dbs" -// 监控节点 +// MonitorNode 监控节点 type MonitorNode struct { Id uint32 `field:"id"` // ID - IsOn uint8 `field:"isOn"` // 是否启用 + IsOn bool `field:"isOn"` // 是否启用 UniqueId string `field:"uniqueId"` // 唯一ID Secret string `field:"secret"` // 密钥 Name string `field:"name"` // 名称 diff --git a/internal/db/models/nameservers/ns_domain_model.go b/internal/db/models/nameservers/ns_domain_model.go index 2f358ab4..4a40cc40 100644 --- a/internal/db/models/nameservers/ns_domain_model.go +++ b/internal/db/models/nameservers/ns_domain_model.go @@ -7,7 +7,7 @@ type NSDomain struct { Id uint32 `field:"id"` // ID ClusterId uint32 `field:"clusterId"` // 集群ID UserId uint32 `field:"userId"` // 用户ID - IsOn uint8 `field:"isOn"` // 是否启用 + IsOn bool `field:"isOn"` // 是否启用 Name string `field:"name"` // 域名 CreatedAt uint64 `field:"createdAt"` // 创建时间 Version uint64 `field:"version"` // 版本 diff --git a/internal/db/models/nameservers/ns_key_model.go b/internal/db/models/nameservers/ns_key_model.go index d3e51f88..7817afab 100644 --- a/internal/db/models/nameservers/ns_key_model.go +++ b/internal/db/models/nameservers/ns_key_model.go @@ -3,7 +3,7 @@ package nameservers // NSKey 密钥管理 type NSKey struct { Id uint64 `field:"id"` // ID - IsOn uint8 `field:"isOn"` // 状态 + IsOn bool `field:"isOn"` // 状态 Name string `field:"name"` // 名称 DomainId uint64 `field:"domainId"` // 域名ID ZoneId uint64 `field:"zoneId"` // 子域ID diff --git a/internal/db/models/nameservers/ns_record_model.go b/internal/db/models/nameservers/ns_record_model.go index 81a41f19..acb8672b 100644 --- a/internal/db/models/nameservers/ns_record_model.go +++ b/internal/db/models/nameservers/ns_record_model.go @@ -6,7 +6,7 @@ import "github.com/iwind/TeaGo/dbs" type NSRecord struct { Id uint64 `field:"id"` // ID DomainId uint32 `field:"domainId"` // 域名ID - IsOn uint8 `field:"isOn"` // 是否启用 + IsOn bool `field:"isOn"` // 是否启用 Description string `field:"description"` // 备注 Name string `field:"name"` // 记录名 Type string `field:"type"` // 类型 diff --git a/internal/db/models/nameservers/ns_route_dao.go b/internal/db/models/nameservers/ns_route_dao.go index 57b75dff..2305bc74 100644 --- a/internal/db/models/nameservers/ns_route_dao.go +++ b/internal/db/models/nameservers/ns_route_dao.go @@ -107,7 +107,7 @@ func (this *NSRouteDAO) FindEnabledRouteWithCode(tx *dbs.Tx, code string) (*NSRo return &NSRoute{ Id: 0, - IsOn: 1, + IsOn: true, Name: route.Name, Code: route.Code, State: NSRouteStateEnabled, diff --git a/internal/db/models/nameservers/ns_route_model.go b/internal/db/models/nameservers/ns_route_model.go index f2c1a631..30a65ebc 100644 --- a/internal/db/models/nameservers/ns_route_model.go +++ b/internal/db/models/nameservers/ns_route_model.go @@ -5,7 +5,7 @@ import "github.com/iwind/TeaGo/dbs" // NSRoute DNS线路 type NSRoute struct { Id uint32 `field:"id"` // ID - IsOn uint8 `field:"isOn"` // 是否启用 + IsOn bool `field:"isOn"` // 是否启用 ClusterId uint32 `field:"clusterId"` // 集群ID DomainId uint32 `field:"domainId"` // 域名ID UserId uint32 `field:"userId"` // 用户ID diff --git a/internal/db/models/nameservers/ns_zone_model.go b/internal/db/models/nameservers/ns_zone_model.go index 7efad82b..d665e75b 100644 --- a/internal/db/models/nameservers/ns_zone_model.go +++ b/internal/db/models/nameservers/ns_zone_model.go @@ -6,7 +6,7 @@ import "github.com/iwind/TeaGo/dbs" type NSZone struct { Id uint64 `field:"id"` // ID DomainId uint64 `field:"domainId"` // 域名ID - IsOn uint8 `field:"isOn"` // 是否启用 + IsOn bool `field:"isOn"` // 是否启用 Order uint32 `field:"order"` // 排序 Version uint64 `field:"version"` // 版本 Tsig dbs.JSON `field:"tsig"` // TSIG配置 diff --git a/internal/db/models/node_cluster_dao.go b/internal/db/models/node_cluster_dao.go index a53d2917..0969ee30 100644 --- a/internal/db/models/node_cluster_dao.go +++ b/internal/db/models/node_cluster_dao.go @@ -263,7 +263,7 @@ func (this *NodeClusterDAO) FindAllAPINodeAddrsWithCluster(tx *dbs.Tx, clusterId return nil, err } for _, apiNode := range apiNodes { - if apiNode.IsOn != 1 { + if !apiNode.IsOn { continue } addrs, err := apiNode.DecodeAccessAddrStrings() @@ -288,7 +288,7 @@ func (this *NodeClusterDAO) FindAllAPINodeAddrsWithCluster(tx *dbs.Tx, clusterId if err != nil { return nil, err } - if apiNode == nil || apiNode.IsOn != 1 { + if apiNode == nil || !apiNode.IsOn { continue } addrs, err := apiNode.DecodeAccessAddrStrings() diff --git a/internal/db/models/node_cluster_metric_item_model.go b/internal/db/models/node_cluster_metric_item_model.go index 12cd4935..7887d2a1 100644 --- a/internal/db/models/node_cluster_metric_item_model.go +++ b/internal/db/models/node_cluster_metric_item_model.go @@ -3,7 +3,7 @@ package models // NodeClusterMetricItem 集群使用的指标 type NodeClusterMetricItem struct { Id uint32 `field:"id"` // ID - IsOn uint8 `field:"isOn"` // 是否启用 + IsOn bool `field:"isOn"` // 是否启用 ClusterId uint32 `field:"clusterId"` // 集群ID ItemId uint64 `field:"itemId"` // 指标ID State uint8 `field:"state"` // 是否启用 diff --git a/internal/db/models/node_cluster_model.go b/internal/db/models/node_cluster_model.go index e8c5a93f..9a6ba397 100644 --- a/internal/db/models/node_cluster_model.go +++ b/internal/db/models/node_cluster_model.go @@ -7,7 +7,7 @@ type NodeCluster struct { Id uint32 `field:"id"` // ID AdminId uint32 `field:"adminId"` // 管理员ID UserId uint32 `field:"userId"` // 用户ID - IsOn uint8 `field:"isOn"` // 是否启用 + IsOn bool `field:"isOn"` // 是否启用 Name string `field:"name"` // 名称 UseAllAPINodes uint8 `field:"useAllAPINodes"` // 是否使用所有API节点 ApiNodes dbs.JSON `field:"apiNodes"` // 使用的API节点 diff --git a/internal/db/models/node_dao.go b/internal/db/models/node_dao.go index 00e5f50b..aa59835f 100644 --- a/internal/db/models/node_dao.go +++ b/internal/db/models/node_dao.go @@ -736,7 +736,7 @@ func (this *NodeDAO) ComposeNodeConfig(tx *dbs.Tx, nodeId int64, cacheMap *utils Id: int64(node.Id), NodeId: node.UniqueId, Secret: node.Secret, - IsOn: node.IsOn == 1, + IsOn: node.IsOn, Servers: nil, Version: int64(node.Version), Name: node.Name, @@ -767,7 +767,7 @@ func (this *NodeDAO) ComposeNodeConfig(tx *dbs.Tx, nodeId int64, cacheMap *utils } config.Servers = append(config.Servers, serverConfig) - if server.IsOn == 1 && server.SupportCNAME == 1 { + if server.IsOn && server.SupportCNAME == 1 { config.SupportCNAME = true } } diff --git a/internal/db/models/node_ip_address_log_model.go b/internal/db/models/node_ip_address_log_model.go index 79440291..4a48fcfa 100644 --- a/internal/db/models/node_ip_address_log_model.go +++ b/internal/db/models/node_ip_address_log_model.go @@ -8,7 +8,7 @@ type NodeIPAddressLog struct { Description string `field:"description"` // 描述 CreatedAt uint64 `field:"createdAt"` // 操作时间 IsUp uint8 `field:"isUp"` // 是否在线 - IsOn uint8 `field:"isOn"` // 是否启用 + IsOn bool `field:"isOn"` // 是否启用 CanAccess uint8 `field:"canAccess"` // 是否可访问 Day string `field:"day"` // YYYYMMDD，用来清理 BackupIP string `field:"backupIP"` // 备用IP diff --git a/internal/db/models/node_ip_address_model.go b/internal/db/models/node_ip_address_model.go index 15c1efbd..649e2e39 100644 --- a/internal/db/models/node_ip_address_model.go +++ b/internal/db/models/node_ip_address_model.go @@ -14,7 +14,7 @@ type NodeIPAddress struct { State uint8 `field:"state"` // 状态 Order uint32 `field:"order"` // 排序 CanAccess uint8 `field:"canAccess"` // 是否可以访问 - IsOn uint8 `field:"isOn"` // 是否启用 + IsOn bool `field:"isOn"` // 是否启用 IsUp uint8 `field:"isUp"` // 是否上线 IsHealthy uint8 `field:"isHealthy"` // 是否健康 Thresholds dbs.JSON `field:"thresholds"` // 上线阈值 diff --git a/internal/db/models/node_model.go b/internal/db/models/node_model.go index 005769d9..eee78e8d 100644 --- a/internal/db/models/node_model.go +++ b/internal/db/models/node_model.go @@ -7,7 +7,7 @@ type Node struct { Id uint32 `field:"id"` // ID AdminId uint32 `field:"adminId"` // 管理员ID UserId uint32 `field:"userId"` // 用户ID - IsOn uint8 `field:"isOn"` // 是否启用 + IsOn bool `field:"isOn"` // 是否启用 IsUp uint8 `field:"isUp"` // 是否在线 CountUp uint32 `field:"countUp"` // 连续在线次数 CountDown uint32 `field:"countDown"` // 连续下线次数 diff --git a/internal/db/models/node_price_item_model.go b/internal/db/models/node_price_item_model.go index 0dbb44a1..11ffbb2b 100644 --- a/internal/db/models/node_price_item_model.go +++ b/internal/db/models/node_price_item_model.go @@ -3,7 +3,7 @@ package models // NodePriceItem 区域计费设置 type NodePriceItem struct { Id uint32 `field:"id"` // ID - IsOn uint8 `field:"isOn"` // 是否启用 + IsOn bool `field:"isOn"` // 是否启用 Type string `field:"type"` // 类型：峰值|流量 Name string `field:"name"` // 名称 BitsFrom uint64 `field:"bitsFrom"` // 起始值 diff --git a/internal/db/models/node_region_model.go b/internal/db/models/node_region_model.go index 21d47905..ab320d30 100644 --- a/internal/db/models/node_region_model.go +++ b/internal/db/models/node_region_model.go @@ -6,7 +6,7 @@ import "github.com/iwind/TeaGo/dbs" type NodeRegion struct { Id uint32 `field:"id"` // ID AdminId uint32 `field:"adminId"` // 管理员ID - IsOn uint8 `field:"isOn"` // 是否启用 + IsOn bool `field:"isOn"` // 是否启用 Name string `field:"name"` // 名称 Description string `field:"description"` // 描述 Order uint32 `field:"order"` // 排序 diff --git a/internal/db/models/node_threshold_model.go b/internal/db/models/node_threshold_model.go index 0965e98e..7f3c23ce 100644 --- a/internal/db/models/node_threshold_model.go +++ b/internal/db/models/node_threshold_model.go @@ -8,7 +8,7 @@ type NodeThreshold struct { Role string `field:"role"` // 节点角色 ClusterId uint32 `field:"clusterId"` // 集群ID NodeId uint32 `field:"nodeId"` // 节点ID - IsOn uint8 `field:"isOn"` // 是否启用 + IsOn bool `field:"isOn"` // 是否启用 Item string `field:"item"` // 监控项 Param string `field:"param"` // 参数 Operator string `field:"operator"` // 操作符 diff --git a/internal/db/models/ns_cluster_model.go b/internal/db/models/ns_cluster_model.go index 4fb77e18..b72b6add 100644 --- a/internal/db/models/ns_cluster_model.go +++ b/internal/db/models/ns_cluster_model.go @@ -5,7 +5,7 @@ import "github.com/iwind/TeaGo/dbs" // NSCluster 域名服务器集群 type NSCluster struct { Id uint32 `field:"id"` // ID - IsOn uint8 `field:"isOn"` // 是否启用 + IsOn bool `field:"isOn"` // 是否启用 Name string `field:"name"` // 集群名 InstallDir string `field:"installDir"` // 安装目录 State uint8 `field:"state"` // 状态 diff --git a/internal/db/models/ns_node_model.go b/internal/db/models/ns_node_model.go index d3207714..3c446568 100644 --- a/internal/db/models/ns_node_model.go +++ b/internal/db/models/ns_node_model.go @@ -8,7 +8,7 @@ type NSNode struct { AdminId uint32 `field:"adminId"` // 管理员ID ClusterId uint32 `field:"clusterId"` // 集群ID Name string `field:"name"` // 节点名称 - IsOn uint8 `field:"isOn"` // 是否启用 + IsOn bool `field:"isOn"` // 是否启用 Status dbs.JSON `field:"status"` // 运行状态 UniqueId string `field:"uniqueId"` // 节点ID Secret string `field:"secret"` // 密钥 diff --git a/internal/db/models/origin_dao.go b/internal/db/models/origin_dao.go index 6b8aad3f..01298b58 100644 --- a/internal/db/models/origin_dao.go +++ b/internal/db/models/origin_dao.go @@ -292,7 +292,7 @@ func (this *OriginDAO) ComposeOriginConfig(tx *dbs.Tx, originId int64, cacheMap var config = &serverconfigs.OriginConfig{ Id: int64(origin.Id), - IsOn: origin.IsOn == 1, + IsOn: origin.IsOn, Version: int(origin.Version), Name: origin.Name, Description: origin.Description, diff --git a/internal/db/models/origin_model.go b/internal/db/models/origin_model.go index 89005968..f0bf312c 100644 --- a/internal/db/models/origin_model.go +++ b/internal/db/models/origin_model.go @@ -7,7 +7,7 @@ type Origin struct { Id uint32 `field:"id"` // ID AdminId uint32 `field:"adminId"` // 管理员ID UserId uint32 `field:"userId"` // 用户ID - IsOn uint8 `field:"isOn"` // 是否启用 + IsOn bool `field:"isOn"` // 是否启用 Name string `field:"name"` // 名称 Version uint32 `field:"version"` // 版本 Addr dbs.JSON `field:"addr"` // 地址 diff --git a/internal/db/models/plan_model.go b/internal/db/models/plan_model.go index 6221c614..310b26f5 100644 --- a/internal/db/models/plan_model.go +++ b/internal/db/models/plan_model.go @@ -5,7 +5,7 @@ import "github.com/iwind/TeaGo/dbs" // Plan 用户套餐 type Plan struct { Id uint32 `field:"id"` // ID - IsOn uint8 `field:"isOn"` // 是否启用 + IsOn bool `field:"isOn"` // 是否启用 Name string `field:"name"` // 套餐名 ClusterId uint32 `field:"clusterId"` // 集群ID TrafficLimit dbs.JSON `field:"trafficLimit"` // 流量限制 diff --git a/internal/db/models/report_node_group_model.go b/internal/db/models/report_node_group_model.go index d56639a2..e754b449 100644 --- a/internal/db/models/report_node_group_model.go +++ b/internal/db/models/report_node_group_model.go @@ -5,7 +5,7 @@ type ReportNodeGroup struct { Id uint32 `field:"id"` // ID Name string `field:"name"` // 名称 State uint8 `field:"state"` // 状态 - IsOn uint8 `field:"isOn"` // 是否启用 + IsOn bool `field:"isOn"` // 是否启用 } type ReportNodeGroupOperator struct { diff --git a/internal/db/models/report_node_model.go b/internal/db/models/report_node_model.go index 6ea86ce1..58ab1ed9 100644 --- a/internal/db/models/report_node_model.go +++ b/internal/db/models/report_node_model.go @@ -7,7 +7,7 @@ type ReportNode struct { Id uint32 `field:"id"` // ID UniqueId string `field:"uniqueId"` // 唯一ID Secret string `field:"secret"` // 密钥 - IsOn uint8 `field:"isOn"` // 是否启用 + IsOn bool `field:"isOn"` // 是否启用 Name string `field:"name"` // 名称 Location string `field:"location"` // 所在区域 Isp string `field:"isp"` // 网络服务商 diff --git a/internal/db/models/reverse_proxy_dao.go b/internal/db/models/reverse_proxy_dao.go index b5410c59..4d78f5f6 100644 --- a/internal/db/models/reverse_proxy_dao.go +++ b/internal/db/models/reverse_proxy_dao.go @@ -101,7 +101,7 @@ func (this *ReverseProxyDAO) ComposeReverseProxyConfig(tx *dbs.Tx, reverseProxyI config := &serverconfigs.ReverseProxyConfig{} config.Id = int64(reverseProxy.Id) - config.IsOn = reverseProxy.IsOn == 1 + config.IsOn = reverseProxy.IsOn config.RequestHostType = types.Int8(reverseProxy.RequestHostType) config.RequestHost = reverseProxy.RequestHost config.RequestURI = reverseProxy.RequestURI diff --git a/internal/db/models/reverse_proxy_model.go b/internal/db/models/reverse_proxy_model.go index 1e733a4b..20ae1a5d 100644 --- a/internal/db/models/reverse_proxy_model.go +++ b/internal/db/models/reverse_proxy_model.go @@ -8,7 +8,7 @@ type ReverseProxy struct { AdminId uint32 `field:"adminId"` // 管理员ID UserId uint32 `field:"userId"` // 用户ID TemplateId uint32 `field:"templateId"` // 模版ID - IsOn uint8 `field:"isOn"` // 是否启用 + IsOn bool `field:"isOn"` // 是否启用 Scheduling dbs.JSON `field:"scheduling"` // 调度算法 PrimaryOrigins dbs.JSON `field:"primaryOrigins"` // 主要源站 BackupOrigins dbs.JSON `field:"backupOrigins"` // 备用源站 diff --git a/internal/db/models/server_dao.go b/internal/db/models/server_dao.go index 395f65f4..5de9bc08 100644 --- a/internal/db/models/server_dao.go +++ b/internal/db/models/server_dao.go @@ -890,7 +890,7 @@ func (this *ServerDAO) ComposeServerConfig(tx *dbs.Tx, server *Server, cacheMap config.Id = int64(server.Id) config.ClusterId = int64(server.ClusterId) config.Type = server.Type - config.IsOn = server.IsOn == 1 + config.IsOn = server.IsOn config.Name = server.Name config.Description = server.Description @@ -1085,7 +1085,7 @@ func (this *ServerDAO) ComposeServerConfig(tx *dbs.Tx, server *Server, cacheMap if err != nil { return nil, err } - if userPlan != nil && userPlan.IsOn == 1 { + if userPlan != nil && userPlan.IsOn { if len(userPlan.DayTo) == 0 { userPlan.DayTo = DefaultUserPlanMaxDay } diff --git a/internal/db/models/server_dao_test.go b/internal/db/models/server_dao_test.go index c168a185..08dbf740 100644 --- a/internal/db/models/server_dao_test.go +++ b/internal/db/models/server_dao_test.go @@ -1,8 +1,9 @@ -package models +package models_test import ( "crypto/md5" "encoding/json" + "github.com/TeaOSLab/EdgeAPI/internal/db/models" "github.com/TeaOSLab/EdgeAPI/internal/utils" "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs" "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/shared" @@ -16,7 +17,7 @@ import ( func TestServerDAO_ComposeServerConfig(t *testing.T) { dbs.NotifyReady() var tx *dbs.Tx - config, err := SharedServerDAO.ComposeServerConfigWithServerId(tx, 1, false) + config, err := models.SharedServerDAO.ComposeServerConfigWithServerId(tx, 1, false) if err != nil { t.Fatal(err) } @@ -26,7 +27,7 @@ func TestServerDAO_ComposeServerConfig(t *testing.T) { func TestServerDAO_ComposeServerConfig_AliasServerNames(t *testing.T) { dbs.NotifyReady() var tx *dbs.Tx - config, err := SharedServerDAO.ComposeServerConfigWithServerId(tx, 14, false) + config, err := models.SharedServerDAO.ComposeServerConfigWithServerId(tx, 14, false) if err != nil { t.Fatal(err) } @@ -36,7 +37,7 @@ func TestServerDAO_ComposeServerConfig_AliasServerNames(t *testing.T) { func TestServerDAO_UpdateServerConfig(t *testing.T) { dbs.NotifyReady() var tx *dbs.Tx - config, err := SharedServerDAO.ComposeServerConfigWithServerId(tx, 1, false) + config, err := models.SharedServerDAO.ComposeServerConfigWithServerId(tx, 1, false) if err != nil { t.Fatal(err) } @@ -62,7 +63,7 @@ func TestNewServerDAO_md5(t *testing.T) { func TestServerDAO_genDNSName(t *testing.T) { dbs.NotifyReady() var tx *dbs.Tx - dnsName, err := SharedServerDAO.GenDNSName(tx) + dnsName, err := models.SharedServerDAO.GenDNSName(tx) if err != nil { t.Fatal(err) } @@ -72,7 +73,7 @@ func TestServerDAO_genDNSName(t *testing.T) { func TestServerDAO_FindAllServerDNSNamesWithDNSDomainId(t *testing.T) { dbs.NotifyReady() var tx *dbs.Tx - dnsNames, err := SharedServerDAO.FindAllServerDNSNamesWithDNSDomainId(tx, 2) + dnsNames, err := models.SharedServerDAO.FindAllServerDNSNamesWithDNSDomainId(tx, 2) if err != nil { t.Fatal(err) } @@ -82,7 +83,7 @@ func TestServerDAO_FindAllServerDNSNamesWithDNSDomainId(t *testing.T) { func TestServerDAO_FindAllEnabledServerIdsWithSSLPolicyIds(t *testing.T) { dbs.NotifyReady() var tx *dbs.Tx - serverIds, err := SharedServerDAO.FindAllEnabledServerIdsWithSSLPolicyIds(tx, []int64{14}) + serverIds, err := models.SharedServerDAO.FindAllEnabledServerIdsWithSSLPolicyIds(tx, []int64{14}) if err != nil { t.Fatal(err) } @@ -100,7 +101,7 @@ func TestServerDAO_CheckPortIsUsing(t *testing.T) { // t.Log("isUsing:", isUsing) //} { - isUsing, err := SharedServerDAO.CheckPortIsUsing(tx, 18, "tcp", 3306, 0, "") + isUsing, err := models.SharedServerDAO.CheckPortIsUsing(tx, 18, "tcp", 3306, 0, "") if err != nil { t.Fatal(err) } @@ -113,7 +114,7 @@ func TestServerDAO_ExistServerNameInCluster(t *testing.T) { var tx *dbs.Tx { - exist, err := SharedServerDAO.ExistServerNameInCluster(tx, 18, "hello.teaos.cn", 0) + exist, err := models.SharedServerDAO.ExistServerNameInCluster(tx, 18, "hello.teaos.cn", 0) if err != nil { t.Fatal(err) } @@ -121,7 +122,7 @@ func TestServerDAO_ExistServerNameInCluster(t *testing.T) { } { - exist, err := SharedServerDAO.ExistServerNameInCluster(tx, 18, "cdn.teaos.cn", 0) + exist, err := models.SharedServerDAO.ExistServerNameInCluster(tx, 18, "cdn.teaos.cn", 0) if err != nil { t.Fatal(err) } @@ -129,7 +130,7 @@ func TestServerDAO_ExistServerNameInCluster(t *testing.T) { } { - exist, err := SharedServerDAO.ExistServerNameInCluster(tx, 18, "cdn.teaos.cn", 23) + exist, err := models.SharedServerDAO.ExistServerNameInCluster(tx, 18, "cdn.teaos.cn", 23) if err != nil { t.Fatal(err) } @@ -141,7 +142,7 @@ func TestServerDAO_FindAllEnabledServersWithNode(t *testing.T) { dbs.NotifyReady() var before = time.Now() - servers, err := SharedServerDAO.FindAllEnabledServersWithNode(nil, 48) + servers, err := models.SharedServerDAO.FindAllEnabledServersWithNode(nil, 48) if err != nil { t.Fatal(err) } @@ -156,23 +157,23 @@ func TestServerDAO_FindAllEnabledServersWithNode_Cache(t *testing.T) { var cacheMap = utils.NewCacheMap() { - servers, err := SharedServerDAO.FindAllEnabledServersWithNode(nil, 48) + servers, err := models.SharedServerDAO.FindAllEnabledServersWithNode(nil, 48) if err != nil { t.Fatal(err) } for _, server := range servers { - _, _ = SharedServerDAO.ComposeServerConfig(nil, server, cacheMap, true) + _, _ = models.SharedServerDAO.ComposeServerConfig(nil, server, cacheMap, true) } } var before = time.Now() { - servers, err := SharedServerDAO.FindAllEnabledServersWithNode(nil, 48) + servers, err := models.SharedServerDAO.FindAllEnabledServersWithNode(nil, 48) if err != nil { t.Fatal(err) } for _, server := range servers { - _, _ = SharedServerDAO.ComposeServerConfig(nil, server, cacheMap, true) + _, _ = models.SharedServerDAO.ComposeServerConfig(nil, server, cacheMap, true) } } t.Log(time.Since(before).Seconds()*1000, "ms") @@ -180,7 +181,7 @@ func TestServerDAO_FindAllEnabledServersWithNode_Cache(t *testing.T) { func TestServerDAO_FindAllEnabledServersWithDomain(t *testing.T) { for _, domain := range []string{"yun4s.cn", "teaos.cn", "teaos2.cn", "cdn.teaos.cn", "cdn100.teaos.cn"} { - servers, err := NewServerDAO().FindAllEnabledServersWithDomain(nil, domain) + servers, err := models.NewServerDAO().FindAllEnabledServersWithDomain(nil, domain) if err != nil { t.Fatal(err) } @@ -202,7 +203,7 @@ func TestServerDAO_UpdateServerTrafficLimitStatus(t *testing.T) { defer func() { t.Log(time.Since(before).Seconds()*1000, "ms") }() - err := NewServerDAO().UpdateServerTrafficLimitStatus(tx, &serverconfigs.TrafficLimitConfig{ + err := models.NewServerDAO().UpdateServerTrafficLimitStatus(tx, &serverconfigs.TrafficLimitConfig{ IsOn: true, DailySize: &shared.SizeCapacity{Count: 1, Unit: "mb"}, MonthlySize: &shared.SizeCapacity{Count: 10, Unit: "mb"}, @@ -225,7 +226,7 @@ func TestServerDAO_CalculateServerTrafficLimitConfig(t *testing.T) { }() var cacheMap = utils.NewCacheMap() - config, err := SharedServerDAO.CalculateServerTrafficLimitConfig(tx, 23, cacheMap) + config, err := models.SharedServerDAO.CalculateServerTrafficLimitConfig(tx, 23, cacheMap) if err != nil { t.Fatal(err) } @@ -243,7 +244,7 @@ func TestServerDAO_CalculateServerTrafficLimitConfig_Cache(t *testing.T) { var cacheMap = utils.NewCacheMap() for i := 0; i < 10; i++ { - config, err := SharedServerDAO.CalculateServerTrafficLimitConfig(tx, 23, cacheMap) + config, err := models.SharedServerDAO.CalculateServerTrafficLimitConfig(tx, 23, cacheMap) if err != nil { t.Fatal(err) } @@ -251,11 +252,35 @@ func TestServerDAO_CalculateServerTrafficLimitConfig_Cache(t *testing.T) { } } +func TestServerDAO_FindBytes(t *testing.T) { + col, err := models.NewServerDAO().Query(nil). + Result("http"). + Pk(1). + FindBytesCol() + if err != nil { + t.Fatal(err) + } + t.Log(string(col)) +} + +func TestServerDAO_FindBool(t *testing.T) { + one, err := models.NewServerDAO().Query(nil). + Result("isOn"). + Pk(1). + Find() + if err != nil { + t.Fatal(err) + } + if one != nil { + t.Log(one.(*models.Server).IsOn) + } +} + func BenchmarkServerDAO_CountAllEnabledServers(b *testing.B) { - SharedServerDAO = NewServerDAO() + models.SharedServerDAO = models.NewServerDAO() for i := 0; i < b.N; i++ { - result, err := SharedServerDAO.CountAllEnabledServers(nil) + result, err := models.SharedServerDAO.CountAllEnabledServers(nil) if err != nil { b.Fatal(err) } diff --git a/internal/db/models/server_group_dao.go b/internal/db/models/server_group_dao.go index 2df5889b..939cf886 100644 --- a/internal/db/models/server_group_dao.go +++ b/internal/db/models/server_group_dao.go @@ -312,7 +312,7 @@ func (this *ServerGroupDAO) ComposeGroupConfig(tx *dbs.Tx, groupId int64, cacheM var config = &serverconfigs.ServerGroupConfig{ Id: int64(group.Id), Name: group.Name, - IsOn: group.IsOn == 1, + IsOn: group.IsOn, } if IsNotNull(group.HttpReverseProxy) { diff --git a/internal/db/models/server_group_model.go b/internal/db/models/server_group_model.go index 7a777aaa..28c3b563 100644 --- a/internal/db/models/server_group_model.go +++ b/internal/db/models/server_group_model.go @@ -7,7 +7,7 @@ type ServerGroup struct { Id uint32 `field:"id"` // ID AdminId uint32 `field:"adminId"` // 管理员ID UserId uint32 `field:"userId"` // 用户ID - IsOn uint8 `field:"isOn"` // 是否启用 + IsOn bool `field:"isOn"` // 是否启用 Name string `field:"name"` // 名称 Order uint32 `field:"order"` // 排序 CreatedAt uint64 `field:"createdAt"` // 创建时间 diff --git a/internal/db/models/server_model.go b/internal/db/models/server_model.go index 2729ee58..94945c4f 100644 --- a/internal/db/models/server_model.go +++ b/internal/db/models/server_model.go @@ -5,7 +5,7 @@ import "github.com/iwind/TeaGo/dbs" // Server 服务 type Server struct { Id uint32 `field:"id"` // ID - IsOn uint8 `field:"isOn"` // 是否启用 + IsOn bool `field:"isOn"` // 是否启用 UserId uint32 `field:"userId"` // 用户ID AdminId uint32 `field:"adminId"` // 管理员ID Type string `field:"type"` // 服务类型 diff --git a/internal/db/models/server_stat_board_model.go b/internal/db/models/server_stat_board_model.go index 8277dd4f..809260f8 100644 --- a/internal/db/models/server_stat_board_model.go +++ b/internal/db/models/server_stat_board_model.go @@ -5,7 +5,7 @@ type ServerStatBoard struct { Id uint64 `field:"id"` // ID Name string `field:"name"` // 名称 ClusterId uint32 `field:"clusterId"` // 集群ID - IsOn uint8 `field:"isOn"` // 是否启用 + IsOn bool `field:"isOn"` // 是否启用 Order uint32 `field:"order"` // 排序 State uint8 `field:"state"` // 状态 } diff --git a/internal/db/models/ssl_cert_dao.go b/internal/db/models/ssl_cert_dao.go index eae0998e..13735fb0 100644 --- a/internal/db/models/ssl_cert_dao.go +++ b/internal/db/models/ssl_cert_dao.go @@ -219,7 +219,7 @@ func (this *SSLCertDAO) ComposeCertConfig(tx *dbs.Tx, certId int64, cacheMap *ut config := &sslconfigs.SSLCertConfig{} config.Id = int64(cert.Id) - config.IsOn = cert.IsOn == 1 + config.IsOn = cert.IsOn config.IsCA = cert.IsCA == 1 config.IsACME = cert.IsACME == 1 config.Name = cert.Name diff --git a/internal/db/models/ssl_cert_model.go b/internal/db/models/ssl_cert_model.go index 2983b40f..74168a6d 100644 --- a/internal/db/models/ssl_cert_model.go +++ b/internal/db/models/ssl_cert_model.go @@ -10,7 +10,7 @@ type SSLCert struct { State uint8 `field:"state"` // 状态 CreatedAt uint64 `field:"createdAt"` // 创建时间 UpdatedAt uint64 `field:"updatedAt"` // 修改时间 - IsOn uint8 `field:"isOn"` // 是否启用 + IsOn bool `field:"isOn"` // 是否启用 Name string `field:"name"` // 证书名 Description string `field:"description"` // 描述 CertData []byte `field:"certData"` // 证书内容 diff --git a/internal/db/models/ssl_policy_dao.go b/internal/db/models/ssl_policy_dao.go index 841e2ed1..3bea49a8 100644 --- a/internal/db/models/ssl_policy_dao.go +++ b/internal/db/models/ssl_policy_dao.go @@ -97,7 +97,7 @@ func (this *SSLPolicyDAO) ComposePolicyConfig(tx *dbs.Tx, policyId int64, cacheM } config := &sslconfigs.SSLPolicy{} config.Id = int64(policy.Id) - config.IsOn = policy.IsOn == 1 + config.IsOn = policy.IsOn config.ClientAuthType = int(policy.ClientAuthType) config.HTTP2Enabled = policy.Http2Enabled == 1 config.MinVersion = policy.MinVersion diff --git a/internal/db/models/ssl_policy_model.go b/internal/db/models/ssl_policy_model.go index 7de8f576..6264b433 100644 --- a/internal/db/models/ssl_policy_model.go +++ b/internal/db/models/ssl_policy_model.go @@ -7,7 +7,7 @@ type SSLPolicy struct { Id uint32 `field:"id"` // ID AdminId uint32 `field:"adminId"` // 管理员ID UserId uint32 `field:"userId"` // 用户ID - IsOn uint8 `field:"isOn"` // 是否启用 + IsOn bool `field:"isOn"` // 是否启用 Certs dbs.JSON `field:"certs"` // 证书列表 ClientCACerts dbs.JSON `field:"clientCACerts"` // 客户端证书 ClientAuthType uint32 `field:"clientAuthType"` // 客户端认证类型 diff --git a/internal/db/models/sub_user_model.go b/internal/db/models/sub_user_model.go index 05a9466b..1ac631a3 100644 --- a/internal/db/models/sub_user_model.go +++ b/internal/db/models/sub_user_model.go @@ -1,10 +1,10 @@ package models -// 子用户 +// SubUser 子用户 type SubUser struct { Id uint32 `field:"id"` // ID UserId uint32 `field:"userId"` // 所属主用户ID - IsOn uint8 `field:"isOn"` // 是否启用 + IsOn bool `field:"isOn"` // 是否启用 Name string `field:"name"` // 名称 Username string `field:"username"` // 用户名 Password string `field:"password"` // 密码 diff --git a/internal/db/models/user_access_key_model.go b/internal/db/models/user_access_key_model.go index 88fd3d03..9b6fdec7 100644 --- a/internal/db/models/user_access_key_model.go +++ b/internal/db/models/user_access_key_model.go @@ -6,7 +6,7 @@ type UserAccessKey struct { AdminId uint32 `field:"adminId"` // 管理员ID UserId uint32 `field:"userId"` // 用户ID SubUserId uint32 `field:"subUserId"` // 子用户ID - IsOn uint8 `field:"isOn"` // 是否启用 + IsOn bool `field:"isOn"` // 是否启用 UniqueId string `field:"uniqueId"` // 唯一的Key Secret string `field:"secret"` // 密钥 Description string `field:"description"` // 备注 diff --git a/internal/db/models/user_model.go b/internal/db/models/user_model.go index cd0ba8f5..418081dc 100644 --- a/internal/db/models/user_model.go +++ b/internal/db/models/user_model.go @@ -5,7 +5,7 @@ import "github.com/iwind/TeaGo/dbs" // User 用户 type User struct { Id uint32 `field:"id"` // ID - IsOn uint8 `field:"isOn"` // 是否启用 + IsOn bool `field:"isOn"` // 是否启用 Username string `field:"username"` // 用户名 Password string `field:"password"` // 密码 Fullname string `field:"fullname"` // 真实姓名 diff --git a/internal/db/models/user_node_model.go b/internal/db/models/user_node_model.go index 2d70b41a..7c0078a1 100644 --- a/internal/db/models/user_node_model.go +++ b/internal/db/models/user_node_model.go @@ -2,10 +2,10 @@ package models import "github.com/iwind/TeaGo/dbs" -// 用户节点 +// UserNode 用户节点 type UserNode struct { Id uint32 `field:"id"` // ID - IsOn uint8 `field:"isOn"` // 是否启用 + IsOn bool `field:"isOn"` // 是否启用 UniqueId string `field:"uniqueId"` // 唯一ID Secret string `field:"secret"` // 密钥 Name string `field:"name"` // 名称 diff --git a/internal/db/models/user_plan_model.go b/internal/db/models/user_plan_model.go index 5f02a2cb..d2266d13 100644 --- a/internal/db/models/user_plan_model.go +++ b/internal/db/models/user_plan_model.go @@ -5,7 +5,7 @@ type UserPlan struct { Id uint64 `field:"id"` // ID UserId uint32 `field:"userId"` // 用户ID PlanId uint32 `field:"planId"` // 套餐ID - IsOn uint8 `field:"isOn"` // 是否启用 + IsOn bool `field:"isOn"` // 是否启用 Name string `field:"name"` // 名称 DayTo string `field:"dayTo"` // 结束日期 State uint8 `field:"state"` // 状态 diff --git a/internal/rpc/services/nameservers/service_ns_access_log.go b/internal/rpc/services/nameservers/service_ns_access_log.go index ba4ca5d0..6bbd1342 100644 --- a/internal/rpc/services/nameservers/service_ns_access_log.go +++ b/internal/rpc/services/nameservers/service_ns_access_log.go @@ -74,7 +74,7 @@ func (this *NSAccessLogService) ListNSAccessLogs(ctx context.Context, req *pb.Li if route != nil { a.NsRoutes = append(a.NsRoutes, &pb.NSRoute{ Id: types.Int64(route.Id), - IsOn: route.IsOn == 1, + IsOn: route.IsOn, Name: route.Name, Code: routeCode, NsCluster: nil, diff --git a/internal/rpc/services/nameservers/service_ns_cluster.go b/internal/rpc/services/nameservers/service_ns_cluster.go index 7b8a7960..7ffa9ecd 100644 --- a/internal/rpc/services/nameservers/service_ns_cluster.go +++ b/internal/rpc/services/nameservers/service_ns_cluster.go @@ -112,7 +112,7 @@ func (this *NSClusterService) FindEnabledNSCluster(ctx context.Context, req *pb. } return &pb.FindEnabledNSClusterResponse{NsCluster: &pb.NSCluster{ Id: int64(cluster.Id), - IsOn: cluster.IsOn == 1, + IsOn: cluster.IsOn, Name: cluster.Name, InstallDir: cluster.InstallDir, }}, nil @@ -147,7 +147,7 @@ func (this *NSClusterService) ListEnabledNSClusters(ctx context.Context, req *pb for _, cluster := range clusters { pbClusters = append(pbClusters, &pb.NSCluster{ Id: int64(cluster.Id), - IsOn: cluster.IsOn == 1, + IsOn: cluster.IsOn, Name: cluster.Name, InstallDir: cluster.InstallDir, }) @@ -170,7 +170,7 @@ func (this *NSClusterService) FindAllEnabledNSClusters(ctx context.Context, req for _, cluster := range clusters { pbClusters = append(pbClusters, &pb.NSCluster{ Id: int64(cluster.Id), - IsOn: cluster.IsOn == 1, + IsOn: cluster.IsOn, Name: cluster.Name, InstallDir: cluster.InstallDir, }) diff --git a/internal/rpc/services/nameservers/service_ns_domain.go b/internal/rpc/services/nameservers/service_ns_domain.go index 05b3983d..5bd50cb9 100644 --- a/internal/rpc/services/nameservers/service_ns_domain.go +++ b/internal/rpc/services/nameservers/service_ns_domain.go @@ -108,12 +108,12 @@ func (this *NSDomainService) FindEnabledNSDomain(ctx context.Context, req *pb.Fi NsDomain: &pb.NSDomain{ Id: int64(domain.Id), Name: domain.Name, - IsOn: domain.IsOn == 1, + IsOn: domain.IsOn, TsigJSON: domain.Tsig, CreatedAt: int64(domain.CreatedAt), NsCluster: &pb.NSCluster{ Id: int64(cluster.Id), - IsOn: cluster.IsOn == 1, + IsOn: cluster.IsOn, Name: cluster.Name, }, User: pbUser, @@ -180,12 +180,12 @@ func (this *NSDomainService) ListEnabledNSDomains(ctx context.Context, req *pb.L pbDomains = append(pbDomains, &pb.NSDomain{ Id: int64(domain.Id), Name: domain.Name, - IsOn: domain.IsOn == 1, + IsOn: domain.IsOn, CreatedAt: int64(domain.CreatedAt), TsigJSON: domain.Tsig, NsCluster: &pb.NSCluster{ Id: int64(cluster.Id), - IsOn: cluster.IsOn == 1, + IsOn: cluster.IsOn, Name: cluster.Name, }, User: pbUser, @@ -217,7 +217,7 @@ func (this *NSDomainService) ListNSDomainsAfterVersion(ctx context.Context, req pbDomains = append(pbDomains, &pb.NSDomain{ Id: int64(domain.Id), Name: domain.Name, - IsOn: domain.IsOn == 1, + IsOn: domain.IsOn, IsDeleted: domain.State == nameservers.NSDomainStateDisabled, Version: int64(domain.Version), TsigJSON: domain.Tsig, diff --git a/internal/rpc/services/nameservers/service_ns_key.go b/internal/rpc/services/nameservers/service_ns_key.go index f18e3d16..c9e13832 100644 --- a/internal/rpc/services/nameservers/service_ns_key.go +++ b/internal/rpc/services/nameservers/service_ns_key.go @@ -76,7 +76,7 @@ func (this *NSKeyService) FindEnabledNSKey(ctx context.Context, req *pb.FindEnab return &pb.FindEnabledNSKeyResponse{ NsKey: &pb.NSKey{ Id: int64(key.Id), - IsOn: key.IsOn == 1, + IsOn: key.IsOn, Name: key.Name, Algo: key.Algo, Secret: key.Secret, @@ -116,7 +116,7 @@ func (this *NSKeyService) ListEnabledNSKeys(ctx context.Context, req *pb.ListEna for _, key := range keys { pbKeys = append(pbKeys, &pb.NSKey{ Id: int64(key.Id), - IsOn: key.IsOn == 1, + IsOn: key.IsOn, Name: key.Name, Algo: key.Algo, Secret: key.Secret, @@ -155,7 +155,7 @@ func (this *NSKeyService) ListNSKeysAfterVersion(ctx context.Context, req *pb.Li pbKeys = append(pbKeys, &pb.NSKey{ Id: int64(key.Id), - IsOn: key.IsOn == 1, + IsOn: key.IsOn, Name: "", Algo: key.Algo, Secret: key.Secret, diff --git a/internal/rpc/services/nameservers/service_ns_node.go b/internal/rpc/services/nameservers/service_ns_node.go index b027f05e..0752d14b 100644 --- a/internal/rpc/services/nameservers/service_ns_node.go +++ b/internal/rpc/services/nameservers/service_ns_node.go @@ -44,7 +44,7 @@ func (this *NSNodeService) FindAllEnabledNSNodesWithNSClusterId(ctx context.Cont pbNodes = append(pbNodes, &pb.NSNode{ Id: int64(node.Id), Name: node.Name, - IsOn: node.IsOn == 1, + IsOn: node.IsOn, UniqueId: node.UniqueId, Secret: node.Secret, IsInstalled: node.IsInstalled == 1, @@ -120,7 +120,7 @@ func (this *NSNodeService) ListEnabledNSNodesMatch(ctx context.Context, req *pb. pbNodes = append(pbNodes, &pb.NSNode{ Id: int64(node.Id), Name: node.Name, - IsOn: node.IsOn == 1, + IsOn: node.IsOn, UniqueId: node.UniqueId, Secret: node.Secret, IsActive: node.IsActive == 1, @@ -276,7 +276,7 @@ func (this *NSNodeService) FindEnabledNSNode(ctx context.Context, req *pb.FindEn Name: clusterName, }, InstallStatus: installStatusResult, - IsOn: node.IsOn == 1, + IsOn: node.IsOn, IsActive: node.IsActive == 1, NodeLogin: respLogin, }}, nil diff --git a/internal/rpc/services/nameservers/service_ns_record.go b/internal/rpc/services/nameservers/service_ns_record.go index e247ba40..a18e7308 100644 --- a/internal/rpc/services/nameservers/service_ns_record.go +++ b/internal/rpc/services/nameservers/service_ns_record.go @@ -120,7 +120,7 @@ func (this *NSRecordService) ListEnabledNSRecords(ctx context.Context, req *pb.L Ttl: types.Int32(record.Ttl), Weight: types.Int32(record.Weight), CreatedAt: int64(record.CreatedAt), - IsOn: record.IsOn == 1, + IsOn: record.IsOn, NsDomain: nil, NsRoutes: pbRoutes, }) @@ -155,7 +155,7 @@ func (this *NSRecordService) FindEnabledNSRecord(ctx context.Context, req *pb.Fi var pbDomain = &pb.NSDomain{ Id: int64(domain.Id), Name: domain.Name, - IsOn: domain.IsOn == 1, + IsOn: domain.IsOn, } // 线路 @@ -186,7 +186,7 @@ func (this *NSRecordService) FindEnabledNSRecord(ctx context.Context, req *pb.Fi Ttl: types.Int32(record.Ttl), Weight: types.Int32(record.Weight), CreatedAt: int64(record.CreatedAt), - IsOn: record.IsOn == 1, + IsOn: record.IsOn, NsDomain: pbDomain, NsRoutes: pbRoutes, }}, nil @@ -237,7 +237,7 @@ func (this *NSRecordService) ListNSRecordsAfterVersion(ctx context.Context, req Ttl: types.Int32(record.Ttl), Weight: types.Int32(record.Weight), IsDeleted: record.State == nameservers.NSRecordStateDisabled, - IsOn: record.IsOn == 1, + IsOn: record.IsOn, Version: int64(record.Version), NsDomain: &pb.NSDomain{Id: int64(record.DomainId)}, NsRoutes: pbRoutes, diff --git a/internal/rpc/services/nameservers/service_ns_route.go b/internal/rpc/services/nameservers/service_ns_route.go index e2317a69..d5bfd094 100644 --- a/internal/rpc/services/nameservers/service_ns_route.go +++ b/internal/rpc/services/nameservers/service_ns_route.go @@ -83,7 +83,7 @@ func (this *NSRouteService) FindEnabledNSRoute(ctx context.Context, req *pb.Find if cluster != nil { pbCluster = &pb.NSCluster{ Id: int64(cluster.Id), - IsOn: cluster.IsOn == 1, + IsOn: cluster.IsOn, Name: cluster.Name, } } @@ -100,14 +100,14 @@ func (this *NSRouteService) FindEnabledNSRoute(ctx context.Context, req *pb.Find pbDomain = &pb.NSDomain{ Id: int64(domain.Id), Name: domain.Name, - IsOn: domain.IsOn == 1, + IsOn: domain.IsOn, } } } return &pb.FindEnabledNSRouteResponse{NsRoute: &pb.NSRoute{ Id: int64(route.Id), - IsOn: route.IsOn == 1, + IsOn: route.IsOn, Name: route.Name, RangesJSON: route.Ranges, NsCluster: pbCluster, @@ -138,7 +138,7 @@ func (this *NSRouteService) FindAllEnabledNSRoutes(ctx context.Context, req *pb. if cluster != nil { pbCluster = &pb.NSCluster{ Id: int64(cluster.Id), - IsOn: cluster.IsOn == 1, + IsOn: cluster.IsOn, Name: cluster.Name, } } @@ -155,14 +155,14 @@ func (this *NSRouteService) FindAllEnabledNSRoutes(ctx context.Context, req *pb. pbDomain = &pb.NSDomain{ Id: int64(domain.Id), Name: domain.Name, - IsOn: domain.IsOn == 1, + IsOn: domain.IsOn, } } } pbRoutes = append(pbRoutes, &pb.NSRoute{ Id: int64(route.Id), - IsOn: route.IsOn == 1, + IsOn: route.IsOn, Name: route.Name, RangesJSON: route.Ranges, NsCluster: pbCluster, @@ -216,7 +216,7 @@ func (this *NSRouteService) ListNSRoutesAfterVersion(ctx context.Context, req *p pbRoutes = append(pbRoutes, &pb.NSRoute{ Id: int64(route.Id), - IsOn: route.IsOn == 1, + IsOn: route.IsOn, Name: "", RangesJSON: route.Ranges, IsDeleted: route.State == nameservers.NSRouteStateDisabled, diff --git a/internal/rpc/services/service_acme_provider_account.go b/internal/rpc/services/service_acme_provider_account.go index 46de0d17..0785a819 100644 --- a/internal/rpc/services/service_acme_provider_account.go +++ b/internal/rpc/services/service_acme_provider_account.go @@ -61,7 +61,7 @@ func (this *ACMEProviderAccountService) FindAllACMEProviderAccountsWithProviderC Id: int64(account.Id), Name: account.Name, ProviderCode: account.ProviderCode, - IsOn: account.IsOn == 1, + IsOn: account.IsOn, EabKid: account.EabKid, EabKey: account.EabKey, Error: account.Error, @@ -137,7 +137,7 @@ func (this *ACMEProviderAccountService) FindEnabledACMEProviderAccount(ctx conte Id: int64(account.Id), Name: account.Name, ProviderCode: account.ProviderCode, - IsOn: account.IsOn == 1, + IsOn: account.IsOn, EabKid: account.EabKid, EabKey: account.EabKey, Error: account.Error, @@ -191,7 +191,7 @@ func (this *ACMEProviderAccountService) ListEnabledACMEProviderAccounts(ctx cont Id: int64(account.Id), Name: account.Name, ProviderCode: account.ProviderCode, - IsOn: account.IsOn == 1, + IsOn: account.IsOn, EabKid: account.EabKid, EabKey: account.EabKey, Error: account.Error, diff --git a/internal/rpc/services/service_acme_task.go b/internal/rpc/services/service_acme_task.go index f7c75e5d..df6db1c1 100644 --- a/internal/rpc/services/service_acme_task.go +++ b/internal/rpc/services/service_acme_task.go @@ -123,7 +123,7 @@ func (this *ACMETaskService) ListEnabledACMETasks(ctx context.Context, req *pb.L pbACMEUser.AcmeProviderAccount = &pb.ACMEProviderAccount{ Id: int64(account.Id), Name: account.Name, - IsOn: account.IsOn == 1, + IsOn: account.IsOn, ProviderCode: account.ProviderCode, AcmeProvider: nil, } @@ -171,7 +171,7 @@ func (this *ACMETaskService) ListEnabledACMETasks(ctx context.Context, req *pb.L } pbCert = &pb.SSLCert{ Id: int64(cert.Id), - IsOn: cert.IsOn == 1, + IsOn: cert.IsOn, Name: cert.Name, TimeBeginAt: int64(cert.TimeBeginAt), TimeEndAt: int64(cert.TimeEndAt), @@ -195,7 +195,7 @@ func (this *ACMETaskService) ListEnabledACMETasks(ctx context.Context, req *pb.L result = append(result, &pb.ACMETask{ Id: int64(task.Id), - IsOn: task.IsOn == 1, + IsOn: task.IsOn, DnsDomain: task.DnsDomain, Domains: task.DecodeDomains(), CreatedAt: int64(task.CreatedAt), @@ -370,7 +370,7 @@ func (this *ACMETaskService) FindEnabledACMETask(ctx context.Context, req *pb.Fi pbACMEUser.AcmeProviderAccount = &pb.ACMEProviderAccount{ Id: int64(account.Id), Name: account.Name, - IsOn: account.IsOn == 1, + IsOn: account.IsOn, ProviderCode: account.ProviderCode, AcmeProvider: nil, } @@ -407,7 +407,7 @@ func (this *ACMETaskService) FindEnabledACMETask(ctx context.Context, req *pb.Fi return &pb.FindEnabledACMETaskResponse{AcmeTask: &pb.ACMETask{ Id: int64(task.Id), - IsOn: task.IsOn == 1, + IsOn: task.IsOn, DnsDomain: task.DnsDomain, Domains: task.DecodeDomains(), CreatedAt: int64(task.CreatedAt), diff --git a/internal/rpc/services/service_acme_user.go b/internal/rpc/services/service_acme_user.go index 9bea2f58..32cc56db 100644 --- a/internal/rpc/services/service_acme_user.go +++ b/internal/rpc/services/service_acme_user.go @@ -147,7 +147,7 @@ func (this *ACMEUserService) ListACMEUsers(ctx context.Context, req *pb.ListACME pbUser.AcmeProviderAccount = &pb.ACMEProviderAccount{ Id: int64(account.Id), Name: account.Name, - IsOn: account.IsOn == 1, + IsOn: account.IsOn, ProviderCode: account.ProviderCode, AcmeProvider: nil, } @@ -229,7 +229,7 @@ func (this *ACMEUserService) FindEnabledACMEUser(ctx context.Context, req *pb.Fi pbACMEUser.AcmeProviderAccount = &pb.ACMEProviderAccount{ Id: int64(account.Id), Name: account.Name, - IsOn: account.IsOn == 1, + IsOn: account.IsOn, ProviderCode: account.ProviderCode, AcmeProvider: nil, } diff --git a/internal/rpc/services/service_admin.go b/internal/rpc/services/service_admin.go index 2cfce2b3..21651835 100644 --- a/internal/rpc/services/service_admin.go +++ b/internal/rpc/services/service_admin.go @@ -174,7 +174,7 @@ func (this *AdminService) FindEnabledAdmin(ctx context.Context, req *pb.FindEnab Id: int64(adminAuth.Id), Type: adminAuth.Type, ParamsJSON: adminAuth.Params, - IsOn: adminAuth.IsOn == 1, + IsOn: adminAuth.IsOn, } } } @@ -183,7 +183,7 @@ func (this *AdminService) FindEnabledAdmin(ctx context.Context, req *pb.FindEnab Id: int64(admin.Id), Fullname: admin.Fullname, Username: admin.Username, - IsOn: admin.IsOn == 1, + IsOn: admin.IsOn, IsSuper: admin.IsSuper == 1, Modules: pbModules, OtpLogin: pbOtpAuth, @@ -394,7 +394,7 @@ func (this *AdminService) ListEnabledAdmins(ctx context.Context, req *pb.ListEna Id: int64(adminAuth.Id), Type: adminAuth.Type, ParamsJSON: adminAuth.Params, - IsOn: adminAuth.IsOn == 1, + IsOn: adminAuth.IsOn, } } } @@ -403,7 +403,7 @@ func (this *AdminService) ListEnabledAdmins(ctx context.Context, req *pb.ListEna Id: int64(admin.Id), Fullname: admin.Fullname, Username: admin.Username, - IsOn: admin.IsOn == 1, + IsOn: admin.IsOn, IsSuper: admin.IsSuper == 1, CreatedAt: int64(admin.CreatedAt), OtpLogin: pbOtpAuth, diff --git a/internal/rpc/services/service_api_node.go b/internal/rpc/services/service_api_node.go index 26b262a6..a9dfe345 100644 --- a/internal/rpc/services/service_api_node.go +++ b/internal/rpc/services/service_api_node.go @@ -87,7 +87,7 @@ func (this *APINodeService) FindAllEnabledAPINodes(ctx context.Context, req *pb. result = append(result, &pb.APINode{ Id: int64(node.Id), - IsOn: node.IsOn == 1, + IsOn: node.IsOn, NodeClusterId: int64(node.ClusterId), UniqueId: node.UniqueId, Secret: node.Secret, @@ -160,7 +160,7 @@ func (this *APINodeService) ListEnabledAPINodes(ctx context.Context, req *pb.Lis result = append(result, &pb.APINode{ Id: int64(node.Id), - IsOn: node.IsOn == 1, + IsOn: node.IsOn, NodeClusterId: int64(node.ClusterId), UniqueId: node.UniqueId, Secret: node.Secret, @@ -205,7 +205,7 @@ func (this *APINodeService) FindEnabledAPINode(ctx context.Context, req *pb.Find result := &pb.APINode{ Id: int64(node.Id), - IsOn: node.IsOn == 1, + IsOn: node.IsOn, NodeClusterId: int64(node.ClusterId), UniqueId: node.UniqueId, Secret: node.Secret, @@ -256,7 +256,7 @@ func (this *APINodeService) FindCurrentAPINode(ctx context.Context, req *pb.Find return &pb.FindCurrentAPINodeResponse{ApiNode: &pb.APINode{ Id: int64(node.Id), - IsOn: node.IsOn == 1, + IsOn: node.IsOn, NodeClusterId: 0, UniqueId: "", Secret: "", diff --git a/internal/rpc/services/service_authority_node.go b/internal/rpc/services/service_authority_node.go index 210a4439..b03f02bd 100644 --- a/internal/rpc/services/service_authority_node.go +++ b/internal/rpc/services/service_authority_node.go @@ -82,7 +82,7 @@ func (this *AuthorityNodeService) FindAllEnabledAuthorityNodes(ctx context.Conte for _, node := range nodes { result = append(result, &pb.AuthorityNode{ Id: int64(node.Id), - IsOn: node.IsOn == 1, + IsOn: node.IsOn, UniqueId: node.UniqueId, Secret: node.Secret, Name: node.Name, @@ -128,7 +128,7 @@ func (this *AuthorityNodeService) ListEnabledAuthorityNodes(ctx context.Context, for _, node := range nodes { result = append(result, &pb.AuthorityNode{ Id: int64(node.Id), - IsOn: node.IsOn == 1, + IsOn: node.IsOn, UniqueId: node.UniqueId, Secret: node.Secret, Name: node.Name, @@ -160,7 +160,7 @@ func (this *AuthorityNodeService) FindEnabledAuthorityNode(ctx context.Context, result := &pb.AuthorityNode{ Id: int64(node.Id), - IsOn: node.IsOn == 1, + IsOn: node.IsOn, UniqueId: node.UniqueId, Secret: node.Secret, Name: node.Name, @@ -198,7 +198,7 @@ func (this *AuthorityNodeService) FindCurrentAuthorityNode(ctx context.Context, result := &pb.AuthorityNode{ Id: int64(node.Id), - IsOn: node.IsOn == 1, + IsOn: node.IsOn, UniqueId: node.UniqueId, Secret: node.Secret, Name: node.Name, diff --git a/internal/rpc/services/service_db_node.go b/internal/rpc/services/service_db_node.go index e59a5832..e5e7d40b 100644 --- a/internal/rpc/services/service_db_node.go +++ b/internal/rpc/services/service_db_node.go @@ -104,7 +104,7 @@ func (this *DBNodeService) ListEnabledDBNodes(ctx context.Context, req *pb.ListE status := &pb.DBNodeStatus{} // 是否能够连接 - if node.IsOn == 1 { + if node.IsOn { db, err := dbs.NewInstanceFromConfig(node.DBConfig()) if err != nil { status.Error = err.Error() @@ -132,7 +132,7 @@ func (this *DBNodeService) ListEnabledDBNodes(ctx context.Context, req *pb.ListE Id: int64(node.Id), Name: node.Name, Description: node.Description, - IsOn: node.IsOn == 1, + IsOn: node.IsOn, Host: node.Host, Port: types.Int32(node.Port), Database: node.Database, @@ -166,7 +166,7 @@ func (this *DBNodeService) FindEnabledDBNode(ctx context.Context, req *pb.FindEn Id: int64(node.Id), Name: node.Name, Description: node.Description, - IsOn: node.IsOn == 1, + IsOn: node.IsOn, Host: node.Host, Port: types.Int32(node.Port), Database: node.Database, @@ -318,7 +318,7 @@ func (this *DBNodeService) CheckDBNodeStatus(ctx context.Context, req *pb.CheckD status := &pb.DBNodeStatus{} // 是否能够连接 - if node.IsOn == 1 { + if node.IsOn { db, err := dbs.NewInstanceFromConfig(node.DBConfig()) if err != nil { status.Error = err.Error() diff --git a/internal/rpc/services/service_dns_domain.go b/internal/rpc/services/service_dns_domain.go index 160a98d1..430dd50f 100644 --- a/internal/rpc/services/service_dns_domain.go +++ b/internal/rpc/services/service_dns_domain.go @@ -190,7 +190,7 @@ func (this *DNSDomainService) FindEnabledBasicDNSDomain(ctx context.Context, req return &pb.FindEnabledBasicDNSDomainResponse{DnsDomain: &pb.DNSDomain{ Id: int64(domain.Id), Name: domain.Name, - IsOn: domain.IsOn == 1, + IsOn: domain.IsOn, ProviderId: int64(domain.ProviderId), }}, nil } @@ -259,7 +259,7 @@ func (this *DNSDomainService) FindAllEnabledBasicDNSDomainsWithDNSProviderId(ctx result = append(result, &pb.DNSDomain{ Id: int64(domain.Id), Name: domain.Name, - IsOn: domain.IsOn == 1, + IsOn: domain.IsOn, IsUp: domain.IsUp == 1, IsDeleted: domain.IsDeleted == 1, }) @@ -389,7 +389,7 @@ func (this *DNSDomainService) convertDomainToPB(tx *dbs.Tx, domain *dns.DNSDomai Id: int64(domain.Id), ProviderId: int64(domain.ProviderId), Name: domain.Name, - IsOn: domain.IsOn == 1, + IsOn: domain.IsOn, IsUp: domain.IsUp == 1, IsDeleted: domain.IsDeleted == 1, DataUpdatedAt: int64(domain.DataUpdatedAt), diff --git a/internal/rpc/services/service_http_access_log_policy.go b/internal/rpc/services/service_http_access_log_policy.go index 893bf378..e4c98174 100644 --- a/internal/rpc/services/service_http_access_log_policy.go +++ b/internal/rpc/services/service_http_access_log_policy.go @@ -43,7 +43,7 @@ func (this *HTTPAccessLogPolicyService) ListEnabledHTTPAccessLogPolicies(ctx con pbPolicies = append(pbPolicies, &pb.HTTPAccessLogPolicy{ Id: int64(policy.Id), Name: policy.Name, - IsOn: policy.IsOn == 1, + IsOn: policy.IsOn, Type: policy.Type, OptionsJSON: policy.Options, CondsJSON: policy.Conds, @@ -121,7 +121,7 @@ func (this *HTTPAccessLogPolicyService) FindEnabledHTTPAccessLogPolicy(ctx conte return &pb.FindEnabledHTTPAccessLogPolicyResponse{HttpAccessLogPolicy: &pb.HTTPAccessLogPolicy{ Id: int64(policy.Id), Name: policy.Name, - IsOn: policy.IsOn == 1, + IsOn: policy.IsOn, Type: policy.Type, OptionsJSON: policy.Options, CondsJSON: policy.Conds, diff --git a/internal/rpc/services/service_http_auth_policy.go b/internal/rpc/services/service_http_auth_policy.go index 7493f428..e2554f8e 100644 --- a/internal/rpc/services/service_http_auth_policy.go +++ b/internal/rpc/services/service_http_auth_policy.go @@ -61,7 +61,7 @@ func (this *HTTPAuthPolicyService) FindEnabledHTTPAuthPolicy(ctx context.Context return &pb.FindEnabledHTTPAuthPolicyResponse{HttpAuthPolicy: &pb.HTTPAuthPolicy{ Id: int64(policy.Id), - IsOn: policy.IsOn == 1, + IsOn: policy.IsOn, Name: policy.Name, Type: policy.Type, ParamsJSON: policy.Params, diff --git a/internal/rpc/services/service_http_cache_policy.go b/internal/rpc/services/service_http_cache_policy.go index f5de99ac..87eff3ff 100644 --- a/internal/rpc/services/service_http_cache_policy.go +++ b/internal/rpc/services/service_http_cache_policy.go @@ -30,7 +30,7 @@ func (this *HTTPCachePolicyService) FindAllEnabledHTTPCachePolicies(ctx context. result = append(result, &pb.HTTPCachePolicy{ Id: int64(p.Id), Name: p.Name, - IsOn: p.IsOn == 1, + IsOn: p.IsOn, }) } return &pb.FindAllEnabledHTTPCachePoliciesResponse{CachePolicies: result}, nil @@ -164,7 +164,7 @@ func (this *HTTPCachePolicyService) FindEnabledHTTPCachePolicy(ctx context.Conte return &pb.FindEnabledHTTPCachePolicyResponse{HttpCachePolicy: &pb.HTTPCachePolicy{ Id: int64(policy.Id), Name: policy.Name, - IsOn: policy.IsOn == 1, + IsOn: policy.IsOn, }}, nil } diff --git a/internal/rpc/services/service_http_fastcgi.go b/internal/rpc/services/service_http_fastcgi.go index 571fa5eb..fe44c1dd 100644 --- a/internal/rpc/services/service_http_fastcgi.go +++ b/internal/rpc/services/service_http_fastcgi.go @@ -75,7 +75,7 @@ func (this *HTTPFastcgiService) FindEnabledHTTPFastcgi(ctx context.Context, req } return &pb.FindEnabledHTTPFastcgiResponse{HttpFastcgi: &pb.HTTPFastcgi{ Id: int64(fastcgi.Id), - IsOn: fastcgi.IsOn == 1, + IsOn: fastcgi.IsOn, Address: fastcgi.Address, ParamsJSON: fastcgi.Params, ReadTimeoutJSON: fastcgi.ReadTimeout, diff --git a/internal/rpc/services/service_http_firewall_policy.go b/internal/rpc/services/service_http_firewall_policy.go index 1a2b8ef4..ac28c34b 100644 --- a/internal/rpc/services/service_http_firewall_policy.go +++ b/internal/rpc/services/service_http_firewall_policy.go @@ -40,7 +40,7 @@ func (this *HTTPFirewallPolicyService) FindAllEnabledHTTPFirewallPolicies(ctx co Id: int64(p.Id), Name: p.Name, Description: p.Description, - IsOn: p.IsOn == 1, + IsOn: p.IsOn, InboundJSON: p.Inbound, OutboundJSON: p.Outbound, Mode: p.Mode, @@ -389,7 +389,7 @@ func (this *HTTPFirewallPolicyService) ListEnabledHTTPFirewallPolicies(ctx conte Id: int64(p.Id), Name: p.Name, Description: p.Description, - IsOn: p.IsOn == 1, + IsOn: p.IsOn, InboundJSON: p.Inbound, OutboundJSON: p.Outbound, Mode: p.Mode, @@ -481,7 +481,7 @@ func (this *HTTPFirewallPolicyService) FindEnabledHTTPFirewallPolicy(ctx context ServerId: int64(policy.ServerId), Name: policy.Name, Description: policy.Description, - IsOn: policy.IsOn == 1, + IsOn: policy.IsOn, InboundJSON: policy.Inbound, OutboundJSON: policy.Outbound, Mode: policy.Mode, diff --git a/internal/rpc/services/service_http_firewall_rule_group.go b/internal/rpc/services/service_http_firewall_rule_group.go index 189b7f20..d5ae54dd 100644 --- a/internal/rpc/services/service_http_firewall_rule_group.go +++ b/internal/rpc/services/service_http_firewall_rule_group.go @@ -147,7 +147,7 @@ func (this *HTTPFirewallRuleGroupService) FindEnabledHTTPFirewallRuleGroup(ctx c FirewallRuleGroup: &pb.HTTPFirewallRuleGroup{ Id: int64(group.Id), Name: group.Name, - IsOn: group.IsOn == 1, + IsOn: group.IsOn, Description: group.Description, Code: group.Code, }, diff --git a/internal/rpc/services/service_http_firewall_rule_set.go b/internal/rpc/services/service_http_firewall_rule_set.go index 1504a254..5e0f1958 100644 --- a/internal/rpc/services/service_http_firewall_rule_set.go +++ b/internal/rpc/services/service_http_firewall_rule_set.go @@ -131,7 +131,7 @@ func (this *HTTPFirewallRuleSetService) FindEnabledHTTPFirewallRuleSet(ctx conte FirewallRuleSet: &pb.HTTPFirewallRuleSet{ Id: int64(set.Id), Name: set.Name, - IsOn: set.IsOn == 1, + IsOn: set.IsOn, Description: set.Description, Code: set.Code, }, diff --git a/internal/rpc/services/service_http_web.go b/internal/rpc/services/service_http_web.go index e8385b53..a312c188 100644 --- a/internal/rpc/services/service_http_web.go +++ b/internal/rpc/services/service_http_web.go @@ -61,7 +61,7 @@ func (this *HTTPWebService) FindEnabledHTTPWeb(ctx context.Context, req *pb.Find result := &pb.HTTPWeb{} result.Id = int64(web.Id) - result.IsOn = web.IsOn == 1 + result.IsOn = web.IsOn return &pb.FindEnabledHTTPWebResponse{HttpWeb: result}, nil } diff --git a/internal/rpc/services/service_ip_list.go b/internal/rpc/services/service_ip_list.go index d4b37d0f..4b9f13eb 100644 --- a/internal/rpc/services/service_ip_list.go +++ b/internal/rpc/services/service_ip_list.go @@ -66,7 +66,7 @@ func (this *IPListService) FindEnabledIPList(ctx context.Context, req *pb.FindEn } return &pb.FindEnabledIPListResponse{IpList: &pb.IPList{ Id: int64(list.Id), - IsOn: list.IsOn == 1, + IsOn: list.IsOn, Type: list.Type, Name: list.Name, Code: list.Code, @@ -107,7 +107,7 @@ func (this *IPListService) ListEnabledIPLists(ctx context.Context, req *pb.ListE for _, list := range ipLists { pbLists = append(pbLists, &pb.IPList{ Id: int64(list.Id), - IsOn: list.IsOn == 1, + IsOn: list.IsOn, Type: list.Type, Name: list.Name, Code: list.Code, @@ -190,7 +190,7 @@ func (this *IPListService) FindEnabledIPListContainsIP(ctx context.Context, req } pbLists = append(pbLists, &pb.IPList{ Id: int64(list.Id), - IsOn: list.IsOn == 1, + IsOn: list.IsOn, Type: list.Type, Name: list.Name, Code: list.Code, diff --git a/internal/rpc/services/service_login.go b/internal/rpc/services/service_login.go index de5c0403..67145d1b 100644 --- a/internal/rpc/services/service_login.go +++ b/internal/rpc/services/service_login.go @@ -34,7 +34,7 @@ func (this *LoginService) FindEnabledLogin(ctx context.Context, req *pb.FindEnab Id: int64(login.Id), Type: login.Type, ParamsJSON: login.Params, - IsOn: login.IsOn == 1, + IsOn: login.IsOn, AdminId: int64(login.AdminId), UserId: int64(login.UserId), }}, nil diff --git a/internal/rpc/services/service_message_media.go b/internal/rpc/services/service_message_media.go index 8a90634f..980302ad 100644 --- a/internal/rpc/services/service_message_media.go +++ b/internal/rpc/services/service_message_media.go @@ -31,7 +31,7 @@ func (this *MessageMediaService) FindAllMessageMedias(ctx context.Context, req * Name: media.Name, Description: media.Description, UserDescription: media.UserDescription, - IsOn: media.IsOn == 1, + IsOn: media.IsOn, }) } return &pb.FindAllMessageMediasResponse{MessageMedias: pbMedias}, nil diff --git a/internal/rpc/services/service_message_media_instance.go b/internal/rpc/services/service_message_media_instance.go index d449d465..3e570507 100644 --- a/internal/rpc/services/service_message_media_instance.go +++ b/internal/rpc/services/service_message_media_instance.go @@ -123,13 +123,13 @@ func (this *MessageMediaInstanceService) ListEnabledMessageMediaInstances(ctx co Name: media.Name, Description: media.Description, UserDescription: media.UserDescription, - IsOn: media.IsOn == 1, + IsOn: media.IsOn, } pbInstances = append(pbInstances, &pb.MessageMediaInstance{ Id: int64(instance.Id), Name: instance.Name, - IsOn: instance.IsOn == 1, + IsOn: instance.IsOn, MessageMedia: pbMedia, ParamsJSON: instance.Params, Description: instance.Description, @@ -171,13 +171,13 @@ func (this *MessageMediaInstanceService) FindEnabledMessageMediaInstance(ctx con Name: media.Name, Description: media.Description, UserDescription: media.UserDescription, - IsOn: media.IsOn == 1, + IsOn: media.IsOn, } return &pb.FindEnabledMessageMediaInstanceResponse{MessageMediaInstance: &pb.MessageMediaInstance{ Id: int64(instance.Id), Name: instance.Name, - IsOn: instance.IsOn == 1, + IsOn: instance.IsOn, MessageMedia: pbMedia, ParamsJSON: instance.Params, Description: instance.Description, diff --git a/internal/rpc/services/service_message_receiver.go b/internal/rpc/services/service_message_receiver.go index b352c0f8..ce9122f6 100644 --- a/internal/rpc/services/service_message_receiver.go +++ b/internal/rpc/services/service_message_receiver.go @@ -113,14 +113,14 @@ func (this *MessageReceiverService) FindAllEnabledMessageReceivers(ctx context.C Id: int64(admin.Id), Fullname: admin.Fullname, Username: admin.Username, - IsOn: admin.IsOn == 1, + IsOn: admin.IsOn, }, MessageMediaInstance: &pb.MessageMediaInstance{ Id: int64(instance.Id), Name: instance.Name, - IsOn: instance.IsOn == 1, + IsOn: instance.IsOn, }, - IsOn: recipient.IsOn == 1, + IsOn: recipient.IsOn, MessageRecipientGroups: nil, Description: "", User: "", @@ -140,7 +140,7 @@ func (this *MessageReceiverService) FindAllEnabledMessageReceivers(ctx context.C pbRecipientGroup = &pb.MessageRecipientGroup{ Id: int64(group.Id), Name: group.Name, - IsOn: group.IsOn == 1, + IsOn: group.IsOn, } } diff --git a/internal/rpc/services/service_message_recipient.go b/internal/rpc/services/service_message_recipient.go index 7195b07c..40c932c6 100644 --- a/internal/rpc/services/service_message_recipient.go +++ b/internal/rpc/services/service_message_recipient.go @@ -102,7 +102,7 @@ func (this *MessageRecipientService) ListEnabledMessageRecipients(ctx context.Co Id: int64(admin.Id), Fullname: admin.Fullname, Username: admin.Username, - IsOn: admin.IsOn == 1, + IsOn: admin.IsOn, } // 媒介实例 @@ -115,7 +115,7 @@ func (this *MessageRecipientService) ListEnabledMessageRecipients(ctx context.Co } pbInstance := &pb.MessageMediaInstance{ Id: int64(instance.Id), - IsOn: instance.IsOn == 1, + IsOn: instance.IsOn, Name: instance.Name, Description: instance.Description, } @@ -133,7 +133,7 @@ func (this *MessageRecipientService) ListEnabledMessageRecipients(ctx context.Co pbGroups = append(pbGroups, &pb.MessageRecipientGroup{ Id: int64(group.Id), Name: group.Name, - IsOn: group.IsOn == 1, + IsOn: group.IsOn, }) } } @@ -144,7 +144,7 @@ func (this *MessageRecipientService) ListEnabledMessageRecipients(ctx context.Co Admin: pbAdmin, User: recipient.User, MessageMediaInstance: pbInstance, - IsOn: recipient.IsOn == 1, + IsOn: recipient.IsOn, MessageRecipientGroups: pbGroups, Description: recipient.Description, TimeFrom: recipient.TimeFrom, @@ -184,7 +184,7 @@ func (this *MessageRecipientService) FindEnabledMessageRecipient(ctx context.Con Id: int64(admin.Id), Fullname: admin.Fullname, Username: admin.Username, - IsOn: admin.IsOn == 1, + IsOn: admin.IsOn, } // 媒介实例 @@ -197,7 +197,7 @@ func (this *MessageRecipientService) FindEnabledMessageRecipient(ctx context.Con } pbInstance := &pb.MessageMediaInstance{ Id: int64(instance.Id), - IsOn: instance.IsOn == 1, + IsOn: instance.IsOn, Name: instance.Name, Description: instance.Description, } @@ -215,7 +215,7 @@ func (this *MessageRecipientService) FindEnabledMessageRecipient(ctx context.Con pbGroups = append(pbGroups, &pb.MessageRecipientGroup{ Id: int64(group.Id), Name: group.Name, - IsOn: group.IsOn == 1, + IsOn: group.IsOn, }) } } @@ -226,7 +226,7 @@ func (this *MessageRecipientService) FindEnabledMessageRecipient(ctx context.Con User: recipient.User, Admin: pbAdmin, MessageMediaInstance: pbInstance, - IsOn: recipient.IsOn == 1, + IsOn: recipient.IsOn, MessageRecipientGroups: pbGroups, Description: recipient.Description, TimeFrom: recipient.TimeFrom, diff --git a/internal/rpc/services/service_message_recipient_group.go b/internal/rpc/services/service_message_recipient_group.go index 3d9db320..ebd47c94 100644 --- a/internal/rpc/services/service_message_recipient_group.go +++ b/internal/rpc/services/service_message_recipient_group.go @@ -60,7 +60,7 @@ func (this *MessageRecipientGroupService) FindAllEnabledMessageRecipientGroups(c pbGroups = append(pbGroups, &pb.MessageRecipientGroup{ Id: int64(group.Id), Name: group.Name, - IsOn: group.IsOn == 1, + IsOn: group.IsOn, }) } @@ -99,7 +99,7 @@ func (this *MessageRecipientGroupService) FindEnabledMessageRecipientGroup(ctx c } pbGroup := &pb.MessageRecipientGroup{ Id: int64(group.Id), - IsOn: group.IsOn == 1, + IsOn: group.IsOn, Name: group.Name, } return &pb.FindEnabledMessageRecipientGroupResponse{MessageRecipientGroup: pbGroup}, nil diff --git a/internal/rpc/services/service_message_task.go b/internal/rpc/services/service_message_task.go index b9e4dbe8..785dcf8b 100644 --- a/internal/rpc/services/service_message_task.go +++ b/internal/rpc/services/service_message_task.go @@ -51,7 +51,7 @@ func (this *MessageTaskService) FindSendingMessageTasks(ctx context.Context, req if err != nil { return nil, err } - if recipient == nil || recipient.IsOn == 0 { + if recipient == nil || !recipient.IsOn { // 如果发送人已经删除或者禁用，则删除此消息 err = models.SharedMessageTaskDAO.DisableMessageTask(tx, int64(task.Id)) if err != nil { @@ -65,7 +65,7 @@ func (this *MessageTaskService) FindSendingMessageTasks(ctx context.Context, req if err != nil { return nil, err } - if instance == nil || instance.IsOn == 0 { + if instance == nil || !instance.IsOn { // 如果媒介实例已经删除或者禁用，则删除此消息 err = models.SharedMessageTaskDAO.DisableMessageTask(tx, int64(task.Id)) if err != nil { @@ -92,7 +92,7 @@ func (this *MessageTaskService) FindSendingMessageTasks(ctx context.Context, req if err != nil { return nil, err } - if instance == nil || instance.IsOn == 0 { + if instance == nil || !instance.IsOn { // 如果媒介实例已经删除或者禁用，则删除此消息 err = models.SharedMessageTaskDAO.DisableMessageTask(tx, int64(task.Id)) if err != nil { @@ -202,7 +202,7 @@ func (this *MessageTaskService) FindEnabledMessageTask(ctx context.Context, req if err != nil { return nil, err } - if recipient == nil || recipient.IsOn == 0 { + if recipient == nil || !recipient.IsOn { // 如果发送人已经删除或者禁用，则删除此消息 err = models.SharedMessageTaskDAO.DisableMessageTask(tx, int64(task.Id)) if err != nil { @@ -216,7 +216,7 @@ func (this *MessageTaskService) FindEnabledMessageTask(ctx context.Context, req if err != nil { return nil, err } - if instance == nil || instance.IsOn == 0 { + if instance == nil || !instance.IsOn { // 如果媒介实例已经删除或者禁用，则删除此消息 err = models.SharedMessageTaskDAO.DisableMessageTask(tx, int64(task.Id)) if err != nil { @@ -241,7 +241,7 @@ func (this *MessageTaskService) FindEnabledMessageTask(ctx context.Context, req if err != nil { return nil, err } - if instance == nil || instance.IsOn == 0 { + if instance == nil || !instance.IsOn { // 如果媒介实例已经删除或者禁用，则删除此消息 err = models.SharedMessageTaskDAO.DisableMessageTask(tx, int64(task.Id)) if err != nil { @@ -320,7 +320,7 @@ func (this *MessageTaskService) ListMessageTasksWithStatus(ctx context.Context, if err != nil { return nil, err } - if recipient == nil || recipient.IsOn == 0 { + if recipient == nil || !recipient.IsOn { // 如果发送人已经删除或者禁用，则删除此消息 err = models.SharedMessageTaskDAO.DisableMessageTask(tx, int64(task.Id)) if err != nil { @@ -334,7 +334,7 @@ func (this *MessageTaskService) ListMessageTasksWithStatus(ctx context.Context, if err != nil { return nil, err } - if instance == nil || instance.IsOn == 0 { + if instance == nil || !instance.IsOn { // 如果媒介实例已经删除或者禁用，则删除此消息 err = models.SharedMessageTaskDAO.DisableMessageTask(tx, int64(task.Id)) if err != nil { @@ -362,7 +362,7 @@ func (this *MessageTaskService) ListMessageTasksWithStatus(ctx context.Context, if err != nil { return nil, err } - if instance == nil || instance.IsOn == 0 { + if instance == nil || !instance.IsOn { // 如果媒介实例已经删除或者禁用，则删除此消息 err = models.SharedMessageTaskDAO.DisableMessageTask(tx, int64(task.Id)) if err != nil { diff --git a/internal/rpc/services/service_metric_chart.go b/internal/rpc/services/service_metric_chart.go index bbf02503..1f0ce16c 100644 --- a/internal/rpc/services/service_metric_chart.go +++ b/internal/rpc/services/service_metric_chart.go @@ -85,7 +85,7 @@ func (this *MetricChartService) FindEnabledMetricChart(ctx context.Context, req ParamsJSON: chart.Params, IgnoreEmptyKeys: chart.IgnoreEmptyKeys == 1, IgnoredKeys: chart.DecodeIgnoredKeys(), - IsOn: chart.IsOn == 1, + IsOn: chart.IsOn, MetricItem: &pb.MetricItem{Id: int64(chart.ItemId)}, }, }, nil @@ -129,7 +129,7 @@ func (this *MetricChartService) ListEnabledMetricCharts(ctx context.Context, req ParamsJSON: chart.Params, IgnoreEmptyKeys: chart.IgnoreEmptyKeys == 1, IgnoredKeys: chart.DecodeIgnoredKeys(), - IsOn: chart.IsOn == 1, + IsOn: chart.IsOn, }) } return &pb.ListEnabledMetricChartsResponse{MetricCharts: pbCharts}, nil diff --git a/internal/rpc/services/service_metric_item.go b/internal/rpc/services/service_metric_item.go index 2e174a75..cefe3c0c 100644 --- a/internal/rpc/services/service_metric_item.go +++ b/internal/rpc/services/service_metric_item.go @@ -61,7 +61,7 @@ func (this *MetricItemService) FindEnabledMetricItem(ctx context.Context, req *p } return &pb.FindEnabledMetricItemResponse{MetricItem: &pb.MetricItem{ Id: int64(item.Id), - IsOn: item.IsOn == 1, + IsOn: item.IsOn, Code: item.Code, Category: item.Category, Name: item.Name, @@ -104,7 +104,7 @@ func (this *MetricItemService) ListEnabledMetricItems(ctx context.Context, req * for _, item := range items { pbItems = append(pbItems, &pb.MetricItem{ Id: int64(item.Id), - IsOn: item.IsOn == 1, + IsOn: item.IsOn, Code: item.Code, Category: item.Category, Name: item.Name, diff --git a/internal/rpc/services/service_monitor_node.go b/internal/rpc/services/service_monitor_node.go index 6320405f..0420f41e 100644 --- a/internal/rpc/services/service_monitor_node.go +++ b/internal/rpc/services/service_monitor_node.go @@ -82,7 +82,7 @@ func (this *MonitorNodeService) FindAllEnabledMonitorNodes(ctx context.Context, for _, node := range nodes { result = append(result, &pb.MonitorNode{ Id: int64(node.Id), - IsOn: node.IsOn == 1, + IsOn: node.IsOn, UniqueId: node.UniqueId, Secret: node.Secret, Name: node.Name, @@ -128,7 +128,7 @@ func (this *MonitorNodeService) ListEnabledMonitorNodes(ctx context.Context, req for _, node := range nodes { result = append(result, &pb.MonitorNode{ Id: int64(node.Id), - IsOn: node.IsOn == 1, + IsOn: node.IsOn, UniqueId: node.UniqueId, Secret: node.Secret, Name: node.Name, @@ -160,7 +160,7 @@ func (this *MonitorNodeService) FindEnabledMonitorNode(ctx context.Context, req result := &pb.MonitorNode{ Id: int64(node.Id), - IsOn: node.IsOn == 1, + IsOn: node.IsOn, UniqueId: node.UniqueId, Secret: node.Secret, Name: node.Name, @@ -198,7 +198,7 @@ func (this *MonitorNodeService) FindCurrentMonitorNode(ctx context.Context, req result := &pb.MonitorNode{ Id: int64(node.Id), - IsOn: node.IsOn == 1, + IsOn: node.IsOn, UniqueId: node.UniqueId, Secret: node.Secret, Name: node.Name, diff --git a/internal/rpc/services/service_node.go b/internal/rpc/services/service_node.go index ba013ac3..741c6f02 100644 --- a/internal/rpc/services/service_node.go +++ b/internal/rpc/services/service_node.go @@ -238,7 +238,7 @@ func (this *NodeService) ListEnabledNodesMatch(ctx context.Context, req *pb.List for _, secondaryCluster := range secondaryClusters { pbSecondaryClusters = append(pbSecondaryClusters, &pb.NodeCluster{ Id: int64(secondaryCluster.Id), - IsOn: secondaryCluster.IsOn == 1, + IsOn: secondaryCluster.IsOn, Name: secondaryCluster.Name, }) } @@ -303,7 +303,7 @@ func (this *NodeService) ListEnabledNodesMatch(ctx context.Context, req *pb.List if region != nil { pbRegion = &pb.NodeRegion{ Id: int64(region.Id), - IsOn: region.IsOn == 1, + IsOn: region.IsOn, Name: region.Name, } } @@ -322,7 +322,7 @@ func (this *NodeService) ListEnabledNodesMatch(ctx context.Context, req *pb.List SecondaryNodeClusters: pbSecondaryClusters, InstallStatus: installStatusResult, MaxCPU: types.Int32(node.MaxCPU), - IsOn: node.IsOn == 1, + IsOn: node.IsOn, IsUp: node.IsUp == 1, NodeGroup: pbGroup, NodeRegion: pbRegion, @@ -369,7 +369,7 @@ func (this *NodeService) FindAllEnabledNodesWithNodeClusterId(ctx context.Contex Secret: node.Secret, ConnectedAPINodeIds: apiNodeIds, MaxCPU: types.Int32(node.MaxCPU), - IsOn: node.IsOn == 1, + IsOn: node.IsOn, }) } return &pb.FindAllEnabledNodesWithNodeClusterIdResponse{Nodes: result}, nil @@ -466,7 +466,7 @@ func (this *NodeService) FindEnabledNode(ctx context.Context, req *pb.FindEnable } secondaryPBClusters = append(secondaryPBClusters, &pb.NodeCluster{ Id: int64(cluster.Id), - IsOn: cluster.IsOn == 1, + IsOn: cluster.IsOn, Name: cluster.Name, }) } @@ -528,7 +528,7 @@ func (this *NodeService) FindEnabledNode(ctx context.Context, req *pb.FindEnable if region != nil { pbRegion = &pb.NodeRegion{ Id: int64(region.Id), - IsOn: region.IsOn == 1, + IsOn: region.IsOn, Name: region.Name, } } @@ -572,7 +572,7 @@ func (this *NodeService) FindEnabledNode(ctx context.Context, req *pb.FindEnable NodeLogin: respLogin, InstallStatus: installStatusResult, MaxCPU: types.Int32(node.MaxCPU), - IsOn: node.IsOn == 1, + IsOn: node.IsOn, IsUp: node.IsUp == 1, NodeGroup: pbGroup, NodeRegion: pbRegion, @@ -606,7 +606,7 @@ func (this *NodeService) FindEnabledBasicNode(ctx context.Context, req *pb.FindE return &pb.FindEnabledBasicNodeResponse{Node: &pb.BasicNode{ Id: int64(node.Id), Name: node.Name, - IsOn: node.IsOn == 1, + IsOn: node.IsOn, IsUp: node.IsUp == 1, NodeCluster: &pb.NodeCluster{ Id: int64(node.ClusterId), @@ -881,7 +881,7 @@ func (this *NodeService) FindAllEnabledNodesWithNodeGrantId(ctx context.Context, Id: int64(node.ClusterId), Name: clusterName, }, - IsOn: node.IsOn == 1, + IsOn: node.IsOn, }) } @@ -975,7 +975,7 @@ func (this *NodeService) FindAllNotInstalledNodesWithNodeClusterId(ctx context.C Version: int64(node.Version), IsInstalled: node.IsInstalled == 1, StatusJSON: node.Status, - IsOn: node.IsOn == 1, + IsOn: node.IsOn, NodeLogin: pbLogin, IpAddresses: pbAddresses, InstallStatus: pbInstallStatus, @@ -1093,7 +1093,7 @@ func (this *NodeService) FindAllUpgradeNodesWithNodeClusterId(ctx context.Contex Version: int64(node.Version), IsInstalled: node.IsInstalled == 1, StatusJSON: node.Status, - IsOn: node.IsOn == 1, + IsOn: node.IsOn, IpAddresses: pbAddresses, NodeLogin: pbLogin, InstallStatus: pbInstallStatus, @@ -1451,7 +1451,7 @@ func (this *NodeService) FindEnabledNodesWithIds(ctx context.Context, req *pb.Fi } pbNodes = append(pbNodes, &pb.Node{ Id: int64(node.Id), - IsOn: node.IsOn == 1, + IsOn: node.IsOn, IsActive: node.IsActive == 1, ConnectedAPINodeIds: connectedAPINodeIds, }) diff --git a/internal/rpc/services/service_node_cluster.go b/internal/rpc/services/service_node_cluster.go index d1bbaa5d..8b751b5c 100644 --- a/internal/rpc/services/service_node_cluster.go +++ b/internal/rpc/services/service_node_cluster.go @@ -159,7 +159,7 @@ func (this *NodeClusterService) FindEnabledNodeCluster(ctx context.Context, req HttpFirewallPolicyId: int64(cluster.HttpFirewallPolicyId), DnsName: cluster.DnsName, DnsDomainId: int64(cluster.DnsDomainId), - IsOn: cluster.IsOn == 1, + IsOn: cluster.IsOn, TimeZone: cluster.TimeZone, NodeMaxThreads: int32(cluster.NodeMaxThreads), NodeTCPMaxConnections: int32(cluster.NodeTCPMaxConnections), @@ -207,7 +207,7 @@ func (this *NodeClusterService) FindAPINodesWithNodeCluster(ctx context.Context, } apiNodes = append(apiNodes, &pb.APINode{ Id: int64(apiNode.Id), - IsOn: apiNode.IsOn == 1, + IsOn: apiNode.IsOn, NodeClusterId: int64(apiNode.ClusterId), Name: apiNode.Name, Description: apiNode.Description, @@ -244,7 +244,7 @@ func (this *NodeClusterService) FindAllEnabledNodeClusters(ctx context.Context, CreatedAt: int64(cluster.CreatedAt), UniqueId: cluster.UniqueId, Secret: cluster.Secret, - IsOn: cluster.IsOn == 1, + IsOn: cluster.IsOn, }) } @@ -296,7 +296,7 @@ func (this *NodeClusterService) ListEnabledNodeClusters(ctx context.Context, req Secret: cluster.Secret, DnsName: cluster.DnsName, DnsDomainId: int64(cluster.DnsDomainId), - IsOn: cluster.IsOn == 1, + IsOn: cluster.IsOn, TimeZone: cluster.TimeZone, IsPinned: cluster.IsPinned == 1, }) @@ -412,7 +412,7 @@ func (this *NodeClusterService) FindAllEnabledNodeClustersWithNodeGrantId(ctx co CreatedAt: int64(cluster.CreatedAt), UniqueId: cluster.UniqueId, Secret: cluster.Secret, - IsOn: cluster.IsOn == 1, + IsOn: cluster.IsOn, }) } return &pb.FindAllEnabledNodeClustersWithNodeGrantIdResponse{NodeClusters: result}, nil @@ -471,7 +471,7 @@ func (this *NodeClusterService) FindEnabledNodeClusterDNS(ctx context.Context, r pbDomain := &pb.DNSDomain{ Id: int64(domain.Id), Name: domain.Name, - IsOn: domain.IsOn == 1, + IsOn: domain.IsOn, } provider, err := dns.SharedDNSProviderDAO.FindEnabledDNSProvider(tx, int64(domain.ProviderId)) @@ -572,7 +572,7 @@ func (this *NodeClusterService) FindAllEnabledNodeClustersWithDNSDomainId(ctx co Name: cluster.Name, DnsName: cluster.DnsName, DnsDomainId: int64(cluster.DnsDomainId), - IsOn: cluster.IsOn == 1, + IsOn: cluster.IsOn, }) } return &pb.FindAllEnabledNodeClustersWithDNSDomainIdResponse{NodeClusters: result}, nil @@ -733,7 +733,7 @@ func (this *NodeClusterService) FindAllEnabledNodeClustersWithHTTPCachePolicyId( result = append(result, &pb.NodeCluster{ Id: int64(cluster.Id), Name: cluster.Name, - IsOn: cluster.IsOn == 1, + IsOn: cluster.IsOn, }) } return &pb.FindAllEnabledNodeClustersWithHTTPCachePolicyIdResponse{ @@ -775,7 +775,7 @@ func (this *NodeClusterService) FindAllEnabledNodeClustersWithHTTPFirewallPolicy result = append(result, &pb.NodeCluster{ Id: int64(cluster.Id), Name: cluster.Name, - IsOn: cluster.IsOn == 1, + IsOn: cluster.IsOn, }) } return &pb.FindAllEnabledNodeClustersWithHTTPFirewallPolicyIdResponse{ @@ -953,7 +953,7 @@ func (this *NodeClusterService) FindLatestNodeClusters(ctx context.Context, req pbClusters = append(pbClusters, &pb.NodeCluster{ Id: int64(cluster.Id), Name: cluster.Name, - IsOn: cluster.IsOn == 1, + IsOn: cluster.IsOn, }) } return &pb.FindLatestNodeClustersResponse{NodeClusters: pbClusters}, nil diff --git a/internal/rpc/services/service_node_cluster_metric_item.go b/internal/rpc/services/service_node_cluster_metric_item.go index 139e861c..ab121bee 100644 --- a/internal/rpc/services/service_node_cluster_metric_item.go +++ b/internal/rpc/services/service_node_cluster_metric_item.go @@ -71,7 +71,7 @@ func (this *NodeClusterMetricItemService) FindAllNodeClusterMetricItems(ctx cont if item != nil { pbItems = append(pbItems, &pb.MetricItem{ Id: int64(item.Id), - IsOn: item.IsOn == 1, + IsOn: item.IsOn, Code: item.Code, Category: item.Category, Name: item.Name, diff --git a/internal/rpc/services/service_node_ip_address.go b/internal/rpc/services/service_node_ip_address.go index ffc49d84..b7d4d823 100644 --- a/internal/rpc/services/service_node_ip_address.go +++ b/internal/rpc/services/service_node_ip_address.go @@ -156,7 +156,7 @@ func (this *NodeIPAddressService) FindEnabledNodeIPAddress(ctx context.Context, State: int64(address.State), Order: int64(address.Order), CanAccess: address.CanAccess == 1, - IsOn: address.IsOn == 1, + IsOn: address.IsOn, IsUp: address.IsUp == 1, BackupIP: address.DecodeBackupIP(), } @@ -192,7 +192,7 @@ func (this *NodeIPAddressService) FindAllEnabledNodeIPAddressesWithNodeId(ctx co State: int64(address.State), Order: int64(address.Order), CanAccess: address.CanAccess == 1, - IsOn: address.IsOn == 1, + IsOn: address.IsOn, IsUp: address.IsUp == 1, BackupIP: address.DecodeBackupIP(), }) @@ -242,7 +242,7 @@ func (this *NodeIPAddressService) ListEnabledNodeIPAddresses(ctx context.Context Ip: addr.Ip, Description: addr.Description, CanAccess: addr.CanAccess == 1, - IsOn: addr.IsOn == 1, + IsOn: addr.IsOn, IsUp: addr.IsUp == 1, BackupIP: addr.DecodeBackupIP(), }) diff --git a/internal/rpc/services/service_node_ip_address_log.go b/internal/rpc/services/service_node_ip_address_log.go index 0c5965ee..a94b61eb 100644 --- a/internal/rpc/services/service_node_ip_address_log.go +++ b/internal/rpc/services/service_node_ip_address_log.go @@ -78,7 +78,7 @@ func (this *NodeIPAddressLogService) ListNodeIPAddressLogs(ctx context.Context, Id: int64(log.Id), Description: log.Description, CreatedAt: int64(log.CreatedAt), - IsOn: log.IsOn == 1, + IsOn: log.IsOn, IsUp: log.IsUp == 1, CanAccess: log.CanAccess == 1, BackupIP: log.BackupIP, diff --git a/internal/rpc/services/service_node_price_item.go b/internal/rpc/services/service_node_price_item.go index 29c93b4a..393088ac 100644 --- a/internal/rpc/services/service_node_price_item.go +++ b/internal/rpc/services/service_node_price_item.go @@ -76,7 +76,7 @@ func (this *NodePriceItemService) FindAllEnabledNodePriceItems(ctx context.Conte for _, price := range prices { result = append(result, &pb.NodePriceItem{ Id: int64(price.Id), - IsOn: price.IsOn == 1, + IsOn: price.IsOn, Name: price.Name, Type: price.Type, BitsFrom: int64(price.BitsFrom), @@ -87,7 +87,7 @@ func (this *NodePriceItemService) FindAllEnabledNodePriceItems(ctx context.Conte return &pb.FindAllEnabledNodePriceItemsResponse{NodePriceItems: result}, nil } -// 查找所有启用的区域价格 +// FindAllEnabledAndOnNodePriceItems 查找所有启用的区域价格 func (this *NodePriceItemService) FindAllEnabledAndOnNodePriceItems(ctx context.Context, req *pb.FindAllEnabledAndOnNodePriceItemsRequest) (*pb.FindAllEnabledAndOnNodePriceItemsResponse, error) { _, err := this.ValidateAdmin(ctx, 0) if err != nil { @@ -104,7 +104,7 @@ func (this *NodePriceItemService) FindAllEnabledAndOnNodePriceItems(ctx context. for _, price := range prices { result = append(result, &pb.NodePriceItem{ Id: int64(price.Id), - IsOn: price.IsOn == 1, + IsOn: price.IsOn, Name: price.Name, Type: price.Type, BitsFrom: int64(price.BitsFrom), @@ -133,7 +133,7 @@ func (this *NodePriceItemService) FindEnabledNodePriceItem(ctx context.Context, } return &pb.FindEnabledNodePriceItemResponse{NodePriceItem: &pb.NodePriceItem{ Id: int64(price.Id), - IsOn: price.IsOn == 1, + IsOn: price.IsOn, Name: price.Name, Type: price.Type, BitsFrom: int64(price.BitsFrom), diff --git a/internal/rpc/services/service_node_region.go b/internal/rpc/services/service_node_region.go index 41dc78cf..5fc572f4 100644 --- a/internal/rpc/services/service_node_region.go +++ b/internal/rpc/services/service_node_region.go @@ -76,7 +76,7 @@ func (this *NodeRegionService) FindAllEnabledNodeRegions(ctx context.Context, re for _, region := range regions { result = append(result, &pb.NodeRegion{ Id: int64(region.Id), - IsOn: region.IsOn == 1, + IsOn: region.IsOn, Name: region.Name, Description: region.Description, PricesJSON: region.Prices, @@ -102,7 +102,7 @@ func (this *NodeRegionService) FindAllEnabledAndOnNodeRegions(ctx context.Contex for _, region := range regions { result = append(result, &pb.NodeRegion{ Id: int64(region.Id), - IsOn: region.IsOn == 1, + IsOn: region.IsOn, Name: region.Name, Description: region.Description, PricesJSON: region.Prices, @@ -145,7 +145,7 @@ func (this *NodeRegionService) FindEnabledNodeRegion(ctx context.Context, req *p } return &pb.FindEnabledNodeRegionResponse{NodeRegion: &pb.NodeRegion{ Id: int64(region.Id), - IsOn: region.IsOn == 1, + IsOn: region.IsOn, Name: region.Name, Description: region.Description, PricesJSON: region.Prices, diff --git a/internal/rpc/services/service_node_threshold.go b/internal/rpc/services/service_node_threshold.go index 0c82f69e..f5f8d501 100644 --- a/internal/rpc/services/service_node_threshold.go +++ b/internal/rpc/services/service_node_threshold.go @@ -100,7 +100,7 @@ func (this *NodeThresholdService) FindAllEnabledNodeThresholds(ctx context.Conte DurationUnit: threshold.DurationUnit, SumMethod: threshold.SumMethod, NotifyDuration: int32(threshold.NotifyDuration), - IsOn: threshold.IsOn == 1, + IsOn: threshold.IsOn, }) } return &pb.FindAllEnabledNodeThresholdsResponse{NodeThresholds: pbThresholds}, nil @@ -166,6 +166,6 @@ func (this *NodeThresholdService) FindEnabledNodeThreshold(ctx context.Context, DurationUnit: threshold.DurationUnit, SumMethod: threshold.SumMethod, NotifyDuration: int32(threshold.NotifyDuration), - IsOn: threshold.IsOn == 1, + IsOn: threshold.IsOn, }}, nil } diff --git a/internal/rpc/services/service_origin.go b/internal/rpc/services/service_origin.go index e0c445e4..5c40c8dc 100644 --- a/internal/rpc/services/service_origin.go +++ b/internal/rpc/services/service_origin.go @@ -176,7 +176,7 @@ func (this *OriginService) FindEnabledOrigin(ctx context.Context, req *pb.FindEn result := &pb.Origin{ Id: int64(origin.Id), - IsOn: origin.IsOn == 1, + IsOn: origin.IsOn, Name: origin.Name, Addr: &pb.NetworkAddress{ Protocol: addr.Protocol.String(), diff --git a/internal/rpc/services/service_server.go b/internal/rpc/services/service_server.go index 100f1d7f..eeace2fc 100644 --- a/internal/rpc/services/service_server.go +++ b/internal/rpc/services/service_server.go @@ -686,7 +686,7 @@ func (this *ServerService) ListEnabledServersMatch(ctx context.Context, req *pb. result = append(result, &pb.Server{ Id: int64(server.Id), - IsOn: server.IsOn == 1, + IsOn: server.IsOn, Type: server.Type, Config: configJSON, Name: server.Name, @@ -829,7 +829,7 @@ func (this *ServerService) FindEnabledServer(ctx context.Context, req *pb.FindEn return &pb.FindEnabledServerResponse{Server: &pb.Server{ Id: int64(server.Id), - IsOn: server.IsOn == 1, + IsOn: server.IsOn, Type: server.Type, Name: server.Name, Description: server.Description, @@ -1074,7 +1074,7 @@ func (this *ServerService) FindAllEnabledServersWithSSLCertId(ctx context.Contex result = append(result, &pb.Server{ Id: int64(server.Id), Name: server.Name, - IsOn: server.IsOn == 1, + IsOn: server.IsOn, Type: server.Type, }) } @@ -1311,7 +1311,7 @@ func (this *ServerService) FindEnabledUserServerBasic(ctx context.Context, req * Id: int64(server.Id), Name: server.Name, Description: server.Description, - IsOn: server.IsOn == 1, + IsOn: server.IsOn, Type: server.Type, NodeCluster: &pb.NodeCluster{ Id: int64(server.ClusterId), @@ -1610,7 +1610,7 @@ func (this *ServerService) FindNearbyServers(ctx context.Context, req *pb.FindNe pbGroup.Servers = append(pbGroup.Servers, &pb.Server{ Id: int64(server.Id), Name: server.Name, - IsOn: server.IsOn == 1, + IsOn: server.IsOn, }) } pbGroups = append(pbGroups, pbGroup) @@ -1651,7 +1651,7 @@ func (this *ServerService) FindNearbyServers(ctx context.Context, req *pb.FindNe pbGroup.Servers = append(pbGroup.Servers, &pb.Server{ Id: int64(server.Id), Name: server.Name, - IsOn: server.IsOn == 1, + IsOn: server.IsOn, }) } @@ -1913,7 +1913,7 @@ func (this *ServerService) FindServerUserPlan(ctx context.Context, req *pb.FindS UserId: int64(userPlan.UserId), PlanId: int64(userPlan.PlanId), Name: userPlan.Name, - IsOn: userPlan.IsOn == 1, + IsOn: userPlan.IsOn, DayTo: userPlan.DayTo, User: nil, Plan: &pb.Plan{ diff --git a/internal/rpc/services/service_server_stat_board.go b/internal/rpc/services/service_server_stat_board.go index 32b7fa08..6a14ad6e 100644 --- a/internal/rpc/services/service_server_stat_board.go +++ b/internal/rpc/services/service_server_stat_board.go @@ -41,7 +41,7 @@ func (this *ServerStatBoardService) FindAllEnabledServerStatBoards(ctx context.C pbBoards = append(pbBoards, &pb.ServerStatBoard{ Id: int64(board.Id), Name: board.Name, - IsOn: board.IsOn == 1, + IsOn: board.IsOn, }) } diff --git a/internal/rpc/services/service_server_stat_board_chart.go b/internal/rpc/services/service_server_stat_board_chart.go index 48044582..2bd5faff 100644 --- a/internal/rpc/services/service_server_stat_board_chart.go +++ b/internal/rpc/services/service_server_stat_board_chart.go @@ -86,11 +86,11 @@ func (this *ServerStatBoardChartService) FindAllEnabledServerStatBoardCharts(ctx Type: metricChart.Type, WidthDiv: types.Int32(metricChart.WidthDiv), ParamsJSON: nil, - IsOn: metricChart.IsOn == 1, + IsOn: metricChart.IsOn, MaxItems: types.Int32(metricChart.MaxItems), MetricItem: &pb.MetricItem{ Id: int64(metricItem.Id), - IsOn: metricItem.IsOn == 1, + IsOn: metricItem.IsOn, Code: metricItem.Code, Category: metricItem.Category, Name: metricItem.Name, diff --git a/internal/rpc/services/service_ssl_cert.go b/internal/rpc/services/service_ssl_cert.go index 80483c42..6fe6ce9b 100644 --- a/internal/rpc/services/service_ssl_cert.go +++ b/internal/rpc/services/service_ssl_cert.go @@ -214,7 +214,7 @@ func (this *SSLCertService) ListSSLCertsWithOCSPError(ctx context.Context, req * for _, cert := range certs { pbCerts = append(pbCerts, &pb.SSLCert{ Id: int64(cert.Id), - IsOn: cert.IsOn == 1, + IsOn: cert.IsOn, Name: cert.Name, TimeBeginAt: types.Int64(cert.TimeBeginAt), TimeEndAt: types.Int64(cert.TimeEndAt), diff --git a/internal/rpc/services/service_user.go b/internal/rpc/services/service_user.go index 297ae5ae..b87456c8 100644 --- a/internal/rpc/services/service_user.go +++ b/internal/rpc/services/service_user.go @@ -219,7 +219,7 @@ func (this *UserService) ListEnabledUsers(ctx context.Context, req *pb.ListEnabl Tel: user.Tel, Email: user.Email, Remark: user.Remark, - IsOn: user.IsOn == 1, + IsOn: user.IsOn, RegisteredIP: user.RegisteredIP, IsVerified: user.IsVerified == 1, IsRejected: user.IsRejected == 1, @@ -269,7 +269,7 @@ func (this *UserService) FindEnabledUser(ctx context.Context, req *pb.FindEnable Tel: user.Tel, Email: user.Email, Remark: user.Remark, - IsOn: user.IsOn == 1, + IsOn: user.IsOn, CreatedAt: int64(user.CreatedAt), RegisteredIP: user.RegisteredIP, IsVerified: user.IsVerified == 1, diff --git a/internal/rpc/services/service_user_access_key.go b/internal/rpc/services/service_user_access_key.go index d73249d9..505ddd94 100644 --- a/internal/rpc/services/service_user_access_key.go +++ b/internal/rpc/services/service_user_access_key.go @@ -47,7 +47,7 @@ func (this *UserAccessKeyService) FindAllEnabledUserAccessKeys(ctx context.Conte Id: int64(accessKey.Id), UserId: int64(accessKey.UserId), SubUserId: int64(accessKey.SubUserId), - IsOn: accessKey.IsOn == 1, + IsOn: accessKey.IsOn, UniqueId: accessKey.UniqueId, Secret: accessKey.Secret, Description: accessKey.Description, diff --git a/internal/rpc/services/service_user_node.go b/internal/rpc/services/service_user_node.go index a56314f8..b976cfc0 100644 --- a/internal/rpc/services/service_user_node.go +++ b/internal/rpc/services/service_user_node.go @@ -87,7 +87,7 @@ func (this *UserNodeService) FindAllEnabledUserNodes(ctx context.Context, req *p result = append(result, &pb.UserNode{ Id: int64(node.Id), - IsOn: node.IsOn == 1, + IsOn: node.IsOn, UniqueId: node.UniqueId, Secret: node.Secret, Name: node.Name, @@ -142,7 +142,7 @@ func (this *UserNodeService) ListEnabledUserNodes(ctx context.Context, req *pb.L result = append(result, &pb.UserNode{ Id: int64(node.Id), - IsOn: node.IsOn == 1, + IsOn: node.IsOn, UniqueId: node.UniqueId, Secret: node.Secret, Name: node.Name, @@ -183,7 +183,7 @@ func (this *UserNodeService) FindEnabledUserNode(ctx context.Context, req *pb.Fi result := &pb.UserNode{ Id: int64(node.Id), - IsOn: node.IsOn == 1, + IsOn: node.IsOn, UniqueId: node.UniqueId, Secret: node.Secret, Name: node.Name, @@ -230,7 +230,7 @@ func (this *UserNodeService) FindCurrentUserNode(ctx context.Context, req *pb.Fi result := &pb.UserNode{ Id: int64(node.Id), - IsOn: node.IsOn == 1, + IsOn: node.IsOn, UniqueId: node.UniqueId, Secret: node.Secret, Name: node.Name, diff --git a/internal/rpc/tasks/cache_task_manager.go b/internal/rpc/tasks/cache_task_manager.go index 647580ee..87bd078a 100644 --- a/internal/rpc/tasks/cache_task_manager.go +++ b/internal/rpc/tasks/cache_task_manager.go @@ -230,7 +230,7 @@ func (this *CacheTaskManager) findAllMetricDataCharts(tx *dbs.Tx) (result []*pb. } for _, chart := range charts { - if chart.IsOn == 0 { + if !chart.IsOn { continue } @@ -240,7 +240,7 @@ func (this *CacheTaskManager) findAllMetricDataCharts(tx *dbs.Tx) (result []*pb. Type: chart.Type, WidthDiv: chart.WidthDiv, ParamsJSON: nil, - IsOn: chart.IsOn == 1, + IsOn: chart.IsOn, MaxItems: types.Int32(chart.MaxItems), MetricItem: &pb.MetricItem{ Id: itemId, @@ -251,7 +251,7 @@ func (this *CacheTaskManager) findAllMetricDataCharts(tx *dbs.Tx) (result []*pb. Category: item.Category, Keys: item.DecodeKeys(), Code: item.Code, - IsOn: item.IsOn == 1, + IsOn: item.IsOn, }, } var pbStats = []*pb.MetricStat{} @@ -333,7 +333,7 @@ func (this *CacheTaskManager) findNodeClusterMetricDataCharts(tx *dbs.Tx, cluste var metricItemIds = []int64{} var items = []*models.MetricItem{} for _, clusterMetricItem := range clusterMetricItems { - if clusterMetricItem.IsOn != 1 { + if !clusterMetricItem.IsOn { continue } var itemId = int64(clusterMetricItem.ItemId) @@ -341,7 +341,7 @@ func (this *CacheTaskManager) findNodeClusterMetricDataCharts(tx *dbs.Tx, cluste if err != nil { return nil, err } - if item == nil || item.IsOn == 0 { + if item == nil || !item.IsOn { continue } items = append(items, item) @@ -353,7 +353,7 @@ func (this *CacheTaskManager) findNodeClusterMetricDataCharts(tx *dbs.Tx, cluste return nil, err } for _, item := range publicMetricItems { - if item.IsOn != 1 { + if !item.IsOn { continue } if lists.ContainsInt64(metricItemIds, int64(item.Id)) { @@ -370,7 +370,7 @@ func (this *CacheTaskManager) findNodeClusterMetricDataCharts(tx *dbs.Tx, cluste } for _, chart := range charts { - if chart.IsOn == 0 { + if !chart.IsOn { continue } @@ -380,7 +380,7 @@ func (this *CacheTaskManager) findNodeClusterMetricDataCharts(tx *dbs.Tx, cluste Type: chart.Type, WidthDiv: chart.WidthDiv, ParamsJSON: nil, - IsOn: chart.IsOn == 1, + IsOn: chart.IsOn, MaxItems: types.Int32(chart.MaxItems), MetricItem: &pb.MetricItem{ Id: itemId, @@ -391,7 +391,7 @@ func (this *CacheTaskManager) findNodeClusterMetricDataCharts(tx *dbs.Tx, cluste Category: item.Category, Keys: item.DecodeKeys(), Code: item.Code, - IsOn: item.IsOn == 1, + IsOn: item.IsOn, }, } var pbStats = []*pb.MetricStat{} diff --git a/internal/tasks/dns_task_executor.go b/internal/tasks/dns_task_executor.go index b605c387..fabb788a 100644 --- a/internal/tasks/dns_task_executor.go +++ b/internal/tasks/dns_task_executor.go @@ -146,7 +146,7 @@ func (this *DNSTaskExecutor) doServer(taskId int64, serverId int64) error { recordValue := clusterDNSName + "." + domain + "." recordRoute := manager.DefaultRoute() recordType := dnstypes.RecordTypeCNAME - if serverDNS.State == models.ServerStateDisabled || serverDNS.IsOn == 0 { + if serverDNS.State == models.ServerStateDisabled || !serverDNS.IsOn { // 检查记录是否已经存在 record, err := manager.QueryRecord(domain, recordName, recordType) if err != nil { @@ -333,7 +333,7 @@ func (this *DNSTaskExecutor) doCluster(taskId int64, clusterId int64) error { } for _, ipAddress := range ipAddresses { ip := ipAddress.DNSIP() - if len(ip) == 0 || ipAddress.CanAccess == 0 || ipAddress.IsUp == 0 || ipAddress.IsOn == 0 { + if len(ip) == 0 || ipAddress.CanAccess == 0 || ipAddress.IsUp == 0 || !ipAddress.IsOn { continue } if net.ParseIP(ip) == nil { diff --git a/internal/tasks/health_check_executor.go b/internal/tasks/health_check_executor.go index 2c63f5ef..dae77354 100644 --- a/internal/tasks/health_check_executor.go +++ b/internal/tasks/health_check_executor.go @@ -57,7 +57,7 @@ func (this *HealthCheckExecutor) Run() ([]*HealthCheckResult, error) { return nil, err } for _, node := range nodes { - if node.IsOn != 1 { + if !node.IsOn { continue } result := &HealthCheckResult{