diff --git a/internal/db/models/node_ip_address_dao.go b/internal/db/models/node_ip_address_dao.go index 33a17b61..07d661bb 100644 --- a/internal/db/models/node_ip_address_dao.go +++ b/internal/db/models/node_ip_address_dao.go @@ -223,6 +223,8 @@ func (this *NodeIPAddressDAO) FindFirstNodeAccessIPAddress(tx *dbs.Tx, nodeId in Attr("role", role). State(NodeIPAddressStateEnabled). Attr("canAccess", true). + Attr("isOn", true). + Attr("isUp", true). Desc("order"). AscPk(). Result("ip"). @@ -239,6 +241,8 @@ func (this *NodeIPAddressDAO) FindFirstNodeAccessIPAddressId(tx *dbs.Tx, nodeId Attr("role", role). State(NodeIPAddressStateEnabled). Attr("canAccess", true). + Attr("isOn", true). + Attr("isUp", true). Desc("order"). AscPk(). Result("id"). diff --git a/internal/db/models/node_ip_address_log_dao_test.go b/internal/db/models/node_ip_address_log_dao_test.go index 224e9db7..1aaf1460 100644 --- a/internal/db/models/node_ip_address_log_dao_test.go +++ b/internal/db/models/node_ip_address_log_dao_test.go @@ -1,6 +1,14 @@ package models import ( + "github.com/TeaOSLab/EdgeCommon/pkg/nodeconfigs" _ "github.com/go-sql-driver/mysql" _ "github.com/iwind/TeaGo/bootstrap" + "testing" ) + +func TestNodeIPAddressDAO_FindFirstNodeAccessIPAddress(t *testing.T) { + var dao = NewNodeIPAddressDAO() + t.Log(dao.FindFirstNodeAccessIPAddress(nil, 48, nodeconfigs.NodeRoleNode)) + t.Log(dao.FindFirstNodeAccessIPAddressId(nil, 48, nodeconfigs.NodeRoleNode)) +} \ No newline at end of file