简化数据库查询代码

This commit is contained in:
刘祥超
2020-12-09 20:44:05 +08:00
parent 415539df93
commit 82543e9fde
56 changed files with 164 additions and 141 deletions

3
go.mod
View File

@@ -11,11 +11,12 @@ require (
github.com/go-sql-driver/mysql v1.5.0 github.com/go-sql-driver/mysql v1.5.0
github.com/go-yaml/yaml v2.1.0+incompatible github.com/go-yaml/yaml v2.1.0+incompatible
github.com/golang/protobuf v1.4.2 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/lionsoul2014/ip2region v2.2.0-release+incompatible
github.com/mozillazg/go-pinyin v0.18.0 github.com/mozillazg/go-pinyin v0.18.0
github.com/pkg/sftp v1.12.0 github.com/pkg/sftp v1.12.0
golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a
google.golang.org/grpc v1.32.0 google.golang.org/grpc v1.32.0
google.golang.org/protobuf v1.25.0 google.golang.org/protobuf v1.25.0
gopkg.in/yaml.v2 v2.4.0 // indirect
) )

6
go.sum
View File

@@ -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-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 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-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 h1:pmfjZENx5imkbgOkpRUYLnmbU7UEFbjtDA2hxJ1ichM=
github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= 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= 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.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU= 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.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 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-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 h1:tQIYjPdBoyREyB9XMu+nnTclpTYkz2zFM+lzLJFO4gQ= gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 h1:tQIYjPdBoyREyB9XMu+nnTclpTYkz2zFM+lzLJFO4gQ=

View File

@@ -34,7 +34,7 @@ func (this *ACMEAuthenticationDAO) CreateAuth(taskId int64, domain string, token
op.Domain = domain op.Domain = domain
op.Token = token op.Token = token
op.Key = key op.Key = key
_, err := this.Save(op) err := this.Save(op)
return err return err
} }

View File

@@ -137,7 +137,7 @@ func (this *ACMETaskDAO) CreateACMETask(adminId int64, userId int64, authType ac
op.AutoRenew = autoRenew op.AutoRenew = autoRenew
op.IsOn = true op.IsOn = true
op.State = ACMETaskStateEnabled op.State = ACMETaskStateEnabled
_, err := this.Save(op) err := this.Save(op)
if err != nil { if err != nil {
return 0, err return 0, err
} }
@@ -167,7 +167,7 @@ func (this *ACMETaskDAO) UpdateACMETask(acmeTaskId int64, acmeUserId int64, dnsP
} }
op.AutoRenew = autoRenew op.AutoRenew = autoRenew
_, err := this.Save(op) err := this.Save(op)
return err return err
} }
@@ -188,7 +188,7 @@ func (this *ACMETaskDAO) UpdateACMETaskCert(taskId int64, certId int64) error {
op := NewACMETaskOperator() op := NewACMETaskOperator()
op.Id = taskId op.Id = taskId
op.CertId = certId op.CertId = certId
_, err := this.Save(op) err := this.Save(op)
return err return err
} }

View File

@@ -33,7 +33,7 @@ func (this *ACMETaskLogDAO) CreateACMETaskLog(taskId int64, isOk bool, errMsg st
op.TaskId = taskId op.TaskId = taskId
op.Error = errMsg op.Error = errMsg
op.IsOk = isOk op.IsOk = isOk
_, err := this.Save(op) err := this.Save(op)
return err return err
} }

View File

@@ -90,7 +90,7 @@ func (this *ACMEUserDAO) CreateACMEUser(adminId int64, userId int64, email strin
op.Description = description op.Description = description
op.PrivateKey = privateKeyText op.PrivateKey = privateKeyText
op.State = ACMEUserStateEnabled op.State = ACMEUserStateEnabled
_, err = this.Save(op) err = this.Save(op)
if err != nil { if err != nil {
return 0, err return 0, err
} }
@@ -105,7 +105,7 @@ func (this *ACMEUserDAO) UpdateACMEUser(acmeUserId int64, description string) er
op := NewACMEUserOperator() op := NewACMEUserOperator()
op.Id = acmeUserId op.Id = acmeUserId
op.Description = description op.Description = description
_, err := this.Save(op) err := this.Save(op)
return err return err
} }
@@ -117,7 +117,7 @@ func (this *ACMEUserDAO) UpdateACMEUserRegistration(acmeUserId int64, registrati
op := NewACMEUserOperator() op := NewACMEUserOperator()
op.Id = acmeUserId op.Id = acmeUserId
op.Registration = registrationJSON op.Registration = registrationJSON
_, err := this.Save(op) err := this.Save(op)
return err return err
} }

View File

@@ -117,7 +117,7 @@ func (this *AdminDAO) UpdateAdminPassword(adminId int64, password string) error
op := NewAdminOperator() op := NewAdminOperator()
op.Id = adminId op.Id = adminId
op.Password = stringutil.Md5(password) op.Password = stringutil.Md5(password)
_, err := this.Save(op) err := this.Save(op)
return err return err
} }
@@ -135,7 +135,7 @@ func (this *AdminDAO) CreateAdmin(username string, password string, fullname str
} else { } else {
op.Modules = "[]" op.Modules = "[]"
} }
_, err := this.Save(op) err := this.Save(op)
if err != nil { if err != nil {
return 0, err return 0, err
} }
@@ -150,7 +150,7 @@ func (this *AdminDAO) UpdateAdminInfo(adminId int64, fullname string) error {
op := NewAdminOperator() op := NewAdminOperator()
op.Id = adminId op.Id = adminId
op.Fullname = fullname op.Fullname = fullname
_, err := this.Save(op) err := this.Save(op)
return err return err
} }
@@ -173,7 +173,7 @@ func (this *AdminDAO) UpdateAdmin(adminId int64, username string, password strin
op.Modules = "[]" op.Modules = "[]"
} }
op.IsOn = isOn op.IsOn = isOn
_, err := this.Save(op) err := this.Save(op)
return err return err
} }
@@ -199,7 +199,7 @@ func (this *AdminDAO) UpdateAdminLogin(adminId int64, username string, password
op.Id = adminId op.Id = adminId
op.Username = username op.Username = username
op.Password = stringutil.Md5(password) op.Password = stringutil.Md5(password)
_, err := this.Save(op) err := this.Save(op)
return err return err
} }
@@ -211,7 +211,7 @@ func (this *AdminDAO) UpdateAdminModules(adminId int64, allowModulesJSON []byte)
op := NewAdminOperator() op := NewAdminOperator()
op.Id = adminId op.Id = adminId
op.Modules = allowModulesJSON op.Modules = allowModulesJSON
_, err := this.Save(op) err := this.Save(op)
if err != nil { if err != nil {
return err return err
} }

View File

@@ -119,7 +119,7 @@ func (this *APINodeDAO) CreateAPINode(name string, description string, httpJSON
} }
op.State = NodeStateEnabled op.State = NodeStateEnabled
_, err = this.Save(op) err = this.Save(op)
if err != nil { if err != nil {
return return
} }
@@ -155,7 +155,7 @@ func (this *APINodeDAO) UpdateAPINode(nodeId int64, name string, description str
op.AccessAddrs = "null" op.AccessAddrs = "null"
} }
_, err := this.Save(op) err := this.Save(op)
return err return err
} }

