From e2a0fcbd8c978a7bce0b7028e3602e6869ed8ebe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E7=A5=A5=E8=B6=85?= Date: Mon, 30 Nov 2020 20:00:44 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=8F=8D=E5=90=91=E4=BB=A3=E7=90=86]=E6=BA=90?= =?UTF-8?q?=E7=AB=99=E5=8F=AF=E4=BB=A5=E8=AE=BE=E7=BD=AE=E5=90=8D=E7=A7=B0?= =?UTF-8?q?=E3=80=81=E6=8F=8F=E8=BF=B0=E3=80=81=E6=98=AF=E5=90=A6=E5=90=AF?= =?UTF-8?q?=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- internal/db/models/origin_dao.go | 7 ++++--- internal/rpc/services/service_origin.go | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/internal/db/models/origin_dao.go b/internal/db/models/origin_dao.go index 50df4ca4..9ecf0ef5 100644 --- a/internal/db/models/origin_dao.go +++ b/internal/db/models/origin_dao.go @@ -91,9 +91,9 @@ func (this *OriginDAO) FindOriginName(id int64) (string, error) { } // 创建源站 -func (this *OriginDAO) CreateOrigin(name string, addrJSON string, description string, weight int32) (originId int64, err error) { +func (this *OriginDAO) CreateOrigin(name string, addrJSON string, description string, weight int32, isOn bool) (originId int64, err error) { op := NewOriginOperator() - op.IsOn = true + op.IsOn = isOn op.Name = name op.Addr = addrJSON op.Description = description @@ -110,7 +110,7 @@ func (this *OriginDAO) CreateOrigin(name string, addrJSON string, description st } // 修改源站 -func (this *OriginDAO) UpdateOrigin(originId int64, name string, addrJSON string, description string, weight int32) error { +func (this *OriginDAO) UpdateOrigin(originId int64, name string, addrJSON string, description string, weight int32, isOn bool) error { if originId <= 0 { return errors.New("invalid originId") } @@ -123,6 +123,7 @@ func (this *OriginDAO) UpdateOrigin(originId int64, name string, addrJSON string weight = 0 } op.Weight = weight + op.IsOn = isOn op.Version = dbs.SQL("version+1") _, err := this.Save(op) return err diff --git a/internal/rpc/services/service_origin.go b/internal/rpc/services/service_origin.go index b95f07e9..3e6020bf 100644 --- a/internal/rpc/services/service_origin.go +++ b/internal/rpc/services/service_origin.go @@ -30,7 +30,7 @@ func (this *OriginService) CreateOrigin(ctx context.Context, req *pb.CreateOrigi "portRange": req.Addr.PortRange, "host": req.Addr.Host, } - originId, err := models.SharedOriginDAO.CreateOrigin(req.Name, string(addrMap.AsJSON()), req.Description, req.Weight) + originId, err := models.SharedOriginDAO.CreateOrigin(req.Name, string(addrMap.AsJSON()), req.Description, req.Weight, req.IsOn) if err != nil { return nil, err } @@ -53,7 +53,7 @@ func (this *OriginService) UpdateOrigin(ctx context.Context, req *pb.UpdateOrigi "portRange": req.Addr.PortRange, "host": req.Addr.Host, } - err = models.SharedOriginDAO.UpdateOrigin(req.OriginId, req.Name, string(addrMap.AsJSON()), req.Description, req.Weight) + err = models.SharedOriginDAO.UpdateOrigin(req.OriginId, req.Name, string(addrMap.AsJSON()), req.Description, req.Weight, req.IsOn) if err != nil { return nil, err }