diff --git a/go.mod b/go.mod index d0581038..6819204d 100644 --- a/go.mod +++ b/go.mod @@ -11,11 +11,12 @@ require ( github.com/go-sql-driver/mysql v1.5.0 github.com/go-yaml/yaml v2.1.0+incompatible github.com/golang/protobuf v1.4.2 - github.com/iwind/TeaGo v0.0.0-20201020081413-7cf62d6f420f + github.com/iwind/TeaGo v0.0.0-20201209122854-4c8b1780a42b github.com/lionsoul2014/ip2region v2.2.0-release+incompatible github.com/mozillazg/go-pinyin v0.18.0 github.com/pkg/sftp v1.12.0 golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a google.golang.org/grpc v1.32.0 google.golang.org/protobuf v1.25.0 + gopkg.in/yaml.v2 v2.4.0 // indirect ) diff --git a/go.sum b/go.sum index 448d7577..b84c2d42 100644 --- a/go.sum +++ b/go.sum @@ -178,6 +178,10 @@ github.com/iwind/TeaGo v0.0.0-20200923021120-f5d76441fe9e h1:/xn7wUvlwaoA5IkdBUc github.com/iwind/TeaGo v0.0.0-20200923021120-f5d76441fe9e/go.mod h1:KU4mS7QNiZ7QWEuDBk1zw0/Q2LrAPZv3tycEFBsuUwc= github.com/iwind/TeaGo v0.0.0-20201020081413-7cf62d6f420f h1:6Ws2H+eorfVUoMO2jta6A9nIdh8oi5/5LXo/LkAxR+E= github.com/iwind/TeaGo v0.0.0-20201020081413-7cf62d6f420f/go.mod h1:KU4mS7QNiZ7QWEuDBk1zw0/Q2LrAPZv3tycEFBsuUwc= +github.com/iwind/TeaGo v0.0.0-20201206115018-cdd967bfb13d h1:J4ohNUwOqCQkY62LFwaygfGtHJj+87pnzr+RJxEYSBo= +github.com/iwind/TeaGo v0.0.0-20201206115018-cdd967bfb13d/go.mod h1:KU4mS7QNiZ7QWEuDBk1zw0/Q2LrAPZv3tycEFBsuUwc= +github.com/iwind/TeaGo v0.0.0-20201209122854-4c8b1780a42b h1:tLO0mUyXn4Szo6SPEtJmeR2aQSHBXy9MsfnaLlulQA0= +github.com/iwind/TeaGo v0.0.0-20201209122854-4c8b1780a42b/go.mod h1:KU4mS7QNiZ7QWEuDBk1zw0/Q2LrAPZv3tycEFBsuUwc= github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af h1:pmfjZENx5imkbgOkpRUYLnmbU7UEFbjtDA2hxJ1ichM= github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= github.com/jmespath/go-jmespath v0.3.0 h1:OS12ieG61fsCg5+qLJ+SsW9NicxNkg3b25OyT2yCeUc= @@ -581,6 +585,8 @@ gopkg.in/yaml.v2 v2.2.7/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU= gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= +gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 h1:tQIYjPdBoyREyB9XMu+nnTclpTYkz2zFM+lzLJFO4gQ= diff --git a/internal/db/models/acme_authentication_dao.go b/internal/db/models/acme_authentication_dao.go index 3c940255..77ade7a4 100644 --- a/internal/db/models/acme_authentication_dao.go +++ b/internal/db/models/acme_authentication_dao.go @@ -34,7 +34,7 @@ func (this *ACMEAuthenticationDAO) CreateAuth(taskId int64, domain string, token op.Domain = domain op.Token = token op.Key = key - _, err := this.Save(op) + err := this.Save(op) return err } diff --git a/internal/db/models/acme_task_dao.go b/internal/db/models/acme_task_dao.go index 6512c836..2efd5799 100644 --- a/internal/db/models/acme_task_dao.go +++ b/internal/db/models/acme_task_dao.go @@ -137,7 +137,7 @@ func (this *ACMETaskDAO) CreateACMETask(adminId int64, userId int64, authType ac op.AutoRenew = autoRenew op.IsOn = true op.State = ACMETaskStateEnabled - _, err := this.Save(op) + err := this.Save(op) if err != nil { return 0, err } @@ -167,7 +167,7 @@ func (this *ACMETaskDAO) UpdateACMETask(acmeTaskId int64, acmeUserId int64, dnsP } op.AutoRenew = autoRenew - _, err := this.Save(op) + err := this.Save(op) return err } @@ -188,7 +188,7 @@ func (this *ACMETaskDAO) UpdateACMETaskCert(taskId int64, certId int64) error { op := NewACMETaskOperator() op.Id = taskId op.CertId = certId - _, err := this.Save(op) + err := this.Save(op) return err } diff --git a/internal/db/models/acme_task_log_dao.go b/internal/db/models/acme_task_log_dao.go index 811879cb..23812e30 100644 --- a/internal/db/models/acme_task_log_dao.go +++ b/internal/db/models/acme_task_log_dao.go @@ -33,7 +33,7 @@ func (this *ACMETaskLogDAO) CreateACMETaskLog(taskId int64, isOk bool, errMsg st op.TaskId = taskId op.Error = errMsg op.IsOk = isOk - _, err := this.Save(op) + err := this.Save(op) return err } diff --git a/internal/db/models/acme_user_dao.go b/internal/db/models/acme_user_dao.go index 448e2ab7..decfd11d 100644 --- a/internal/db/models/acme_user_dao.go +++ b/internal/db/models/acme_user_dao.go @@ -90,7 +90,7 @@ func (this *ACMEUserDAO) CreateACMEUser(adminId int64, userId int64, email strin op.Description = description op.PrivateKey = privateKeyText op.State = ACMEUserStateEnabled - _, err = this.Save(op) + err = this.Save(op) if err != nil { return 0, err } @@ -105,7 +105,7 @@ func (this *ACMEUserDAO) UpdateACMEUser(acmeUserId int64, description string) er op := NewACMEUserOperator() op.Id = acmeUserId op.Description = description - _, err := this.Save(op) + err := this.Save(op) return err } @@ -117,7 +117,7 @@ func (this *ACMEUserDAO) UpdateACMEUserRegistration(acmeUserId int64, registrati op := NewACMEUserOperator() op.Id = acmeUserId op.Registration = registrationJSON - _, err := this.Save(op) + err := this.Save(op) return err } diff --git a/internal/db/models/admin_dao.go b/internal/db/models/admin_dao.go index 8f267382..fcee164e 100644 --- a/internal/db/models/admin_dao.go +++ b/internal/db/models/admin_dao.go @@ -117,7 +117,7 @@ func (this *AdminDAO) UpdateAdminPassword(adminId int64, password string) error op := NewAdminOperator() op.Id = adminId op.Password = stringutil.Md5(password) - _, err := this.Save(op) + err := this.Save(op) return err } @@ -135,7 +135,7 @@ func (this *AdminDAO) CreateAdmin(username string, password string, fullname str } else { op.Modules = "[]" } - _, err := this.Save(op) + err := this.Save(op) if err != nil { return 0, err } @@ -150,7 +150,7 @@ func (this *AdminDAO) UpdateAdminInfo(adminId int64, fullname string) error { op := NewAdminOperator() op.Id = adminId op.Fullname = fullname - _, err := this.Save(op) + err := this.Save(op) return err } @@ -173,7 +173,7 @@ func (this *AdminDAO) UpdateAdmin(adminId int64, username string, password strin op.Modules = "[]" } op.IsOn = isOn - _, err := this.Save(op) + err := this.Save(op) return err } @@ -199,7 +199,7 @@ func (this *AdminDAO) UpdateAdminLogin(adminId int64, username string, password op.Id = adminId op.Username = username op.Password = stringutil.Md5(password) - _, err := this.Save(op) + err := this.Save(op) return err } @@ -211,7 +211,7 @@ func (this *AdminDAO) UpdateAdminModules(adminId int64, allowModulesJSON []byte) op := NewAdminOperator() op.Id = adminId op.Modules = allowModulesJSON - _, err := this.Save(op) + err := this.Save(op) if err != nil { return err } diff --git a/internal/db/models/api_node_dao.go b/internal/db/models/api_node_dao.go index a03a1577..180682cd 100644 --- a/internal/db/models/api_node_dao.go +++ b/internal/db/models/api_node_dao.go @@ -119,7 +119,7 @@ func (this *APINodeDAO) CreateAPINode(name string, description string, httpJSON } op.State = NodeStateEnabled - _, err = this.Save(op) + err = this.Save(op) if err != nil { return } @@ -155,7 +155,7 @@ func (this *APINodeDAO) UpdateAPINode(nodeId int64, name string, description str op.AccessAddrs = "null" } - _, err := this.Save(op) + err := this.Save(op) return err } diff --git a/internal/db/models/api_token_dao.go b/internal/db/models/api_token_dao.go index 241ee764..e53a2340 100644 --- a/internal/db/models/api_token_dao.go +++ b/internal/db/models/api_token_dao.go @@ -92,6 +92,6 @@ func (this *ApiTokenDAO) CreateAPIToken(nodeId string, secret string, role NodeR op.Secret = secret op.Role = role op.State = ApiTokenStateEnabled - _, err := this.Save(op) + err := this.Save(op) return err } diff --git a/internal/db/models/db_node_dao.go b/internal/db/models/db_node_dao.go index 572a053e..29a0b43a 100644 --- a/internal/db/models/db_node_dao.go +++ b/internal/db/models/db_node_dao.go @@ -104,7 +104,7 @@ func (this *DBNodeDAO) CreateDBNode(isOn bool, name string, description string, op.Username = username op.Password = password op.Charset = charset - _, err := this.Save(op) + err := this.Save(op) if err != nil { return 0, err } @@ -127,7 +127,7 @@ func (this *DBNodeDAO) UpdateNode(nodeId int64, isOn bool, name string, descript op.Username = username op.Password = password op.Charset = charset - _, err := this.Save(op) + err := this.Save(op) return err } diff --git a/internal/db/models/dns_domain_dao.go b/internal/db/models/dns_domain_dao.go index 85a4dfef..ef415d9b 100644 --- a/internal/db/models/dns_domain_dao.go +++ b/internal/db/models/dns_domain_dao.go @@ -84,7 +84,7 @@ func (this *DNSDomainDAO) CreateDomain(adminId int64, userId int64, providerId i op.Name = name op.State = DNSDomainStateEnabled op.IsOn = true - _, err := this.Save(op) + err := this.Save(op) if err != nil { return 0, err } @@ -100,7 +100,7 @@ func (this *DNSDomainDAO) UpdateDomain(domainId int64, name string, isOn bool) e op.Id = domainId op.Name = name op.IsOn = isOn - _, err := this.Save(op) + err := this.Save(op) if err != nil { return err } @@ -134,7 +134,7 @@ func (this *DNSDomainDAO) UpdateDomainData(domainId int64, data string) error { op := NewDNSDomainOperator() op.Id = domainId op.Data = data - _, err := this.Save(op) + err := this.Save(op) return err } @@ -147,7 +147,7 @@ func (this *DNSDomainDAO) UpdateDomainRecords(domainId int64, recordsJSON []byte op.Id = domainId op.Records = recordsJSON op.DataUpdatedAt = time.Now().Unix() - _, err := this.Save(op) + err := this.Save(op) return err } @@ -160,7 +160,7 @@ func (this *DNSDomainDAO) UpdateDomainRoutes(domainId int64, routesJSON []byte) op.Id = domainId op.Routes = routesJSON op.DataUpdatedAt = time.Now().Unix() - _, err := this.Save(op) + err := this.Save(op) return err } diff --git a/internal/db/models/dns_provider_dao.go b/internal/db/models/dns_provider_dao.go index ae04fc8b..2c6f2247 100644 --- a/internal/db/models/dns_provider_dao.go +++ b/internal/db/models/dns_provider_dao.go @@ -76,7 +76,7 @@ func (this *DNSProviderDAO) CreateDNSProvider(adminId int64, userId int64, provi op.ApiParams = apiParamsJSON } op.State = DNSProviderStateEnabled - _, err := this.Save(op) + err := this.Save(op) if err != nil { return 0, err } @@ -98,7 +98,7 @@ func (this *DNSProviderDAO) UpdateDNSProvider(dnsProviderId int64, name string, op.ApiParams = apiParamsJSON } - _, err := this.Save(op) + err := this.Save(op) if err != nil { return err } diff --git a/internal/db/models/file_chunk_dao.go b/internal/db/models/file_chunk_dao.go index a78c018d..c704bc6b 100644 --- a/internal/db/models/file_chunk_dao.go +++ b/internal/db/models/file_chunk_dao.go @@ -34,7 +34,7 @@ func (this *FileChunkDAO) CreateFileChunk(fileId int64, data []byte) (int64, err op := NewFileChunkOperator() op.FileId = fileId op.Data = data - _, err := this.Save(op) + err := this.Save(op) if err != nil { return 0, err } diff --git a/internal/db/models/file_dao.go b/internal/db/models/file_dao.go index ab92dbab..657f6c9e 100644 --- a/internal/db/models/file_dao.go +++ b/internal/db/models/file_dao.go @@ -71,7 +71,7 @@ func (this *FileDAO) CreateFile(businessType, description string, filename strin op.State = FileStateEnabled op.Size = size op.Filename = filename - _, err := this.Save(op) + err := this.Save(op) if err != nil { return 0, err } diff --git a/internal/db/models/http_cache_policy_dao.go b/internal/db/models/http_cache_policy_dao.go index 73ff1ea0..83059489 100644 --- a/internal/db/models/http_cache_policy_dao.go +++ b/internal/db/models/http_cache_policy_dao.go @@ -117,7 +117,7 @@ func (this *HTTPCachePolicyDAO) CreateCachePolicy(isOn bool, name string, descri if len(storageOptionsJSON) > 0 { op.Options = storageOptionsJSON } - _, err := this.Save(op) + err := this.Save(op) if err != nil { return 0, err } @@ -146,7 +146,7 @@ func (this *HTTPCachePolicyDAO) UpdateCachePolicy(policyId int64, isOn bool, nam if len(storageOptionsJSON) > 0 { op.Options = storageOptionsJSON } - _, err := this.Save(op) + err := this.Save(op) return errors.Wrap(err) } diff --git a/internal/db/models/http_firewall_policy_dao.go b/internal/db/models/http_firewall_policy_dao.go index 12ad52a0..43bf5da6 100644 --- a/internal/db/models/http_firewall_policy_dao.go +++ b/internal/db/models/http_firewall_policy_dao.go @@ -111,7 +111,7 @@ func (this *HTTPFirewallPolicyDAO) CreateFirewallPolicy(isOn bool, name string, if len(outboundJSON) > 0 { op.Outbound = outboundJSON } - _, err := this.Save(op) + err := this.Save(op) return types.Int64(op.Id), err } @@ -132,7 +132,7 @@ func (this *HTTPFirewallPolicyDAO) UpdateFirewallPolicyInboundAndOutbound(policy } else { op.Outbound = "null" } - _, err := this.Save(op) + err := this.Save(op) return err } @@ -148,7 +148,7 @@ func (this *HTTPFirewallPolicyDAO) UpdateFirewallPolicyInbound(policyId int64, i } else { op.Inbound = "null" } - _, err := this.Save(op) + err := this.Save(op) return err } @@ -175,7 +175,7 @@ func (this *HTTPFirewallPolicyDAO) UpdateFirewallPolicy(policyId int64, isOn boo if len(blockOptionsJSON) > 0 { op.BlockOptions = blockOptionsJSON } - _, err := this.Save(op) + err := this.Save(op) return err } diff --git a/internal/db/models/http_firewall_rule_dao.go b/internal/db/models/http_firewall_rule_dao.go index 86fac63c..4e5f3a52 100644 --- a/internal/db/models/http_firewall_rule_dao.go +++ b/internal/db/models/http_firewall_rule_dao.go @@ -150,7 +150,7 @@ func (this *HTTPFirewallRuleDAO) CreateOrUpdateRuleFromConfig(ruleConfig *firewa } op.CheckpointOptions = checkpointOptionsJSON } - _, err := this.Save(op) + err := this.Save(op) if err != nil { return 0, err } diff --git a/internal/db/models/http_firewall_rule_group_dao.go b/internal/db/models/http_firewall_rule_group_dao.go index 15cf2e55..626da28b 100644 --- a/internal/db/models/http_firewall_rule_group_dao.go +++ b/internal/db/models/http_firewall_rule_group_dao.go @@ -151,7 +151,7 @@ func (this *HTTPFirewallRuleGroupDAO) CreateGroupFromConfig(groupConfig *firewal return 0, err } op.Sets = setRefsJSON - _, err = this.Save(op) + err = this.Save(op) if err != nil { return 0, err } @@ -174,7 +174,7 @@ func (this *HTTPFirewallRuleGroupDAO) CreateGroup(isOn bool, name string, descri op.IsOn = isOn op.Name = name op.Description = description - _, err := this.Save(op) + err := this.Save(op) if err != nil { return 0, err } @@ -191,7 +191,7 @@ func (this *HTTPFirewallRuleGroupDAO) UpdateGroup(groupId int64, isOn bool, name op.IsOn = isOn op.Name = name op.Description = description - _, err := this.Save(op) + err := this.Save(op) return err } @@ -203,6 +203,6 @@ func (this *HTTPFirewallRuleGroupDAO) UpdateGroupSets(groupId int64, setsJSON [] op := NewHTTPFirewallRuleGroupOperator() op.Id = groupId op.Sets = setsJSON - _, err := this.Save(op) + err := this.Save(op) return err } diff --git a/internal/db/models/http_firewall_rule_set_dao.go b/internal/db/models/http_firewall_rule_set_dao.go index ef5ad1a2..0fd410ea 100644 --- a/internal/db/models/http_firewall_rule_set_dao.go +++ b/internal/db/models/http_firewall_rule_set_dao.go @@ -176,7 +176,7 @@ func (this *HTTPFirewallRuleSetDAO) CreateOrUpdateSetFromConfig(setConfig *firew return 0, err } op.Rules = ruleRefsJSON - _, err = this.Save(op) + err = this.Save(op) if err != nil { return 0, err } diff --git a/internal/db/models/http_gzip_dao.go b/internal/db/models/http_gzip_dao.go index dda3da0c..98c11b01 100644 --- a/internal/db/models/http_gzip_dao.go +++ b/internal/db/models/http_gzip_dao.go @@ -140,7 +140,7 @@ func (this *HTTPGzipDAO) CreateGzip(level int, minLengthJSON []byte, maxLengthJS if len(condsJSON) > 0 { op.Conds = JSONBytes(condsJSON) } - _, err := this.Save(op) + err := this.Save(op) if err != nil { return 0, err } @@ -164,6 +164,6 @@ func (this *HTTPGzipDAO) UpdateGzip(gzipId int64, level int, minLengthJSON []byt if len(condsJSON) > 0 { op.Conds = JSONBytes(condsJSON) } - _, err := this.Save(op) + err := this.Save(op) return err } diff --git a/internal/db/models/http_header_dao.go b/internal/db/models/http_header_dao.go index e8fc405f..e9998d29 100644 --- a/internal/db/models/http_header_dao.go +++ b/internal/db/models/http_header_dao.go @@ -105,7 +105,7 @@ func (this *HTTPHeaderDAO) CreateHeader(name string, value string) (int64, error } op.Status = statusJSON - _, err = this.Save(op) + err = this.Save(op) if err != nil { return 0, err } @@ -122,7 +122,7 @@ func (this *HTTPHeaderDAO) UpdateHeader(headerId int64, name string, value strin op.Id = headerId op.Name = name op.Value = value - _, err := this.Save(op) + err := this.Save(op) // TODO 更新相关配置 diff --git a/internal/db/models/http_header_policy_dao.go b/internal/db/models/http_header_policy_dao.go index ec606785..aa782cdd 100644 --- a/internal/db/models/http_header_policy_dao.go +++ b/internal/db/models/http_header_policy_dao.go @@ -85,7 +85,7 @@ func (this *HTTPHeaderPolicyDAO) CreateHeaderPolicy() (int64, error) { op := NewHTTPHeaderPolicyOperator() op.IsOn = true op.State = HTTPHeaderPolicyStateEnabled - _, err := this.Save(op) + err := this.Save(op) if err != nil { return 0, err } @@ -101,7 +101,7 @@ func (this *HTTPHeaderPolicyDAO) UpdateAddingHeaders(policyId int64, headersJSON op := NewHTTPHeaderPolicyOperator() op.Id = policyId op.AddHeaders = headersJSON - _, err := this.Save(op) + err := this.Save(op) return err } @@ -115,7 +115,7 @@ func (this *HTTPHeaderPolicyDAO) UpdateSettingHeaders(policyId int64, headersJSO op := NewHTTPHeaderPolicyOperator() op.Id = policyId op.SetHeaders = headersJSON - _, err := this.Save(op) + err := this.Save(op) return err } @@ -129,7 +129,7 @@ func (this *HTTPHeaderPolicyDAO) UpdateReplacingHeaders(policyId int64, headersJ op := NewHTTPHeaderPolicyOperator() op.Id = policyId op.ReplaceHeaders = headersJSON - _, err := this.Save(op) + err := this.Save(op) return err } @@ -143,7 +143,7 @@ func (this *HTTPHeaderPolicyDAO) UpdateAddingTrailers(policyId int64, headersJSO op := NewHTTPHeaderPolicyOperator() op.Id = policyId op.AddTrailers = headersJSON - _, err := this.Save(op) + err := this.Save(op) return err } @@ -162,7 +162,7 @@ func (this *HTTPHeaderPolicyDAO) UpdateDeletingHeaders(policyId int64, headerNam op := NewHTTPHeaderPolicyOperator() op.Id = policyId op.DeleteHeaders = string(namesJSON) - _, err = this.Save(op) + err = this.Save(op) return err } diff --git a/internal/db/models/http_location_dao.go b/internal/db/models/http_location_dao.go index 5f028283..360bf10c 100644 --- a/internal/db/models/http_location_dao.go +++ b/internal/db/models/http_location_dao.go @@ -98,7 +98,7 @@ func (this *HTTPLocationDAO) CreateLocation(parentId int64, name string, pattern op.Pattern = pattern op.Description = description op.IsBreak = isBreak - _, err := this.Save(op) + err := this.Save(op) if err != nil { return 0, err } @@ -117,7 +117,7 @@ func (this *HTTPLocationDAO) UpdateLocation(locationId int64, name string, patte op.Description = description op.IsOn = isOn op.IsBreak = isBreak - _, err := this.Save(op) + err := this.Save(op) return err } @@ -197,7 +197,7 @@ func (this *HTTPLocationDAO) UpdateLocationReverseProxy(locationId int64, revers op := NewHTTPLocationOperator() op.Id = locationId op.ReverseProxy = JSONBytes(reverseProxyJSON) - _, err := this.Save(op) + err := this.Save(op) return err } @@ -218,7 +218,7 @@ func (this *HTTPLocationDAO) UpdateLocationWeb(locationId int64, webId int64) er op := NewHTTPLocationOperator() op.Id = locationId op.WebId = webId - _, err := this.Save(op) + err := this.Save(op) return err } diff --git a/internal/db/models/http_page_dao.go b/internal/db/models/http_page_dao.go index 409f26e3..6a0744cd 100644 --- a/internal/db/models/http_page_dao.go +++ b/internal/db/models/http_page_dao.go @@ -95,7 +95,7 @@ func (this *HTTPPageDAO) CreatePage(statusList []string, url string, newStatus i } op.Url = url op.NewStatus = newStatus - _, err = this.Save(op) + err = this.Save(op) if err != nil { return 0, err } @@ -125,7 +125,7 @@ func (this *HTTPPageDAO) UpdatePage(pageId int64, statusList []string, url strin op.Url = url op.NewStatus = newStatus - _, err = this.Save(op) + err = this.Save(op) return err } diff --git a/internal/db/models/http_rewrite_rule_dao.go b/internal/db/models/http_rewrite_rule_dao.go index 7b73b9b3..1dce4914 100644 --- a/internal/db/models/http_rewrite_rule_dao.go +++ b/internal/db/models/http_rewrite_rule_dao.go @@ -115,7 +115,7 @@ func (this *HTTPRewriteRuleDAO) CreateRewriteRule(pattern string, replace string op.IsBreak = isBreak op.WithQuery = withQuery op.ProxyHost = proxyHost - _, err := this.Save(op) + err := this.Save(op) return types.Int64(op.Id), err } @@ -134,6 +134,6 @@ func (this *HTTPRewriteRuleDAO) UpdateRewriteRule(rewriteRuleId int64, pattern s op.IsBreak = isBreak op.WithQuery = withQuery op.ProxyHost = proxyHost - _, err := this.Save(op) + err := this.Save(op) return err } diff --git a/internal/db/models/http_web_dao.go b/internal/db/models/http_web_dao.go index 7dd145e2..3a979076 100644 --- a/internal/db/models/http_web_dao.go +++ b/internal/db/models/http_web_dao.go @@ -338,7 +338,7 @@ func (this *HTTPWebDAO) CreateWeb(rootJSON []byte) (int64, error) { op := NewHTTPWebOperator() op.State = HTTPWebStateEnabled op.Root = JSONBytes(rootJSON) - _, err := this.Save(op) + err := this.Save(op) if err != nil { return 0, err } @@ -353,7 +353,7 @@ func (this *HTTPWebDAO) UpdateWeb(webId int64, rootJSON []byte) error { op := NewHTTPWebOperator() op.Id = webId op.Root = JSONBytes(rootJSON) - _, err := this.Save(op) + err := this.Save(op) return err } @@ -365,7 +365,7 @@ func (this *HTTPWebDAO) UpdateWebGzip(webId int64, gzipJSON []byte) error { op := NewHTTPWebOperator() op.Id = webId op.Gzip = JSONBytes(gzipJSON) - _, err := this.Save(op) + err := this.Save(op) return err } @@ -377,7 +377,7 @@ func (this *HTTPWebDAO) UpdateWebCharset(webId int64, charsetJSON []byte) error op := NewHTTPWebOperator() op.Id = webId op.Charset = JSONBytes(charsetJSON) - _, err := this.Save(op) + err := this.Save(op) return err } @@ -389,7 +389,7 @@ func (this *HTTPWebDAO) UpdateWebRequestHeaderPolicy(webId int64, headerPolicyJS op := NewHTTPWebOperator() op.Id = webId op.RequestHeader = JSONBytes(headerPolicyJSON) - _, err := this.Save(op) + err := this.Save(op) return err } @@ -401,7 +401,7 @@ func (this *HTTPWebDAO) UpdateWebResponseHeaderPolicy(webId int64, headerPolicyJ op := NewHTTPWebOperator() op.Id = webId op.ResponseHeader = JSONBytes(headerPolicyJSON) - _, err := this.Save(op) + err := this.Save(op) return err } @@ -413,7 +413,7 @@ func (this *HTTPWebDAO) UpdateWebPages(webId int64, pagesJSON []byte) error { op := NewHTTPWebOperator() op.Id = webId op.Pages = JSONBytes(pagesJSON) - _, err := this.Save(op) + err := this.Save(op) return err } @@ -425,7 +425,7 @@ func (this *HTTPWebDAO) UpdateWebShutdown(webId int64, shutdownJSON []byte) erro op := NewHTTPWebOperator() op.Id = webId op.Shutdown = JSONBytes(shutdownJSON) - _, err := this.Save(op) + err := this.Save(op) return err } @@ -437,7 +437,7 @@ func (this *HTTPWebDAO) UpdateWebAccessLogConfig(webId int64, accessLogJSON []by op := NewHTTPWebOperator() op.Id = webId op.AccessLog = JSONBytes(accessLogJSON) - _, err := this.Save(op) + err := this.Save(op) return err } @@ -449,7 +449,7 @@ func (this *HTTPWebDAO) UpdateWebStat(webId int64, statJSON []byte) error { op := NewHTTPWebOperator() op.Id = webId op.Stat = JSONBytes(statJSON) - _, err := this.Save(op) + err := this.Save(op) return err } @@ -461,7 +461,7 @@ func (this *HTTPWebDAO) UpdateWebCache(webId int64, cacheJSON []byte) error { op := NewHTTPWebOperator() op.Id = webId op.Cache = JSONBytes(cacheJSON) - _, err := this.Save(op) + err := this.Save(op) return err } @@ -473,7 +473,7 @@ func (this *HTTPWebDAO) UpdateWebFirewall(webId int64, firewallJSON []byte) erro op := NewHTTPWebOperator() op.Id = webId op.Firewall = JSONBytes(firewallJSON) - _, err := this.Save(op) + err := this.Save(op) return err } @@ -485,7 +485,7 @@ func (this *HTTPWebDAO) UpdateWebLocations(webId int64, locationsJSON []byte) er op := NewHTTPWebOperator() op.Id = webId op.Locations = JSONBytes(locationsJSON) - _, err := this.Save(op) + err := this.Save(op) return err } @@ -497,7 +497,7 @@ func (this *HTTPWebDAO) UpdateWebRedirectToHTTPS(webId int64, redirectToHTTPSJSO op := NewHTTPWebOperator() op.Id = webId op.RedirectToHttps = JSONBytes(redirectToHTTPSJSON) - _, err := this.Save(op) + err := this.Save(op) return err } @@ -509,7 +509,7 @@ func (this *HTTPWebDAO) UpdateWebsocket(webId int64, websocketJSON []byte) error op := NewHTTPWebOperator() op.Id = webId op.Websocket = JSONBytes(websocketJSON) - _, err := this.Save(op) + err := this.Save(op) return err } @@ -521,7 +521,7 @@ func (this *HTTPWebDAO) UpdateWebRewriteRules(webId int64, rewriteRulesJSON []by op := NewHTTPWebOperator() op.Id = webId op.RewriteRules = JSONBytes(rewriteRulesJSON) - _, err := this.Save(op) + err := this.Save(op) return err } diff --git a/internal/db/models/http_websocket_dao.go b/internal/db/models/http_websocket_dao.go index 52b02483..394503f7 100644 --- a/internal/db/models/http_websocket_dao.go +++ b/internal/db/models/http_websocket_dao.go @@ -123,7 +123,7 @@ func (this *HTTPWebsocketDAO) CreateWebsocket(handshakeTimeoutJSON []byte, allow } op.RequestSameOrigin = requestSameOrigin op.RequestOrigin = requestOrigin - _, err = this.Save(op) + err = this.Save(op) return types.Int64(op.Id), err } @@ -149,6 +149,6 @@ func (this *HTTPWebsocketDAO) UpdateWebsocket(websocketId int64, handshakeTimeou } op.RequestSameOrigin = requestSameOrigin op.RequestOrigin = requestOrigin - _, err := this.Save(op) + err := this.Save(op) return err } diff --git a/internal/db/models/ip_item_dao.go b/internal/db/models/ip_item_dao.go index 532d2547..01aebbc8 100644 --- a/internal/db/models/ip_item_dao.go +++ b/internal/db/models/ip_item_dao.go @@ -89,7 +89,7 @@ func (this *IPItemDAO) CreateIPItem(listId int64, ipFrom string, ipTo string, ex } op.ExpiredAt = expiredAt op.State = IPItemStateEnabled - _, err = this.Save(op) + err = this.Save(op) if err != nil { return 0, err } @@ -128,7 +128,7 @@ func (this *IPItemDAO) UpdateIPItem(itemId int64, ipFrom string, ipTo string, ex } op.ExpiredAt = expiredAt op.Version = version - _, err = this.Save(op) + err = this.Save(op) return err } diff --git a/internal/db/models/ip_library_dao.go b/internal/db/models/ip_library_dao.go index b5935e42..201748ca 100644 --- a/internal/db/models/ip_library_dao.go +++ b/internal/db/models/ip_library_dao.go @@ -96,7 +96,7 @@ func (this *IPLibraryDAO) CreateIPLibrary(libraryType string, fileId int64) (int op.Type = libraryType op.FileId = fileId op.State = IPLibraryStateEnabled - _, err := this.Save(op) + err := this.Save(op) if err != nil { return 0, err } diff --git a/internal/db/models/ip_list_dao.go b/internal/db/models/ip_list_dao.go index 9fbd16a9..b7929130 100644 --- a/internal/db/models/ip_list_dao.go +++ b/internal/db/models/ip_list_dao.go @@ -85,7 +85,7 @@ func (this *IPListDAO) CreateIPList(listType ipconfigs.IPListType, name string, if len(timeoutJSON) > 0 { op.Timeout = timeoutJSON } - _, err := this.Save(op) + err := this.Save(op) if err != nil { return 0, err } @@ -106,7 +106,7 @@ func (this *IPListDAO) UpdateIPList(listId int64, name string, code string, time } else { op.Timeout = "null" } - _, err := this.Save(op) + err := this.Save(op) return err } diff --git a/internal/db/models/log_dao.go b/internal/db/models/log_dao.go index 5aa155f6..731f3c24 100644 --- a/internal/db/models/log_dao.go +++ b/internal/db/models/log_dao.go @@ -40,7 +40,7 @@ func (this *LogDAO) CreateLog(adminType string, adminId int64, level string, des op.AdminId, op.Level, op.Description, op.Action, op.Ip = adminId, level, description, action, ip op.Day = timeutil.Format("Ymd") op.Type = LogTypeAdmin - _, err := this.Save(op) + err := this.Save(op) return err } diff --git a/internal/db/models/message_dao.go b/internal/db/models/message_dao.go index b403d880..93cfea75 100644 --- a/internal/db/models/message_dao.go +++ b/internal/db/models/message_dao.go @@ -120,7 +120,7 @@ func (this *MessageDAO) CreateMessage(adminId int64, userId int64, messageType M op.IsRead = false op.Day = timeutil.Format("Ymd") op.Hash = hash - _, err := this.Save(op) + err := this.Save(op) return err } @@ -161,7 +161,7 @@ func (this *MessageDAO) UpdateMessageRead(messageId int64, b bool) error { op := NewMessageOperator() op.Id = messageId op.IsRead = b - _, err := this.Save(op) + err := this.Save(op) return err } @@ -213,7 +213,7 @@ func (this *MessageDAO) createMessage(clusterId int64, nodeId int64, messageType op.Day = timeutil.Format("Ymd") op.Hash = hash - _, err := this.Save(op) + err := this.Save(op) if err != nil { return 0, err } diff --git a/internal/db/models/node_cluster_dao.go b/internal/db/models/node_cluster_dao.go index e940d782..1a687289 100644 --- a/internal/db/models/node_cluster_dao.go +++ b/internal/db/models/node_cluster_dao.go @@ -138,7 +138,7 @@ func (this *NodeClusterDAO) CreateCluster(adminId int64, name string, grantId in op.UniqueId = uniqueId op.Secret = secret op.State = NodeClusterStateEnabled - _, err = this.Save(op) + err = this.Save(op) if err != nil { return 0, err } @@ -156,7 +156,7 @@ func (this *NodeClusterDAO) UpdateCluster(clusterId int64, name string, grantId op.Name = name op.GrantId = grantId op.InstallDir = installDir - _, err := this.Save(op) + err := this.Save(op) return err } @@ -264,7 +264,7 @@ func (this *NodeClusterDAO) UpdateClusterHealthCheck(clusterId int64, healthChec op := NewNodeClusterOperator() op.Id = clusterId op.HealthCheck = healthCheckJSON - _, err := this.Save(op) + err := this.Save(op) return err } @@ -408,7 +408,7 @@ func (this *NodeClusterDAO) UpdateClusterDNS(clusterId int64, dnsName string, dn } op.Dns = dnsJSON - _, err = this.Save(op) + err = this.Save(op) return err } @@ -561,7 +561,7 @@ func (this *NodeClusterDAO) UpdateClusterTOA(clusterId int64, toaJSON []byte) er op := NewNodeClusterOperator() op.Id = clusterId op.Toa = toaJSON - _, err := this.Save(op) + err := this.Save(op) return err } diff --git a/internal/db/models/node_dao.go b/internal/db/models/node_dao.go index b04fbcf4..d66fcf1a 100644 --- a/internal/db/models/node_dao.go +++ b/internal/db/models/node_dao.go @@ -103,7 +103,7 @@ func (this *NodeDAO) CreateNode(adminId int64, name string, clusterId int64, gro op.GroupId = groupId op.IsOn = 1 op.State = NodeStateEnabled - _, err = this.Save(op) + err = this.Save(op) if err != nil { return 0, err } @@ -124,7 +124,7 @@ func (this *NodeDAO) UpdateNode(nodeId int64, name string, clusterId int64, grou op.LatestVersion = dbs.SQL("latestVersion+1") op.MaxCPU = maxCPU op.IsOn = isOn - _, err := this.Save(op) + err := this.Save(op) return err } @@ -136,7 +136,7 @@ func (this *NodeDAO) UpdateNodeLatestVersion(nodeId int64) error { op := NewNodeOperator() op.Id = nodeId op.LatestVersion = dbs.SQL("latestVersion+1") - _, err := this.Save(op) + err := this.Save(op) return err } @@ -528,7 +528,7 @@ func (this *NodeDAO) UpdateNodeConnectedAPINodes(nodeId int64, apiNodeIds []int6 } else { op.ConnectedAPINodes = "[]" } - _, err := this.Save(op) + err := this.Save(op) return err } @@ -660,7 +660,7 @@ func (this *NodeDAO) UpdateNodeDNS(nodeId int64, routes map[int64][]string) erro op := NewNodeOperator() op.Id = nodeId op.DnsRoutes = routesJSON - _, err = this.Save(op) + err = this.Save(op) return err } @@ -712,7 +712,7 @@ func (this *NodeDAO) UpdateNodeUp(nodeId int64, isUp bool, maxUp int, maxDown in op.CountUp = countUp op.CountDown = countDown - _, err = this.Save(op) + err = this.Save(op) if err != nil { return false, err } diff --git a/internal/db/models/node_grant_dao.go b/internal/db/models/node_grant_dao.go index f0c04a82..3c32bf56 100644 --- a/internal/db/models/node_grant_dao.go +++ b/internal/db/models/node_grant_dao.go @@ -90,7 +90,7 @@ func (this *NodeGrantDAO) CreateGrant(adminId int64, name string, method string, op.Description = description op.NodeId = nodeId op.State = NodeGrantStateEnabled - _, err = this.Save(op) + err = this.Save(op) return types.Int64(op.Id), err } @@ -115,7 +115,7 @@ func (this *NodeGrantDAO) UpdateGrant(grantId int64, name string, method string, } op.Description = description op.NodeId = nodeId - _, err := this.Save(op) + err := this.Save(op) return err } diff --git a/internal/db/models/node_group_dao.go b/internal/db/models/node_group_dao.go index fedafa04..36e91bda 100644 --- a/internal/db/models/node_group_dao.go +++ b/internal/db/models/node_group_dao.go @@ -77,7 +77,7 @@ func (this *NodeGroupDAO) CreateNodeGroup(clusterId int64, name string) (int64, op.ClusterId = clusterId op.Name = name op.State = NodeGroupStateEnabled - _, err := this.Save(op) + err := this.Save(op) if err != nil { return 0, err } @@ -92,7 +92,7 @@ func (this *NodeGroupDAO) UpdateNodeGroup(groupId int64, name string) error { op := NewNodeGroupOperator() op.Id = groupId op.Name = name - _, err := this.Save(op) + err := this.Save(op) return err } diff --git a/internal/db/models/node_ip_address_dao.go b/internal/db/models/node_ip_address_dao.go index aac62532..67a2686b 100644 --- a/internal/db/models/node_ip_address_dao.go +++ b/internal/db/models/node_ip_address_dao.go @@ -92,7 +92,7 @@ func (this *NodeIPAddressDAO) CreateAddress(nodeId int64, name string, ip string op.Ip = ip op.CanAccess = canAccess op.State = NodeIPAddressStateEnabled - _, err = this.Save(op) + err = this.Save(op) if err != nil { return 0, err } @@ -111,7 +111,7 @@ func (this *NodeIPAddressDAO) UpdateAddress(addressId int64, name string, ip str op.Ip = ip op.CanAccess = canAccess op.State = NodeIPAddressStateEnabled // 恢复状态 - _, err = this.Save(op) + err = this.Save(op) return err } @@ -123,7 +123,7 @@ func (this *NodeIPAddressDAO) UpdateAddressIP(addressId int64, ip string) error op := NewNodeIPAddressOperator() op.Id = addressId op.Ip = ip - _, err := this.Save(op) + err := this.Save(op) return err } diff --git a/internal/db/models/node_log_dao.go b/internal/db/models/node_log_dao.go index fadd37a0..8b6f8529 100644 --- a/internal/db/models/node_log_dao.go +++ b/internal/db/models/node_log_dao.go @@ -43,7 +43,7 @@ func (this *NodeLogDAO) CreateLog(nodeRole NodeRole, nodeId int64, level string, op.Description = description op.CreatedAt = createdAt op.Day = timeutil.FormatTime("Ymd", createdAt) - _, err := this.Save(op) + err := this.Save(op) return err } diff --git a/internal/db/models/node_login_dao.go b/internal/db/models/node_login_dao.go index 0a58e6d7..661c3c87 100644 --- a/internal/db/models/node_login_dao.go +++ b/internal/db/models/node_login_dao.go @@ -81,7 +81,7 @@ func (this *NodeLoginDAO) CreateNodeLogin(nodeId int64, name string, loginType s login.Type = loginType login.Params = string(paramsJSON) login.State = NodeLoginStateEnabled - _, err = this.Save(login) + err = this.Save(login) return types.Int64(login.Id), err } @@ -95,7 +95,7 @@ func (this *NodeLoginDAO) UpdateNodeLogin(loginId int64, name string, loginType login.Name = name login.Type = loginType login.Params = string(paramsJSON) - _, err := this.Save(login) + err := this.Save(login) return err } diff --git a/internal/db/models/origin_dao.go b/internal/db/models/origin_dao.go index 9ecf0ef5..f47e728b 100644 --- a/internal/db/models/origin_dao.go +++ b/internal/db/models/origin_dao.go @@ -102,7 +102,7 @@ func (this *OriginDAO) CreateOrigin(name string, addrJSON string, description st } op.Weight = weight op.State = OriginStateEnabled - _, err = this.Save(op) + err = this.Save(op) if err != nil { return } @@ -125,7 +125,7 @@ func (this *OriginDAO) UpdateOrigin(originId int64, name string, addrJSON string op.Weight = weight op.IsOn = isOn op.Version = dbs.SQL("version+1") - _, err := this.Save(op) + err := this.Save(op) return err } diff --git a/internal/db/models/region_city_dao.go b/internal/db/models/region_city_dao.go index ef526a32..b4fa5408 100644 --- a/internal/db/models/region_city_dao.go +++ b/internal/db/models/region_city_dao.go @@ -94,7 +94,7 @@ func (this *RegionCityDAO) CreateCity(provinceId int64, name string, dataId stri return 0, err } op.Codes = codesJSON - _, err = this.Save(op) + err = this.Save(op) if err != nil { return 0, err } diff --git a/internal/db/models/region_country_dao.go b/internal/db/models/region_country_dao.go index 1746c1a4..df30eb14 100644 --- a/internal/db/models/region_country_dao.go +++ b/internal/db/models/region_country_dao.go @@ -114,7 +114,7 @@ func (this *RegionCountryDAO) CreateCountry(name string, dataId string) (int64, op.DataId = dataId op.State = RegionCountryStateEnabled - _, err = this.Save(op) + err = this.Save(op) if err != nil { return 0, err } diff --git a/internal/db/models/region_province_dao.go b/internal/db/models/region_province_dao.go index 1ae91d51..69957558 100644 --- a/internal/db/models/region_province_dao.go +++ b/internal/db/models/region_province_dao.go @@ -104,7 +104,7 @@ func (this *RegionProvinceDAO) CreateProvince(countryId int64, name string, data return 0, err } op.Codes = codesJSON - _, err = this.Save(op) + err = this.Save(op) if err != nil { return 0, err } diff --git a/internal/db/models/reverse_proxy_dao.go b/internal/db/models/reverse_proxy_dao.go index a10e2189..f30a8467 100644 --- a/internal/db/models/reverse_proxy_dao.go +++ b/internal/db/models/reverse_proxy_dao.go @@ -164,7 +164,7 @@ func (this *ReverseProxyDAO) CreateReverseProxy(schedulingJSON []byte, primaryOr if len(backupOriginsJSON) > 0 { op.BackupOrigins = string(backupOriginsJSON) } - _, err := this.Save(op) + err := this.Save(op) if err != nil { return 0, err } @@ -184,7 +184,7 @@ func (this *ReverseProxyDAO) UpdateReverseProxyScheduling(reverseProxyId int64, } else { op.Scheduling = "null" } - _, err := this.Save(op) + err := this.Save(op) return err } @@ -201,7 +201,7 @@ func (this *ReverseProxyDAO) UpdateReverseProxyPrimaryOrigins(reverseProxyId int } else { op.PrimaryOrigins = "[]" } - _, err := this.Save(op) + err := this.Save(op) return err } @@ -218,7 +218,7 @@ func (this *ReverseProxyDAO) UpdateReverseProxyBackupOrigins(reverseProxyId int6 } else { op.BackupOrigins = "[]" } - _, err := this.Save(op) + err := this.Save(op) return err } @@ -241,7 +241,7 @@ func (this *ReverseProxyDAO) UpdateReverseProxy(reverseProxyId int64, requestHos op.RequestURI = requestURI op.StripPrefix = stripPrefix op.AutoFlush = autoFlush - _, err := this.Save(op) + err := this.Save(op) return err } diff --git a/internal/db/models/server_dao.go b/internal/db/models/server_dao.go index 475f503f..5d48ee53 100644 --- a/internal/db/models/server_dao.go +++ b/internal/db/models/server_dao.go @@ -148,7 +148,7 @@ func (this *ServerDAO) CreateServer(adminId int64, userId int64, serverType serv op.Version = 1 op.IsOn = 1 op.State = ServerStateEnabled - _, err = this.Save(op) + err = this.Save(op) if err != nil { return 0, err @@ -191,7 +191,7 @@ func (this *ServerDAO) UpdateServerBasic(serverId int64, name string, descriptio op.GroupIds = groupIdsJSON } - _, err := this.Save(op) + err := this.Save(op) if err != nil { return err } @@ -243,7 +243,7 @@ func (this *ServerDAO) UpdateServerConfig(serverId int64, configJSON []byte, upd if updateMd5 { op.ConfigMd5 = newConfigMd5 } - _, err = this.Save(op) + err = this.Save(op) return true, err } @@ -455,7 +455,7 @@ func (this *ServerDAO) UpdateServerReverseProxy(serverId int64, config []byte) e op := NewServerOperator() op.Id = serverId op.ReverseProxy = JSONBytes(config) - _, err := this.Save(op) + err := this.Save(op) if err != nil { return err } @@ -886,7 +886,7 @@ func (this *ServerDAO) GenerateServerDNSName(serverId int64) (string, error) { op := NewServerOperator() op.Id = serverId op.DnsName = dnsName - _, err = this.Save(op) + err = this.Save(op) return dnsName, err } diff --git a/internal/db/models/server_group_dao.go b/internal/db/models/server_group_dao.go index d5d1726e..b7ed812c 100644 --- a/internal/db/models/server_group_dao.go +++ b/internal/db/models/server_group_dao.go @@ -77,7 +77,7 @@ func (this *ServerGroupDAO) CreateGroup(name string) (groupId int64, err error) op := NewServerGroupOperator() op.State = ServerGroupStateEnabled op.Name = name - _, err = this.Save(op) + err = this.Save(op) if err != nil { return 0, err } @@ -92,7 +92,7 @@ func (this *ServerGroupDAO) UpdateGroup(groupId int64, name string) error { op := NewServerGroupOperator() op.Id = groupId op.Name = name - _, err := this.Save(op) + err := this.Save(op) return err } diff --git a/internal/db/models/ssl_cert_dao.go b/internal/db/models/ssl_cert_dao.go index c3f2ad05..c6e178a3 100644 --- a/internal/db/models/ssl_cert_dao.go +++ b/internal/db/models/ssl_cert_dao.go @@ -118,7 +118,7 @@ func (this *SSLCertDAO) CreateCert(adminId int64, userId int64, isOn bool, name } op.CommonNames = commonNamesJSON - _, err = this.Save(op) + err = this.Save(op) if err != nil { return 0, err } @@ -161,7 +161,7 @@ func (this *SSLCertDAO) UpdateCert(certId int64, isOn bool, name string, descrip } op.CommonNames = commonNamesJSON - _, err = this.Save(op) + err = this.Save(op) return err } @@ -281,7 +281,7 @@ func (this *SSLCertDAO) UpdateCertACME(certId int64, acmeTaskId int64) error { op.Id = certId op.AcmeTaskId = acmeTaskId op.IsACME = true - _, err := this.Save(op) + err := this.Save(op) return err } diff --git a/internal/db/models/ssl_policy_dao.go b/internal/db/models/ssl_policy_dao.go index 5e814c30..60eedd76 100644 --- a/internal/db/models/ssl_policy_dao.go +++ b/internal/db/models/ssl_policy_dao.go @@ -214,7 +214,7 @@ func (this *SSLPolicyDAO) CreatePolicy(http2Enabled bool, minVersion string, cer } op.CipherSuites = cipherSuitesJSON } - _, err := this.Save(op) + err := this.Save(op) if err != nil { return 0, err } @@ -255,6 +255,6 @@ func (this *SSLPolicyDAO) UpdatePolicy(policyId int64, http2Enabled bool, minVer } else { op.CipherSuites = "[]" } - _, err := this.Save(op) + err := this.Save(op) return err } diff --git a/internal/db/models/sys_event_dao.go b/internal/db/models/sys_event_dao.go index 378ecc01..c9fcc413 100644 --- a/internal/db/models/sys_event_dao.go +++ b/internal/db/models/sys_event_dao.go @@ -44,7 +44,7 @@ func (this *SysEventDAO) CreateEvent(event EventInterface) error { } op.Params = eventJSON - _, err = this.Save(op) + err = this.Save(op) return err } diff --git a/internal/db/models/sys_locker_dao.go b/internal/db/models/sys_locker_dao.go index 3dcd6726..27c918ab 100644 --- a/internal/db/models/sys_locker_dao.go +++ b/internal/db/models/sys_locker_dao.go @@ -50,7 +50,7 @@ func (this *SysLockerDAO) Lock(key string, timeout int64) (bool, error) { op.Key = key op.TimeoutAt = time.Now().Unix() + timeout op.Version = 1 - _, err := this.Save(op) + err := this.Save(op) if err != nil { maxErrors-- if maxErrors < 0 { @@ -73,7 +73,7 @@ func (this *SysLockerDAO) Lock(key string, timeout int64) (bool, error) { op.Id = locker.Id op.Version = locker.Version + 1 op.TimeoutAt = time.Now().Unix() + timeout - _, err = this.Save(op) + err = this.Save(op) if err != nil { maxErrors-- if maxErrors < 0 { diff --git a/internal/db/models/sys_setting_dao.go b/internal/db/models/sys_setting_dao.go index 02712831..4af21728 100644 --- a/internal/db/models/sys_setting_dao.go +++ b/internal/db/models/sys_setting_dao.go @@ -63,7 +63,7 @@ func (this *SysSettingDAO) UpdateSetting(codeFormat string, valueJSON []byte, co op := NewSysSettingOperator() op.Code = codeFormat op.Value = valueJSON - _, err = this.Save(op) + err = this.Save(op) if err != nil { lastErr = err @@ -77,7 +77,7 @@ func (this *SysSettingDAO) UpdateSetting(codeFormat string, valueJSON []byte, co op := NewSysSettingOperator() op.Id = settingId op.Value = valueJSON - _, err = this.Save(op) + err = this.Save(op) if err != nil { return err } diff --git a/internal/db/models/user_dao.go b/internal/db/models/user_dao.go index 8f7d90b1..68fa6bfd 100644 --- a/internal/db/models/user_dao.go +++ b/internal/db/models/user_dao.go @@ -98,7 +98,7 @@ func (this *UserDAO) CreateUser(username string, password string, fullname strin op.IsOn = true op.State = UserStateEnabled - _, err := this.Save(op) + err := this.Save(op) if err != nil { return 0, err } @@ -122,7 +122,7 @@ func (this *UserDAO) UpdateUser(userId int64, username string, password string, op.Email = email op.Remark = remark op.IsOn = isOn - _, err := this.Save(op) + err := this.Save(op) return err } diff --git a/internal/setup/sql_dump.go b/internal/setup/sql_dump.go index cdef83b3..4a05e064 100644 --- a/internal/setup/sql_dump.go +++ b/internal/setup/sql_dump.go @@ -126,13 +126,13 @@ func (this *SQLDump) Apply(db *dbs.DB, newResult *SQLDumpResult) (ops []string, oldField := oldTable.FindField(newField.Name) if oldField == nil { ops = append(ops, "+ "+newTable.Name+" "+newField.Name) - _, err = db.Exec("ALTER TABLE " + newTable.Name + " ADD " + newField.Name + " " + newField.Definition) + _, err = db.Exec("ALTER TABLE " + newTable.Name + " ADD `" + newField.Name + "` " + newField.Definition) if err != nil { return nil, err } - } else if oldField.Definition != newField.Definition { + } else if !newField.EqualDefinition(oldField.Definition) { ops = append(ops, "* "+newTable.Name+" "+newField.Name) - _, err = db.Exec("ALTER TABLE " + newTable.Name + " MODIFY " + newField.Name + " " + newField.Definition) + _, err = db.Exec("ALTER TABLE " + newTable.Name + " MODIFY `" + newField.Name + "` " + newField.Definition) if err != nil { return nil, err } @@ -180,7 +180,7 @@ func (this *SQLDump) Apply(db *dbs.DB, newResult *SQLDumpResult) (ops []string, newField := newTable.FindField(oldField.Name) if newField == nil { ops = append(ops, "- field "+oldTable.Name+" "+oldField.Name) - _, err = db.Exec("ALTER TABLE " + oldTable.Name + " DROP COLUMN " + oldField.Name) + _, err = db.Exec("ALTER TABLE " + oldTable.Name + " DROP COLUMN `" + oldField.Name + "`") if err != nil { return nil, err } diff --git a/internal/setup/sql_executor.go b/internal/setup/sql_executor.go index 62071ac2..507722ca 100644 --- a/internal/setup/sql_executor.go +++ b/internal/setup/sql_executor.go @@ -79,6 +79,9 @@ func (this *SQLExecutor) checkData(db *dbs.DB) error { // 检查集群配置 err = this.checkCluster(db) + if err != nil { + return err + } // 更新版本号 err = this.updateVersion(db, teaconst.Version) diff --git a/internal/setup/sql_field.go b/internal/setup/sql_field.go index 64bf8085..d4d14098 100644 --- a/internal/setup/sql_field.go +++ b/internal/setup/sql_field.go @@ -1,6 +1,19 @@ package setup +import "regexp" + type SQLField struct { Name string `json:"name"` Definition string `json:"definition"` } + +func (this *SQLField) EqualDefinition(definition2 string) bool { + if this.Definition == definition2 { + return true + } + + // 针对MySQL v8.0.17以后 + def1 := regexp.MustCompile(`(?)(tinyint|smallint|mediumint|int|bigint)\(\d+\)`). + ReplaceAllString(this.Definition, "${1}") + return def1 == definition2 +} diff --git a/internal/tasks/log_task.go b/internal/tasks/log_task.go index 5d9e84e0..4e8bfb35 100644 --- a/internal/tasks/log_task.go +++ b/internal/tasks/log_task.go @@ -84,7 +84,7 @@ func (this *LogTask) loopClean(seconds int64) error { func (this *LogTask) runMonitor() { ticker := utils.NewTicker(1 * time.Minute) for ticker.Wait() { - err := this.loopClean(60) + err := this.loopMonitor(60) if err != nil { logs.Println("[TASK][LOG]" + err.Error()) }