修改nodeid为字符串

2026-02-03 22:45:13 +08:00 · 2024-04-10 17:30:52 +08:00
parent 161a67c8a1
commit 0cf935ffa4
16 changed files with 283 additions and 283 deletions
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@ Hello world!
 下面我们来一步步的建立origin服务器,先下载[origin引擎](https://github.com/duanhf2012/origin "origin引擎"),或者使用如下命令：

 ```go
-go get -v -u  github.com/duanhf2012/origin
+go get -v -u  github.com/duanhf2012/origin/v2
 ```
 [README.md](README.md)
 于是下载到GOPATH环境目录中,在src中加入main.go,内容如下：
--- a/cluster/cluster.go
+++ b/cluster/cluster.go
@@ -21,13 +21,13 @@ const (
 )

 type MasterDiscoveryService struct {
-	MasterNodeId int32 //要筛选的主结点Id，如果不配置或者配置成0，表示针对所有的主结点
+	MasterNodeId string //要筛选的主结点Id，如果不配置或者配置成0，表示针对所有的主结点
 	DiscoveryService  []string  //只发现的服务列表
 }

 type NodeInfo struct {
-	NodeId            int
-	NodeName          string
+	NodeId            string
+	//NodeName          string
 	Private           bool
 	ListenAddr        string
 	MaxRpcParamLen    uint32   //最大Rpc参数长度
@@ -56,9 +56,9 @@ type Cluster struct {


 	locker         sync.RWMutex                //结点与服务关系保护锁
-	mapRpc           map[int]*NodeRpcInfo    //nodeId
+	mapRpc           map[string]*NodeRpcInfo    //nodeId
 	//mapIdNode      map[int]NodeInfo            //map[NodeId]NodeInfo
-	mapServiceNode map[string]map[int]struct{} //map[serviceName]map[NodeId]
+	mapServiceNode map[string]map[string]struct{} //map[serviceName]map[NodeId]

 	rpcServer                rpc.Server
 	rpcEventLocker           sync.RWMutex        //Rpc事件监听保护锁
@@ -86,7 +86,7 @@ func (cls *Cluster) Stop() {
 	cls.serviceDiscovery.OnNodeStop()
 }

-func (cls *Cluster) DiscardNode(nodeId int) {
+func (cls *Cluster) DiscardNode(nodeId string) {
 	cls.locker.Lock()
 	nodeInfo, ok := cls.mapRpc[nodeId]
 	bDel := (ok == true) &&  nodeInfo.nodeInfo.status == Discard
@@ -97,7 +97,7 @@ func (cls *Cluster) DiscardNode(nodeId int) {
 	}
 }

-func (cls *Cluster) DelNode(nodeId int, immediately bool) {
+func (cls *Cluster) DelNode(nodeId string, immediately bool) {
 	//MasterDiscover结点与本地结点不删除
 	if cls.GetMasterDiscoveryNodeInfo(nodeId) != nil || nodeId == cls.localNodeInfo.NodeId {
 		return
@@ -114,7 +114,7 @@ func (cls *Cluster) DelNode(nodeId int, immediately bool) {
 		//正在连接中不主动断开，只断开没有连接中的
 		if rpc.client.IsConnected() {
 			rpc.nodeInfo.status = Discard
-			log.Info("Discard node",log.Int("nodeId",rpc.nodeInfo.NodeId),log.String("ListenAddr", rpc.nodeInfo.ListenAddr))
+			log.Info("Discard node",log.String("nodeId",rpc.nodeInfo.NodeId),log.String("ListenAddr", rpc.nodeInfo.ListenAddr))
 			return
 		}
 	}
@@ -128,18 +128,18 @@ func (cls *Cluster) DelNode(nodeId int, immediately bool) {
 		rpc.client.Close(false)
 	}

-	log.Info("remove node ",log.Int("NodeId", rpc.nodeInfo.NodeId),log.String("ListenAddr", rpc.nodeInfo.ListenAddr))
+	log.Info("remove node ",log.String("NodeId", rpc.nodeInfo.NodeId),log.String("ListenAddr", rpc.nodeInfo.ListenAddr))
 }

-func (cls *Cluster) serviceDiscoveryDelNode(nodeId int, immediately bool) {
-	if nodeId == 0 {
-		return
-	}
+func (cls *Cluster) serviceDiscoveryDelNode(nodeId string, immediately bool) {
+	//if nodeId == "" {
+	//	return
+	//}

 	cls.DelNode(nodeId, immediately)
 }

-func (cls *Cluster) delServiceNode(serviceName string, nodeId int) {
+func (cls *Cluster) delServiceNode(serviceName string, nodeId string) {
 	if nodeId == cls.localNodeInfo.NodeId {
 		return
 	}
@@ -178,13 +178,13 @@ func (cls *Cluster) serviceDiscoverySetNodeInfo(nodeInfo *NodeInfo) {
 		}
 		mapDuplicate[serviceName] = nil
 		if _, ok := cls.mapServiceNode[serviceName]; ok == false {
-			cls.mapServiceNode[serviceName] = make(map[int]struct{}, 1)
+			cls.mapServiceNode[serviceName] = make(map[string]struct{}, 1)
 		}
 		cls.mapServiceNode[serviceName][nodeInfo.NodeId] = struct{}{}
 	}

 	if lastNodeInfo != nil {
-		log.Info("Discovery nodeId",log.Int("NodeId", nodeInfo.NodeId),log.Any("services:", nodeInfo.PublicServiceList),log.Bool("Retire",nodeInfo.Retire))
+		log.Info("Discovery nodeId",log.String("NodeId", nodeInfo.NodeId),log.Any("services:", nodeInfo.PublicServiceList),log.Bool("Retire",nodeInfo.Retire))
 		lastNodeInfo.nodeInfo = *nodeInfo
 		return
 	}
@@ -194,12 +194,12 @@ func (cls *Cluster) serviceDiscoverySetNodeInfo(nodeInfo *NodeInfo) {
 	rpcInfo.nodeInfo = *nodeInfo
 	rpcInfo.client =rpc.NewRClient(nodeInfo.NodeId, nodeInfo.ListenAddr, nodeInfo.MaxRpcParamLen,cls.localNodeInfo.CompressBytesLen,cls.triggerRpcEvent)
 	cls.mapRpc[nodeInfo.NodeId] = &rpcInfo
-	log.Info("Discovery nodeId and new rpc client",log.Int("NodeId", nodeInfo.NodeId),log.Any("services:", nodeInfo.PublicServiceList),log.Bool("Retire",nodeInfo.Retire),log.String("nodeListenAddr",nodeInfo.ListenAddr))
+	log.Info("Discovery nodeId and new rpc client",log.String("NodeId", nodeInfo.NodeId),log.Any("services:", nodeInfo.PublicServiceList),log.Bool("Retire",nodeInfo.Retire),log.String("nodeListenAddr",nodeInfo.ListenAddr))
 }



-func (cls *Cluster) Init(localNodeId int, setupServiceFun SetupServiceFun) error {
+func (cls *Cluster) Init(localNodeId string, setupServiceFun SetupServiceFun) error {
 	//1.初始化配置
 	err := cls.InitCfg(localNodeId)
 	if err != nil {
@@ -223,7 +223,7 @@ func (cls *Cluster) Init(localNodeId int, setupServiceFun SetupServiceFun) error
 	return nil
 }

-func (cls *Cluster) checkDynamicDiscovery(localNodeId int) (bool, bool) {
+func (cls *Cluster) checkDynamicDiscovery(localNodeId string) (bool, bool) {
 	var localMaster bool //本结点是否为Master结点
 	var hasMaster bool   //是否配置Master服务

@@ -247,7 +247,7 @@ func (cls *Cluster) AddDynamicDiscoveryService(serviceName string, bPublicServic
 	}

 	if _, ok := cls.mapServiceNode[serviceName]; ok == false {
-		cls.mapServiceNode[serviceName] = map[int]struct{}{}
+		cls.mapServiceNode[serviceName] = map[string]struct{}{}
 	}
 	cls.mapServiceNode[serviceName][cls.localNodeInfo.NodeId] = struct{}{}
 }
@@ -256,7 +256,7 @@ func (cls *Cluster) GetDiscoveryNodeList() []NodeInfo {
 	return cls.masterDiscoveryNodeList
 }

-func (cls *Cluster) GetMasterDiscoveryNodeInfo(nodeId int) *NodeInfo {
+func (cls *Cluster) GetMasterDiscoveryNodeInfo(nodeId string) *NodeInfo {
 	for i := 0; i < len(cls.masterDiscoveryNodeList); i++ {
 		if cls.masterDiscoveryNodeList[i].NodeId == nodeId {
 			return &cls.masterDiscoveryNodeList[i]
@@ -270,7 +270,7 @@ func (cls *Cluster) IsMasterDiscoveryNode() bool {
 	return cls.GetMasterDiscoveryNodeInfo(cls.GetLocalNodeInfo().NodeId) != nil
 }

-func (cls *Cluster) SetupServiceDiscovery(localNodeId int, setupServiceFun SetupServiceFun) {
+func (cls *Cluster) SetupServiceDiscovery(localNodeId string, setupServiceFun SetupServiceFun) {
 	if cls.serviceDiscovery != nil {
 		return
 	}
@@ -300,7 +300,7 @@ func (cls *Cluster) FindRpcHandler(serviceName string) rpc.IRpcHandler {
 	return pService.GetRpcHandler()
 }

-func (cls *Cluster) getRpcClient(nodeId int) (*rpc.Client,bool) {
+func (cls *Cluster) getRpcClient(nodeId string) (*rpc.Client,bool) {
 	c, ok := cls.mapRpc[nodeId]
 	if ok == false {
 		return nil,false
@@ -309,14 +309,14 @@ func (cls *Cluster) getRpcClient(nodeId int) (*rpc.Client,bool) {
 	return c.client,c.nodeInfo.Retire
 }

-func (cls *Cluster) GetRpcClient(nodeId int) (*rpc.Client,bool) {
+func (cls *Cluster) GetRpcClient(nodeId string) (*rpc.Client,bool) {
 	cls.locker.RLock()
 	defer cls.locker.RUnlock()
 	return cls.getRpcClient(nodeId)
 }

-func GetRpcClient(nodeId int, serviceMethod string,filterRetire bool, clientList []*rpc.Client) (error, int) {
-	if nodeId > 0 {
+func GetRpcClient(nodeId string, serviceMethod string,filterRetire bool, clientList []*rpc.Client) (error, int) {
+	if nodeId != rpc.NodeIdNull {
 		pClient,retire := GetCluster().GetRpcClient(nodeId)
 		if pClient == nil {
 			return fmt.Errorf("cannot find  nodeid %d!", nodeId), 0
@@ -345,12 +345,12 @@ func GetRpcServer() *rpc.Server {
 	return &cluster.rpcServer
 }

-func (cls *Cluster) IsNodeConnected(nodeId int) bool {
+func (cls *Cluster) IsNodeConnected(nodeId string) bool {
 	pClient,_ := cls.GetRpcClient(nodeId)
 	return pClient != nil && pClient.IsConnected()
 }

-func (cls *Cluster) IsNodeRetire(nodeId int) bool {
+func (cls *Cluster) IsNodeRetire(nodeId string) bool {
 	cls.locker.RLock()
 	defer cls.locker.RUnlock()

@@ -359,7 +359,7 @@ func (cls *Cluster) IsNodeRetire(nodeId int) bool {
 }


-func (cls *Cluster) triggerRpcEvent(bConnect bool, clientId uint32, nodeId int) {
+func (cls *Cluster) triggerRpcEvent(bConnect bool, clientId uint32, nodeId string) {
 	cls.locker.Lock()
 	nodeInfo, ok := cls.mapRpc[nodeId]
 	if ok == false || nodeInfo.client == nil || nodeInfo.client.GetClientId() != clientId {
@@ -384,7 +384,7 @@ func (cls *Cluster) triggerRpcEvent(bConnect bool, clientId uint32, nodeId int)
 	}
 }

-func (cls *Cluster) TriggerDiscoveryEvent(bDiscovery bool, nodeId int, serviceName []string) {
+func (cls *Cluster) TriggerDiscoveryEvent(bDiscovery bool, nodeId string, serviceName []string) {
 	cls.rpcEventLocker.Lock()
 	defer cls.rpcEventLocker.Unlock()

@@ -443,7 +443,7 @@ func (cls *Cluster) UnReDiscoveryEvent(serviceName string) {



-func HasService(nodeId int, serviceName string) bool {
+func HasService(nodeId string, serviceName string) bool {
 	cluster.locker.RLock()
 	defer cluster.locker.RUnlock()

@@ -456,7 +456,7 @@ func HasService(nodeId int, serviceName string) bool {
 	return false
 }

-func GetNodeByServiceName(serviceName string) map[int]struct{} {
+func GetNodeByServiceName(serviceName string) map[string]struct{} {
 	cluster.locker.RLock()
 	defer cluster.locker.RUnlock()

@@ -465,7 +465,7 @@ func GetNodeByServiceName(serviceName string) map[int]struct{} {
 		return nil
 	}

-	mapNodeId := map[int]struct{}{}
+	mapNodeId := map[string]struct{}{}
 	for nodeId,_ := range mapNode {
 		mapNodeId[nodeId] = struct{}{}
 	}
@@ -477,7 +477,7 @@ func (cls *Cluster) GetGlobalCfg() interface{} {
 	return cls.globalCfg
 }

-func (cls *Cluster) GetNodeInfo(nodeId int) (NodeInfo,bool) {
+func (cls *Cluster) GetNodeInfo(nodeId string) (NodeInfo,bool) {
 	cls.locker.RLock()
 	defer cls.locker.RUnlock()

--- a/cluster/configdiscovery.go
+++ b/cluster/configdiscovery.go
@@ -1,19 +1,21 @@
 package cluster

+import "github.com/duanhf2012/origin/v2/rpc"
+
 type ConfigDiscovery struct {
 	funDelService FunDelNode
 	funSetService FunSetNodeInfo
-	localNodeId int
+	localNodeId string
 }


-func (discovery *ConfigDiscovery) InitDiscovery(localNodeId int,funDelNode FunDelNode,funSetNodeInfo FunSetNodeInfo) error{
+func (discovery *ConfigDiscovery) InitDiscovery(localNodeId string,funDelNode FunDelNode,funSetNodeInfo FunSetNodeInfo) error{
 	discovery.localNodeId = localNodeId
 	discovery.funDelService = funDelNode
 	discovery.funSetService = funSetNodeInfo

 	//解析本地其他服务配置
-	_,nodeInfoList,err := GetCluster().readLocalClusterConfig(0)
+	_,nodeInfoList,err := GetCluster().readLocalClusterConfig(rpc.NodeIdNull)
 	if err != nil {
 		return err
 	}
--- a/cluster/dynamicdiscovery.go
+++ b/cluster/dynamicdiscovery.go
@@ -20,7 +20,7 @@ const NodeRetireRpcMethod = DynamicDiscoveryMasterName+".RPC_NodeRetire"
 type DynamicDiscoveryMaster struct {
 	service.Service

-	mapNodeInfo map[int32]struct{}
+	mapNodeInfo map[string]struct{}
 	nodeInfo    []*rpc.NodeInfo
 }

@@ -29,9 +29,9 @@ type DynamicDiscoveryClient struct {

 	funDelService FunDelNode
 	funSetService FunSetNodeInfo
-	localNodeId   int
+	localNodeId   string

-	mapDiscovery map[int32]map[int32]struct{} //map[masterNodeId]map[nodeId]struct{}
+	mapDiscovery map[string]map[string]struct{} //map[masterNodeId]map[nodeId]struct{}
 	bRetire bool
 }

@@ -47,7 +47,7 @@ func init() {
 	clientService.SetName(DynamicDiscoveryClientName)
 }

-func (ds *DynamicDiscoveryMaster) isRegNode(nodeId int32) bool {
+func (ds *DynamicDiscoveryMaster) isRegNode(nodeId string) bool {
 	_, ok := ds.mapNodeInfo[nodeId]
 	return ok
 }
@@ -81,7 +81,7 @@ func (ds *DynamicDiscoveryMaster) addNodeInfo(nInfo *rpc.NodeInfo) {
 	ds.nodeInfo = append(ds.nodeInfo, nodeInfo)
 }

-func (ds *DynamicDiscoveryMaster) removeNodeInfo(nodeId int32) {
+func (ds *DynamicDiscoveryMaster) removeNodeInfo(nodeId string) {
 	if _,ok:= ds.mapNodeInfo[nodeId];ok == false {
 		return
 	}
@@ -97,7 +97,7 @@ func (ds *DynamicDiscoveryMaster) removeNodeInfo(nodeId int32) {
 }

 func (ds *DynamicDiscoveryMaster) OnInit() error {
-	ds.mapNodeInfo = make(map[int32]struct{}, 20)
+	ds.mapNodeInfo = make(map[string]struct{}, 20)
 	ds.RegRpcListener(ds)

 	return nil
@@ -106,8 +106,7 @@ func (ds *DynamicDiscoveryMaster) OnInit() error {
 func (ds *DynamicDiscoveryMaster) OnStart() {
 	var nodeInfo rpc.NodeInfo
 	localNodeInfo := cluster.GetLocalNodeInfo()
-	nodeInfo.NodeId = int32(localNodeInfo.NodeId)
-	nodeInfo.NodeName = localNodeInfo.NodeName
+	nodeInfo.NodeId = localNodeInfo.NodeId
 	nodeInfo.ListenAddr = localNodeInfo.ListenAddr
 	nodeInfo.PublicServiceList = localNodeInfo.PublicServiceList
 	nodeInfo.MaxRpcParamLen = localNodeInfo.MaxRpcParamLen
@@ -117,9 +116,9 @@ func (ds *DynamicDiscoveryMaster) OnStart() {
 	ds.addNodeInfo(&nodeInfo)
 }

-func (ds *DynamicDiscoveryMaster) OnNodeConnected(nodeId int) {
+func (ds *DynamicDiscoveryMaster) OnNodeConnected(nodeId string) {
 	//没注册过结点不通知
-	if ds.isRegNode(int32(nodeId)) == false {
+	if ds.isRegNode(nodeId) == false {
 		return
 	}

@@ -127,21 +126,21 @@ func (ds *DynamicDiscoveryMaster) OnNodeConnected(nodeId int) {
 	var notifyDiscover rpc.SubscribeDiscoverNotify
 	notifyDiscover.IsFull = true
 	notifyDiscover.NodeInfo = ds.nodeInfo
-	notifyDiscover.MasterNodeId = int32(cluster.GetLocalNodeInfo().NodeId)
+	notifyDiscover.MasterNodeId = cluster.GetLocalNodeInfo().NodeId

 	ds.GoNode(nodeId, SubServiceDiscover, &notifyDiscover)
 }

-func (ds *DynamicDiscoveryMaster) OnNodeDisconnect(nodeId int) {
-	if ds.isRegNode(int32(nodeId)) == false {
+func (ds *DynamicDiscoveryMaster) OnNodeDisconnect(nodeId string) {
+	if ds.isRegNode(nodeId) == false {
 		return
 	}

-	ds.removeNodeInfo(int32(nodeId))
+	ds.removeNodeInfo(nodeId)

 	var notifyDiscover rpc.SubscribeDiscoverNotify
-	notifyDiscover.MasterNodeId = int32(cluster.GetLocalNodeInfo().NodeId)
-	notifyDiscover.DelNodeId = int32(nodeId)
+	notifyDiscover.MasterNodeId = cluster.GetLocalNodeInfo().NodeId
+	notifyDiscover.DelNodeId = nodeId
 	//删除结点
 	cluster.DelNode(nodeId, true)

@@ -151,17 +150,17 @@ func (ds *DynamicDiscoveryMaster) OnNodeDisconnect(nodeId int) {

 func (ds *DynamicDiscoveryMaster) RpcCastGo(serviceMethod string, args interface{}) {
 	for nodeId, _ := range ds.mapNodeInfo {
-		ds.GoNode(int(nodeId), serviceMethod, args)
+		ds.GoNode(nodeId, serviceMethod, args)
 	}
 }

 func (ds *DynamicDiscoveryMaster) RPC_NodeRetire(req *rpc.NodeRetireReq, res *rpc.Empty) error {
-	log.Info("node is retire",log.Int32("nodeId",req.NodeInfo.NodeId),log.Bool("retire",req.NodeInfo.Retire))
+	log.Info("node is retire",log.String("nodeId",req.NodeInfo.NodeId),log.Bool("retire",req.NodeInfo.Retire))

 	ds.updateNodeInfo(req.NodeInfo)

 	var notifyDiscover rpc.SubscribeDiscoverNotify
-	notifyDiscover.MasterNodeId = int32(cluster.GetLocalNodeInfo().NodeId)
+	notifyDiscover.MasterNodeId = cluster.GetLocalNodeInfo().NodeId
 	notifyDiscover.NodeInfo = append(notifyDiscover.NodeInfo, req.NodeInfo)
 	ds.RpcCastGo(SubServiceDiscover, &notifyDiscover)

@@ -179,7 +178,7 @@ func (ds *DynamicDiscoveryMaster) RPC_RegServiceDiscover(req *rpc.ServiceDiscove

 	//广播给其他所有结点
 	var notifyDiscover rpc.SubscribeDiscoverNotify
-	notifyDiscover.MasterNodeId = int32(cluster.GetLocalNodeInfo().NodeId)
+	notifyDiscover.MasterNodeId = cluster.GetLocalNodeInfo().NodeId
 	notifyDiscover.NodeInfo = append(notifyDiscover.NodeInfo, req.NodeInfo)
 	ds.RpcCastGo(SubServiceDiscover, &notifyDiscover)

@@ -188,8 +187,7 @@ func (ds *DynamicDiscoveryMaster) RPC_RegServiceDiscover(req *rpc.ServiceDiscove

 	//初始化结点信息
 	var nodeInfo NodeInfo
-	nodeInfo.NodeId = int(req.NodeInfo.NodeId)
-	nodeInfo.NodeName = req.NodeInfo.NodeName
+	nodeInfo.NodeId = req.NodeInfo.NodeId
 	nodeInfo.Private = req.NodeInfo.Private
 	nodeInfo.ServiceList = req.NodeInfo.PublicServiceList
 	nodeInfo.PublicServiceList = req.NodeInfo.PublicServiceList
@@ -208,19 +206,19 @@ func (ds *DynamicDiscoveryMaster) RPC_RegServiceDiscover(req *rpc.ServiceDiscove

 func (dc *DynamicDiscoveryClient) OnInit() error {
 	dc.RegRpcListener(dc)
-	dc.mapDiscovery = map[int32]map[int32]struct{}{}
+	dc.mapDiscovery = map[string]map[string]struct{}{}
 	return nil
 }

-func (dc *DynamicDiscoveryClient) addMasterNode(masterNodeId int32, nodeId int32) {
+func (dc *DynamicDiscoveryClient) addMasterNode(masterNodeId string, nodeId string) {
 	_, ok := dc.mapDiscovery[masterNodeId]
 	if ok == false {
-		dc.mapDiscovery[masterNodeId] = map[int32]struct{}{}
+		dc.mapDiscovery[masterNodeId] = map[string]struct{}{}
 	}
 	dc.mapDiscovery[masterNodeId][nodeId] = struct{}{}
 }

-func (dc *DynamicDiscoveryClient) removeMasterNode(masterNodeId int32, nodeId int32) {
+func (dc *DynamicDiscoveryClient) removeMasterNode(masterNodeId string, nodeId string) {
 	mapNodeId, ok := dc.mapDiscovery[masterNodeId]
 	if ok == false {
 		return
@@ -229,7 +227,7 @@ func (dc *DynamicDiscoveryClient) removeMasterNode(masterNodeId int32, nodeId in
 	delete(mapNodeId, nodeId)
 }

-func (dc *DynamicDiscoveryClient) findNodeId(nodeId int32) bool {
+func (dc *DynamicDiscoveryClient) findNodeId(nodeId string) bool {
 	for _, mapNodeId := range dc.mapDiscovery {
 		_, ok := mapNodeId[nodeId]
 		if ok == true {
@@ -255,13 +253,13 @@ func (dc *DynamicDiscoveryClient) addDiscoveryMaster() {
 	}
 }

-func (dc *DynamicDiscoveryClient) fullCompareDiffNode(masterNodeId int32, mapNodeInfo map[int32]*rpc.NodeInfo) []int32 {
+func (dc *DynamicDiscoveryClient) fullCompareDiffNode(masterNodeId string, mapNodeInfo map[string]*rpc.NodeInfo) []string {
 	if mapNodeInfo == nil {
 		return nil
 	}

-	diffNodeIdSlice := make([]int32, 0, len(mapNodeInfo))
-	mapNodeId := map[int32]struct{}{}
+	diffNodeIdSlice := make([]string, 0, len(mapNodeInfo))
+	mapNodeId := map[string]struct{}{}
 	mapNodeId, ok := dc.mapDiscovery[masterNodeId]
 	if ok == false {
 		return nil
@@ -280,10 +278,10 @@ func (dc *DynamicDiscoveryClient) fullCompareDiffNode(masterNodeId int32, mapNod

 //订阅发现的服务通知
 func (dc *DynamicDiscoveryClient) RPC_SubServiceDiscover(req *rpc.SubscribeDiscoverNotify) error {
-	mapNodeInfo := map[int32]*rpc.NodeInfo{}
+	mapNodeInfo := map[string]*rpc.NodeInfo{}
 	for _, nodeInfo := range req.NodeInfo {
 		//不对本地结点或者不存在任何公开服务的结点
-		if int(nodeInfo.NodeId) == dc.localNodeId {
+		if nodeInfo.NodeId == dc.localNodeId {
 			continue
 		}

@@ -298,7 +296,6 @@ func (dc *DynamicDiscoveryClient) RPC_SubServiceDiscover(req *rpc.SubscribeDisco
 			if nInfo == nil {
 				nInfo = &rpc.NodeInfo{}
 				nInfo.NodeId = nodeInfo.NodeId
-				nInfo.NodeName = nodeInfo.NodeName
 				nInfo.ListenAddr = nodeInfo.ListenAddr
 				nInfo.MaxRpcParamLen = nodeInfo.MaxRpcParamLen
 				nInfo.Retire = nodeInfo.Retire
@@ -312,7 +309,7 @@ func (dc *DynamicDiscoveryClient) RPC_SubServiceDiscover(req *rpc.SubscribeDisco
 	}

 	//如果为完整同步，则找出差异的结点
-	var willDelNodeId []int32
+	var willDelNodeId []string
 	if req.IsFull == true {
 		diffNode := dc.fullCompareDiffNode(req.MasterNodeId, mapNodeInfo)
 		if len(diffNode) > 0 {
@@ -321,16 +318,16 @@ func (dc *DynamicDiscoveryClient) RPC_SubServiceDiscover(req *rpc.SubscribeDisco
 	}

 	//指定删除结点
-	if req.DelNodeId > 0 && req.DelNodeId != int32(dc.localNodeId) {
+	if req.DelNodeId != rpc.NodeIdNull && req.DelNodeId != dc.localNodeId {
 		willDelNodeId = append(willDelNodeId, req.DelNodeId)
 	}

 	//删除不必要的结点
 	for _, nodeId := range willDelNodeId {
-		cluster.TriggerDiscoveryEvent(false,int(nodeId),nil)
-		dc.removeMasterNode(req.MasterNodeId, int32(nodeId))
+		cluster.TriggerDiscoveryEvent(false,nodeId,nil)
+		dc.removeMasterNode(req.MasterNodeId, nodeId)
 		if dc.findNodeId(nodeId) == false {
-			dc.funDelService(int(nodeId), false)
+			dc.funDelService(nodeId, false)
 		}
 	}

@@ -341,13 +338,13 @@ func (dc *DynamicDiscoveryClient) RPC_SubServiceDiscover(req *rpc.SubscribeDisco
 			continue
 		}

-		cluster.TriggerDiscoveryEvent(true,int(nodeInfo.NodeId),nodeInfo.PublicServiceList)
+		cluster.TriggerDiscoveryEvent(true,nodeInfo.NodeId,nodeInfo.PublicServiceList)
 	}

 	return nil
 }

-func (dc *DynamicDiscoveryClient) isDiscoverNode(nodeId int) bool {
+func (dc *DynamicDiscoveryClient) isDiscoverNode(nodeId string) bool {
 	for i := 0; i < len(cluster.masterDiscoveryNodeList); i++ {
 		if cluster.masterDiscoveryNodeList[i].NodeId == nodeId {
 			return true
@@ -357,7 +354,7 @@ func (dc *DynamicDiscoveryClient) isDiscoverNode(nodeId int) bool {
 	return false
 }

-func (dc *DynamicDiscoveryClient) OnNodeConnected(nodeId int) {
+func (dc *DynamicDiscoveryClient) OnNodeConnected(nodeId string) {
 	dc.regServiceDiscover(nodeId)
 }

@@ -369,22 +366,21 @@ func (dc *DynamicDiscoveryClient) OnRetire(){
 		var nodeRetireReq rpc.NodeRetireReq

 		nodeRetireReq.NodeInfo = &rpc.NodeInfo{}
-		nodeRetireReq.NodeInfo.NodeId = int32(cluster.localNodeInfo.NodeId)
-		nodeRetireReq.NodeInfo.NodeName = cluster.localNodeInfo.NodeName
+		nodeRetireReq.NodeInfo.NodeId = cluster.localNodeInfo.NodeId
 		nodeRetireReq.NodeInfo.ListenAddr = cluster.localNodeInfo.ListenAddr
 		nodeRetireReq.NodeInfo.MaxRpcParamLen = cluster.localNodeInfo.MaxRpcParamLen
 		nodeRetireReq.NodeInfo.PublicServiceList =  cluster.localNodeInfo.PublicServiceList
 		nodeRetireReq.NodeInfo.Retire = dc.bRetire
 		nodeRetireReq.NodeInfo.Private = cluster.localNodeInfo.Private

-		err := dc.GoNode(int(masterNodeList[i].NodeId),NodeRetireRpcMethod,&nodeRetireReq)
+		err := dc.GoNode(masterNodeList[i].NodeId,NodeRetireRpcMethod,&nodeRetireReq)
 		if err!= nil {
 			log.Error("call "+NodeRetireRpcMethod+" is fail",log.ErrorAttr("err",err))
 		}
 	}
 }

-func (dc *DynamicDiscoveryClient) regServiceDiscover(nodeId int){
+func (dc *DynamicDiscoveryClient) regServiceDiscover(nodeId string){
 	nodeInfo := cluster.GetMasterDiscoveryNodeInfo(nodeId)
 	if nodeInfo == nil {
 		return
@@ -392,8 +388,7 @@ func (dc *DynamicDiscoveryClient) regServiceDiscover(nodeId int){

 	var req rpc.ServiceDiscoverReq
 	req.NodeInfo = &rpc.NodeInfo{}
-	req.NodeInfo.NodeId = int32(cluster.localNodeInfo.NodeId)
-	req.NodeInfo.NodeName = cluster.localNodeInfo.NodeName
+	req.NodeInfo.NodeId = cluster.localNodeInfo.NodeId
 	req.NodeInfo.ListenAddr = cluster.localNodeInfo.ListenAddr
 	req.NodeInfo.MaxRpcParamLen = cluster.localNodeInfo.MaxRpcParamLen
 	req.NodeInfo.PublicServiceList =  cluster.localNodeInfo.PublicServiceList
@@ -416,13 +411,13 @@ func (dc *DynamicDiscoveryClient) regServiceDiscover(nodeId int){
 	}
 }

-func (dc *DynamicDiscoveryClient) canDiscoveryService(fromMasterNodeId int32,serviceName string) bool{
+func (dc *DynamicDiscoveryClient) canDiscoveryService(fromMasterNodeId string,serviceName string) bool{
 	canDiscovery := true

 	for i:=0;i<len(cluster.GetLocalNodeInfo().MasterDiscoveryService);i++{
 		masterNodeId := cluster.GetLocalNodeInfo().MasterDiscoveryService[i].MasterNodeId

-		if masterNodeId == fromMasterNodeId || masterNodeId == 0 {
+		if masterNodeId == fromMasterNodeId || masterNodeId == rpc.NodeIdNull {
 			canDiscovery = false

 			for _,discoveryService := range cluster.GetLocalNodeInfo().MasterDiscoveryService[i].DiscoveryService {
@@ -436,8 +431,8 @@ func (dc *DynamicDiscoveryClient) canDiscoveryService(fromMasterNodeId int32,ser
 	return canDiscovery
 }

-func (dc *DynamicDiscoveryClient) setNodeInfo(masterNodeId int32,nodeInfo *rpc.NodeInfo) bool{
-	if nodeInfo == nil || nodeInfo.Private == true || int(nodeInfo.NodeId) == dc.localNodeId {
+func (dc *DynamicDiscoveryClient) setNodeInfo(masterNodeId string,nodeInfo *rpc.NodeInfo) bool{
+	if nodeInfo == nil || nodeInfo.Private == true || nodeInfo.NodeId == dc.localNodeId {
 		return false
 	}

@@ -456,8 +451,7 @@ func (dc *DynamicDiscoveryClient) setNodeInfo(masterNodeId int32,nodeInfo *rpc.N
 	var nInfo NodeInfo
 	nInfo.ServiceList = discoverServiceSlice
 	nInfo.PublicServiceList = discoverServiceSlice
-	nInfo.NodeId = int(nodeInfo.NodeId)
-	nInfo.NodeName = nodeInfo.NodeName
+	nInfo.NodeId = nodeInfo.NodeId
 	nInfo.ListenAddr = nodeInfo.ListenAddr
 	nInfo.MaxRpcParamLen = nodeInfo.MaxRpcParamLen
 	nInfo.Retire = nodeInfo.Retire
@@ -468,12 +462,12 @@ func (dc *DynamicDiscoveryClient) setNodeInfo(masterNodeId int32,nodeInfo *rpc.N
 	return true
 }

-func (dc *DynamicDiscoveryClient) OnNodeDisconnect(nodeId int) {
+func (dc *DynamicDiscoveryClient) OnNodeDisconnect(nodeId string) {
 	//将Discard结点清理
 	cluster.DiscardNode(nodeId)
 }

-func (dc *DynamicDiscoveryClient) InitDiscovery(localNodeId int, funDelNode FunDelNode, funSetNodeInfo FunSetNodeInfo) error {
+func (dc *DynamicDiscoveryClient) InitDiscovery(localNodeId string, funDelNode FunDelNode, funSetNodeInfo FunSetNodeInfo) error {
 	dc.localNodeId = localNodeId
 	dc.funDelService = funDelNode
 	dc.funSetService = funSetNodeInfo
--- a/cluster/parsecfg.go
+++ b/cluster/parsecfg.go
@@ -31,7 +31,7 @@ func (cls *Cluster) ReadClusterConfig(filepath string) (*NodeInfoList, error) {
 	return c, nil
 }

-func (cls *Cluster) readServiceConfig(filepath string) (interface{}, map[string]interface{}, map[int]map[string]interface{}, error) {
+func (cls *Cluster) readServiceConfig(filepath string) (interface{}, map[string]interface{}, map[string]map[string]interface{}, error) {
 	c := map[string]interface{}{}
 	//读取配置
 	d, err := os.ReadFile(filepath)
@@ -50,7 +50,7 @@ func (cls *Cluster) readServiceConfig(filepath string) (interface{}, map[string]
 		serviceConfig = serviceCfg.(map[string]interface{})
 	}

-	mapNodeService := map[int]map[string]interface{}{}
+	mapNodeService := map[string]map[string]interface{}{}
 	nodeServiceCfg, ok := c["NodeService"]
 	if ok == true {
 		nodeServiceList := nodeServiceCfg.([]interface{})
@@ -60,13 +60,13 @@ func (cls *Cluster) readServiceConfig(filepath string) (interface{}, map[string]
 			if ok == false {
 				log.Fatal("NodeService list not find nodeId field")
 			}
-			mapNodeService[int(nodeId.(float64))] = serviceCfg
+			mapNodeService[nodeId.(string)] = serviceCfg
 		}
 	}
 	return GlobalCfg, serviceConfig, mapNodeService, nil
 }

-func (cls *Cluster) readLocalClusterConfig(nodeId int) ([]NodeInfo, []NodeInfo, error) {
+func (cls *Cluster) readLocalClusterConfig(nodeId string) ([]NodeInfo, []NodeInfo, error) {
 	var nodeInfoList []NodeInfo
 	var masterDiscoverNodeList []NodeInfo
 	clusterCfgPath := strings.TrimRight(configDir, "/") + "/cluster"
@@ -85,14 +85,14 @@ func (cls *Cluster) readLocalClusterConfig(nodeId int) ([]NodeInfo, []NodeInfo,
 			}
 			masterDiscoverNodeList = append(masterDiscoverNodeList, localNodeInfoList.MasterDiscoveryNode...)
 			for _, nodeInfo := range localNodeInfoList.NodeList {
-				if nodeInfo.NodeId == nodeId || nodeId == 0 {
+				if nodeInfo.NodeId == nodeId || nodeId == rpc.NodeIdNull {
 					nodeInfoList = append(nodeInfoList, nodeInfo)
 				}
 			}
 		}
 	}

-	if nodeId != 0 && (len(nodeInfoList) != 1) {
+	if nodeId != rpc.NodeIdNull && (len(nodeInfoList) != 1) {
 		return nil, nil, fmt.Errorf("%d configurations were found for the configuration with node ID %d!", len(nodeInfoList), nodeId)
 	}

@@ -110,7 +110,7 @@ func (cls *Cluster) readLocalClusterConfig(nodeId int) ([]NodeInfo, []NodeInfo,
 	return masterDiscoverNodeList, nodeInfoList, nil
 }

-func (cls *Cluster) readLocalService(localNodeId int) error {
+func (cls *Cluster) readLocalService(localNodeId string) error {
 	clusterCfgPath := strings.TrimRight(configDir, "/") + "/cluster"
 	fileInfoList, err := os.ReadDir(clusterCfgPath)
 	if err != nil {
@@ -207,7 +207,7 @@ func (cls *Cluster) parseLocalCfg() {

 	for _, sName := range cls.localNodeInfo.ServiceList {
 		if _, ok := cls.mapServiceNode[sName]; ok == false {
-			cls.mapServiceNode[sName] = make(map[int]struct{})
+			cls.mapServiceNode[sName] = make(map[string]struct{})
 		}

 		cls.mapServiceNode[sName][cls.localNodeInfo.NodeId] = struct{}{}
@@ -227,10 +227,10 @@ func (cls *Cluster) checkDiscoveryNodeList(discoverMasterNode []NodeInfo) bool {
 	return true
 }

-func (cls *Cluster) InitCfg(localNodeId int) error {
+func (cls *Cluster) InitCfg(localNodeId string) error {
 	cls.localServiceCfg = map[string]interface{}{}
-	cls.mapRpc = map[int]*NodeRpcInfo{}
-	cls.mapServiceNode = map[string]map[int]struct{}{}
+	cls.mapRpc = map[string]*NodeRpcInfo{}
+	cls.mapServiceNode = map[string]map[string]struct{}{}

 	//加载本地结点的NodeList配置
 	discoveryNode, nodeInfoList, err := cls.readLocalClusterConfig(localNodeId)
--- a/cluster/servicediscovery.go
+++ b/cluster/servicediscovery.go
@@ -2,11 +2,11 @@ package cluster

 type OperType int

-type FunDelNode func (nodeId int,immediately bool)
+type FunDelNode func (nodeId string,immediately bool)
 type FunSetNodeInfo func(nodeInfo *NodeInfo)

 type IServiceDiscovery interface {
-	InitDiscovery(localNodeId int,funDelNode FunDelNode,funSetNodeInfo FunSetNodeInfo) error
+	InitDiscovery(localNodeId string,funDelNode FunDelNode,funSetNodeInfo FunSetNodeInfo) error
 	OnNodeStop()
 }

--- a/node/node.go
+++ b/node/node.go
@@ -23,7 +23,7 @@ import (
 )

 var sig chan os.Signal
-var nodeId int
+var nodeId string
 var preSetupService []service.IService //预安装
 var profilerInterval time.Duration
 var bValid bool
@@ -116,7 +116,7 @@ func setConfigPath(val interface{}) error {
 	return nil
 }

-func getRunProcessPid(nodeId int) (int, error) {
+func getRunProcessPid(nodeId string) (int, error) {
 	f, err := os.OpenFile(fmt.Sprintf("%s_%d.pid", os.Args[0], nodeId), os.O_RDONLY, 0600)
 	defer f.Close()
 	if err != nil {
@@ -131,9 +131,9 @@ func getRunProcessPid(nodeId int) (int, error) {
 	return strconv.Atoi(string(pidByte))
 }

-func writeProcessPid(nodeId int) {
+func writeProcessPid(nodeId string) {
 	//pid
-	f, err := os.OpenFile(fmt.Sprintf("%s_%d.pid", os.Args[0], nodeId), os.O_WRONLY|os.O_TRUNC|os.O_CREATE, 0600)
+	f, err := os.OpenFile(fmt.Sprintf("%s_%s.pid", os.Args[0], nodeId), os.O_WRONLY|os.O_TRUNC|os.O_CREATE, 0600)
 	defer f.Close()
 	if err != nil {
 		fmt.Println(err.Error())
@@ -147,11 +147,11 @@ func writeProcessPid(nodeId int) {
 	}
 }

-func GetNodeId() int {
+func GetNodeId() string {
 	return nodeId
 }

-func initNode(id int) {
+func initNode(id string) {
 	//1.初始化集群
 	nodeId = id
 	err := cluster.GetCluster().Init(GetNodeId(), Setup)
@@ -194,7 +194,7 @@ func initLog() error {
 	}

 	localnodeinfo := cluster.GetCluster().GetLocalNodeInfo()
-	filepre := fmt.Sprintf("%s_%d_", localnodeinfo.NodeName, localnodeinfo.NodeId)
+	filepre := fmt.Sprintf("%s_", localnodeinfo.NodeId)
 	logger, err := log.NewTextLogger(log.LogLevel,log.LogPath,filepre,true,log.LogChannelCap)
 	if err != nil {
 		fmt.Printf("cannot create log file!\n")
@@ -227,8 +227,8 @@ func retireNode(args interface{}) error {
 	if sParam[0] != "nodeid" {
 		return fmt.Errorf("invalid option %s", param)
 	}
-	nId, err := strconv.Atoi(sParam[1])
-	if err != nil {
+	nId := strings.TrimSpace(sParam[1])
+	if nId == "" {
 		return fmt.Errorf("invalid option %s", param)
 	}

@@ -257,8 +257,8 @@ func stopNode(args interface{}) error {
 	if sParam[0] != "nodeid" {
 		return fmt.Errorf("invalid option %s", param)
 	}
-	nId, err := strconv.Atoi(sParam[1])
-	if err != nil {
+	nId := strings.TrimSpace(sParam[1])
+	if nId == "" {
 		return fmt.Errorf("invalid option %s", param)
 	}

@@ -285,12 +285,13 @@ func startNode(args interface{}) error {
 	if sParam[0] != "nodeid" {
 		return fmt.Errorf("invalid option %s", param)
 	}
-	nodeId, err := strconv.Atoi(sParam[1])
-	if err != nil {
+	strNodeId := strings.TrimSpace(sParam[1])
+	if strNodeId == "" {
 		return fmt.Errorf("invalid option %s", param)
 	}
+
 	for{
-		processId, pErr := getRunProcessPid(nodeId)
+		processId, pErr := getRunProcessPid(strNodeId)
 		if pErr != nil {
 			break
 		}
@@ -299,13 +300,13 @@ func startNode(args interface{}) error {
 		myName, mErr := sysprocess.GetMyProcessName()
 		//当前进程名获取失败，不应该发生
 		if mErr != nil {
-			log.SInfo("get my process's name is error,", err.Error())
+			log.SInfo("get my process's name is error,", mErr.Error())
 			os.Exit(-1)
 		}

 		//进程id存在，而且进程名也相同，被认为是当前进程重复运行
 		if cErr == nil && name == myName {
-			log.SInfo(fmt.Sprintf("repeat runs are not allowed,node is %d,processid is %d",nodeId,processId))
+			log.SInfo(fmt.Sprintf("repeat runs are not allowed,node is %s,processid is %d",strNodeId,processId))
 			os.Exit(-1)
 		}
 		break
@@ -313,11 +314,11 @@ func startNode(args interface{}) error {

 	//2.记录进程id号
 	log.Info("Start running server.")
-	writeProcessPid(nodeId)
+	writeProcessPid(strNodeId)
 	timer.StartTimer(10*time.Millisecond, 1000000)

 	//3.初始化node
-	initNode(nodeId)
+	initNode(strNodeId)

 	//4.运行service
 	service.Start()
--- a/rpc/client.go
+++ b/rpc/client.go
@@ -40,8 +40,8 @@ type IRealClient interface {
 }

 type Client struct {
-	clientId 		uint32
-	nodeId        int
+	clientId             uint32
+	nodeId               string
 	pendingLock          sync.RWMutex
 	startSeq             uint64
 	pending              map[uint64]*Call
@@ -176,7 +176,7 @@ func (bc *Client) generateSeq() uint64 {
 	return atomic.AddUint64(&bc.startSeq, 1)
 }

-func (client *Client) GetNodeId() int {
+func (client *Client) GetNodeId() string {
 	return client.nodeId
 }

--- a/rpc/dynamicdiscover.pb.go
+++ b/rpc/dynamicdiscover.pb.go
@@ -2,7 +2,7 @@
 // versions:
 // 	protoc-gen-go v1.31.0
 // 	protoc        v4.24.0
-// source: proto/rpcproto/dynamicdiscover.proto
+// source: rpcproto/dynamicdiscover.proto

 package rpc

@@ -25,19 +25,18 @@ type NodeInfo struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields

-	NodeId            int32    `protobuf:"varint,1,opt,name=NodeId,proto3" json:"NodeId,omitempty"`
-	NodeName          string   `protobuf:"bytes,2,opt,name=NodeName,proto3" json:"NodeName,omitempty"`
-	ListenAddr        string   `protobuf:"bytes,3,opt,name=ListenAddr,proto3" json:"ListenAddr,omitempty"`
-	MaxRpcParamLen    uint32   `protobuf:"varint,4,opt,name=MaxRpcParamLen,proto3" json:"MaxRpcParamLen,omitempty"`
-	Private           bool     `protobuf:"varint,5,opt,name=Private,proto3" json:"Private,omitempty"`
-	Retire            bool     `protobuf:"varint,6,opt,name=Retire,proto3" json:"Retire,omitempty"`
-	PublicServiceList []string `protobuf:"bytes,7,rep,name=PublicServiceList,proto3" json:"PublicServiceList,omitempty"`
+	NodeId            string   `protobuf:"bytes,1,opt,name=NodeId,proto3" json:"NodeId,omitempty"`
+	ListenAddr        string   `protobuf:"bytes,2,opt,name=ListenAddr,proto3" json:"ListenAddr,omitempty"`
+	MaxRpcParamLen    uint32   `protobuf:"varint,3,opt,name=MaxRpcParamLen,proto3" json:"MaxRpcParamLen,omitempty"`
+	Private           bool     `protobuf:"varint,4,opt,name=Private,proto3" json:"Private,omitempty"`
+	Retire            bool     `protobuf:"varint,5,opt,name=Retire,proto3" json:"Retire,omitempty"`
+	PublicServiceList []string `protobuf:"bytes,6,rep,name=PublicServiceList,proto3" json:"PublicServiceList,omitempty"`
 }

 func (x *NodeInfo) Reset() {
 	*x = NodeInfo{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_proto_rpcproto_dynamicdiscover_proto_msgTypes[0]
+		mi := &file_rpcproto_dynamicdiscover_proto_msgTypes[0]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -50,7 +49,7 @@ func (x *NodeInfo) String() string {
 func (*NodeInfo) ProtoMessage() {}

 func (x *NodeInfo) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_rpcproto_dynamicdiscover_proto_msgTypes[0]
+	mi := &file_rpcproto_dynamicdiscover_proto_msgTypes[0]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -63,20 +62,13 @@ func (x *NodeInfo) ProtoReflect() protoreflect.Message {

 // Deprecated: Use NodeInfo.ProtoReflect.Descriptor instead.
 func (*NodeInfo) Descriptor() ([]byte, []int) {
-	return file_proto_rpcproto_dynamicdiscover_proto_rawDescGZIP(), []int{0}
+	return file_rpcproto_dynamicdiscover_proto_rawDescGZIP(), []int{0}
 }

-func (x *NodeInfo) GetNodeId() int32 {
+func (x *NodeInfo) GetNodeId() string {
 	if x != nil {
 		return x.NodeId
 	}
-	return 0
-}
-
-func (x *NodeInfo) GetNodeName() string {
-	if x != nil {
-		return x.NodeName
-	}
 	return ""
 }

@@ -127,7 +119,7 @@ type ServiceDiscoverReq struct {
 func (x *ServiceDiscoverReq) Reset() {
 	*x = ServiceDiscoverReq{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_proto_rpcproto_dynamicdiscover_proto_msgTypes[1]
+		mi := &file_rpcproto_dynamicdiscover_proto_msgTypes[1]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -140,7 +132,7 @@ func (x *ServiceDiscoverReq) String() string {
 func (*ServiceDiscoverReq) ProtoMessage() {}

 func (x *ServiceDiscoverReq) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_rpcproto_dynamicdiscover_proto_msgTypes[1]
+	mi := &file_rpcproto_dynamicdiscover_proto_msgTypes[1]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -153,7 +145,7 @@ func (x *ServiceDiscoverReq) ProtoReflect() protoreflect.Message {

 // Deprecated: Use ServiceDiscoverReq.ProtoReflect.Descriptor instead.
 func (*ServiceDiscoverReq) Descriptor() ([]byte, []int) {
-	return file_proto_rpcproto_dynamicdiscover_proto_rawDescGZIP(), []int{1}
+	return file_rpcproto_dynamicdiscover_proto_rawDescGZIP(), []int{1}
 }

 func (x *ServiceDiscoverReq) GetNodeInfo() *NodeInfo {
@@ -169,16 +161,16 @@ type SubscribeDiscoverNotify struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields

-	MasterNodeId int32       `protobuf:"varint,1,opt,name=MasterNodeId,proto3" json:"MasterNodeId,omitempty"`
+	MasterNodeId string      `protobuf:"bytes,1,opt,name=MasterNodeId,proto3" json:"MasterNodeId,omitempty"`
 	IsFull       bool        `protobuf:"varint,2,opt,name=IsFull,proto3" json:"IsFull,omitempty"`
-	DelNodeId    int32       `protobuf:"varint,3,opt,name=DelNodeId,proto3" json:"DelNodeId,omitempty"`
+	DelNodeId    string      `protobuf:"bytes,3,opt,name=DelNodeId,proto3" json:"DelNodeId,omitempty"`
 	NodeInfo     []*NodeInfo `protobuf:"bytes,4,rep,name=nodeInfo,proto3" json:"nodeInfo,omitempty"`
 }

 func (x *SubscribeDiscoverNotify) Reset() {
 	*x = SubscribeDiscoverNotify{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_proto_rpcproto_dynamicdiscover_proto_msgTypes[2]
+		mi := &file_rpcproto_dynamicdiscover_proto_msgTypes[2]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -191,7 +183,7 @@ func (x *SubscribeDiscoverNotify) String() string {
 func (*SubscribeDiscoverNotify) ProtoMessage() {}

 func (x *SubscribeDiscoverNotify) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_rpcproto_dynamicdiscover_proto_msgTypes[2]
+	mi := &file_rpcproto_dynamicdiscover_proto_msgTypes[2]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -204,14 +196,14 @@ func (x *SubscribeDiscoverNotify) ProtoReflect() protoreflect.Message {

 // Deprecated: Use SubscribeDiscoverNotify.ProtoReflect.Descriptor instead.
 func (*SubscribeDiscoverNotify) Descriptor() ([]byte, []int) {
-	return file_proto_rpcproto_dynamicdiscover_proto_rawDescGZIP(), []int{2}
+	return file_rpcproto_dynamicdiscover_proto_rawDescGZIP(), []int{2}
 }

-func (x *SubscribeDiscoverNotify) GetMasterNodeId() int32 {
+func (x *SubscribeDiscoverNotify) GetMasterNodeId() string {
 	if x != nil {
 		return x.MasterNodeId
 	}
-	return 0
+	return ""
 }

 func (x *SubscribeDiscoverNotify) GetIsFull() bool {
@@ -221,11 +213,11 @@ func (x *SubscribeDiscoverNotify) GetIsFull() bool {
 	return false
 }

-func (x *SubscribeDiscoverNotify) GetDelNodeId() int32 {
+func (x *SubscribeDiscoverNotify) GetDelNodeId() string {
 	if x != nil {
 		return x.DelNodeId
 	}
-	return 0
+	return ""
 }

 func (x *SubscribeDiscoverNotify) GetNodeInfo() []*NodeInfo {
@@ -247,7 +239,7 @@ type NodeRetireReq struct {
 func (x *NodeRetireReq) Reset() {
 	*x = NodeRetireReq{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_proto_rpcproto_dynamicdiscover_proto_msgTypes[3]
+		mi := &file_rpcproto_dynamicdiscover_proto_msgTypes[3]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -260,7 +252,7 @@ func (x *NodeRetireReq) String() string {
 func (*NodeRetireReq) ProtoMessage() {}

 func (x *NodeRetireReq) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_rpcproto_dynamicdiscover_proto_msgTypes[3]
+	mi := &file_rpcproto_dynamicdiscover_proto_msgTypes[3]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -273,7 +265,7 @@ func (x *NodeRetireReq) ProtoReflect() protoreflect.Message {

 // Deprecated: Use NodeRetireReq.ProtoReflect.Descriptor instead.
 func (*NodeRetireReq) Descriptor() ([]byte, []int) {
-	return file_proto_rpcproto_dynamicdiscover_proto_rawDescGZIP(), []int{3}
+	return file_rpcproto_dynamicdiscover_proto_rawDescGZIP(), []int{3}
 }

 func (x *NodeRetireReq) GetNodeInfo() *NodeInfo {
@@ -293,7 +285,7 @@ type Empty struct {
 func (x *Empty) Reset() {
 	*x = Empty{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_proto_rpcproto_dynamicdiscover_proto_msgTypes[4]
+		mi := &file_rpcproto_dynamicdiscover_proto_msgTypes[4]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -306,7 +298,7 @@ func (x *Empty) String() string {
 func (*Empty) ProtoMessage() {}

 func (x *Empty) ProtoReflect() protoreflect.Message {
-	mi := &file_proto_rpcproto_dynamicdiscover_proto_msgTypes[4]
+	mi := &file_rpcproto_dynamicdiscover_proto_msgTypes[4]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -319,72 +311,70 @@ func (x *Empty) ProtoReflect() protoreflect.Message {

 // Deprecated: Use Empty.ProtoReflect.Descriptor instead.
 func (*Empty) Descriptor() ([]byte, []int) {
-	return file_proto_rpcproto_dynamicdiscover_proto_rawDescGZIP(), []int{4}
+	return file_rpcproto_dynamicdiscover_proto_rawDescGZIP(), []int{4}
 }

-var File_proto_rpcproto_dynamicdiscover_proto protoreflect.FileDescriptor
+var File_rpcproto_dynamicdiscover_proto protoreflect.FileDescriptor

-var file_proto_rpcproto_dynamicdiscover_proto_rawDesc = []byte{
-	0x0a, 0x24, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x72, 0x70, 0x63, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x2f, 0x64, 0x79, 0x6e, 0x61, 0x6d, 0x69, 0x63, 0x64, 0x69, 0x73, 0x63, 0x6f, 0x76, 0x65, 0x72,
-	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x03, 0x72, 0x70, 0x63, 0x22, 0xe6, 0x01, 0x0a, 0x08,
-	0x4e, 0x6f, 0x64, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x16, 0x0a, 0x06, 0x4e, 0x6f, 0x64, 0x65,
-	0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x4e, 0x6f, 0x64, 0x65, 0x49, 0x64,
-	0x12, 0x1a, 0x0a, 0x08, 0x4e, 0x6f, 0x64, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x08, 0x4e, 0x6f, 0x64, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x1e, 0x0a, 0x0a,
-	0x4c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x41, 0x64, 0x64, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x0a, 0x4c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x41, 0x64, 0x64, 0x72, 0x12, 0x26, 0x0a, 0x0e,
-	0x4d, 0x61, 0x78, 0x52, 0x70, 0x63, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x4c, 0x65, 0x6e, 0x18, 0x04,
-	0x20, 0x01, 0x28, 0x0d, 0x52, 0x0e, 0x4d, 0x61, 0x78, 0x52, 0x70, 0x63, 0x50, 0x61, 0x72, 0x61,
-	0x6d, 0x4c, 0x65, 0x6e, 0x12, 0x18, 0x0a, 0x07, 0x50, 0x72, 0x69, 0x76, 0x61, 0x74, 0x65, 0x18,
-	0x05, 0x20, 0x01, 0x28, 0x08, 0x52, 0x07, 0x50, 0x72, 0x69, 0x76, 0x61, 0x74, 0x65, 0x12, 0x16,
-	0x0a, 0x06, 0x52, 0x65, 0x74, 0x69, 0x72, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06,
-	0x52, 0x65, 0x74, 0x69, 0x72, 0x65, 0x12, 0x2c, 0x0a, 0x11, 0x50, 0x75, 0x62, 0x6c, 0x69, 0x63,
-	0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x4c, 0x69, 0x73, 0x74, 0x18, 0x07, 0x20, 0x03, 0x28,
-	0x09, 0x52, 0x11, 0x50, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65,
-	0x4c, 0x69, 0x73, 0x74, 0x22, 0x3f, 0x0a, 0x12, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x44,
-	0x69, 0x73, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x52, 0x65, 0x71, 0x12, 0x29, 0x0a, 0x08, 0x6e, 0x6f,
-	0x64, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x72,
-	0x70, 0x63, 0x2e, 0x4e, 0x6f, 0x64, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x08, 0x6e, 0x6f, 0x64,
-	0x65, 0x49, 0x6e, 0x66, 0x6f, 0x22, 0x9e, 0x01, 0x0a, 0x17, 0x53, 0x75, 0x62, 0x73, 0x63, 0x72,
-	0x69, 0x62, 0x65, 0x44, 0x69, 0x73, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x4e, 0x6f, 0x74, 0x69, 0x66,
-	0x79, 0x12, 0x22, 0x0a, 0x0c, 0x4d, 0x61, 0x73, 0x74, 0x65, 0x72, 0x4e, 0x6f, 0x64, 0x65, 0x49,
-	0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x4d, 0x61, 0x73, 0x74, 0x65, 0x72, 0x4e,
-	0x6f, 0x64, 0x65, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x49, 0x73, 0x46, 0x75, 0x6c, 0x6c, 0x18,
-	0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x49, 0x73, 0x46, 0x75, 0x6c, 0x6c, 0x12, 0x1c, 0x0a,
-	0x09, 0x44, 0x65, 0x6c, 0x4e, 0x6f, 0x64, 0x65, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05,
-	0x52, 0x09, 0x44, 0x65, 0x6c, 0x4e, 0x6f, 0x64, 0x65, 0x49, 0x64, 0x12, 0x29, 0x0a, 0x08, 0x6e,
-	0x6f, 0x64, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e,
-	0x72, 0x70, 0x63, 0x2e, 0x4e, 0x6f, 0x64, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x08, 0x6e, 0x6f,
-	0x64, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x22, 0x3a, 0x0a, 0x0d, 0x4e, 0x6f, 0x64, 0x65, 0x52, 0x65,
-	0x74, 0x69, 0x72, 0x65, 0x52, 0x65, 0x71, 0x12, 0x29, 0x0a, 0x08, 0x6e, 0x6f, 0x64, 0x65, 0x49,
-	0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x72, 0x70, 0x63, 0x2e,
-	0x4e, 0x6f, 0x64, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x08, 0x6e, 0x6f, 0x64, 0x65, 0x49, 0x6e,
-	0x66, 0x6f, 0x22, 0x07, 0x0a, 0x05, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x42, 0x07, 0x5a, 0x05, 0x2e,
-	0x3b, 0x72, 0x70, 0x63, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+var file_rpcproto_dynamicdiscover_proto_rawDesc = []byte{
+	0x0a, 0x1e, 0x72, 0x70, 0x63, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x64, 0x79, 0x6e, 0x61, 0x6d,
+	0x69, 0x63, 0x64, 0x69, 0x73, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+	0x12, 0x03, 0x72, 0x70, 0x63, 0x22, 0xca, 0x01, 0x0a, 0x08, 0x4e, 0x6f, 0x64, 0x65, 0x49, 0x6e,
+	0x66, 0x6f, 0x12, 0x16, 0x0a, 0x06, 0x4e, 0x6f, 0x64, 0x65, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x06, 0x4e, 0x6f, 0x64, 0x65, 0x49, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x4c, 0x69,
+	0x73, 0x74, 0x65, 0x6e, 0x41, 0x64, 0x64, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a,
+	0x4c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x41, 0x64, 0x64, 0x72, 0x12, 0x26, 0x0a, 0x0e, 0x4d, 0x61,
+	0x78, 0x52, 0x70, 0x63, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x4c, 0x65, 0x6e, 0x18, 0x03, 0x20, 0x01,
+	0x28, 0x0d, 0x52, 0x0e, 0x4d, 0x61, 0x78, 0x52, 0x70, 0x63, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x4c,
+	0x65, 0x6e, 0x12, 0x18, 0x0a, 0x07, 0x50, 0x72, 0x69, 0x76, 0x61, 0x74, 0x65, 0x18, 0x04, 0x20,
+	0x01, 0x28, 0x08, 0x52, 0x07, 0x50, 0x72, 0x69, 0x76, 0x61, 0x74, 0x65, 0x12, 0x16, 0x0a, 0x06,
+	0x52, 0x65, 0x74, 0x69, 0x72, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x52, 0x65,
+	0x74, 0x69, 0x72, 0x65, 0x12, 0x2c, 0x0a, 0x11, 0x50, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x53, 0x65,
+	0x72, 0x76, 0x69, 0x63, 0x65, 0x4c, 0x69, 0x73, 0x74, 0x18, 0x06, 0x20, 0x03, 0x28, 0x09, 0x52,
+	0x11, 0x50, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x4c, 0x69,
+	0x73, 0x74, 0x22, 0x3f, 0x0a, 0x12, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x44, 0x69, 0x73,
+	0x63, 0x6f, 0x76, 0x65, 0x72, 0x52, 0x65, 0x71, 0x12, 0x29, 0x0a, 0x08, 0x6e, 0x6f, 0x64, 0x65,
+	0x49, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x72, 0x70, 0x63,
+	0x2e, 0x4e, 0x6f, 0x64, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x08, 0x6e, 0x6f, 0x64, 0x65, 0x49,
+	0x6e, 0x66, 0x6f, 0x22, 0x9e, 0x01, 0x0a, 0x17, 0x53, 0x75, 0x62, 0x73, 0x63, 0x72, 0x69, 0x62,
+	0x65, 0x44, 0x69, 0x73, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x4e, 0x6f, 0x74, 0x69, 0x66, 0x79, 0x12,
+	0x22, 0x0a, 0x0c, 0x4d, 0x61, 0x73, 0x74, 0x65, 0x72, 0x4e, 0x6f, 0x64, 0x65, 0x49, 0x64, 0x18,
+	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x4d, 0x61, 0x73, 0x74, 0x65, 0x72, 0x4e, 0x6f, 0x64,
+	0x65, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x49, 0x73, 0x46, 0x75, 0x6c, 0x6c, 0x18, 0x02, 0x20,
+	0x01, 0x28, 0x08, 0x52, 0x06, 0x49, 0x73, 0x46, 0x75, 0x6c, 0x6c, 0x12, 0x1c, 0x0a, 0x09, 0x44,
+	0x65, 0x6c, 0x4e, 0x6f, 0x64, 0x65, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09,
+	0x44, 0x65, 0x6c, 0x4e, 0x6f, 0x64, 0x65, 0x49, 0x64, 0x12, 0x29, 0x0a, 0x08, 0x6e, 0x6f, 0x64,
+	0x65, 0x49, 0x6e, 0x66, 0x6f, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x72, 0x70,
+	0x63, 0x2e, 0x4e, 0x6f, 0x64, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x08, 0x6e, 0x6f, 0x64, 0x65,
+	0x49, 0x6e, 0x66, 0x6f, 0x22, 0x3a, 0x0a, 0x0d, 0x4e, 0x6f, 0x64, 0x65, 0x52, 0x65, 0x74, 0x69,
+	0x72, 0x65, 0x52, 0x65, 0x71, 0x12, 0x29, 0x0a, 0x08, 0x6e, 0x6f, 0x64, 0x65, 0x49, 0x6e, 0x66,
+	0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x72, 0x70, 0x63, 0x2e, 0x4e, 0x6f,
+	0x64, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x08, 0x6e, 0x6f, 0x64, 0x65, 0x49, 0x6e, 0x66, 0x6f,
+	0x22, 0x07, 0x0a, 0x05, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x42, 0x07, 0x5a, 0x05, 0x2e, 0x3b, 0x72,
+	0x70, 0x63, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }

 var (
-	file_proto_rpcproto_dynamicdiscover_proto_rawDescOnce sync.Once
-	file_proto_rpcproto_dynamicdiscover_proto_rawDescData = file_proto_rpcproto_dynamicdiscover_proto_rawDesc
+	file_rpcproto_dynamicdiscover_proto_rawDescOnce sync.Once
+	file_rpcproto_dynamicdiscover_proto_rawDescData = file_rpcproto_dynamicdiscover_proto_rawDesc
 )

-func file_proto_rpcproto_dynamicdiscover_proto_rawDescGZIP() []byte {
-	file_proto_rpcproto_dynamicdiscover_proto_rawDescOnce.Do(func() {
-		file_proto_rpcproto_dynamicdiscover_proto_rawDescData = protoimpl.X.CompressGZIP(file_proto_rpcproto_dynamicdiscover_proto_rawDescData)
+func file_rpcproto_dynamicdiscover_proto_rawDescGZIP() []byte {
+	file_rpcproto_dynamicdiscover_proto_rawDescOnce.Do(func() {
+		file_rpcproto_dynamicdiscover_proto_rawDescData = protoimpl.X.CompressGZIP(file_rpcproto_dynamicdiscover_proto_rawDescData)
 	})
-	return file_proto_rpcproto_dynamicdiscover_proto_rawDescData
+	return file_rpcproto_dynamicdiscover_proto_rawDescData
 }

-var file_proto_rpcproto_dynamicdiscover_proto_msgTypes = make([]protoimpl.MessageInfo, 5)
-var file_proto_rpcproto_dynamicdiscover_proto_goTypes = []interface{}{
+var file_rpcproto_dynamicdiscover_proto_msgTypes = make([]protoimpl.MessageInfo, 5)
+var file_rpcproto_dynamicdiscover_proto_goTypes = []interface{}{
 	(*NodeInfo)(nil),                // 0: rpc.NodeInfo
 	(*ServiceDiscoverReq)(nil),      // 1: rpc.ServiceDiscoverReq
 	(*SubscribeDiscoverNotify)(nil), // 2: rpc.SubscribeDiscoverNotify
 	(*NodeRetireReq)(nil),           // 3: rpc.NodeRetireReq
 	(*Empty)(nil),                   // 4: rpc.Empty
 }
-var file_proto_rpcproto_dynamicdiscover_proto_depIdxs = []int32{
+var file_rpcproto_dynamicdiscover_proto_depIdxs = []int32{
 	0, // 0: rpc.ServiceDiscoverReq.nodeInfo:type_name -> rpc.NodeInfo
 	0, // 1: rpc.SubscribeDiscoverNotify.nodeInfo:type_name -> rpc.NodeInfo
 	0, // 2: rpc.NodeRetireReq.nodeInfo:type_name -> rpc.NodeInfo
@@ -395,13 +385,13 @@ var file_proto_rpcproto_dynamicdiscover_proto_depIdxs = []int32{
 	0, // [0:3] is the sub-list for field type_name
 }

-func init() { file_proto_rpcproto_dynamicdiscover_proto_init() }
-func file_proto_rpcproto_dynamicdiscover_proto_init() {
-	if File_proto_rpcproto_dynamicdiscover_proto != nil {
+func init() { file_rpcproto_dynamicdiscover_proto_init() }
+func file_rpcproto_dynamicdiscover_proto_init() {
+	if File_rpcproto_dynamicdiscover_proto != nil {
 		return
 	}
 	if !protoimpl.UnsafeEnabled {
-		file_proto_rpcproto_dynamicdiscover_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+		file_rpcproto_dynamicdiscover_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*NodeInfo); i {
 			case 0:
 				return &v.state
@@ -413,7 +403,7 @@ func file_proto_rpcproto_dynamicdiscover_proto_init() {
 				return nil
 			}
 		}
-		file_proto_rpcproto_dynamicdiscover_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+		file_rpcproto_dynamicdiscover_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*ServiceDiscoverReq); i {
 			case 0:
 				return &v.state
@@ -425,7 +415,7 @@ func file_proto_rpcproto_dynamicdiscover_proto_init() {
 				return nil
 			}
 		}
-		file_proto_rpcproto_dynamicdiscover_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
+		file_rpcproto_dynamicdiscover_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*SubscribeDiscoverNotify); i {
 			case 0:
 				return &v.state
@@ -437,7 +427,7 @@ func file_proto_rpcproto_dynamicdiscover_proto_init() {
 				return nil
 			}
 		}
-		file_proto_rpcproto_dynamicdiscover_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
+		file_rpcproto_dynamicdiscover_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*NodeRetireReq); i {
 			case 0:
 				return &v.state
@@ -449,7 +439,7 @@ func file_proto_rpcproto_dynamicdiscover_proto_init() {
 				return nil
 			}
 		}
-		file_proto_rpcproto_dynamicdiscover_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
+		file_rpcproto_dynamicdiscover_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*Empty); i {
 			case 0:
 				return &v.state
@@ -466,18 +456,18 @@ func file_proto_rpcproto_dynamicdiscover_proto_init() {
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_proto_rpcproto_dynamicdiscover_proto_rawDesc,
+			RawDescriptor: file_rpcproto_dynamicdiscover_proto_rawDesc,
 			NumEnums:      0,
 			NumMessages:   5,
 			NumExtensions: 0,
 			NumServices:   0,
 		},
-		GoTypes:           file_proto_rpcproto_dynamicdiscover_proto_goTypes,
-		DependencyIndexes: file_proto_rpcproto_dynamicdiscover_proto_depIdxs,
-		MessageInfos:      file_proto_rpcproto_dynamicdiscover_proto_msgTypes,
+		GoTypes:           file_rpcproto_dynamicdiscover_proto_goTypes,
+		DependencyIndexes: file_rpcproto_dynamicdiscover_proto_depIdxs,
+		MessageInfos:      file_rpcproto_dynamicdiscover_proto_msgTypes,
 	}.Build()
-	File_proto_rpcproto_dynamicdiscover_proto = out.File
-	file_proto_rpcproto_dynamicdiscover_proto_rawDesc = nil
-	file_proto_rpcproto_dynamicdiscover_proto_goTypes = nil
-	file_proto_rpcproto_dynamicdiscover_proto_depIdxs = nil
+	File_rpcproto_dynamicdiscover_proto = out.File
+	file_rpcproto_dynamicdiscover_proto_rawDesc = nil
+	file_rpcproto_dynamicdiscover_proto_goTypes = nil
+	file_rpcproto_dynamicdiscover_proto_depIdxs = nil
 }
--- a/rpc/dynamicdiscover.proto
+++ b/rpc/dynamicdiscover.proto
@@ -3,13 +3,12 @@ package rpc;
 option go_package = ".;rpc";

 message NodeInfo{
-    int32 NodeId = 1;
-    string NodeName = 2;
-    string ListenAddr  = 3;
-    uint32 MaxRpcParamLen = 4;
-    bool Private = 5;
-	bool Retire = 6;
-    repeated string PublicServiceList = 7;
+    string NodeId = 1;
+    string ListenAddr  = 2;
+    uint32 MaxRpcParamLen = 3;
+    bool Private = 4;
+	bool Retire = 5;
+    repeated string PublicServiceList = 6;
 }

 //Client->Master
@@ -19,9 +18,9 @@ message ServiceDiscoverReq{

 //Master->Client
 message SubscribeDiscoverNotify{
-    int32 MasterNodeId = 1;
+    string MasterNodeId = 1;
    bool IsFull = 2;
-    int32 DelNodeId    = 3;
+    string DelNodeId    = 3;
    repeated NodeInfo nodeInfo = 4;
 }

--- a/rpc/lclient.go
+++ b/rpc/lclient.go
@@ -119,7 +119,7 @@ func (lc *LClient) AsyncCall(timeout time.Duration,rpcHandler IRpcHandler, servi
 	return calcelRpc,nil
 }

-func NewLClient(nodeId int) *Client{
+func NewLClient(nodeId string) *Client{
 	client := &Client{}
 	client.clientId = atomic.AddUint32(&clientSeq, 1)
 	client.nodeId = nodeId
--- a/rpc/rclient.go
+++ b/rpc/rclient.go
@@ -278,7 +278,7 @@ func (rc *RClient) OnClose() {
 	rc.TriggerRpcConnEvent(false, rc.selfClient.GetClientId(), rc.selfClient.GetNodeId())
 }

-func NewRClient(nodeId int, addr string, maxRpcParamLen uint32,compressBytesLen int,triggerRpcConnEvent TriggerRpcConnEvent) *Client{
+func NewRClient(nodeId string, addr string, maxRpcParamLen uint32,compressBytesLen int,triggerRpcConnEvent TriggerRpcConnEvent) *Client{
 	client := &Client{}
 	client.clientId = atomic.AddUint32(&clientSeq, 1)
 	client.nodeId = nodeId
--- a/rpc/rpchandler.go
+++ b/rpc/rpchandler.go
@@ -14,9 +14,9 @@ import (

 const maxClusterNode int = 128

-type FuncRpcClient func(nodeId int, serviceMethod string,filterRetire bool, client []*Client) (error, int)
+type FuncRpcClient func(nodeId string, serviceMethod string,filterRetire bool, client []*Client) (error, int)
 type FuncRpcServer func() *Server
-
+const NodeIdNull = ""

 var nilError = reflect.Zero(reflect.TypeOf((*error)(nil)).Elem())

@@ -65,15 +65,15 @@ type RpcHandler struct {
 	pClientList []*Client
 }

-type TriggerRpcConnEvent func(bConnect bool, clientSeq uint32, nodeId int)
+type TriggerRpcConnEvent func(bConnect bool, clientSeq uint32, nodeId string)
 type INodeListener interface {
-	OnNodeConnected(nodeId int)
-	OnNodeDisconnect(nodeId int)
+	OnNodeConnected(nodeId string)
+	OnNodeDisconnect(nodeId string)
 }

 type IDiscoveryServiceListener interface {
-	OnDiscoveryService(nodeId int, serviceName []string)
-	OnUnDiscoveryService(nodeId int)
+	OnDiscoveryService(nodeId string, serviceName []string)
+	OnUnDiscoveryService(nodeId string)
 }

 type CancelRpc func()
@@ -89,18 +89,18 @@ type IRpcHandler interface {
 	CallMethod(client *Client,ServiceMethod string, param interface{},callBack reflect.Value, reply interface{}) error

 	Call(serviceMethod string, args interface{}, reply interface{}) error
-	CallNode(nodeId int, serviceMethod string, args interface{}, reply interface{}) error
+	CallNode(nodeId string, serviceMethod string, args interface{}, reply interface{}) error
 	AsyncCall(serviceMethod string, args interface{}, callback interface{}) error
-	AsyncCallNode(nodeId int, serviceMethod string, args interface{}, callback interface{}) error
+	AsyncCallNode(nodeId string, serviceMethod string, args interface{}, callback interface{}) error

 	CallWithTimeout(timeout time.Duration,serviceMethod string, args interface{}, reply interface{}) error
-	CallNodeWithTimeout(timeout time.Duration,nodeId int, serviceMethod string, args interface{}, reply interface{}) error
+	CallNodeWithTimeout(timeout time.Duration,nodeId string, serviceMethod string, args interface{}, reply interface{}) error
 	AsyncCallWithTimeout(timeout time.Duration,serviceMethod string, args interface{}, callback interface{})  (CancelRpc,error)
-	AsyncCallNodeWithTimeout(timeout time.Duration,nodeId int, serviceMethod string, args interface{}, callback interface{})  (CancelRpc,error)
+	AsyncCallNodeWithTimeout(timeout time.Duration,nodeId string, serviceMethod string, args interface{}, callback interface{})  (CancelRpc,error)

 	Go(serviceMethod string, args interface{}) error
-	GoNode(nodeId int, serviceMethod string, args interface{}) error
-	RawGoNode(rpcProcessorType RpcProcessorType, nodeId int, rpcMethodId uint32, serviceName string, rawArgs []byte) error
+	GoNode(nodeId string, serviceMethod string, args interface{}) error
+	RawGoNode(rpcProcessorType RpcProcessorType, nodeId string, rpcMethodId uint32, serviceName string, rawArgs []byte) error
 	CastGo(serviceMethod string, args interface{}) error
 	IsSingleCoroutine() bool
 	UnmarshalInParam(rpcProcessor IRpcProcessor, serviceMethod string, rawRpcMethodId uint32, inParam []byte) (interface{}, error)
@@ -426,7 +426,7 @@ func (handler *RpcHandler) CallMethod(client *Client,ServiceMethod string, param
 	return err
 }

-func (handler *RpcHandler) goRpc(processor IRpcProcessor, bCast bool, nodeId int, serviceMethod string, args interface{}) error {
+func (handler *RpcHandler) goRpc(processor IRpcProcessor, bCast bool, nodeId string, serviceMethod string, args interface{}) error {
 	var pClientList [maxClusterNode]*Client
 	err, count := handler.funcRpcClient(nodeId, serviceMethod,false, pClientList[:])
 	if count == 0 {
@@ -456,7 +456,7 @@ func (handler *RpcHandler) goRpc(processor IRpcProcessor, bCast bool, nodeId int
 	return err
 }

-func (handler *RpcHandler) callRpc(timeout time.Duration,nodeId int, serviceMethod string, args interface{}, reply interface{}) error {
+func (handler *RpcHandler) callRpc(timeout time.Duration,nodeId string, serviceMethod string, args interface{}, reply interface{}) error {
 	var pClientList [maxClusterNode]*Client
 	err, count := handler.funcRpcClient(nodeId, serviceMethod,false, pClientList[:])
 	if err != nil {
@@ -480,7 +480,7 @@ func (handler *RpcHandler) callRpc(timeout time.Duration,nodeId int, serviceMeth
 	return err
 }

-func (handler *RpcHandler) asyncCallRpc(timeout time.Duration,nodeId int, serviceMethod string, args interface{}, callback interface{}) (CancelRpc,error) {
+func (handler *RpcHandler) asyncCallRpc(timeout time.Duration,nodeId string, serviceMethod string, args interface{}, callback interface{}) (CancelRpc,error) {
 	fVal := reflect.ValueOf(callback)
 	if fVal.Kind() != reflect.Func {
 		err := errors.New("call " + serviceMethod + " input callback param is error!")
@@ -505,14 +505,14 @@ func (handler *RpcHandler) asyncCallRpc(timeout time.Duration,nodeId int, servic
 	err, count := handler.funcRpcClient(nodeId, serviceMethod,false, pClientList[:])
 	if count == 0 || err != nil {
 		if err == nil {
-			if nodeId  > 0 {
+			if nodeId  != NodeIdNull {
 				err = fmt.Errorf("cannot find %s from nodeId %d",serviceMethod,nodeId)
 			}else {
 				err = fmt.Errorf("No %s service found in the origin network",serviceMethod)
 			}
 		}
 		fVal.Call([]reflect.Value{reflect.ValueOf(reply), reflect.ValueOf(err)})
-		log.Error("cannot find serviceMethod from node",log.String("serviceMethod",serviceMethod),log.Int("nodeId",nodeId))
+		log.Error("cannot find serviceMethod from node",log.String("serviceMethod",serviceMethod),log.String("nodeId",nodeId))
 		return emptyCancelRpc,nil
 	}

@@ -537,53 +537,53 @@ func (handler *RpcHandler) IsSingleCoroutine() bool {
 }

 func (handler *RpcHandler) CallWithTimeout(timeout time.Duration,serviceMethod string, args interface{}, reply interface{}) error {
-	return handler.callRpc(timeout,0, serviceMethod, args, reply)
+	return handler.callRpc(timeout,NodeIdNull, serviceMethod, args, reply)
 }

-func (handler *RpcHandler) CallNodeWithTimeout(timeout time.Duration,nodeId int, serviceMethod string, args interface{}, reply interface{})  error{
+func (handler *RpcHandler) CallNodeWithTimeout(timeout time.Duration,nodeId string, serviceMethod string, args interface{}, reply interface{})  error{
 	return handler.callRpc(timeout,nodeId, serviceMethod, args, reply)
 }

 func (handler *RpcHandler) AsyncCallWithTimeout(timeout time.Duration,serviceMethod string, args interface{}, callback interface{})  (CancelRpc,error){
-	return handler.asyncCallRpc(timeout,0, serviceMethod, args, callback)
+	return handler.asyncCallRpc(timeout,NodeIdNull, serviceMethod, args, callback)
 }

-func (handler *RpcHandler) AsyncCallNodeWithTimeout(timeout time.Duration,nodeId int, serviceMethod string, args interface{}, callback interface{})  (CancelRpc,error){
+func (handler *RpcHandler) AsyncCallNodeWithTimeout(timeout time.Duration,nodeId string, serviceMethod string, args interface{}, callback interface{})  (CancelRpc,error){
 	return handler.asyncCallRpc(timeout,nodeId, serviceMethod, args, callback)
 }

 func (handler *RpcHandler) AsyncCall(serviceMethod string, args interface{}, callback interface{}) error {
-	_,err := handler.asyncCallRpc(DefaultRpcTimeout,0, serviceMethod, args, callback)
+	_,err := handler.asyncCallRpc(DefaultRpcTimeout,NodeIdNull, serviceMethod, args, callback)
 	return err
 }

 func (handler *RpcHandler) Call(serviceMethod string, args interface{}, reply interface{}) error {
-	return handler.callRpc(DefaultRpcTimeout,0, serviceMethod, args, reply)
+	return handler.callRpc(DefaultRpcTimeout,NodeIdNull, serviceMethod, args, reply)
 }

 func (handler *RpcHandler) Go(serviceMethod string, args interface{}) error {
-	return handler.goRpc(nil, false, 0, serviceMethod, args)
+	return handler.goRpc(nil, false, NodeIdNull, serviceMethod, args)
 }

-func (handler *RpcHandler) AsyncCallNode(nodeId int, serviceMethod string, args interface{}, callback interface{}) error {
+func (handler *RpcHandler) AsyncCallNode(nodeId string, serviceMethod string, args interface{}, callback interface{}) error {
 	_,err:= handler.asyncCallRpc(DefaultRpcTimeout,nodeId, serviceMethod, args, callback)

 	return err
 }

-func (handler *RpcHandler) CallNode(nodeId int, serviceMethod string, args interface{}, reply interface{}) error {
+func (handler *RpcHandler) CallNode(nodeId string, serviceMethod string, args interface{}, reply interface{}) error {
 	return handler.callRpc(DefaultRpcTimeout,nodeId, serviceMethod, args, reply)
 }

-func (handler *RpcHandler) GoNode(nodeId int, serviceMethod string, args interface{}) error {
+func (handler *RpcHandler) GoNode(nodeId string, serviceMethod string, args interface{}) error {
 	return handler.goRpc(nil, false, nodeId, serviceMethod, args)
 }

 func (handler *RpcHandler) CastGo(serviceMethod string, args interface{}) error {
-	return handler.goRpc(nil, true, 0, serviceMethod, args)
+	return handler.goRpc(nil, true, NodeIdNull, serviceMethod, args)
 }

-func (handler *RpcHandler) RawGoNode(rpcProcessorType RpcProcessorType, nodeId int, rpcMethodId uint32, serviceName string, rawArgs []byte) error {
+func (handler *RpcHandler) RawGoNode(rpcProcessorType RpcProcessorType, nodeId string, rpcMethodId uint32, serviceName string, rawArgs []byte) error {
 	processor := GetProcessor(uint8(rpcProcessorType))
 	err, count := handler.funcRpcClient(nodeId, serviceName,false, handler.pClientList)
 	if count == 0 || err != nil {
--- a/service/service.go
+++ b/service/service.go
@@ -67,14 +67,14 @@ type Service struct {
 // RpcConnEvent Node结点连接事件
 type RpcConnEvent struct{
 	IsConnect bool
-	NodeId int
+	NodeId string
 }

 // DiscoveryServiceEvent 发现服务结点
 type DiscoveryServiceEvent struct{
 	IsDiscovery bool
 	ServiceName []string
-	NodeId int
+	NodeId string
 }

 func SetMaxServiceChannel(maxEventChannel int){
--- a/sysservice/tcpservice/tcpservice.go
+++ b/sysservice/tcpservice/tcpservice.go
@@ -6,7 +6,6 @@ import (
 	"github.com/duanhf2012/origin/v2/log"
 	"github.com/duanhf2012/origin/v2/network"
 	"github.com/duanhf2012/origin/v2/network/processor"
-	"github.com/duanhf2012/origin/v2/node"
 	"github.com/duanhf2012/origin/v2/service"
 	"github.com/duanhf2012/origin/v2/util/bytespool"
 	"runtime"
@@ -22,6 +21,7 @@ type TcpService struct {
 	mapClientLocker sync.RWMutex
 	mapClient       map[uint64] *Client
 	process processor.IProcessor
+	machineId uint16
 }

 type TcpPackType int8
@@ -33,7 +33,7 @@ const(
 )

 const (
-	MaxNodeId = 1<<14 - 1  //最大值 16383
+	MaxMachineId = 1<<14 - 1  //最大值 16383
 	MaxSeed   = 1<<19 - 1  //最大值 524287
 	MaxTime   = 1<<31 - 1  //最大值 2147483647
 )
@@ -55,7 +55,7 @@ type Client struct {
 func (tcpService *TcpService) genId() uint64 {
 	newSeed := atomic.AddUint32(&seed,1) % MaxSeed
 	nowTime := uint64(time.Now().Unix())%MaxTime
-	return (uint64(node.GetNodeId()%MaxNodeId)<<50)|(nowTime<<19)|uint64(newSeed)
+	return (uint64(tcpService.machineId)<<50)|(nowTime<<19)|uint64(newSeed)
 }

 func (tcpService *TcpService) OnInit() error{
@@ -74,6 +74,17 @@ func (tcpService *TcpService) OnInit() error{
 	if ok == true {
 		tcpService.tcpServer.MaxConnNum = int(MaxConnNum.(float64))
 	}
+
+	MachineId,ok := tcpCfg["MachineId"]
+	if ok == true {
+		tcpService.machineId = uint16(MachineId.(float64))
+		if tcpService.machineId > MaxMachineId {
+			return fmt.Errorf("MachineId is error!")
+		}
+	}else {
+		return fmt.Errorf("MachineId is error!")
+	}
+
 	PendingWriteNum,ok := tcpCfg["PendingWriteNum"]
 	if ok == true {
 		tcpService.tcpServer.PendingWriteNum = int(PendingWriteNum.(float64))
--- a/sysservice/wsservice/wsservice.go
+++ b/sysservice/wsservice/wsservice.go
@@ -7,7 +7,6 @@ import (
 	"github.com/duanhf2012/origin/v2/network"
 	"github.com/duanhf2012/origin/v2/network/processor"
 	"github.com/duanhf2012/origin/v2/service"
-	"github.com/duanhf2012/origin/v2/node"
 	"sync"
 	"sync/atomic"
 	"time"
@@ -22,8 +21,7 @@ type WSService struct {
 	mapClientLocker sync.RWMutex
 	mapClient       map[uint64] *WSClient
 	process         processor.IProcessor
-
-
+	machineId    	uint16
 }

 var seed uint32
@@ -41,7 +39,7 @@ const Default_WS_PendingWriteNum = 10000
 const Default_WS_MaxMsgLen = 65535

 const (
-	MaxNodeId = 1<<14 - 1  //最大值 16383
+	MaxMachineId = 1<<14 - 1  //最大值 16383
 	MaxSeed   = 1<<19 - 1  //最大值 524287
 	MaxTime   = 1<<31 - 1  //最大值 2147483647
 )
@@ -79,6 +77,15 @@ func (ws *WSService) OnInit() error{
 	if ok == true {
 		ws.wsServer.MaxConnNum = int(MaxConnNum.(float64))
 	}
+	MachineId,ok := wsCfg["MachineId"]
+	if ok == true {
+		ws.machineId = uint16(MachineId.(float64))
+		if ws.machineId > MaxMachineId {
+			return fmt.Errorf("MachineId is error!")
+		}
+	}else {
+		return fmt.Errorf("MachineId is error!")
+	}
 	PendingWriteNum,ok := wsCfg["PendingWriteNum"]
 	if ok == true {
 		ws.wsServer.PendingWriteNum = int(PendingWriteNum.(float64))
@@ -119,13 +126,9 @@ func (ws *WSService) SetProcessor(process processor.IProcessor,handler event.IEv
 }

 func (ws *WSService) genId() uint64 {
-	if node.GetNodeId()>MaxNodeId{
-		panic("nodeId exceeds the maximum!")
-	}
-
 	newSeed := atomic.AddUint32(&seed,1) % MaxSeed
 	nowTime := uint64(time.Now().Unix())%MaxTime
-	return (uint64(node.GetNodeId())<<50)|(nowTime<<19)|uint64(newSeed)
+	return (uint64(ws.machineId)<<50)|(nowTime<<19)|uint64(newSeed)
 }

 func (ws *WSService) NewWSClient(conn *network.WSConn) network.Agent {