新增name命令参数

README.md

@@ -87,6 +87,9 @@ service.json如下：
 ---------------
 ```
 {
+"Global": {
+		"AreaId": 1
+	},
   "Service":{
 	  "HttpService":{
 		"ListenAddr":"0.0.0.0:9402",
@@ -157,7 +160,7 @@ service.json如下：
 ```
 
 ---------------
-以上配置分为两个部分：Service与NodeService，NodeService中配置的对应结点中服务的配置，如果启动程序中根据nodeid查找该域的对应的服务，如果找不到时，从Service公共部分查找。
+以上配置分为两个部分：Global,Service与NodeService。Global是全局配置，在任何服务中都可以通过cluster.GetCluster().GetGlobalCfg()获取，NodeService中配置的对应结点中服务的配置，如果启动程序中根据nodeid查找该域的对应的服务，如果找不到时，从Service公共部分查找。
 
 **HttpService配置**
 * ListenAddr:Http监听地址

cluster/cluster.go

@@ -41,8 +41,9 @@ type NodeRpcInfo struct {
 var cluster Cluster
 
 type Cluster struct {
-	localNodeInfo           NodeInfo   //本结点配置信息
-	masterDiscoveryNodeList []NodeInfo //配置发现Master结点
+	localNodeInfo           NodeInfo    //本结点配置信息
+	masterDiscoveryNodeList []NodeInfo  //配置发现Master结点
+	globalCfg               interface{} //全局配置
 
 	localServiceCfg  map[string]interface{} //map[serviceName]配置数据*
 	mapRpc           map[int]NodeRpcInfo    //nodeId
@@ -418,3 +419,7 @@ func HasService(nodeId int, serviceName string) bool {
 
 	return false
 }
+
+func (cls *Cluster) GetGlobalCfg() interface{} {
+	return cls.globalCfg
+}

cluster/parsecfg.go

@@ -10,12 +10,13 @@ import (
 )
 
 var json = jsoniter.ConfigCompatibleWithStandardLibrary
+
 type NodeInfoList struct {
-	MasterDiscoveryNode []NodeInfo  //用于服务发现Node
-	NodeList []NodeInfo
+	MasterDiscoveryNode []NodeInfo //用于服务发现Node
+	NodeList            []NodeInfo
 }
 
-func (cls *Cluster) ReadClusterConfig(filepath string) (*NodeInfoList,error) {
+func (cls *Cluster) ReadClusterConfig(filepath string) (*NodeInfoList, error) {
 	c := &NodeInfoList{}
 	d, err := ioutil.ReadFile(filepath)
 	if err != nil {
@@ -26,119 +27,123 @@ func (cls *Cluster) ReadClusterConfig(filepath string) (*NodeInfoList,error) {
 		return nil, err
 	}
 
-	return c,nil
+	return c, nil
 }
 
-func (cls *Cluster) readServiceConfig(filepath string)  (map[string]interface{},map[int]map[string]interface{},error) {
+func (cls *Cluster) readServiceConfig(filepath string) (interface{}, map[string]interface{}, map[int]map[string]interface{}, error) {
 	c := map[string]interface{}{}
 	//读取配置
 	d, err := ioutil.ReadFile(filepath)
 	if err != nil {
-		return nil,nil, err
+		return nil, nil, nil, err
 	}
 	err = json.Unmarshal(d, &c)
 	if err != nil {
-		return nil,nil, err
+		return nil, nil, nil, err
 	}
 
+	GlobalCfg, ok := c["Global"]
 	serviceConfig := map[string]interface{}{}
-	serviceCfg,ok  := c["Service"]
+	serviceCfg, ok := c["Service"]
 	if ok == true {
 		serviceConfig = serviceCfg.(map[string]interface{})
 	}
 
 	mapNodeService := map[int]map[string]interface{}{}
-	nodeServiceCfg,ok  := c["NodeService"]
+	nodeServiceCfg, ok := c["NodeService"]
 	if ok == true {
 		nodeServiceList := nodeServiceCfg.([]interface{})
-		for _,v := range nodeServiceList{
-			serviceCfg :=v.(map[string]interface{})
-			nodeId,ok := serviceCfg["NodeId"]
+		for _, v := range nodeServiceList {
+			serviceCfg := v.(map[string]interface{})
+			nodeId, ok := serviceCfg["NodeId"]
 			if ok == false {
 				log.SFatal("NodeService list not find nodeId field")
 			}
 			mapNodeService[int(nodeId.(float64))] = serviceCfg
 		}
 	}
-	return serviceConfig,mapNodeService,nil
+	return GlobalCfg, serviceConfig, mapNodeService, nil
 }
 
-func (cls *Cluster) readLocalClusterConfig(nodeId int) ([]NodeInfo,[]NodeInfo,error) {
+func (cls *Cluster) readLocalClusterConfig(nodeId int) ([]NodeInfo, []NodeInfo, error) {
 	var nodeInfoList []NodeInfo
 	var masterDiscoverNodeList []NodeInfo
-	clusterCfgPath :=strings.TrimRight(configDir,"/")  +"/cluster"
-	fileInfoList,err := ioutil.ReadDir(clusterCfgPath)
+	clusterCfgPath := strings.TrimRight(configDir, "/") + "/cluster"
+	fileInfoList, err := ioutil.ReadDir(clusterCfgPath)
 	if err != nil {
-		return nil,nil,fmt.Errorf("Read dir %s is fail :%+v",clusterCfgPath,err)
+		return nil, nil, fmt.Errorf("Read dir %s is fail :%+v", clusterCfgPath, err)
 	}
 
 	//读取任何文件,只读符合格式的配置,目录下的文件可以自定义分文件
-	for _,f := range fileInfoList{
+	for _, f := range fileInfoList {
 		if f.IsDir() == false {
-			filePath := strings.TrimRight(strings.TrimRight(clusterCfgPath,"/"),"\\")+"/"+f.Name()
-			localNodeInfoList,err := cls.ReadClusterConfig(filePath)
+			filePath := strings.TrimRight(strings.TrimRight(clusterCfgPath, "/"), "\\") + "/" + f.Name()
+			localNodeInfoList, err := cls.ReadClusterConfig(filePath)
 			if err != nil {
-				return nil,nil,fmt.Errorf("read file path %s is error:%+v" ,filePath,err)
+				return nil, nil, fmt.Errorf("read file path %s is error:%+v", filePath, err)
 			}
-			masterDiscoverNodeList = append(masterDiscoverNodeList,localNodeInfoList.MasterDiscoveryNode...)
-			for _,nodeInfo := range localNodeInfoList.NodeList {
+			masterDiscoverNodeList = append(masterDiscoverNodeList, localNodeInfoList.MasterDiscoveryNode...)
+			for _, nodeInfo := range localNodeInfoList.NodeList {
 				if nodeInfo.NodeId == nodeId || nodeId == 0 {
-					nodeInfoList = append(nodeInfoList,nodeInfo)
+					nodeInfoList = append(nodeInfoList, nodeInfo)
 				}
 			}
 		}
 	}
 
-	if nodeId != 0 &&  (len(nodeInfoList)!=1){
-		return nil,nil,fmt.Errorf("%d configurations were found for the configuration with node ID %d!",len(nodeInfoList),nodeId)
+	if nodeId != 0 && (len(nodeInfoList) != 1) {
+		return nil, nil, fmt.Errorf("%d configurations were found for the configuration with node ID %d!", len(nodeInfoList), nodeId)
 	}
 
-	for i,_ := range nodeInfoList{
-		for j,s := range nodeInfoList[i].ServiceList{
+	for i, _ := range nodeInfoList {
+		for j, s := range nodeInfoList[i].ServiceList {
 			//私有结点不加入到Public服务列表中
-			if strings.HasPrefix(s,"_") == false && nodeInfoList[i].Private==false {
-				nodeInfoList[i].PublicServiceList = append(nodeInfoList[i].PublicServiceList,strings.TrimLeft(s,"_"))
-			}else{
-				nodeInfoList[i].ServiceList[j] = strings.TrimLeft(s,"_")
+			if strings.HasPrefix(s, "_") == false && nodeInfoList[i].Private == false {
+				nodeInfoList[i].PublicServiceList = append(nodeInfoList[i].PublicServiceList, strings.TrimLeft(s, "_"))
+			} else {
+				nodeInfoList[i].ServiceList[j] = strings.TrimLeft(s, "_")
 			}
 		}
 	}
 
-
-	return masterDiscoverNodeList,nodeInfoList,nil
+	return masterDiscoverNodeList, nodeInfoList, nil
 }
 
 func (cls *Cluster) readLocalService(localNodeId int) error {
-	clusterCfgPath :=strings.TrimRight(configDir,"/")  +"/cluster"
-	fileInfoList,err := ioutil.ReadDir(clusterCfgPath)
+	clusterCfgPath := strings.TrimRight(configDir, "/") + "/cluster"
+	fileInfoList, err := ioutil.ReadDir(clusterCfgPath)
 	if err != nil {
-		return fmt.Errorf("Read dir %s is fail :%+v",clusterCfgPath,err)
+		return fmt.Errorf("Read dir %s is fail :%+v", clusterCfgPath, err)
 	}
 
 	//读取任何文件,只读符合格式的配置,目录下的文件可以自定义分文件
-	for _,f := range fileInfoList {
+	for _, f := range fileInfoList {
 		if f.IsDir() == false {
 			filePath := strings.TrimRight(strings.TrimRight(clusterCfgPath, "/"), "\\") + "/" + f.Name()
-			serviceConfig,mapNodeService,err := cls.readServiceConfig(filePath)
+			currGlobalCfg, serviceConfig, mapNodeService, err := cls.readServiceConfig(filePath)
 			if err != nil {
 				continue
 			}
 
-			for _,s := range cls.localNodeInfo.ServiceList{
-				for{
+			if currGlobalCfg != nil {
+				cls.globalCfg = currGlobalCfg
+			}
+
+			for _, s := range cls.localNodeInfo.ServiceList {
+				for {
 					//取公共服务配置
-					pubCfg,ok := serviceConfig[s]
+					pubCfg, ok := serviceConfig[s]
 					if ok == true {
 						cls.localServiceCfg[s] = pubCfg
 					}
 
 					//如果结点也配置了该服务，则覆盖之
-					nodeService,ok := mapNodeService[localNodeId]
+					nodeService, ok := mapNodeService[localNodeId]
 					if ok == false {
 						break
 					}
-					sCfg,ok := nodeService[s]
-					if ok == false{
+					sCfg, ok := nodeService[s]
+					if ok == false {
 						break
 					}
 
@@ -152,22 +157,21 @@ func (cls *Cluster) readLocalService(localNodeId int) error {
 	return nil
 }
 
-func (cls *Cluster) parseLocalCfg(){
+func (cls *Cluster) parseLocalCfg() {
 	cls.mapIdNode[cls.localNodeInfo.NodeId] = cls.localNodeInfo
 
-	for _,sName := range cls.localNodeInfo.ServiceList{
-		if _,ok:=cls.mapServiceNode[sName];ok==false{
+	for _, sName := range cls.localNodeInfo.ServiceList {
+		if _, ok := cls.mapServiceNode[sName]; ok == false {
 			cls.mapServiceNode[sName] = make(map[int]struct{})
 		}
 
-		cls.mapServiceNode[sName][cls.localNodeInfo.NodeId]= struct{}{}
+		cls.mapServiceNode[sName][cls.localNodeInfo.NodeId] = struct{}{}
 	}
 }
 
-
-func (cls *Cluster) checkDiscoveryNodeList(discoverMasterNode []NodeInfo) bool{
-	for i:=0;i<len(discoverMasterNode)-1;i++{
-		for j:=i+1;j<len(discoverMasterNode);j++{
+func (cls *Cluster) checkDiscoveryNodeList(discoverMasterNode []NodeInfo) bool {
+	for i := 0; i < len(discoverMasterNode)-1; i++ {
+		for j := i + 1; j < len(discoverMasterNode); j++ {
 			if discoverMasterNode[i].NodeId == discoverMasterNode[j].NodeId ||
 				discoverMasterNode[i].ListenAddr == discoverMasterNode[j].ListenAddr {
 				return false
@@ -178,19 +182,19 @@ func (cls *Cluster) checkDiscoveryNodeList(discoverMasterNode []NodeInfo) bool{
 	return true
 }
 
-func (cls *Cluster) InitCfg(localNodeId int) error{
+func (cls *Cluster) InitCfg(localNodeId int) error {
 	cls.localServiceCfg = map[string]interface{}{}
-	cls.mapRpc = map[int] NodeRpcInfo{}
+	cls.mapRpc = map[int]NodeRpcInfo{}
 	cls.mapIdNode = map[int]NodeInfo{}
 	cls.mapServiceNode = map[string]map[int]struct{}{}
 
 	//加载本地结点的NodeList配置
-	discoveryNode,nodeInfoList,err := cls.readLocalClusterConfig(localNodeId)
+	discoveryNode, nodeInfoList, err := cls.readLocalClusterConfig(localNodeId)
 	if err != nil {
 		return err
 	}
 	cls.localNodeInfo = nodeInfoList[0]
-	if cls.checkDiscoveryNodeList(discoveryNode) ==false {
+	if cls.checkDiscoveryNodeList(discoveryNode) == false {
 		return fmt.Errorf("DiscoveryNode config is error!")
 	}
 	cls.masterDiscoveryNodeList = discoveryNode
@@ -209,39 +213,39 @@ func (cls *Cluster) InitCfg(localNodeId int) error{
 func (cls *Cluster) IsConfigService(serviceName string) bool {
 	cls.locker.RLock()
 	defer cls.locker.RUnlock()
-	mapNode,ok := cls.mapServiceNode[serviceName]
+	mapNode, ok := cls.mapServiceNode[serviceName]
 	if ok == false {
 		return false
 	}
 
-	_,ok = mapNode[cls.localNodeInfo.NodeId]
+	_, ok = mapNode[cls.localNodeInfo.NodeId]
 	return ok
 }
 
-func (cls *Cluster) GetNodeIdByService(serviceName string,rpcClientList []*rpc.Client,bAll bool) (error,int) {
+func (cls *Cluster) GetNodeIdByService(serviceName string, rpcClientList []*rpc.Client, bAll bool) (error, int) {
 	cls.locker.RLock()
 	defer cls.locker.RUnlock()
-	mapNodeId,ok := cls.mapServiceNode[serviceName]
+	mapNodeId, ok := cls.mapServiceNode[serviceName]
 	count := 0
 	if ok == true {
-		for nodeId,_ := range mapNodeId {
+		for nodeId, _ := range mapNodeId {
 			pClient := GetCluster().getRpcClient(nodeId)
-			if pClient==nil  || (bAll == false && pClient.IsConnected()==false) {
+			if pClient == nil || (bAll == false && pClient.IsConnected() == false) {
 				continue
 			}
 			rpcClientList[count] = pClient
 			count++
-			if count>=cap(rpcClientList) {
+			if count >= cap(rpcClientList) {
 				break
 			}
 		}
 	}
 
-	return nil,count
+	return nil, count
 }
 
-func (cls *Cluster) getServiceCfg(serviceName string) interface{}{
-	v,ok := cls.localServiceCfg[serviceName]
+func (cls *Cluster) getServiceCfg(serviceName string) interface{} {
+	v, ok := cls.localServiceCfg[serviceName]
 	if ok == false {
 		return nil
 	}
@@ -249,8 +253,8 @@ func (cls *Cluster) getServiceCfg(serviceName string) interface{}{
 	return v
 }
 
-func (cls *Cluster) GetServiceCfg(serviceName string) interface{}{
-	serviceCfg,ok := cls.localServiceCfg[serviceName]
+func (cls *Cluster) GetServiceCfg(serviceName string) interface{} {
+	serviceCfg, ok := cls.localServiceCfg[serviceName]
 	if ok == false {
 		return nil
 	}

node/node.go

@@ -9,6 +9,7 @@ import (
 	"github.com/duanhf2012/origin/profiler"
 	"github.com/duanhf2012/origin/service"
 	"github.com/duanhf2012/origin/util/timer"
+	"github.com/duanhf2012/origin/util/buildtime"
 	"io/ioutil"
 	slog "log"
 	"net/http"
@@ -38,6 +39,7 @@ func init() {
 	signal.Notify(sig, syscall.SIGINT, syscall.SIGTERM,syscall.Signal(10))
 
 	console.RegisterCommandBool("help",false,"<-help> This help.",usage)
+	console.RegisterCommandString("name","","<-name nodeName> Node's name.",setName)
 	console.RegisterCommandString("start","","<-start nodeid=nodeid> Run originserver.",startNode)
 	console.RegisterCommandString("stop","","<-stop nodeid=nodeid> Stop originserver process.",stopNode)
 	console.RegisterCommandString("config","","<-config path> Configuration file path.",setConfigPath)
@@ -53,13 +55,20 @@ func usage(val interface{}) error{
 		return nil
 	}
 
-	fmt.Fprintf(os.Stderr, `orgin version: orgin/2.14.20201029
-Usage: originserver [-help] [-start node=1] [-stop] [-config path] [-pprof 0.0.0.0:6060]...
-`)
+	if len(buildtime.GetBuildDateTime())>0 {
+		fmt.Fprintf(os.Stderr, "Welcome to Origin(build info: %s)\nUsage: originserver [-help] [-start node=1] [-stop] [-config path] [-pprof 0.0.0.0:6060]...\n",buildtime.GetBuildDateTime())
+	}else{
+		fmt.Fprintf(os.Stderr, "Welcome to Origin\nUsage: originserver [-help] [-start node=1] [-stop] [-config path] [-pprof 0.0.0.0:6060]...\n")
+	}
+
 	console.PrintDefaults()
 	return nil
 }
 
+func setName(val interface{}) error {
+	return nil
+}
+
 func setPprof(val interface{}) error {
 	listenAddr := val.(string)
 	if listenAddr==""{

util/buildtime/build.go

@@ -0,0 +1,15 @@
+package buildtime
+
+/*
+//查询buildtime包中的位置，在github.com/duanhf2012/origin/util/buildtime.BuildTime中
+go tool nm ./originserver.exe |grep buildtime
+
+//编译传入编译时间信息
+go build -ldflags "-X 'github.com/duanhf2012/origin/util/buildtime.BuildTime=20200101'"
+*/
+var BuildTime string
+
+
+func GetBuildDateTime() string {
+	return BuildTime
+}