From 433055941553458723a403c48aa55a05aacb0469 Mon Sep 17 00:00:00 2001 From: GoEdgeLab Date: Thu, 17 Mar 2022 15:48:40 +0800 Subject: [PATCH] =?UTF-8?q?=E6=BA=90=E7=AB=99=E6=94=AF=E6=8C=81=E8=87=AA?= =?UTF-8?q?=E5=AE=9A=E4=B9=89=E5=9B=9E=E6=BA=90=E4=B8=BB=E6=9C=BA=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- internal/db/models/origin_dao.go | 16 +++++++++++----- internal/rpc/services/service_origin.go | 4 ++-- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/internal/db/models/origin_dao.go b/internal/db/models/origin_dao.go index 7ae9bcb4..280c3f34 100644 --- a/internal/db/models/origin_dao.go +++ b/internal/db/models/origin_dao.go @@ -100,8 +100,9 @@ func (this *OriginDAO) CreateOrigin(tx *dbs.Tx, maxConns int32, maxIdleConns int32, certRef *sslconfigs.SSLCertRef, - domains []string) (originId int64, err error) { - op := NewOriginOperator() + domains []string, + host string) (originId int64, err error) { + var op = NewOriginOperator() op.AdminId = adminId op.UserId = userId op.IsOn = isOn @@ -165,6 +166,8 @@ func (this *OriginDAO) CreateOrigin(tx *dbs.Tx, op.Domains = "[]" } + op.Host = host + op.State = OriginStateEnabled err = this.Save(tx, op) if err != nil { @@ -187,11 +190,12 @@ func (this *OriginDAO) UpdateOrigin(tx *dbs.Tx, maxConns int32, maxIdleConns int32, certRef *sslconfigs.SSLCertRef, - domains []string) error { + domains []string, + host string) error { if originId <= 0 { return errors.New("invalid originId") } - op := NewOriginOperator() + var op = NewOriginOperator() op.Id = originId op.Name = name op.Addr = addrJSON @@ -257,6 +261,8 @@ func (this *OriginDAO) UpdateOrigin(tx *dbs.Tx, op.Domains = "[]" } + op.Host = host + err := this.Save(tx, op) if err != nil { return err @@ -284,7 +290,7 @@ func (this *OriginDAO) ComposeOriginConfig(tx *dbs.Tx, originId int64, cacheMap return nil, nil } - config := &serverconfigs.OriginConfig{ + var config = &serverconfigs.OriginConfig{ Id: int64(origin.Id), IsOn: origin.IsOn == 1, Version: int(origin.Version), diff --git a/internal/rpc/services/service_origin.go b/internal/rpc/services/service_origin.go index 57764e3e..e0c445e4 100644 --- a/internal/rpc/services/service_origin.go +++ b/internal/rpc/services/service_origin.go @@ -72,7 +72,7 @@ func (this *OriginService) CreateOrigin(ctx context.Context, req *pb.CreateOrigi } } - originId, err := models.SharedOriginDAO.CreateOrigin(tx, adminId, userId, req.Name, string(addrMap.AsJSON()), req.Description, req.Weight, req.IsOn, connTimeout, readTimeout, idleTimeout, req.MaxConns, req.MaxIdleConns, certRef, req.Domains) + originId, err := models.SharedOriginDAO.CreateOrigin(tx, adminId, userId, req.Name, string(addrMap.AsJSON()), req.Description, req.Weight, req.IsOn, connTimeout, readTimeout, idleTimeout, req.MaxConns, req.MaxIdleConns, certRef, req.Domains, req.Host) if err != nil { return nil, err } @@ -139,7 +139,7 @@ func (this *OriginService) UpdateOrigin(ctx context.Context, req *pb.UpdateOrigi } } - err = models.SharedOriginDAO.UpdateOrigin(tx, req.OriginId, req.Name, string(addrMap.AsJSON()), req.Description, req.Weight, req.IsOn, connTimeout, readTimeout, idleTimeout, req.MaxConns, req.MaxIdleConns, certRef, req.Domains) + err = models.SharedOriginDAO.UpdateOrigin(tx, req.OriginId, req.Name, string(addrMap.AsJSON()), req.Description, req.Weight, req.IsOn, connTimeout, readTimeout, idleTimeout, req.MaxConns, req.MaxIdleConns, certRef, req.Domains, req.Host) if err != nil { return nil, err }