View File

@@ -92,6 +92,6 @@ func (this *ApiTokenDAO) CreateAPIToken(nodeId string, secret string, role NodeR
op.Secret = secret op.Secret = secret
op.Role = role op.Role = role
op.State = ApiTokenStateEnabled op.State = ApiTokenStateEnabled
_, err := this.Save(op) err := this.Save(op)
return err return err
} }

View File

@@ -104,7 +104,7 @@ func (this *DBNodeDAO) CreateDBNode(isOn bool, name string, description string,
op.Username = username op.Username = username
op.Password = password op.Password = password
op.Charset = charset op.Charset = charset
_, err := this.Save(op) err := this.Save(op)
if err != nil { if err != nil {
return 0, err return 0, err
} }
@@ -127,7 +127,7 @@ func (this *DBNodeDAO) UpdateNode(nodeId int64, isOn bool, name string, descript
op.Username = username op.Username = username
op.Password = password op.Password = password
op.Charset = charset op.Charset = charset
_, err := this.Save(op) err := this.Save(op)
return err return err
} }

View File

@@ -84,7 +84,7 @@ func (this *DNSDomainDAO) CreateDomain(adminId int64, userId int64, providerId i
op.Name = name op.Name = name
op.State = DNSDomainStateEnabled op.State = DNSDomainStateEnabled
op.IsOn = true op.IsOn = true
_, err := this.Save(op) err := this.Save(op)
if err != nil { if err != nil {
return 0, err return 0, err
} }
@@ -100,7 +100,7 @@ func (this *DNSDomainDAO) UpdateDomain(domainId int64, name string, isOn bool) e
op.Id = domainId op.Id = domainId
op.Name = name op.Name = name
op.IsOn = isOn op.IsOn = isOn
_, err := this.Save(op) err := this.Save(op)
if err != nil { if err != nil {
return err return err
} }
@@ -134,7 +134,7 @@ func (this *DNSDomainDAO) UpdateDomainData(domainId int64, data string) error {
op := NewDNSDomainOperator() op := NewDNSDomainOperator()
op.Id = domainId op.Id = domainId
op.Data = data op.Data = data
_, err := this.Save(op) err := this.Save(op)
return err return err
} }
@@ -147,7 +147,7 @@ func (this *DNSDomainDAO) UpdateDomainRecords(domainId int64, recordsJSON []byte
op.Id = domainId op.Id = domainId
op.Records = recordsJSON op.Records = recordsJSON
op.DataUpdatedAt = time.Now().Unix() op.DataUpdatedAt = time.Now().Unix()
_, err := this.Save(op) err := this.Save(op)
return err return err
} }
@@ -160,7 +160,7 @@ func (this *DNSDomainDAO) UpdateDomainRoutes(domainId int64, routesJSON []byte)
op.Id = domainId op.Id = domainId
op.Routes = routesJSON op.Routes = routesJSON
op.DataUpdatedAt = time.Now().Unix() op.DataUpdatedAt = time.Now().Unix()
_, err := this.Save(op) err := this.Save(op)
return err return err
} }

View File

@@ -76,7 +76,7 @@ func (this *DNSProviderDAO) CreateDNSProvider(adminId int64, userId int64, provi
op.ApiParams = apiParamsJSON op.ApiParams = apiParamsJSON
} }
op.State = DNSProviderStateEnabled op.State = DNSProviderStateEnabled
_, err := this.Save(op) err := this.Save(op)
if err != nil { if err != nil {
return 0, err return 0, err
} }
@@ -98,7 +98,7 @@ func (this *DNSProviderDAO) UpdateDNSProvider(dnsProviderId int64, name string,
op.ApiParams = apiParamsJSON op.ApiParams = apiParamsJSON
} }
_, err := this.Save(op) err := this.Save(op)
if err != nil { if err != nil {
return err return err
} }

View File

@@ -34,7 +34,7 @@ func (this *FileChunkDAO) CreateFileChunk(fileId int64, data []byte) (int64, err
op := NewFileChunkOperator() op := NewFileChunkOperator()
op.FileId = fileId op.FileId = fileId
op.Data = data op.Data = data
_, err := this.Save(op) err := this.Save(op)
if err != nil { if err != nil {
return 0, err return 0, err
} }

View File

@@ -71,7 +71,7 @@ func (this *FileDAO) CreateFile(businessType, description string, filename strin
op.State = FileStateEnabled op.State = FileStateEnabled
op.Size = size op.Size = size
op.Filename = filename op.Filename = filename
_, err := this.Save(op) err := this.Save(op)
if err != nil { if err != nil {
return 0, err return 0, err
} }

View File

@@ -117,7 +117,7 @@ func (this *HTTPCachePolicyDAO) CreateCachePolicy(isOn bool, name string, descri
if len(storageOptionsJSON) > 0 { if len(storageOptionsJSON) > 0 {
op.Options = storageOptionsJSON op.Options = storageOptionsJSON
} }
_, err := this.Save(op) err := this.Save(op)
if err != nil { if err != nil {
return 0, err return 0, err
} }
@@ -146,7 +146,7 @@ func (this *HTTPCachePolicyDAO) UpdateCachePolicy(policyId int64, isOn bool, nam
if len(storageOptionsJSON) > 0 { if len(storageOptionsJSON) > 0 {
op.Options = storageOptionsJSON op.Options = storageOptionsJSON
} }
_, err := this.Save(op) err := this.Save(op)
return errors.Wrap(err) return errors.Wrap(err)
} }

View File

@@ -111,7 +111,7 @@ func (this *HTTPFirewallPolicyDAO) CreateFirewallPolicy(isOn bool, name string,
if len(outboundJSON) > 0 { if len(outboundJSON) > 0 {
op.Outbound = outboundJSON op.Outbound = outboundJSON
} }
_, err := this.Save(op) err := this.Save(op)
return types.Int64(op.Id), err return types.Int64(op.Id), err
} }
@@ -132,7 +132,7 @@ func (this *HTTPFirewallPolicyDAO) UpdateFirewallPolicyInboundAndOutbound(policy
} else { } else {
op.Outbound = "null" op.Outbound = "null"
} }
_, err := this.Save(op) err := this.Save(op)
return err return err
} }
@@ -148,7 +148,7 @@ func (this *HTTPFirewallPolicyDAO) UpdateFirewallPolicyInbound(policyId int64, i
} else { } else {
op.Inbound = "null" op.Inbound = "null"
} }
_, err := this.Save(op) err := this.Save(op)
return err return err
} }
@@ -175,7 +175,7 @@ func (this *HTTPFirewallPolicyDAO) UpdateFirewallPolicy(policyId int64, isOn boo
if len(blockOptionsJSON) > 0 { if len(blockOptionsJSON) > 0 {
op.BlockOptions = blockOptionsJSON op.BlockOptions = blockOptionsJSON
} }
_, err := this.Save(op) err := this.Save(op)
return err return err
} }

