Merge branch 'master' of https://github.com/duanhf2012/origin

cluster/config.go

@@ -75,6 +75,9 @@ func ReadCfg(path string, nodeid int) (*ClusterConfig, error) {
 		}
 	}
 
+	//存入当前Node服务名
+	c.mapClusterNodeService[c.currentNode.NodeName] = append(c.mapClusterNodeService[c.currentNode.NodeName], c.currentNode)
+
 	//组装mapClusterNodeService
 	for _, cn := range custerNodeName {
 		for _, n := range c.mapIdNode {

sysmodule/DBModule.go

@@ -50,6 +50,13 @@ func (slf *DBModule) OnInit() error {
 	return slf.Connect(10)
 }
 
+//Close ...
+func (slf *DBResult) Close() {
+	if slf.res != nil {
+		slf.res.Close()
+	}
+}
+
 // Next ...
 func (slf *DBResult) Next() bool {
 	if slf.Err != nil {