rename client package

Author: c-wind

candy.go

@@ -1,19 +1,19 @@
 /*
-  
-Candy是一款即时通信软件。  
-
-Gate 接收客户端请求，负责客户端连接维护  
-Notice 消息分发中心，整个系统的消息队列  
-Store 消息及用户信息存储  
-  
-下载  
-将 candy 代码 clone 到 $GOPATH/src/github.com/dearcode 目录下   
-    
-编译安装   
-make  
-
-运行  
-依次启动 master, notice, store, gate, 直接运行不需要参数，默认使用9000到9004端口   
+
+Candy是一款即时通信软件。
+
+Gate 接收客户端请求，负责客户端连接维护
+Notice 消息分发中心，整个系统的消息队列
+Store 消息及用户信息存储
+
+下载
+将 candy 代码 clone 到 $GOPATH/src/github.com/dearcode 目录下
+
+编译安装
+make
+
+运行
+依次启动 master, notice, store, gate, 直接运行不需要参数，默认使用9000到9004端口
 
 
 技术讨论QQ群：29996599

client/candy.go

@@ -1,4 +1,4 @@
-package candy
+package client
 
 import (
 	"time"

client/candy_test.go

@@ -1,4 +1,4 @@
-package candy
+package client
 
 import (
 	"bytes"

client/client.aar

@@ -1,4 +1,4 @@
-package candy
+package client
 
 // UserInfo 用户信息
 type UserInfo struct {

client/common.go

@@ -1,4 +1,4 @@
-package candy
+package client
 
 import (
 	"encoding/json"

client/util.go

@@ -17,7 +17,7 @@ func main() {
 		return
 	}
 
-	s := master.NewMasterServer(*host)
+	s := master.NewMaster(*host)
 	if err := s.Start(); err != nil {
 		println(err.Error())
 	}

cmd/master/main.go

@@ -10,20 +10,20 @@ import (
 	"github.com/dearcode/candy/util/log"
 )
 
-// MasterServer process gate request.
-type MasterServer struct {
+// Master process gate request.
+type Master struct {
 	host        string
 	idAllocator *idAllocator
 }
 
-// NewMasterServer create new MasterServer
-func NewMasterServer(host string) *MasterServer {
-	return &MasterServer{host: host, idAllocator: newIDAllocator()}
+// NewMaster create new Master.
+func NewMaster(host string) *Master {
+	return &Master{host: host, idAllocator: newIDAllocator()}
 }
 
-// Start start masterServer
-func (g *MasterServer) Start() error {
-	log.Debugf("masterServer Start...")
+// Start start Master
+func (g *Master) Start() error {
+	log.Debugf("Master Start...")
 	serv := grpc.NewServer()
 	meta.RegisterMasterServer(serv, g)
 
@@ -36,6 +36,6 @@ func (g *MasterServer) Start() error {
 }
 
 // NewID return an new id
-func (g *MasterServer) NewID(_ context.Context, _ *meta.NewIDRequest) (*meta.NewIDResponse, error) {
+func (g *Master) NewID(_ context.Context, _ *meta.NewIDRequest) (*meta.NewIDResponse, error) {
 	return &meta.NewIDResponse{ID: g.idAllocator.newID()}, nil
 }