View File

@@ -150,7 +150,7 @@ func (this *HTTPFirewallRuleDAO) CreateOrUpdateRuleFromConfig(ruleConfig *firewa
} }
op.CheckpointOptions = checkpointOptionsJSON op.CheckpointOptions = checkpointOptionsJSON
} }
_, err := this.Save(op) err := this.Save(op)
if err != nil { if err != nil {
return 0, err return 0, err
} }

View File

@@ -151,7 +151,7 @@ func (this *HTTPFirewallRuleGroupDAO) CreateGroupFromConfig(groupConfig *firewal
return 0, err return 0, err
} }
op.Sets = setRefsJSON op.Sets = setRefsJSON
_, err = this.Save(op) err = this.Save(op)
if err != nil { if err != nil {
return 0, err return 0, err
} }
@@ -174,7 +174,7 @@ func (this *HTTPFirewallRuleGroupDAO) CreateGroup(isOn bool, name string, descri
op.IsOn = isOn op.IsOn = isOn
op.Name = name op.Name = name
op.Description = description op.Description = description
_, err := this.Save(op) err := this.Save(op)
if err != nil { if err != nil {
return 0, err return 0, err
} }
@@ -191,7 +191,7 @@ func (this *HTTPFirewallRuleGroupDAO) UpdateGroup(groupId int64, isOn bool, name
op.IsOn = isOn op.IsOn = isOn
op.Name = name op.Name = name
op.Description = description op.Description = description
_, err := this.Save(op) err := this.Save(op)
return err return err
} }
@@ -203,6 +203,6 @@ func (this *HTTPFirewallRuleGroupDAO) UpdateGroupSets(groupId int64, setsJSON []
op := NewHTTPFirewallRuleGroupOperator() op := NewHTTPFirewallRuleGroupOperator()
op.Id = groupId op.Id = groupId
op.Sets = setsJSON op.Sets = setsJSON
_, err := this.Save(op) err := this.Save(op)
return err return err
} }

View File

@@ -176,7 +176,7 @@ func (this *HTTPFirewallRuleSetDAO) CreateOrUpdateSetFromConfig(setConfig *firew
return 0, err return 0, err
} }
op.Rules = ruleRefsJSON op.Rules = ruleRefsJSON
_, err = this.Save(op) err = this.Save(op)
if err != nil { if err != nil {
return 0, err return 0, err
} }

View File

@@ -140,7 +140,7 @@ func (this *HTTPGzipDAO) CreateGzip(level int, minLengthJSON []byte, maxLengthJS
if len(condsJSON) > 0 { if len(condsJSON) > 0 {
op.Conds = JSONBytes(condsJSON) op.Conds = JSONBytes(condsJSON)
} }
_, err := this.Save(op) err := this.Save(op)
if err != nil { if err != nil {
return 0, err return 0, err
} }
@@ -164,6 +164,6 @@ func (this *HTTPGzipDAO) UpdateGzip(gzipId int64, level int, minLengthJSON []byt
if len(condsJSON) > 0 { if len(condsJSON) > 0 {
op.Conds = JSONBytes(condsJSON) op.Conds = JSONBytes(condsJSON)
} }
_, err := this.Save(op) err := this.Save(op)
return err return err
} }

View File

@@ -105,7 +105,7 @@ func (this *HTTPHeaderDAO) CreateHeader(name string, value string) (int64, error
} }
op.Status = statusJSON op.Status = statusJSON
_, err = this.Save(op) err = this.Save(op)
if err != nil { if err != nil {
return 0, err return 0, err
} }
@@ -122,7 +122,7 @@ func (this *HTTPHeaderDAO) UpdateHeader(headerId int64, name string, value strin
op.Id = headerId op.Id = headerId
op.Name = name op.Name = name
op.Value = value op.Value = value
_, err := this.Save(op) err := this.Save(op)
// TODO 更新相关配置 // TODO 更新相关配置

View File

@@ -85,7 +85,7 @@ func (this *HTTPHeaderPolicyDAO) CreateHeaderPolicy() (int64, error) {
op := NewHTTPHeaderPolicyOperator() op := NewHTTPHeaderPolicyOperator()
op.IsOn = true op.IsOn = true
op.State = HTTPHeaderPolicyStateEnabled op.State = HTTPHeaderPolicyStateEnabled
_, err := this.Save(op) err := this.Save(op)
if err != nil { if err != nil {
return 0, err return 0, err
} }
@@ -101,7 +101,7 @@ func (this *HTTPHeaderPolicyDAO) UpdateAddingHeaders(policyId int64, headersJSON
op := NewHTTPHeaderPolicyOperator() op := NewHTTPHeaderPolicyOperator()
op.Id = policyId op.Id = policyId
op.AddHeaders = headersJSON op.AddHeaders = headersJSON
_, err := this.Save(op) err := this.Save(op)
return err return err
} }
@@ -115,7 +115,7 @@ func (this *HTTPHeaderPolicyDAO) UpdateSettingHeaders(policyId int64, headersJSO
op := NewHTTPHeaderPolicyOperator() op := NewHTTPHeaderPolicyOperator()
op.Id = policyId op.Id = policyId
op.SetHeaders = headersJSON op.SetHeaders = headersJSON
_, err := this.Save(op) err := this.Save(op)
return err return err
} }
@@ -129,7 +129,7 @@ func (this *HTTPHeaderPolicyDAO) UpdateReplacingHeaders(policyId int64, headersJ
op := NewHTTPHeaderPolicyOperator() op := NewHTTPHeaderPolicyOperator()
op.Id = policyId op.Id = policyId
op.ReplaceHeaders = headersJSON op.ReplaceHeaders = headersJSON
_, err := this.Save(op) err := this.Save(op)
return err return err
} }
@@ -143,7 +143,7 @@ func (this *HTTPHeaderPolicyDAO) UpdateAddingTrailers(policyId int64, headersJSO
op := NewHTTPHeaderPolicyOperator() op := NewHTTPHeaderPolicyOperator()
op.Id = policyId op.Id = policyId
op.AddTrailers = headersJSON op.AddTrailers = headersJSON
_, err := this.Save(op) err := this.Save(op)
return err return err
} }
@@ -162,7 +162,7 @@ func (this *HTTPHeaderPolicyDAO) UpdateDeletingHeaders(policyId int64, headerNam
op := NewHTTPHeaderPolicyOperator() op := NewHTTPHeaderPolicyOperator()
op.Id = policyId op.Id = policyId
op.DeleteHeaders = string(namesJSON) op.DeleteHeaders = string(namesJSON)
_, err = this.Save(op) err = this.Save(op)
return err return err
} }

View File

