TRKJ/EdgeAPI
2
0
Fork 0
mirror of https://github.com/TeaOSLab/EdgeAPI.git synced 2025-11-15 00:40:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

优化代码

Browse Source
This commit is contained in:
刘祥超
2021-12-15 20:45:51 +08:00
parent 3ff45d6f49
commit 55034efa87
3 changed files with 10 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
internal/db/models/ip_item_dao.go
View File

@@ -131,6 +131,7 @@ func (this *IPItemDAO) DeleteOldItem(tx *dbs.Tx, listId int64, ipFrom string, ip
Attr("ipFrom", ipFrom). Attr("ipFrom", ipFrom).
Attr("ipTo", ipTo). Attr("ipTo", ipTo).
Delete() Delete()
// 这里不通知更新
return err return err
} }

23
internal/rpc/services/nameservers/service_ns_node_stream.go
View File

@@ -2,9 +2,8 @@ package nameservers
import ( import (
"context" "context"
"encoding/json"
"fmt" "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/db/models"
"github.com/TeaOSLab/EdgeAPI/internal/errors" "github.com/TeaOSLab/EdgeAPI/internal/errors"
"github.com/TeaOSLab/EdgeAPI/internal/goman" "github.com/TeaOSLab/EdgeAPI/internal/goman"
@@ -112,23 +111,9 @@ func (this *NSNodeService) NsNodeStream(server pb.NSNodeService_NsNodeStreamServ
} }
// 返回连接成功 // 返回连接成功
{ err = models.SharedNSNodeDAO.UpdateNodeConnectedAPINodes(nil, nodeId, []int64{teaconst.NodeId})
apiConfig, err := configs.SharedAPIConfig() if err != nil {
if err != nil { return err
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
}
} }
//logs.Println("[RPC]accepted ns node '" + types.String(nodeId) + "' connection") //logs.Println("[RPC]accepted ns node '" + types.String(nodeId) + "' connection")

26
internal/rpc/services/service_node_stream.go
View File

@@ -2,15 +2,13 @@ package services
import ( import (
"context" "context"
"encoding/json"
"fmt" "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/db/models"
"github.com/TeaOSLab/EdgeAPI/internal/errors" "github.com/TeaOSLab/EdgeAPI/internal/errors"
"github.com/TeaOSLab/EdgeAPI/internal/goman" "github.com/TeaOSLab/EdgeAPI/internal/goman"
"github.com/TeaOSLab/EdgeAPI/internal/remotelogs" "github.com/TeaOSLab/EdgeAPI/internal/remotelogs"
rpcutils "github.com/TeaOSLab/EdgeAPI/internal/rpc/utils" 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/nodeconfigs"
"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
"github.com/iwind/TeaGo/logs" "github.com/iwind/TeaGo/logs"
@@ -106,24 +104,10 @@ func (this *NodeService) NodeStream(server pb.NodeService_NodeStreamServer) erro
} }
}() }()
// 返回连接成功 // 设置API节点
{ err = models.SharedNodeDAO.UpdateNodeConnectedAPINodes(nil, nodeId, []int64{teaconst.NodeId})
apiConfig, err := configs.SharedAPIConfig() if err != nil {
if err != nil { return err
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
}
} }
//logs.Println("[RPC]accepted node '" + numberutils.FormatInt64(nodeId) + "' connection") //logs.Println("[RPC]accepted node '" + numberutils.FormatInt64(nodeId) + "' connection")