From c677368482df1828aad31b05e9dfbd77778d5d16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E7=A5=A5=E8=B6=85?= Date: Sun, 8 May 2022 19:33:10 +0800 Subject: [PATCH] =?UTF-8?q?=E9=9B=86=E7=BE=A4=E8=8A=82=E7=82=B9=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E5=8F=AF=E4=BB=A5=E4=BD=BF=E7=94=A8=E2=80=9C=E6=9C=AA?= =?UTF-8?q?=E5=88=86=E7=BB=84=E2=80=9D=E7=AD=9B=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- go.mod | 5 ++++- internal/db/models/node_dao.go | 4 ++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 543c4709..75b8b6e4 100644 --- a/go.mod +++ b/go.mod @@ -4,15 +4,18 @@ go 1.16 replace github.com/TeaOSLab/EdgeCommon => ../EdgeCommon +replace github.com/TeaOSLab/EdgePlus => ../EdgePlus + require ( github.com/TeaOSLab/EdgeCommon v0.0.0-00010101000000-000000000000 + github.com/TeaOSLab/EdgePlus v0.0.0-00010101000000-000000000000 github.com/aliyun/alibaba-cloud-sdk-go v1.61.1183 github.com/andybalholm/brotli v1.0.4 github.com/cespare/xxhash/v2 v2.1.1 github.com/go-acme/lego/v4 v4.5.2 github.com/go-sql-driver/mysql v1.5.0 github.com/golang/protobuf v1.5.2 - github.com/iwind/TeaGo v0.0.0-20220408064305-92be81dc2f7c + github.com/iwind/TeaGo v0.0.0-20220408111647-f36b9bba3570 github.com/iwind/gosock v0.0.0-20210722083328-12b2d66abec3 github.com/json-iterator/go v1.1.12 // indirect github.com/mozillazg/go-pinyin v0.18.0 diff --git a/internal/db/models/node_dao.go b/internal/db/models/node_dao.go index 16675bb4..389c452f 100644 --- a/internal/db/models/node_dao.go +++ b/internal/db/models/node_dao.go @@ -360,6 +360,8 @@ func (this *NodeDAO) ListEnabledNodesMatch(tx *dbs.Tx, // 分组 if groupId > 0 { query.Attr("groupId", groupId) + } else if groupId < 0 { + query.Attr("groupId", 0) } // 区域 @@ -757,6 +759,8 @@ func (this *NodeDAO) CountAllEnabledNodesMatch(tx *dbs.Tx, // 分组 if groupId > 0 { query.Attr("groupId", groupId) + } else if groupId < 0 { + query.Attr("groupId", 0) } // 区域