@@ -98,7 +98,7 @@ func (this *HTTPLocationDAO) CreateLocation(parentId int64, name string, pattern
op.Pattern = pattern op.Pattern = pattern
op.Description = description op.Description = description
op.IsBreak = isBreak op.IsBreak = isBreak
_, err := this.Save(op) err := this.Save(op)
if err != nil { if err != nil {
return 0, err return 0, err
} }
@@ -117,7 +117,7 @@ func (this *HTTPLocationDAO) UpdateLocation(locationId int64, name string, patte
op.Description = description op.Description = description
op.IsOn = isOn op.IsOn = isOn
op.IsBreak = isBreak op.IsBreak = isBreak
_, err := this.Save(op) err := this.Save(op)
return err return err
} }
@@ -197,7 +197,7 @@ func (this *HTTPLocationDAO) UpdateLocationReverseProxy(locationId int64, revers
op := NewHTTPLocationOperator() op := NewHTTPLocationOperator()
op.Id = locationId op.Id = locationId
op.ReverseProxy = JSONBytes(reverseProxyJSON) op.ReverseProxy = JSONBytes(reverseProxyJSON)
_, err := this.Save(op) err := this.Save(op)
return err return err
} }
@@ -218,7 +218,7 @@ func (this *HTTPLocationDAO) UpdateLocationWeb(locationId int64, webId int64) er
op := NewHTTPLocationOperator() op := NewHTTPLocationOperator()
op.Id = locationId op.Id = locationId
op.WebId = webId op.WebId = webId
_, err := this.Save(op) err := this.Save(op)
return err return err
} }

View File

@@ -95,7 +95,7 @@ func (this *HTTPPageDAO) CreatePage(statusList []string, url string, newStatus i
} }
op.Url = url op.Url = url
op.NewStatus = newStatus op.NewStatus = newStatus
_, err = this.Save(op) err = this.Save(op)
if err != nil { if err != nil {
return 0, err return 0, err
} }
@@ -125,7 +125,7 @@ func (this *HTTPPageDAO) UpdatePage(pageId int64, statusList []string, url strin
op.Url = url op.Url = url
op.NewStatus = newStatus op.NewStatus = newStatus
_, err = this.Save(op) err = this.Save(op)
return err return err
} }

View File

@@ -115,7 +115,7 @@ func (this *HTTPRewriteRuleDAO) CreateRewriteRule(pattern string, replace string
op.IsBreak = isBreak op.IsBreak = isBreak
op.WithQuery = withQuery op.WithQuery = withQuery
op.ProxyHost = proxyHost op.ProxyHost = proxyHost
_, err := this.Save(op) err := this.Save(op)
return types.Int64(op.Id), err return types.Int64(op.Id), err
} }
@@ -134,6 +134,6 @@ func (this *HTTPRewriteRuleDAO) UpdateRewriteRule(rewriteRuleId int64, pattern s
op.IsBreak = isBreak op.IsBreak = isBreak
op.WithQuery = withQuery op.WithQuery = withQuery
op.ProxyHost = proxyHost op.ProxyHost = proxyHost
_, err := this.Save(op) err := this.Save(op)
return err return err
} }

View File

@@ -338,7 +338,7 @@ func (this *HTTPWebDAO) CreateWeb(rootJSON []byte) (int64, error) {
op := NewHTTPWebOperator() op := NewHTTPWebOperator()
op.State = HTTPWebStateEnabled op.State = HTTPWebStateEnabled
op.Root = JSONBytes(rootJSON) op.Root = JSONBytes(rootJSON)
_, err := this.Save(op) err := this.Save(op)
if err != nil { if err != nil {
return 0, err return 0, err
} }
@@ -353,7 +353,7 @@ func (this *HTTPWebDAO) UpdateWeb(webId int64, rootJSON []byte) error {
op := NewHTTPWebOperator() op := NewHTTPWebOperator()
op.Id = webId op.Id = webId
op.Root = JSONBytes(rootJSON) op.Root = JSONBytes(rootJSON)
_, err := this.Save(op) err := this.Save(op)
return err return err
} }
@@ -365,7 +365,7 @@ func (this *HTTPWebDAO) UpdateWebGzip(webId int64, gzipJSON []byte) error {
op := NewHTTPWebOperator() op := NewHTTPWebOperator()
op.Id = webId op.Id = webId
op.Gzip = JSONBytes(gzipJSON) op.Gzip = JSONBytes(gzipJSON)
_, err := this.Save(op) err := this.Save(op)
return err return err
} }
@@ -377,7 +377,7 @@ func (this *HTTPWebDAO) UpdateWebCharset(webId int64, charsetJSON []byte) error
op := NewHTTPWebOperator() op := NewHTTPWebOperator()
op.Id = webId op.Id = webId
op.Charset = JSONBytes(charsetJSON) op.Charset = JSONBytes(charsetJSON)
_, err := this.Save(op) err := this.Save(op)
return err return err
} }
@@ -389,7 +389,7 @@ func (this *HTTPWebDAO) UpdateWebRequestHeaderPolicy(webId int64, headerPolicyJS
op := NewHTTPWebOperator() op := NewHTTPWebOperator()
op.Id = webId op.Id = webId
op.RequestHeader = JSONBytes(headerPolicyJSON) op.RequestHeader = JSONBytes(headerPolicyJSON)
_, err := this.Save(op) err := this.Save(op)
return err return err
} }
@@ -401,7 +401,7 @@ func (this *HTTPWebDAO) UpdateWebResponseHeaderPolicy(webId int64, headerPolicyJ
op := NewHTTPWebOperator() op := NewHTTPWebOperator()
op.Id = webId op.Id = webId
op.ResponseHeader = JSONBytes(headerPolicyJSON) op.ResponseHeader = JSONBytes(headerPolicyJSON)
_, err := this.Save(op) err := this.Save(op)
return err return err
} }
@@ -413,7 +413,7 @@ func (this *HTTPWebDAO) UpdateWebPages(webId int64, pagesJSON []byte) error {
op := NewHTTPWebOperator() op := NewHTTPWebOperator()
op.Id = webId op.Id = webId
op.Pages = JSONBytes(pagesJSON) op.Pages = JSONBytes(pagesJSON)
_, err := this.Save(op) err := this.Save(op)
return err return err
} }
@@ -425,7 +425,7 @@ func (this *HTTPWebDAO) UpdateWebShutdown(webId int64, shutdownJSON []byte) erro
op := NewHTTPWebOperator() op := NewHTTPWebOperator()
op.Id = webId op.Id = webId
op.Shutdown = JSONBytes(shutdownJSON) op.Shutdown = JSONBytes(shutdownJSON)
_, err := this.Save(op) err := this.Save(op)
return err return err
} }
@@ -437,7 +437,7 @@ func (this *HTTPWebDAO) UpdateWebAccessLogConfig(webId int64, accessLogJSON []by
op := NewHTTPWebOperator() op := NewHTTPWebOperator()
op.Id = webId op.Id = webId
op.AccessLog = JSONBytes(accessLogJSON) op.AccessLog = JSONBytes(accessLogJSON)
_, err := this.Save(op) err := this.Save(op)
return err return err
} }
@@ -449,7 +449,7 @@ func (this *HTTPWebDAO) UpdateWebStat(webId int64, statJSON []byte) error {
op := NewHTTPWebOperator() op := NewHTTPWebOperator()
op.Id = webId op.Id = webId
op.Stat = JSONBytes(statJSON) op.Stat = JSONBytes(statJSON)
_, err := this.Save(op) err := this.Save(op)
return err return err
} }
@@ -461,7 +461,7 @@ func (this *HTTPWebDAO) UpdateWebCache(webId int64, cacheJSON []byte) error {
op := NewHTTPWebOperator() op := NewHTTPWebOperator()
op.Id = webId op.Id = webId
op.Cache = JSONBytes(cacheJSON) op.Cache = JSONBytes(cacheJSON)
_, err := this.Save(op) err := this.Save(op)
return err return err
} }
@@ -473,7 +473,7 @@ func (this *HTTPWebDAO) UpdateWebFirewall(webId int64, firewallJSON []byte) erro
op := NewHTTPWebOperator() op := NewHTTPWebOperator()
op.Id = webId op.Id = webId
op.Firewall = JSONBytes(firewallJSON) op.Firewall = JSONBytes(firewallJSON)
_, err := this.Save(op) err := this.Save(op)
return err return err
} }
@@ -485,7 +485,7 @@ func (this *HTTPWebDAO) UpdateWebLocations(webId int64, locationsJSON []byte) er
op := NewHTTPWebOperator() op := NewHTTPWebOperator()
op.Id = webId op.Id = webId
op.Locations = JSONBytes(locationsJSON) op.Locations = JSONBytes(locationsJSON)
_, err := this.Save(op) err := this.Save(op)
return err return err
} }
@@ -497,7 +497,7 @@ func (this *HTTPWebDAO) UpdateWebRedirectToHTTPS(webId int64, redirectToHTTPSJSO
op := NewHTTPWebOperator() op := NewHTTPWebOperator()
op.Id = webId op.Id = webId
op.RedirectToHttps = JSONBytes(redirectToHTTPSJSON) op.RedirectToHttps = JSONBytes(redirectToHTTPSJSON)
_, err := this.Save(op) err := this.Save(op)
return err return err
} }
@@ -509,7 +509,7 @@ func (this *HTTPWebDAO) UpdateWebsocket(webId int64, websocketJSON []byte) error
op := NewHTTPWebOperator() op := NewHTTPWebOperator()
op.Id = webId op.Id = webId
op.Websocket = JSONBytes(websocketJSON) op.Websocket = JSONBytes(websocketJSON)
_, err := this.Save(op) err := this.Save(op)
return err return err
} }
@@ -521,7 +521,7 @@ func (this *HTTPWebDAO) UpdateWebRewriteRules(webId int64, rewriteRulesJSON []by
op := NewHTTPWebOperator() op := NewHTTPWebOperator()
op.Id = webId op.Id = webId
op.RewriteRules = JSONBytes(rewriteRulesJSON) op.RewriteRules = JSONBytes(rewriteRulesJSON)
_, err := this.Save(op) err := this.Save(op)
return err return err
} }

