diff --git a/internal/db/models/ip_item_dao.go b/internal/db/models/ip_item_dao.go index e790643b..a4913e4e 100644 --- a/internal/db/models/ip_item_dao.go +++ b/internal/db/models/ip_item_dao.go @@ -131,6 +131,7 @@ func (this *IPItemDAO) DeleteOldItem(tx *dbs.Tx, listId int64, ipFrom string, ip Attr("ipFrom", ipFrom). Attr("ipTo", ipTo). Delete() + // 这里不通知更新 return err } diff --git a/internal/rpc/services/nameservers/service_ns_node_stream.go b/internal/rpc/services/nameservers/service_ns_node_stream.go index a83708cf..68ad9e5e 100644 --- a/internal/rpc/services/nameservers/service_ns_node_stream.go +++ b/internal/rpc/services/nameservers/service_ns_node_stream.go @@ -2,9 +2,8 @@ package nameservers import ( "context" - "encoding/json" "fmt" - "github.com/TeaOSLab/EdgeAPI/internal/configs" + teaconst "github.com/TeaOSLab/EdgeAPI/internal/const" "github.com/TeaOSLab/EdgeAPI/internal/db/models" "github.com/TeaOSLab/EdgeAPI/internal/errors" "github.com/TeaOSLab/EdgeAPI/internal/goman" @@ -112,23 +111,9 @@ func (this *NSNodeService) NsNodeStream(server pb.NSNodeService_NsNodeStreamServ } // 返回连接成功 - { - apiConfig, err := configs.SharedAPIConfig() - if err != nil { - return err - } - connectedMessage := &messageconfigs.NSConnectedAPINodeMessage{APINodeId: apiConfig.NumberId()} - connectedMessageJSON, err := json.Marshal(connectedMessage) - if err != nil { - return errors.Wrap(err) - } - err = server.Send(&pb.NSNodeStreamMessage{ - Code: messageconfigs.NSMessageCodeConnectedAPINode, - DataJSON: connectedMessageJSON, - }) - if err != nil { - return err - } + err = models.SharedNSNodeDAO.UpdateNodeConnectedAPINodes(nil, nodeId, []int64{teaconst.NodeId}) + if err != nil { + return err } //logs.Println("[RPC]accepted ns node '" + types.String(nodeId) + "' connection") diff --git a/internal/rpc/services/service_node_stream.go b/internal/rpc/services/service_node_stream.go index ed2c1c18..7e2f69df 100644 --- a/internal/rpc/services/service_node_stream.go +++ b/internal/rpc/services/service_node_stream.go @@ -2,15 +2,13 @@ package services import ( "context" - "encoding/json" "fmt" - "github.com/TeaOSLab/EdgeAPI/internal/configs" + teaconst "github.com/TeaOSLab/EdgeAPI/internal/const" "github.com/TeaOSLab/EdgeAPI/internal/db/models" "github.com/TeaOSLab/EdgeAPI/internal/errors" "github.com/TeaOSLab/EdgeAPI/internal/goman" "github.com/TeaOSLab/EdgeAPI/internal/remotelogs" rpcutils "github.com/TeaOSLab/EdgeAPI/internal/rpc/utils" - "github.com/TeaOSLab/EdgeCommon/pkg/messageconfigs" "github.com/TeaOSLab/EdgeCommon/pkg/nodeconfigs" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/iwind/TeaGo/logs" @@ -106,24 +104,10 @@ func (this *NodeService) NodeStream(server pb.NodeService_NodeStreamServer) erro } }() - // 返回连接成功 - { - apiConfig, err := configs.SharedAPIConfig() - if err != nil { - return err - } - connectedMessage := &messageconfigs.ConnectedAPINodeMessage{APINodeId: apiConfig.NumberId()} - connectedMessageJSON, err := json.Marshal(connectedMessage) - if err != nil { - return errors.Wrap(err) - } - err = server.Send(&pb.NodeStreamMessage{ - Code: messageconfigs.MessageCodeConnectedAPINode, - DataJSON: connectedMessageJSON, - }) - if err != nil { - return err - } + // 设置API节点 + err = models.SharedNodeDAO.UpdateNodeConnectedAPINodes(nil, nodeId, []int64{teaconst.NodeId}) + if err != nil { + return err } //logs.Println("[RPC]accepted node '" + numberutils.FormatInt64(nodeId) + "' connection")