View File

@@ -123,7 +123,7 @@ func (this *HTTPWebsocketDAO) CreateWebsocket(handshakeTimeoutJSON []byte, allow
} }
op.RequestSameOrigin = requestSameOrigin op.RequestSameOrigin = requestSameOrigin
op.RequestOrigin = requestOrigin op.RequestOrigin = requestOrigin
_, err = this.Save(op) err = this.Save(op)
return types.Int64(op.Id), err return types.Int64(op.Id), err
} }
@@ -149,6 +149,6 @@ func (this *HTTPWebsocketDAO) UpdateWebsocket(websocketId int64, handshakeTimeou
} }
op.RequestSameOrigin = requestSameOrigin op.RequestSameOrigin = requestSameOrigin
op.RequestOrigin = requestOrigin op.RequestOrigin = requestOrigin
_, err := this.Save(op) err := this.Save(op)
return err return err
} }

View File

@@ -89,7 +89,7 @@ func (this *IPItemDAO) CreateIPItem(listId int64, ipFrom string, ipTo string, ex
} }
op.ExpiredAt = expiredAt op.ExpiredAt = expiredAt
op.State = IPItemStateEnabled op.State = IPItemStateEnabled
_, err = this.Save(op) err = this.Save(op)
if err != nil { if err != nil {
return 0, err return 0, err
} }
@@ -128,7 +128,7 @@ func (this *IPItemDAO) UpdateIPItem(itemId int64, ipFrom string, ipTo string, ex
} }
op.ExpiredAt = expiredAt op.ExpiredAt = expiredAt
op.Version = version op.Version = version
_, err = this.Save(op) err = this.Save(op)
return err return err
} }

View File

@@ -96,7 +96,7 @@ func (this *IPLibraryDAO) CreateIPLibrary(libraryType string, fileId int64) (int
op.Type = libraryType op.Type = libraryType
op.FileId = fileId op.FileId = fileId
op.State = IPLibraryStateEnabled op.State = IPLibraryStateEnabled
_, err := this.Save(op) err := this.Save(op)
if err != nil { if err != nil {
return 0, err return 0, err
} }

View File

@@ -85,7 +85,7 @@ func (this *IPListDAO) CreateIPList(listType ipconfigs.IPListType, name string,
if len(timeoutJSON) > 0 { if len(timeoutJSON) > 0 {
op.Timeout = timeoutJSON op.Timeout = timeoutJSON
} }
_, err := this.Save(op) err := this.Save(op)
if err != nil { if err != nil {
return 0, err return 0, err
} }
@@ -106,7 +106,7 @@ func (this *IPListDAO) UpdateIPList(listId int64, name string, code string, time
} else { } else {
op.Timeout = "null" op.Timeout = "null"
} }
_, err := this.Save(op) err := this.Save(op)
return err return err
} }

View File

@@ -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.AdminId, op.Level, op.Description, op.Action, op.Ip = adminId, level, description, action, ip
op.Day = timeutil.Format("Ymd") op.Day = timeutil.Format("Ymd")
op.Type = LogTypeAdmin op.Type = LogTypeAdmin
_, err := this.Save(op) err := this.Save(op)
return err return err
} }

View File

@@ -120,7 +120,7 @@ func (this *MessageDAO) CreateMessage(adminId int64, userId int64, messageType M
op.IsRead = false op.IsRead = false
op.Day = timeutil.Format("Ymd") op.Day = timeutil.Format("Ymd")
op.Hash = hash op.Hash = hash
_, err := this.Save(op) err := this.Save(op)
return err return err
} }
@@ -161,7 +161,7 @@ func (this *MessageDAO) UpdateMessageRead(messageId int64, b bool) error {
op := NewMessageOperator() op := NewMessageOperator()
op.Id = messageId op.Id = messageId
op.IsRead = b op.IsRead = b
_, err := this.Save(op) err := this.Save(op)
return err return err
} }
@@ -213,7 +213,7 @@ func (this *MessageDAO) createMessage(clusterId int64, nodeId int64, messageType
op.Day = timeutil.Format("Ymd") op.Day = timeutil.Format("Ymd")
op.Hash = hash op.Hash = hash
_, err := this.Save(op) err := this.Save(op)
if err != nil { if err != nil {
return 0, err return 0, err
} }

View File

@@ -138,7 +138,7 @@ func (this *NodeClusterDAO) CreateCluster(adminId int64, name string, grantId in
op.UniqueId = uniqueId op.UniqueId = uniqueId
op.Secret = secret op.Secret = secret
op.State = NodeClusterStateEnabled op.State = NodeClusterStateEnabled
_, err = this.Save(op) err = this.Save(op)
if err != nil { if err != nil {
return 0, err return 0, err
} }
@@ -156,7 +156,7 @@ func (this *NodeClusterDAO) UpdateCluster(clusterId int64, name string, grantId
op.Name = name op.Name = name
op.GrantId = grantId op.GrantId = grantId
op.InstallDir = installDir op.InstallDir = installDir
_, err := this.Save(op) err := this.Save(op)
return err return err
} }
@@ -264,7 +264,7 @@ func (this *NodeClusterDAO) UpdateClusterHealthCheck(clusterId int64, healthChec
op := NewNodeClusterOperator() op := NewNodeClusterOperator()
op.Id = clusterId op.Id = clusterId
op.HealthCheck = healthCheckJSON op.HealthCheck = healthCheckJSON
_, err := this.Save(op) err := this.Save(op)
return err return err
} }
@@ -408,7 +408,7 @@ func (this *NodeClusterDAO) UpdateClusterDNS(clusterId int64, dnsName string, dn
} }
op.Dns = dnsJSON op.Dns = dnsJSON
_, err = this.Save(op) err = this.Save(op)
return err return err
} }
@@ -561,7 +561,7 @@ func (this *NodeClusterDAO) UpdateClusterTOA(clusterId int64, toaJSON []byte) er
op := NewNodeClusterOperator() op := NewNodeClusterOperator()
op.Id = clusterId op.Id = clusterId
op.Toa = toaJSON op.Toa = toaJSON
_, err := this.Save(op) err := this.Save(op)
return err return err
} }

View File

@@ -103,7 +103,7 @@ func (this *NodeDAO) CreateNode(adminId int64, name string, clusterId int64, gro
op.GroupId = groupId op.GroupId = groupId
op.IsOn = 1 op.IsOn = 1
op.State = NodeStateEnabled op.State = NodeStateEnabled
_, err = this.Save(op) err = this.Save(op)
if err != nil { if err != nil {
return 0, err 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.LatestVersion = dbs.SQL("latestVersion+1")
op.MaxCPU = maxCPU op.MaxCPU = maxCPU
op.IsOn = isOn op.IsOn = isOn
_, err := this.Save(op) err := this.Save(op)
return err return err
} }
@@ -136,7 +136,7 @@ func (this *NodeDAO) UpdateNodeLatestVersion(nodeId int64) error {
op := NewNodeOperator() op := NewNodeOperator()
op.Id = nodeId op.Id = nodeId
op.LatestVersion = dbs.SQL("latestVersion+1") op.LatestVersion = dbs.SQL("latestVersion+1")
_, err := this.Save(op) err := this.Save(op)
return err return err
} }
@@ -528,7 +528,7 @@ func (this *NodeDAO) UpdateNodeConnectedAPINodes(nodeId int64, apiNodeIds []int6
} else { } else {
op.ConnectedAPINodes = "[]" op.ConnectedAPINodes = "[]"
} }
_, err := this.Save(op) err := this.Save(op)
return err return err
} }
@@ -660,7 +660,7 @@ func (this *NodeDAO) UpdateNodeDNS(nodeId int64, routes map[int64][]string) erro
op := NewNodeOperator() op := NewNodeOperator()
op.Id = nodeId op.Id = nodeId
op.DnsRoutes = routesJSON op.DnsRoutes = routesJSON
_, err = this.Save(op) err = this.Save(op)
return err return err
} }
@@ -712,7 +712,7 @@ func (this *NodeDAO) UpdateNodeUp(nodeId int64, isUp bool, maxUp int, maxDown in
op.CountUp = countUp op.CountUp = countUp
op.CountDown = countDown op.CountDown = countDown
_, err = this.Save(op) err = this.Save(op)
if err != nil { if err != nil {
return false, err return false, err
} }

View File

@@ -90,7 +90,7 @@ func (this *NodeGrantDAO) CreateGrant(adminId int64, name string, method string,
op.Description = description op.Description = description
op.NodeId = nodeId op.NodeId = nodeId
op.State = NodeGrantStateEnabled op.State = NodeGrantStateEnabled
_, err = this.Save(op) err = this.Save(op)
return types.Int64(op.Id), err return types.Int64(op.Id), err
} }
@@ -115,7 +115,7 @@ func (this *NodeGrantDAO) UpdateGrant(grantId int64, name string, method string,
} }
op.Description = description op.Description = description
op.NodeId = nodeId op.NodeId = nodeId
_, err := this.Save(op) err := this.Save(op)
return err return err
} }

View File

@@ -77,7 +77,7 @@ func (this *NodeGroupDAO) CreateNodeGroup(clusterId int64, name string) (int64,
op.ClusterId = clusterId op.ClusterId = clusterId
op.Name = name op.Name = name
op.State = NodeGroupStateEnabled op.State = NodeGroupStateEnabled
_, err := this.Save(op) err := this.Save(op)
if err != nil { if err != nil {
return 0, err return 0, err
} }
@@ -92,7 +92,7 @@ func (this *NodeGroupDAO) UpdateNodeGroup(groupId int64, name string) error {
op := NewNodeGroupOperator() op := NewNodeGroupOperator()
op.Id = groupId op.Id = groupId
op.Name = name op.Name = name
_, err := this.Save(op) err := this.Save(op)
return err return err
} }

View File

@@ -92,7 +92,7 @@ func (this *NodeIPAddressDAO) CreateAddress(nodeId int64, name string, ip string
op.Ip = ip op.Ip = ip
op.CanAccess = canAccess op.CanAccess = canAccess
op.State = NodeIPAddressStateEnabled op.State = NodeIPAddressStateEnabled
_, err = this.Save(op) err = this.Save(op)
if err != nil { if err != nil {
return 0, err return 0, err
} }
@@ -111,7 +111,7 @@ func (this *NodeIPAddressDAO) UpdateAddress(addressId int64, name string, ip str
op.Ip = ip op.Ip = ip
op.CanAccess = canAccess op.CanAccess = canAccess
op.State = NodeIPAddressStateEnabled // 恢复状态 op.State = NodeIPAddressStateEnabled // 恢复状态
_, err = this.Save(op) err = this.Save(op)
return err return err
} }
@@ -123,7 +123,7 @@ func (this *NodeIPAddressDAO) UpdateAddressIP(addressId int64, ip string) error
op := NewNodeIPAddressOperator() op := NewNodeIPAddressOperator()
op.Id = addressId op.Id = addressId
op.Ip = ip op.Ip = ip
_, err := this.Save(op) err := this.Save(op)
return err return err
} }

View File

@@ -43,7 +43,7 @@ func (this *NodeLogDAO) CreateLog(nodeRole NodeRole, nodeId int64, level string,
op.Description = description op.Description = description
op.CreatedAt = createdAt op.CreatedAt = createdAt
op.Day = timeutil.FormatTime("Ymd", createdAt) op.Day = timeutil.FormatTime("Ymd", createdAt)
_, err := this.Save(op) err := this.Save(op)
return err return err
} }

View File

@@ -81,7 +81,7 @@ func (this *NodeLoginDAO) CreateNodeLogin(nodeId int64, name string, loginType s
login.Type = loginType login.Type = loginType
login.Params = string(paramsJSON) login.Params = string(paramsJSON)
login.State = NodeLoginStateEnabled login.State = NodeLoginStateEnabled
_, err = this.Save(login) err = this.Save(login)
return types.Int64(login.Id), err return types.Int64(login.Id), err
} }
@@ -95,7 +95,7 @@ func (this *NodeLoginDAO) UpdateNodeLogin(loginId int64, name string, loginType
login.Name = name login.Name = name
login.Type = loginType login.Type = loginType
login.Params = string(paramsJSON) login.Params = string(paramsJSON)
_, err := this.Save(login) err := this.Save(login)
return err return err
} }

View File

@@ -102,7 +102,7 @@ func (this *OriginDAO) CreateOrigin(name string, addrJSON string, description st
} }
op.Weight = weight op.Weight = weight
op.State = OriginStateEnabled op.State = OriginStateEnabled
_, err = this.Save(op) err = this.Save(op)
if err != nil { if err != nil {
return return
} }
@@ -125,7 +125,7 @@ func (this *OriginDAO) UpdateOrigin(originId int64, name string, addrJSON string
op.Weight = weight op.Weight = weight
op.IsOn = isOn op.IsOn = isOn
op.Version = dbs.SQL("version+1") op.Version = dbs.SQL("version+1")
_, err := this.Save(op) err := this.Save(op)
return err return err
} }

View File

@@ -94,7 +94,7 @@ func (this *RegionCityDAO) CreateCity(provinceId int64, name string, dataId stri
return 0, err return 0, err
} }
op.Codes = codesJSON op.Codes = codesJSON
_, err = this.Save(op) err = this.Save(op)
if err != nil { if err != nil {
return 0, err return 0, err
} }

View File

@@ -114,7 +114,7 @@ func (this *RegionCountryDAO) CreateCountry(name string, dataId string) (int64,
op.DataId = dataId op.DataId = dataId
op.State = RegionCountryStateEnabled op.State = RegionCountryStateEnabled
_, err = this.Save(op) err = this.Save(op)
if err != nil { if err != nil {
return 0, err return 0, err
} }

View File

@@ -104,7 +104,7 @@ func (this *RegionProvinceDAO) CreateProvince(countryId int64, name string, data
return 0, err return 0, err
} }
op.Codes = codesJSON op.Codes = codesJSON
_, err = this.Save(op) err = this.Save(op)
if err != nil { if err != nil {
return 0, err return 0, err
} }

View File

@@ -164,7 +164,7 @@ func (this *ReverseProxyDAO) CreateReverseProxy(schedulingJSON []byte, primaryOr
if len(backupOriginsJSON) > 0 { if len(backupOriginsJSON) > 0 {
op.BackupOrigins = string(backupOriginsJSON) op.BackupOrigins = string(backupOriginsJSON)
} }
_, err := this.Save(op) err := this.Save(op)
if err != nil { if err != nil {
return 0, err return 0, err
} }
@@ -184,7 +184,7 @@ func (this *ReverseProxyDAO) UpdateReverseProxyScheduling(reverseProxyId int64,
} else { } else {
op.Scheduling = "null" op.Scheduling = "null"
} }
_, err := this.Save(op) err := this.Save(op)
return err return err
} }
@@ -201,7 +201,7 @@ func (this *ReverseProxyDAO) UpdateReverseProxyPrimaryOrigins(reverseProxyId int
} else { } else {
op.PrimaryOrigins = "[]" op.PrimaryOrigins = "[]"
} }
_, err := this.Save(op) err := this.Save(op)
return err return err
} }
@@ -218,7 +218,7 @@ func (this *ReverseProxyDAO) UpdateReverseProxyBackupOrigins(reverseProxyId int6
} else { } else {
op.BackupOrigins = "[]" op.BackupOrigins = "[]"
} }
_, err := this.Save(op) err := this.Save(op)
return err return err
} }
@@ -241,7 +241,7 @@ func (this *ReverseProxyDAO) UpdateReverseProxy(reverseProxyId int64, requestHos
op.RequestURI = requestURI op.RequestURI = requestURI
op.StripPrefix = stripPrefix op.StripPrefix = stripPrefix
op.AutoFlush = autoFlush op.AutoFlush = autoFlush
_, err := this.Save(op) err := this.Save(op)
return err return err
} }

View File

@@ -148,7 +148,7 @@ func (this *ServerDAO) CreateServer(adminId int64, userId int64, serverType serv
op.Version = 1 op.Version = 1
op.IsOn = 1 op.IsOn = 1
op.State = ServerStateEnabled op.State = ServerStateEnabled
_, err = this.Save(op) err = this.Save(op)
if err != nil { if err != nil {
return 0, err return 0, err
@@ -191,7 +191,7 @@ func (this *ServerDAO) UpdateServerBasic(serverId int64, name string, descriptio
op.GroupIds = groupIdsJSON op.GroupIds = groupIdsJSON
} }
_, err := this.Save(op) err := this.Save(op)
if err != nil { if err != nil {
return err return err
} }
@@ -243,7 +243,7 @@ func (this *ServerDAO) UpdateServerConfig(serverId int64, configJSON []byte, upd
if updateMd5 { if updateMd5 {
op.ConfigMd5 = newConfigMd5 op.ConfigMd5 = newConfigMd5
} }
_, err = this.Save(op) err = this.Save(op)
return true, err return true, err
} }
@@ -455,7 +455,7 @@ func (this *ServerDAO) UpdateServerReverseProxy(serverId int64, config []byte) e
op := NewServerOperator() op := NewServerOperator()
op.Id = serverId op.Id = serverId
op.ReverseProxy = JSONBytes(config) op.ReverseProxy = JSONBytes(config)
_, err := this.Save(op) err := this.Save(op)
if err != nil { if err != nil {
return err return err
} }
@@ -886,7 +886,7 @@ func (this *ServerDAO) GenerateServerDNSName(serverId int64) (string, error) {
op := NewServerOperator() op := NewServerOperator()
op.Id = serverId op.Id = serverId
op.DnsName = dnsName op.DnsName = dnsName
_, err = this.Save(op) err = this.Save(op)
return dnsName, err return dnsName, err
} }

View File

@@ -77,7 +77,7 @@ func (this *ServerGroupDAO) CreateGroup(name string) (groupId int64, err error)
op := NewServerGroupOperator() op := NewServerGroupOperator()
op.State = ServerGroupStateEnabled op.State = ServerGroupStateEnabled
op.Name = name op.Name = name
_, err = this.Save(op) err = this.Save(op)
if err != nil { if err != nil {
return 0, err return 0, err
} }
@@ -92,7 +92,7 @@ func (this *ServerGroupDAO) UpdateGroup(groupId int64, name string) error {
op := NewServerGroupOperator() op := NewServerGroupOperator()
op.Id = groupId op.Id = groupId
op.Name = name op.Name = name
_, err := this.Save(op) err := this.Save(op)
return err return err
} }

View File

@@ -118,7 +118,7 @@ func (this *SSLCertDAO) CreateCert(adminId int64, userId int64, isOn bool, name
} }
op.CommonNames = commonNamesJSON op.CommonNames = commonNamesJSON
_, err = this.Save(op) err = this.Save(op)
if err != nil { if err != nil {
return 0, err return 0, err
} }
@@ -161,7 +161,7 @@ func (this *SSLCertDAO) UpdateCert(certId int64, isOn bool, name string, descrip
} }
op.CommonNames = commonNamesJSON op.CommonNames = commonNamesJSON
_, err = this.Save(op) err = this.Save(op)
return err return err
} }
@@ -281,7 +281,7 @@ func (this *SSLCertDAO) UpdateCertACME(certId int64, acmeTaskId int64) error {
op.Id = certId op.Id = certId
op.AcmeTaskId = acmeTaskId op.AcmeTaskId = acmeTaskId
op.IsACME = true op.IsACME = true
_, err := this.Save(op) err := this.Save(op)
return err return err
} }

View File

@@ -214,7 +214,7 @@ func (this *SSLPolicyDAO) CreatePolicy(http2Enabled bool, minVersion string, cer
} }
op.CipherSuites = cipherSuitesJSON op.CipherSuites = cipherSuitesJSON
} }
_, err := this.Save(op) err := this.Save(op)
if err != nil { if err != nil {
return 0, err return 0, err
} }
@@ -255,6 +255,6 @@ func (this *SSLPolicyDAO) UpdatePolicy(policyId int64, http2Enabled bool, minVer
} else { } else {
op.CipherSuites = "[]" op.CipherSuites = "[]"
} }
_, err := this.Save(op) err := this.Save(op)
return err return err
} }

View File

@@ -44,7 +44,7 @@ func (this *SysEventDAO) CreateEvent(event EventInterface) error {
} }
op.Params = eventJSON op.Params = eventJSON
_, err = this.Save(op) err = this.Save(op)
return err return err
} }

View File

@@ -50,7 +50,7 @@ func (this *SysLockerDAO) Lock(key string, timeout int64) (bool, error) {
op.Key = key op.Key = key
op.TimeoutAt = time.Now().Unix() + timeout op.TimeoutAt = time.Now().Unix() + timeout
op.Version = 1 op.Version = 1
_, err := this.Save(op) err := this.Save(op)
if err != nil { if err != nil {
maxErrors-- maxErrors--
if maxErrors < 0 { if maxErrors < 0 {
@@ -73,7 +73,7 @@ func (this *SysLockerDAO) Lock(key string, timeout int64) (bool, error) {
op.Id = locker.Id op.Id = locker.Id
op.Version = locker.Version + 1 op.Version = locker.Version + 1
op.TimeoutAt = time.Now().Unix() + timeout op.TimeoutAt = time.Now().Unix() + timeout
_, err = this.Save(op) err = this.Save(op)
if err != nil { if err != nil {
maxErrors-- maxErrors--
if maxErrors < 0 { if maxErrors < 0 {

View File

@@ -63,7 +63,7 @@ func (this *SysSettingDAO) UpdateSetting(codeFormat string, valueJSON []byte, co
op := NewSysSettingOperator() op := NewSysSettingOperator()
op.Code = codeFormat op.Code = codeFormat
op.Value = valueJSON op.Value = valueJSON
_, err = this.Save(op) err = this.Save(op)
if err != nil { if err != nil {
lastErr = err lastErr = err
@@ -77,7 +77,7 @@ func (this *SysSettingDAO) UpdateSetting(codeFormat string, valueJSON []byte, co
op := NewSysSettingOperator() op := NewSysSettingOperator()
op.Id = settingId op.Id = settingId
op.Value = valueJSON op.Value = valueJSON
_, err = this.Save(op) err = this.Save(op)
if err != nil { if err != nil {
return err return err
} }

View File

@@ -98,7 +98,7 @@ func (this *UserDAO) CreateUser(username string, password string, fullname strin
op.IsOn = true op.IsOn = true
op.State = UserStateEnabled op.State = UserStateEnabled
_, err := this.Save(op) err := this.Save(op)
if err != nil { if err != nil {
return 0, err return 0, err
} }
@@ -122,7 +122,7 @@ func (this *UserDAO) UpdateUser(userId int64, username string, password string,
op.Email = email op.Email = email
op.Remark = remark op.Remark = remark
op.IsOn = isOn op.IsOn = isOn
_, err := this.Save(op) err := this.Save(op)
return err return err
} }

View File

@@ -126,13 +126,13 @@ func (this *SQLDump) Apply(db *dbs.DB, newResult *SQLDumpResult) (ops []string,
oldField := oldTable.FindField(newField.Name) oldField := oldTable.FindField(newField.Name)
if oldField == nil { if oldField == nil {
ops = append(ops, "+ "+newTable.Name+" "+newField.Name) 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 { if err != nil {
return nil, err return nil, err
} }
} else if oldField.Definition != newField.Definition { } else if !newField.EqualDefinition(oldField.Definition) {
ops = append(ops, "* "+newTable.Name+" "+newField.Name) 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 { if err != nil {
return nil, err return nil, err
} }
@@ -180,7 +180,7 @@ func (this *SQLDump) Apply(db *dbs.DB, newResult *SQLDumpResult) (ops []string,
newField := newTable.FindField(oldField.Name) newField := newTable.FindField(oldField.Name)
if newField == nil { if newField == nil {
ops = append(ops, "- field "+oldTable.Name+" "+oldField.Name) 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 { if err != nil {
return nil, err return nil, err
} }

View File

@@ -79,6 +79,9 @@ func (this *SQLExecutor) checkData(db *dbs.DB) error {
// 检查集群配置 // 检查集群配置
err = this.checkCluster(db) err = this.checkCluster(db)
if err != nil {
return err
}
// 更新版本号 // 更新版本号
err = this.updateVersion(db, teaconst.Version) err = this.updateVersion(db, teaconst.Version)

View File

@@ -1,6 +1,19 @@
package setup package setup
import "regexp"
type SQLField struct { type SQLField struct {
Name string `json:"name"` Name string `json:"name"`
Definition string `json:"definition"` 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
}

View File

@@ -84,7 +84,7 @@ func (this *LogTask) loopClean(seconds int64) error {
func (this *LogTask) runMonitor() { func (this *LogTask) runMonitor() {
ticker := utils.NewTicker(1 * time.Minute) ticker := utils.NewTicker(1 * time.Minute)
for ticker.Wait() { for ticker.Wait() {
err := this.loopClean(60) err := this.loopMonitor(60)
if err != nil { if err != nil {
logs.Println("[TASK][LOG]" + err.Error()) logs.Println("[TASK][LOG]" + err.Error())
} }