reactor: 重构底层框架1.0

zhangqijia
1 parent 7f269318
Showing 46 changed files with 830 additions and 537 deletions Show diff stats
Makefile
cmd/game.go
cmd/gameserver/agent.go
cmd/gameserver/game.go
src/actions/AccountAction.go -> cmd/httpserver/AccountAction.go
cmd/http.go -> cmd/httpserver/http.go
src/components/net/http_test.go -> cmd/httpserver/http_test.go
test/client.go -> cmd/test/client.go
test/client_test.go -> cmd/test/client_test.go
common/components/conn.go
src/components/net/http.go -> common/components/http.go
common/components/icompontents.go
common/components/pbsplitter.go
common/components/server.go
src/components/timewheel/timerwheel.go -> common/components/timerwheel.go
src/components/timewheel/timewheel_test.go -> common/components/timewheel_test.go
src/components/workpool/workpool.go -> common/components/workpool.go
src/common/common.go -> common/const.go
conf/conf.go
conf/conf.yaml
@@ -7,12 +7,12 @@ gen:
 	protoc-go-inject-tag -input=./pb/*.pb.go
 test:
-	go run test/client.go
+	go run cmd/test/client.go
 http:
-	go run -race cmd/http.go
+	go run -race cmd/httpserver/*.go
 game:
-	go run -race cmd/game.go
+	go run -race cmd/gameserver/*.go
 build:
 	go build -race -o bin/account cmd/http.go
 	go build -race -o bin/game cmd/game.go
@@ -1,41 +0,0 @@
-package main
-
-import (
-	_ "net/http/pprof"
-	"os"
-	"os/signal"
-	"pro2d/conf"
-	"pro2d/src/components/logger"
-	"pro2d/src/components/net"
-	_ "pro2d/src/plugin"
-	"syscall"
-)
-
-func main()  {
-	err := make(chan error)
-	stopChan := make(chan os.Signal)
-	signal.Notify(stopChan, syscall.SIGTERM, syscall.SIGINT, syscall.SIGKILL)
-
-	userChan := make(chan os.Signal)
-	signal.Notify(userChan, syscall.SIGUSR1, syscall.SIGUSR2)
-
-	s := net.NewServer(conf.GlobalConf.GameConf)
-	go func() {
-		err <- s.Start()
-	}()
-
-	for {
-		select {
-		case e := <- err:
-			logger.Error("game server error: %v", e)
-			return
-		case <-stopChan:
-			s.Stop()
-			logger.Debug("game stop...")
-			return
-		case u := <-userChan:
-			logger.Debug("userChan .. %v",u.String())
-			s.LoadPlugin()
-		}
-	}
-}
@@ -0,0 +1,132 @@
+package main
+
+import (
+	"fmt"
+	"github.com/golang/protobuf/proto"
+	"math"
+	"pro2d/common"
+	"pro2d/common/components"
+	"pro2d/models"
+	"pro2d/pb"
+	"pro2d/utils"
+	"pro2d/utils/logger"
+	"sync/atomic"
+)
+
+type Agent struct {
+	components.IConnection
+	Server components.IServer
+
+	Role			*models.RoleModel
+
+	readFunc  chan func()
+	timerFunc chan func()
+	Quit	  chan *Agent
+
+	nextCheckTime   	int64 //下一次检查的时间
+	lastHeartCheckTime 	int64
+	heartTimeoutCount  	int   //超时次数
+}
+
+func NewAgent(s components.IServer) *Agent {
+	return &Agent{
+		Server:    s,
+		readFunc:  make(chan func(), 10),
+		timerFunc: make(chan func(), 10),
+		Quit: make(chan *Agent),
+
+		nextCheckTime:      0,
+		lastHeartCheckTime: utils.Timex(),
+		heartTimeoutCount:  0,
+	}
+}
+
+func (c *Agent) listen()  {
+	defer c.Close()
+	for  {
+		select {
+		case timerFunc := <- c.timerFunc:
+			timerFunc()
+		case readFunc := <- c.readFunc:
+			readFunc()
+		case <- c.Quit:
+			return
+		}
+	}
+}
+
+func (c *Agent) OnConnection(conn components.IConnection)  {
+	c.IConnection = conn
+	go c.listen()
+}
+
+func (c *Agent) OnMessage(msg components.IMessage)  {
+	f := func() {
+		atomic.StoreInt64(&c.lastHeartCheckTime, utils.Timex())
+		if md, ok := components.ActionMap[pb.ProtoCode(msg.GetHeader().GetMsgID())]; ok {
+			logger.Debug("protocode handler: %d", msg.GetHeader().GetMsgID())
+			errCode, protomsg := md(msg)
+			rsp, err := proto.Marshal(protomsg)
+			fmt.Printf("errCode: %d, protomsg:%v\n", errCode, protomsg)
+			if err != nil {
+				conn := c.Server.GetIConnection(msg.GetSessId())
+				if conn != nil {
+					conn.Send(-100, msg.GetHeader().GetMsgID(), nil)
+				}
+				return
+			}
+			conn := c.Server.GetIConnection(msg.GetSessId())
+			if conn != nil {
+				conn.Send(errCode, msg.GetHeader().GetMsgID(), rsp)
+			}
+			return
+		}
+		logger.Error("protocode not handler: %d", msg.GetHeader().GetMsgID())
+	}
+	c.readFunc <- f
+}
+
+func (c *Agent) OnClose()  {
+	c.Quit <- c
+}
+
+func (c *Agent) Close()  {
+	if c.Role == nil {
+		return
+	}
+
+	c.Role.OnOfflineEvent()
+}
+
+func (c *Agent) checkHeartBeat(now int64)  {
+	lastHeartCheckTime := atomic.LoadInt64(&c.lastHeartCheckTime)
+	logger.Debug("checkHeartBeat ID: %d, last: %d, now: %d", c.GetID(), lastHeartCheckTime, now)
+	if math.Abs(float64(lastHeartCheckTime - now)) > common.HeartTimerInterval {
+		c.heartTimeoutCount++
+		if c.heartTimeoutCount >= common.HeartTimeoutCountMax {
+			c.Stop()
+			return
+		}
+		logger.Debug("timeout count: %d", c.heartTimeoutCount)
+	}else {
+		c.heartTimeoutCount = 0
+	}
+}
+
+func (c *Agent) update()  {
+	nextCheckTime := atomic.LoadInt64(&c.nextCheckTime)
+	now := utils.Timex()
+	if now >= nextCheckTime {
+		//检查心跳
+		c.checkHeartBeat(now)
+		nextCheckTime = now + common.HeartTimerInterval
+		atomic.StoreInt64(&c.nextCheckTime, nextCheckTime)
+	}
+
+	c.timerFunc <- func() {
+		if c.Role != nil {
+			//role 恢复数据
+			c.Role.OnRecoverTimer(now)
+		}
+	}
+}
@@ -0,0 +1,125 @@
+package main
+
+import (
+	"context"
+	"fmt"
+	_ "net/http/pprof"
+	"os"
+	"os/signal"
+	"pro2d/common/components"
+	"pro2d/conf"
+	"pro2d/models"
+	_ "pro2d/plugin"
+	"pro2d/utils/db"
+	"pro2d/utils/etcd"
+	"pro2d/utils/logger"
+	"sync"
+	"syscall"
+	"time"
+)
+
+type GameServer struct {
+	components.IServer
+	EtcdClient *etcd.EtcdClient
+
+	Agents 		*sync.Map
+}
+
+func NewGameServer(sconf *conf.SConf) (*GameServer, error)  {
+	s := &GameServer{
+		IServer: components.NewServer(sconf.Port, conf.GlobalConf.GameConf.PluginPath, components.NewPBSplitter()),
+		Agents:  new(sync.Map),
+	}
+	s.SetConnectionCallback(s.OnConnection)
+	s.SetMessageCallback(s.OnMessage)
+	s.SetCloseCallback(s.OnClose)
+
+	//mongo 初始化
+	db.MongoDatabase = db.MongoClient.Database(sconf.DBName)
+	models.InitGameServerModels()
+
+	//Etcd 初始化
+	var err error
+	s.EtcdClient, err = etcd.NewEtcdClient(conf.GlobalConf.Etcd)
+	if err != nil {
+		return nil, err
+	}
+	s.EtcdClient.PutWithLeasePrefix(conf.GlobalConf.GameConf.Name, conf.GlobalConf.GameConf.ID, fmt.Sprintf("%s:%d", conf.GlobalConf.GameConf.IP, conf.GlobalConf.GameConf.Port), 5)
+
+	go s.handleTimeOut()
+	return s, nil
+}
+
+func (s *GameServer) OnConnection(conn components.IConnection)  {
+	agent := NewAgent(s)
+	agent.OnConnection(conn)
+	s.Agents.Store(conn.GetID(),agent)
+}
+
+func (s *GameServer) OnMessage(msg components.IMessage)  {
+	agent, ok := s.Agents.Load(msg.GetSessId())
+	if !ok {
+		return
+	}
+	agent.(*Agent).OnMessage(msg)
+}
+
+func (s *GameServer) OnClose(conn components.IConnection)  {
+	agent, ok := s.Agents.Load(conn.GetID())
+	if !ok {
+		return
+	}
+	agent.(*Agent).OnClose()
+	s.Agents.Delete(conn.GetID())
+}
+
+func (s *GameServer) Stop() {
+	s.IServer.Stop()
+
+	db.MongoClient.Disconnect(context.TODO())
+}
+
+
+func (s *GameServer) handleTimeOut() {
+	s.Agents.Range(func(key, value interface{}) bool {
+		agent := value.(*Agent)
+		agent.update()
+		return true
+	})
+
+	components.TimeOut(1*time.Second, s.handleTimeOut)
+}
+
+func main()  {
+	err := make(chan error)
+	stopChan := make(chan os.Signal)
+	signal.Notify(stopChan, syscall.SIGTERM, syscall.SIGINT, syscall.SIGKILL)
+
+	userChan := make(chan os.Signal)
+	signal.Notify(userChan, syscall.SIGUSR1, syscall.SIGUSR2)
+
+	s,err1 := NewGameServer(conf.GlobalConf.GameConf)
+	if err1 != nil {
+		fmt.Errorf(err1.Error())
+		return
+	}
+
+	go func() {
+		err <- s.Start()
+	}()
+
+	for {
+		select {
+		case e := <- err:
+			logger.Error("game server error: %v", e)
+			return
+		case <-stopChan:
+			s.Stop()
+			logger.Debug("game stop...")
+			return
+		case u := <-userChan:
+			logger.Debug("userChan .. %v",u.String())
+			//s.LoadPlugin()
+		}
+	}
+}
-package actions
+package main
 import (
 	"github.com/gin-gonic/gin"
 	"pro2d/conf"
+	"pro2d/models"
 	"pro2d/pb"
-	"pro2d/src/components/net"
-	"pro2d/src/models"
-	"pro2d/src/utils"
+	"pro2d/utils"
 )
 type AccountAction struct {
-	HttpServer *net.HttpServer
+	HttpServer *AccountServer
 }
 func (h *AccountAction) Register(c *gin.Context) (int, interface{}){
 package main
 import (
+	"fmt"
 	"os"
 	"os/signal"
+	"pro2d/common/components"
+	"pro2d/conf"
 	_ "pro2d/conf"
-	"pro2d/src/actions"
-	"pro2d/src/components/logger"
-	"pro2d/src/components/net"
+	"pro2d/models"
+	"pro2d/utils/db"
+	"pro2d/utils/etcd"
+	"pro2d/utils/logger"
 	"syscall"
 )
+type AccountServer struct {
+	components.IHttp
+	EtcdClient *etcd.EtcdClient
+}
+
+func NewAccountServer(version string, port ...string) *AccountServer {
+	return &AccountServer{IHttp: components.NewHttpServer(version, port...)}
+}
+
+func (s *AccountServer) Start() error  {
+	//mongo 初始化
+	db.MongoDatabase = db.MongoClient.Database(conf.GlobalConf.AccountConf.DBName)
+	models.InitAccountServerModels()
+
+	//Etcd 初始化
+	var err error
+	s.EtcdClient, err = etcd.NewEtcdClient(conf.GlobalConf.Etcd)
+	if err != nil {
+		return err
+	}
+	s.EtcdClient.PutWithLeasePrefix(conf.GlobalConf.AccountConf.Name, conf.GlobalConf.AccountConf.ID, fmt.Sprintf("%s:%d", conf.GlobalConf.AccountConf.IP, conf.GlobalConf.AccountConf.Port), 5)
+	return nil
+}
+
 func main() {
 	err := make(chan error)
 	stopChan := make(chan os.Signal)
 	signal.Notify(stopChan, syscall.SIGTERM, syscall.SIGINT, syscall.SIGKILL)
-	web := net.NewHttpServer("v1")
-	web.BindHandler(&actions.AccountAction{HttpServer: web})
+	web := NewAccountServer("v1")
+	web.BindHandler(&AccountAction{HttpServer: web})
 	go func() {
 		err <- web.Start()
 	}()
@@ -26,5 +54,6 @@ func main() {
 		logger.Error("game server error: %v", e)
 	case <-stopChan:
 		logger.Debug("game stop")
+		web.Stop()
 	}
 }
 \ No newline at end of file
-package net
+package main
 import (
 	"github.com/gin-gonic/gin"
+	"pro2d/common/components"
 	"testing"
 )
@@ -16,7 +17,7 @@ func (h *HttpAction) PrintB(c *gin.Context) (int, interface{}) {
 }
 func TestHttpServer_Start(t *testing.T) {
-	web := NewHttpServer("v1")
+	web := components.NewHttpServer("v1")
 	web.BindHandler(&HttpAction{})
 	web.Start()
 }
 \ No newline at end of file
@@ -6,17 +6,17 @@ import (
 	"encoding/binary"
 	"github.com/golang/protobuf/proto"
 	"net"
+	"pro2d/common/components"
 	"pro2d/pb"
-	"pro2d/src/components/logger"
-	net2 "pro2d/src/components/net"
+	"pro2d/utils/logger"
 	"time"
 )
 func main() {
-	head := &net2.Head{
+	head := &components.PBHead{
 		Length:   0,
-		Cmd:      int32(pb.ProtoCode_LoginReq),
+		Cmd:      uint32(pb.ProtoCode_LoginReq),
 		ErrCode:  0,
 		PreField: 0,
 	}
@@ -27,11 +27,11 @@ func main() {
 	}
 	l, _ :=proto.Marshal(loginReq)
-	b := net2.MsgPkg{
+	b := components.PBMessage{
 		Head: head,
 		Body: l,
 	}
-	head.Length = int32(16 + len(b.Body))
+	head.Length = uint32(16 + len(b.Body))
 	buf := &bytes.Buffer{}
 	err := binary.Write(buf, binary.BigEndian, head)
 	if err != nil {
@@ -46,7 +46,7 @@ func main() {
 		return
 	}
-	client, err := net.Dial("tcp", "localhost:8849")
+	client, err := net.Dial("tcp", "localhost:8850")
 	if err != nil {
 		logger.Error(err)
 		return
@@ -0,0 +1,122 @@
+package components
+
+import (
+	"bufio"
+	"errors"
+	"net"
+	"pro2d/common"
+	"pro2d/utils/logger"
+	"time"
+)
+
+
+type Connection struct {
+	IConnection
+	net.Conn
+	Server IServer
+	Id     int
+
+	scanner 		*bufio.Scanner
+	writer 			*bufio.Writer
+	WBuffer 		chan []byte
+	Quit 			chan *Connection
+
+	messageCallback    MessageCallback
+	connectionCallback ConnectionCallback
+	closeCallback      CloseCallback
+	timerCallback      TimerCallback
+}
+
+func NewConn(id int, conn net.Conn, s IServer) *Connection {
+	return &Connection{
+		Id: id,
+		Conn: conn,
+		Server: s,
+
+		scanner:            bufio.NewScanner(conn),
+		writer:             bufio.NewWriter(conn),
+		WBuffer:            make(chan []byte, common.MaxMsgChan),
+		Quit:               make(chan *Connection),
+	}
+}
+
+func (c *Connection) GetID() int {
+	return c.Id
+}
+
+func (c *Connection) SetConnectionCallback(cb ConnectionCallback) {
+	c.connectionCallback = cb
+}
+
+func (c *Connection) SetMessageCallback(cb MessageCallback) {
+	c.messageCallback = cb
+}
+
+func (c *Connection) SetCloseCallback(cb CloseCallback) {
+	c.closeCallback = cb
+}
+
+func (c *Connection) write()  {
+	defer c.Stop()
+
+	for msg := range c.WBuffer {
+		n, err := c.writer.Write(msg)
+		if err != nil{
+			logger.Error("write fail err: " + err.Error(), "n: ", n)
+			return
+		}
+		if err := c.writer.Flush(); err != nil {
+			logger.Error("write Flush fail err: " + err.Error())
+			return
+		}
+	}
+}
+
+func (c *Connection) read() {
+	defer c.Stop()
+	c.scanner.Split(c.Server.GetSplitter().ParseMsg)
+
+	for c.scanner.Scan() {
+		req, err := c.Server.GetSplitter().UnPack(c.scanner.Bytes())
+		if err != nil {
+			return
+		}
+
+		req.SetSessId(c.Id)
+		c.messageCallback(req)
+	}
+
+	if err := c.scanner.Err(); err != nil {
+		logger.Error("scanner.err: %s", err.Error())
+		return
+	}
+}
+
+func (c *Connection) Start()  {
+	c.connectionCallback(c)
+	go c.write()
+	go c.read()
+}
+
+func (c *Connection) Stop()  {
+	logger.Debug("ID: %d close", c.Id)
+	c.Conn.Close()
+	c.closeCallback(c)
+}
+
+func (c *Connection) Send(errCode int32, cmd uint32, data []byte) error{
+	buf, err := c.Server.GetSplitter().Pack(cmd, data, errCode, 0)
+	if err != nil {
+		return err
+	}
+
+	sendTimeout := time.NewTimer(5 * time.Millisecond)
+	defer sendTimeout.Stop()
+	// 发送超时
+	select {
+	case <-sendTimeout.C:
+		return errors.New("send buff msg timeout")
+	case c.WBuffer <- buf:
+		return nil
+	}
+}
-package net
+package components
 import (
-	"fmt"
 	"github.com/gin-gonic/gin"
 	"net/http"
-	"pro2d/conf"
-	"pro2d/src/components/db"
-	"pro2d/src/components/etcd"
-	"pro2d/src/models"
 	"reflect"
 	"strings"
 )
 type HttpServer struct {
+	IHttp
 	version string
 	port []string
-	EtcdClient *etcd.EtcdClient
-
 	Handler interface{}
 }
@@ -30,6 +24,10 @@ func NewHttpServer(version string, port ...string) *HttpServer {
 	return &HttpServer{version: version, port: port}
 }
+func GetRoutePath(objName, objFunc string) string  {
+	return strings.ToLower(objName + "/" + objFunc)
+}
+
 func  (h *HttpServer)HandlerFuncObj(tvl, obj reflect.Value) gin.HandlerFunc {
 	return func(c *gin.Context) {
 		v := tvl.Call([]reflect.Value{obj, reflect.ValueOf(c)})
@@ -41,27 +39,11 @@ func  (h *HttpServer)HandlerFuncObj(tvl, obj reflect.Value) gin.HandlerFunc {
 	}
 }
-func GetRoutePath(objName, objFunc string) string  {
-	return strings.ToLower(objName + "/" + objFunc)
-}
-
 func (h *HttpServer) BindHandler(handler interface{})  {
 	h.Handler = handler
 }
 func (h *HttpServer) Start() error {
-	//mongo 初始化
-	db.MongoDatabase = db.MongoClient.Database(conf.GlobalConf.AccountConf.DBName)
-	models.InitAccountServerModels()
-
-	//Etcd 初始化
-	var err error
-	h.EtcdClient, err = etcd.NewEtcdClient(conf.GlobalConf.Etcd)
-	if err != nil {
-		return err
-	}
-	h.EtcdClient.PutWithLeasePrefix(conf.GlobalConf.AccountConf.Name, conf.GlobalConf.AccountConf.ID, fmt.Sprintf("%s:%d", conf.GlobalConf.AccountConf.IP, conf.GlobalConf.AccountConf.Port), 5)
-
 	//gin初始化
 	r := gin.Default()
 	r.GET("/ping", Pong)
@@ -0,0 +1,68 @@
+package components
+
+//网络包头
+type IHead interface {
+	GetDataLen() uint32 //获取消息数据段长度
+	GetMsgID() uint32   //获取消息ID
+	GetErrCode() int32   //获取消息错误码
+	GetPreserve() uint32   //获取预留数据
+}
+
+//网络包
+type IMessage interface {
+	IHead
+	GetHeader() IHead       //获取消息头
+	SetHeader(header IHead) //设置消息头
+
+	GetData() []byte    //获取消息内容
+	SetData([]byte)    //设置消息内容
+
+	SetSessId(int)	//设置连接id
+	GetSessId() int	//获取连接id
+}
+
+//网络拆包解包器
+type ISplitter interface {
+	UnPack([]byte) (IMessage, error)
+	Pack(cmd uint32, data []byte, errcode int32, preserve uint32) ([]byte, error)
+	ParseMsg (data []byte, atEOF bool) (advance int, token []byte, err error)
+	GetHeadLen() uint32
+}
+
+//链接
+type IConnection interface {
+	GetID() int
+	Start()
+	Stop()
+	Send(code int32, cmd uint32, b []byte) error
+
+	SetConnectionCallback(ConnectionCallback)
+	SetMessageCallback(MessageCallback)
+	SetCloseCallback(CloseCallback)
+}
+
+type ConnectionCallback func(IConnection)
+type CloseCallback func(IConnection)
+type MessageCallback func(IMessage)
+type TimerCallback func(IConnection)
+
+//server
+type IServer interface {
+	Start() error
+	Stop()
+
+	GetSplitter() ISplitter
+	GetIConnection(id int) IConnection
+
+	SetConnectionCallback(ConnectionCallback)
+	SetMessageCallback(MessageCallback)
+	SetCloseCallback(CloseCallback)
+	SetTimerCallback(TimerCallback)
+}
+
+//httpserver
+type IHttp interface {
+	Start() error
+	Stop()
+	BindHandler(interface{})
+}
 \ No newline at end of file
@@ -0,0 +1,134 @@
+package components
+
+import (
+	"bytes"
+	"encoding/binary"
+	"fmt"
+	"pro2d/common"
+)
+
+type PBHead struct {
+	Length 		uint32
+	Cmd 		uint32
+	ErrCode 	int32
+	PreField    uint32
+}
+
+func (h *PBHead) GetDataLen() uint32 {
+	return h.Length
+}
+
+func (h *PBHead) GetMsgID() uint32 {
+	return h.Cmd
+}
+
+func (h *PBHead) GetErrCode() int32 {
+	return h.ErrCode
+}
+
+func (h *PBHead) GetPreserve() uint32 {
+	return h.PreField
+}
+
+type PBMessage struct {
+	IMessage
+	Head IHead
+	Body []byte
+
+	SessionID int
+}
+
+
+func (m *PBMessage) GetHeader() IHead {
+	return m.Head
+}
+
+func (m *PBMessage) SetHeader(header IHead)	{
+	m.Head = header
+}
+func (m *PBMessage) GetData() []byte {
+	return m.Body
+}
+
+func (m *PBMessage) SetData(b []byte) {
+	m.Body = b
+}
+
+func (m *PBMessage) SetSessId(id int) {
+	m.SessionID = id
+}
+
+func (m *PBMessage) GetSessId() int {
+	return m.SessionID
+}
+
+
+type PBSplitter struct {}
+
+func NewPBSplitter() *PBSplitter {
+	return &PBSplitter{}
+}
+
+func (m *PBSplitter) GetHeadLen() uint32 {
+	return uint32(binary.Size(PBHead{}))
+}
+
+func (m *PBSplitter) UnPack(data []byte) (IMessage,error)  {
+	h := &PBHead{}
+	err := binary.Read(bytes.NewReader(data), binary.BigEndian, h)
+	if err != nil {
+		return nil, err
+	}
+
+	return &PBMessage{
+		Head: h,
+		Body:  data[m.GetHeadLen():],
+	},nil
+}
+
+func (m *PBSplitter) ParseMsg (data []byte, atEOF bool) (advance int, token []byte, err error) {
+	// 表示我们已经扫描到结尾了
+	if atEOF && len(data) == 0 {
+		return 0, nil, nil
+	}
+	if !atEOF && len(data) >= int(m.GetHeadLen()) { //4字节数据包长度  4字节指令
+		length := int32(0)
+		binary.Read(bytes.NewReader(data[0:4]), binary.BigEndian, &length)
+		if length <= 0 {
+			return 0, nil, fmt.Errorf("length is 0")
+		}
+
+		if length > common.MaxPacketLength {
+			return 0, nil, fmt.Errorf("length exceeds maximum length")
+		}
+		if int(length) <= len(data) {
+			return int(length) , data[:int(length)], nil
+		}
+		return 0 , nil, nil
+	}
+	if atEOF {
+		return len(data), data, nil
+	}
+	return 0, nil, nil
+}
+
+func (m *PBSplitter) Pack(cmd uint32, data []byte, errcode int32, preserve uint32) ([]byte, error) {
+	buf := &bytes.Buffer{}
+	h := &PBHead{
+		Length:   m.GetHeadLen()+ uint32(len(data)),
+		Cmd:      cmd,
+		ErrCode:  errcode,
+		PreField: preserve,
+	}
+	err := binary.Write(buf, binary.BigEndian, h)
+	if err != nil {
+		return nil, err
+	}
+
+	err = binary.Write(buf, binary.BigEndian, data)
+	if err != nil {
+		return nil, err
+	}
+
+	return buf.Bytes(), nil
+}
 \ No newline at end of file
@@ -0,0 +1,126 @@
+package components
+
+import (
+	"fmt"
+	"github.com/golang/protobuf/proto"
+	"net"
+	"plugin"
+	"pro2d/pb"
+	"pro2d/utils/logger"
+	"sync"
+)
+
+type ActionHandler func (msg IMessage)  (int32, proto.Message)
+var ActionMap map[pb.ProtoCode]ActionHandler
+
+type Server struct {
+	IServer
+
+	connectionCallback ConnectionCallback
+	messageCallback    MessageCallback
+	closeCallback      CloseCallback
+
+	splitter ISplitter
+
+	port 				int
+	PluginPath 			string
+	Clients *sync.Map
+}
+
+func NewServer(port int, pluginPath string, splitter ISplitter) *Server {
+	s := &Server{
+		splitter: splitter,
+		port:      port,
+		PluginPath: pluginPath,
+		Clients:    new(sync.Map),
+	}
+	return s
+}
+
+func (s *Server) GetSplitter() ISplitter {
+	return s.splitter
+}
+
+func (s *Server) GetIConnection(id int) IConnection {
+	c, ok := s.Clients.Load(id)
+	if !ok {
+		return nil
+	}
+	return c.(IConnection)
+}
+
+func (s *Server) SetConnectionCallback(cb ConnectionCallback) {
+	s.connectionCallback = cb
+}
+
+func (s *Server) SetMessageCallback(cb MessageCallback) {
+	s.messageCallback = cb
+}
+
+func (s *Server) SetCloseCallback(cb CloseCallback) {
+	s.closeCallback = cb
+}
+
+func (s *Server) SetTimerCallback(cb TimerCallback) {
+}
+
+func (s *Server) newConnection(conn IConnection) {
+	s.Clients.Store(conn.GetID(), conn)
+
+	conn.SetConnectionCallback(s.connectionCallback)
+	conn.SetCloseCallback(s.removeConnection)
+	conn.SetMessageCallback(s.messageCallback)
+
+	go conn.Start()
+}
+
+func (s *Server) removeConnection(conn IConnection) {
+	s.closeCallback(conn)
+	s.Clients.Delete(conn.GetID())
+}
+
+func (s *Server) LoadPlugin() {
+	//重新加载
+	_, err:=plugin.Open(s.PluginPath)
+	if err != nil {
+		logger.Error("load plugin err: %v, %s", err, s.PluginPath)
+		return
+	}
+	logger.Debug("load plugin success")
+}
+
+
+func (s *Server) Start() error {
+	//初始化plugin
+	//_, err = plugin.Open(conf.GlobalConf.GameConf.PluginPath)
+	//if err != nil {
+	//	return err
+	//}
+	port := fmt.Sprintf(":%d", s.port)
+	l, err := net.Listen("tcp", port)
+	if err != nil {
+		return err
+	}
+	//监听端口
+	logger.Debug("listen on %s\n", port)
+	id := 0
+	for {
+		conn, err := l.Accept()
+		if err != nil {
+			return err
+		}
+
+		id++
+		client := NewConn(id, conn, s)
+		s.newConnection(client)
+	}
+}
+
+func (s *Server)Stop()  {
+	StopTimer()
+	s.Clients.Range(func(key, value interface{}) bool {
+		client := value.(IConnection)
+		client.Stop()
+		return true
+	})
+}
-package timewheel
+package components
 import (
 	"container/list"
-	"pro2d/src/common"
-	"pro2d/src/components/workpool"
+	"pro2d/common"
 	"sync"
 	"sync/atomic"
 	"time"
@@ -73,16 +72,16 @@ type TimeWheel struct {
 	t				[4][TimeLevel]*bucket
 	time 			uint32
-	WorkPool *workpool.WorkPool
+	WorkPool *WorkPool
 	exit chan struct{}
 }
 func NewTimeWheel() *TimeWheel {
 	tw := &TimeWheel{
-		tick:         10*time.Millisecond,
-		time:         0,
-		WorkPool:     workpool.NewWorkPool(common.WorkerPoolSize, common.MaxTaskPerWorker),
-		exit:         make(chan struct{}),
+		tick:     10*time.Millisecond,
+		time:     0,
+		WorkPool: NewWorkPool(common.WorkerPoolSize, common.MaxTaskPerWorker),
+		exit:     make(chan struct{}),
 	}
 	for i :=0; i < TimeNear; i++ {
 		tw.near[i] = newBucket()
-package timewheel
+package components
 import (
 	"fmt"
-package workpool
+package components
 type Job func()
@@ -5,8 +5,9 @@ const (
 	WorkerPoolSize = 10
 	MaxTaskPerWorker = 100
-	//包头
-	HEADLEN = 16
+	//最大包大
+	MaxPacketLength = 10 * 1024 * 1024
+	MaxMsgChan = 100
 	//jwt
 	Pro2DTokenSignedString = "Pro2DSecret"
@@ -19,6 +20,6 @@ const (
 	HeartTimerInterval   = 5  //s
 	HeartTimeoutCountMax = 20 //最大超时次数
-	//保存数据时间剑客
+	//保存数据时间
 	SaveDataInterval = 5 //s
 )
@@ -5,9 +5,9 @@ import (
 	"fmt"
 	"gopkg.in/yaml.v3"
 	"io/ioutil"
-	"pro2d/src/components/db"
-	"pro2d/src/components/logger"
-	"pro2d/src/utils"
+	"pro2d/utils"
+	"pro2d/utils/db"
+	"pro2d/utils/logger"
 	"strings"
 )
@@ -28,7 +28,7 @@ server_game:
   id: "1"
   name: "game"
   ip: "192.168.0.206"
-  port: 8849
+  port: 8850
   dbname: "game"
   pool_size: 1
   plugin_path: "./bin/plugin.so"
@@ -2,7 +2,7 @@ package models
 import (
 	"pro2d/pb"
-	"pro2d/src/components/db"
+	"pro2d/utils/db"
 )
 type AccountModel struct {
@@ -23,7 +23,7 @@ func NewAccount(phone string) *AccountModel {
 		Phone: phone,
 	}
 	account := &AccountModel{
-		Schema: db.NewSchema(phone, ac),
+		Schema:  db.NewSchema(phone, ac),
 		Account: ac,
 	}
@@ -2,7 +2,7 @@ package models
 import (
 	"pro2d/pb"
-	"pro2d/src/components/db"
+	"pro2d/utils/db"
 )
 type EquipModels struct {
@@ -16,7 +16,7 @@ func NewEquip(id string) *EquipModels {
 	}
 	m := &EquipModels{
 		Schema: db.NewSchema(id, data),
-		Equip:   data,
+		Equip:  data,
 	}
 	return m
@@ -2,7 +2,7 @@ package models
 import (
 	"pro2d/pb"
-	"pro2d/src/components/db"
+	"pro2d/utils/db"
 )
 type HeroModel struct {
@@ -25,7 +25,7 @@ func NewHero(id string) *HeroModel {
 	}
 	m := &HeroModel{
 		Schema: db.NewSchema(id, h),
-		Hero:    h,
+		Hero:   h,
 	}
 	return m
 }
@@ -2,9 +2,9 @@ package models
 import (
 	"pro2d/pb"
-	"pro2d/src/components/db"
-	"pro2d/src/components/logger"
-	"pro2d/src/utils"
+	"pro2d/utils"
+	"pro2d/utils/db"
+	"pro2d/utils/logger"
 )
 func InitDoc(schema ...interface{})  {
@@ -3,7 +3,7 @@ package models
 import (
 	"context"
 	_ "pro2d/conf"
-	"pro2d/src/components/db"
+	"pro2d/utils/db"
 	"testing"
 )
@@ -2,7 +2,7 @@ package models
 import (
 	"pro2d/pb"
-	"pro2d/src/components/db"
+	"pro2d/utils/db"
 )
 type PropModels struct {
@@ -16,7 +16,7 @@ func NewProp(id string) *PropModels {
 	}
 	m := &PropModels{
 		Schema: db.NewSchema(id, data),
-		Prop:    data,
+		Prop:   data,
 	}
 	return m
@@ -2,11 +2,11 @@ package models
 import (
 	"fmt"
+	"pro2d/common"
 	"pro2d/pb"
-	"pro2d/src/common"
-	"pro2d/src/components/db"
-	"pro2d/src/components/logger"
-	"pro2d/src/utils"
+	"pro2d/utils"
+	"pro2d/utils/db"
+	"pro2d/utils/logger"
 	"sync/atomic"
 )
@@ -32,11 +32,11 @@ func RoleExistByUid(uid string) *RoleModel {
 	r := &RoleModel{
 		Schema: db.NewSchema(data.Id, data),
-		Role:    data,
-		Heros:   make(HeroMap),
-		Teams: new(TeamModel),
-		Equip: new(EquipModels),
-		Prop:  new(PropModels),
+		Role:   data,
+		Heros:  make(HeroMap),
+		Teams:  new(TeamModel),
+		Equip:  new(EquipModels),
+		Prop:   new(PropModels),
 	}
 	r.LoadAll()
 	return r
@@ -46,11 +46,11 @@ func NewRole(id string) *RoleModel {
 	data := &pb.Role{Id: id}
 	m := &RoleModel{
 		Schema: db.NewSchema(id, data),
-		Role:    data,
-		Heros:   make(HeroMap),
-		Teams: new(TeamModel),
-		Equip: new(EquipModels),
-		Prop:  new(PropModels),
+		Role:   data,
+		Heros:  make(HeroMap),
+		Teams:  new(TeamModel),
+		Equip:  new(EquipModels),
+		Prop:   new(PropModels),
 	}
 	return m
 }
@@ -4,9 +4,9 @@ import (
 	"fmt"
 	_ "pro2d/conf"
 	"pro2d/pb"
-	"pro2d/src/components/db"
-	"pro2d/src/components/logger"
-	"pro2d/src/utils"
+	"pro2d/utils"
+	"pro2d/utils/db"
+	"pro2d/utils/logger"
 	"testing"
 )
@@ -2,7 +2,7 @@ package models
 import (
 	"pro2d/pb"
-	"pro2d/src/components/db"
+	"pro2d/utils/db"
 )
 type TeamModel struct {
@@ -16,7 +16,7 @@ func NewTeam(id string) *TeamModel {
 	}
 	m := &TeamModel{
 		Schema: db.NewSchema(id, data),
-		Team:    data,
+		Team:   data,
 	}
 	return m
@@ -2,21 +2,21 @@ package plugin
 import (
 	"github.com/golang/protobuf/proto"
+	"pro2d/common/components"
 	"pro2d/conf"
+	"pro2d/models"
 	"pro2d/pb"
-	"pro2d/src/components/logger"
-	"pro2d/src/components/net"
-	"pro2d/src/models"
+	"pro2d/utils/logger"
 )
-func HeartRpc(msg *net.MsgPkg) (int32, proto.Message)   {
+func HeartRpc(msg components.IMessage) (int32, proto.Message)   {
 	//msg.Conn.SetLastHeartCheckTime()
 	return 0, nil
 }
-func CreateRpc(msg *net.MsgPkg) (int32, proto.Message)   {
+func CreateRpc(msg components.IMessage) (int32, proto.Message)   {
 	req := pb.CreateReq{}
-	if err := proto.Unmarshal(msg.Body, &req); err != nil {
+	if err := proto.Unmarshal(msg.GetData(), &req); err != nil {
 		logger.Error("CreateRpc err: %v", err)
 		return 1, nil
 	}
@@ -34,10 +34,10 @@ func CreateRpc(msg *net.MsgPkg) (int32, proto.Message)   {
 	return 0, nil
 }
-func  LoginRpc(msg *net.MsgPkg) (int32, proto.Message)  {
-	//logger.Debug("cmd: %v, msg: %s", msg.Head.Cmd, msg.Body)
+func  LoginRpc(msg components.IMessage) (int32, proto.Message)  {
+	//logger.Debug("cmd: %v, msg: %s", msg.PBHead.Cmd, msg.Body)
 	req := pb.LoginReq{}
-	if err := proto.Unmarshal(msg.Body, &req); err != nil {
+	if err := proto.Unmarshal(msg.GetData(), &req); err != nil {
 		logger.Error("loginRpc err: %v", err)
 		return 1, nil
 	}
@@ -49,7 +49,6 @@ func  LoginRpc(msg *net.MsgPkg) (int32, proto.Message)  {
 	role.SetProperty("Device", req.Device)
-	msg.Conn.Role = role
 	return 0, &pb.RoleRsp{
 		Role:    role.Role,
 		Hero: role.GetAllHero(),
 package plugin
 import (
+	"pro2d/common/components"
 	"pro2d/pb"
-	"pro2d/src/components/logger"
-	"pro2d/src/components/net"
+	"pro2d/utils/logger"
 )
 func init()  {
 	logger.Debug("init protocode...")
-	net.ActionMap = make(map[pb.ProtoCode]net.ActionHandler)
+	components.ActionMap = make(map[pb.ProtoCode]components.ActionHandler)
-	net.ActionMap[pb.ProtoCode_HeartReq] = HeartRpc
-	net.ActionMap[pb.ProtoCode_LoginReq] = LoginRpc
-	net.ActionMap[pb.ProtoCode_CreateReq] = CreateRpc
+	components.ActionMap[pb.ProtoCode_HeartReq] = HeartRpc
+	components.ActionMap[pb.ProtoCode_LoginReq] = LoginRpc
+	components.ActionMap[pb.ProtoCode_CreateReq] = CreateRpc
 }
@@ -1,195 +0,0 @@
-package net
-
-import (
-	"bufio"
-	"fmt"
-	"math"
-	"net"
-	"pro2d/src/common"
-	"pro2d/src/components/logger"
-	"pro2d/src/models"
-	"pro2d/src/utils"
-	"sync/atomic"
-)
-
-type Head struct {
-	Length 		int32
-	Cmd 		int32
-	ErrCode 	int32
-	PreField    int32
-}
-
-
-type Connection struct {
-	net.Conn
-	Id 				int
-	Server 			*Server
-
-	scanner 		*bufio.Scanner
-	writer 			*bufio.Writer
-
-	WBuffer 		chan []byte
-
-	updateFunc 		chan func()
-	readFunc   		chan func()
-
-	Quit 			chan *Connection
-
-	Role			*models.RoleModel
-
-	nextCheckTime   int64 //下一次检查的时间
-	lastHeartCheckTime int64 //最后收消息时间
-	heartTimeoutCount  int   //超时次数
-}
-
-type MsgPkg struct {
-	Head *Head
-	Body []byte
-	Conn *Connection
-}
-
-func NewConn(id int, conn net.Conn, s *Server) *Connection {
-	return &Connection{
-		Id: id,
-		Conn: conn,
-		Server: s,
-
-		scanner:            bufio.NewScanner(conn),
-		writer:             bufio.NewWriter(conn),
-		WBuffer:            make(chan []byte),
-		updateFunc:         make(chan func()),
-		readFunc:           make(chan func()),
-		Quit:               make(chan *Connection),
-		lastHeartCheckTime: utils.Timex(),
-		heartTimeoutCount:  0,
-	}
-}
-
-func (c *Connection) write()  {
-	defer c.Quiting()
-
-	for msg := range c.WBuffer {
-		n, err := c.writer.Write(msg)
-		if err != nil{
-			logger.Error("write fail err: " + err.Error(), "n: ", n)
-			return
-		}
-		if err := c.writer.Flush(); err != nil {
-			logger.Error("write Flush fail err: " + err.Error())
-			return
-		}
-	}
-}
-
-func (c *Connection) read() {
-	defer c.Quiting()
-	c.scanner.Split(ParseMsg)
-
-	for c.scanner.Scan() {
-		req, err := DecodeMsg(c.scanner.Bytes())
-		if err != nil {
-			return
-		}
-
-		req.Conn = c
-		c.readFunc <- func() {
-			c.Server.DoMsgHandler(req)
-		}
-
-		atomic.StoreInt64(&c.lastHeartCheckTime, utils.Timex())
-
-		//备注，可以在当前协程处理当条请求(如下, 实现很简单，已经删除)，也可以丢到协程池里处理任务(如上)，还未对比效果。
-		//c.Server.OnRecv(req)
-	}
-
-	if err := c.scanner.Err(); err != nil {
-		fmt.Printf("scanner.err: %s\n", err.Error())
-		return
-	}
-}
-
-func (c *Connection) checkHeartBeat(now int64)  {
-	lastHeartCheckTime := atomic.LoadInt64(&c.lastHeartCheckTime)
-	logger.Debug("checkHeartBeat ID: %d, last: %d, now: %d", c.Id, lastHeartCheckTime, now)
-	if math.Abs(float64(lastHeartCheckTime - now)) > common.HeartTimerInterval {
-		c.heartTimeoutCount++
-		if c.heartTimeoutCount >= common.HeartTimeoutCountMax {
-			c.Quiting()
-			return
-		}
-		logger.Debug("timeout count: %d", c.heartTimeoutCount)
-	}else {
-		c.heartTimeoutCount = 0
-	}
-}
-
-func (c *Connection) update()  {
-	nextCheckTime := atomic.LoadInt64(&c.nextCheckTime)
-	now := utils.Timex()
-	if now >= nextCheckTime {
-		//检查心跳
-		c.checkHeartBeat(now)
-		nextCheckTime = now + common.HeartTimerInterval
-		atomic.StoreInt64(&c.nextCheckTime, nextCheckTime)
-	}
-
-	c.updateFunc <- func() {
-	 	if c.Role != nil {
-			//role 恢复数据
-			c.Role.OnRecoverTimer(now)
-		}
-	}
-}
-
-func (c *Connection) flush()  {
-	defer c.Stop()
-	for  {
-		select {
-		case rf := <- c.readFunc:
-			rf()
-		case uf := <- c.updateFunc:
-			uf()
-		case <- c.Quit:
-			return
-		}
-	}
-}
-
-func (c *Connection) Start()  {
-	go c.write()
-	go c.read()
- 	c.flush()
-}
-
-func (c *Connection) Stop()  {
-	logger.Debug("ID: %d close", c.Id)
-	c.Conn.Close()
-	if c.Role != nil {
-		c.Role.OnOfflineEvent()
-	}
-
-	c.Server.OnClose(c)
-}
-
-func (c *Connection) Quiting()  {
-	c.Quit <- c
-}
-
-func (c *Connection) SendMsgByCode(errCode int32, cmd int32, data []byte){
-	h := &Head{
-		Length:   int32(common.HEADLEN + len(data)),
-		Cmd:      cmd,
-		ErrCode:  errCode,
-		PreField: 0,
-	}
-	pkg := &MsgPkg{
-		Head: h,
-		Body: data,
-	}
-	buf, err := EncodeMsg(pkg)
-	if err != nil {
-		logger.Error("SendMsg error: %v", err)
-		return
-	}
-	c.WBuffer <- buf
-}
 \ No newline at end of file
@@ -1,57 +0,0 @@
-package net
-
-import (
-	"bytes"
-	"encoding/binary"
-	"fmt"
-	"pro2d/src/common"
-)
-
-func ParseMsg (data []byte, atEOF bool) (advance int, token []byte, err error) {
-	// 表示我们已经扫描到结尾了
-	if atEOF && len(data) == 0 {
-		return 0, nil, nil
-	}
-	if !atEOF && len(data) >= common.HEADLEN { //4字节数据包长度  4字节指令
-		length := int32(0)
-		binary.Read(bytes.NewReader(data[0:4]), binary.BigEndian, &length)
-		if length <= 0 {
-			return 0, nil, fmt.Errorf("length is 0")
-		}
-		if int(length) <= len(data) {
-			return int(length) , data[:int(length)], nil
-		}
-		return 0 , nil, nil
-	}
-	if atEOF {
-		return len(data), data, nil
-	}
-	return 0, nil, nil
-}
-
-
-func DecodeMsg(data []byte) (*MsgPkg, error) {
-	h := &Head{}
-	err := binary.Read(bytes.NewReader(data), binary.BigEndian, h)
-	if err != nil {
-		return nil, err
-	}
-	return &MsgPkg{
-		Head: h,
-		Body: data[common.HEADLEN:],
-	},nil
-}
-
-func EncodeMsg(pkg *MsgPkg) ([]byte, error) {
-	buf := &bytes.Buffer{}
-	err := binary.Write(buf, binary.BigEndian, pkg.Head)
-	if err != nil {
-		return nil, err
-	}
-
-	err = binary.Write(buf, binary.BigEndian, pkg.Body)
-	if err != nil {
-		return nil, err
-	}
-	return buf.Bytes(), nil
-}
 \ No newline at end of file
@@ -1,131 +0,0 @@
-package net
-
-import (
-	"context"
-	"fmt"
-	"github.com/golang/protobuf/proto"
-	"net"
-	"plugin"
-	"pro2d/conf"
-	"pro2d/pb"
-	"pro2d/src/components/db"
-	"pro2d/src/components/etcd"
-	"pro2d/src/components/logger"
-	"pro2d/src/components/timewheel"
-	"pro2d/src/models"
-	"sync"
-	"time"
-)
-
-type ActionHandler func (msg *MsgPkg)  (int32, proto.Message)
-var ActionMap map[pb.ProtoCode]ActionHandler
-
-type Server struct {
-	SConf      *conf.SConf
-	Clients *sync.Map
-	EtcdClient *etcd.EtcdClient
-}
-
-func NewServer(sConf *conf.SConf) *Server {
-	return &Server{
-		SConf:      sConf,
-		Clients:    new(sync.Map),
-		EtcdClient: new(etcd.EtcdClient),
-	}
-}
-
-func (s *Server) DoMsgHandler(msg *MsgPkg) {
-	if md, ok := ActionMap[pb.ProtoCode(msg.Head.Cmd)]; ok {
-		logger.Debug("protocode handler: %d", msg.Head.Cmd)
-		errCode, protomsg := md(msg)
-		rsp, err := proto.Marshal(protomsg)
-		fmt.Printf("errCode: %d, protomsg:%v\n", errCode, protomsg)
-		if err != nil {
-			msg.Conn.SendMsgByCode(-100, msg.Head.Cmd, nil)
-			return
-		}
-		msg.Conn.SendMsgByCode(errCode, msg.Head.Cmd, rsp)
-		return
-	}
-	logger.Error("protocode not handler: %d", msg.Head.Cmd)
-}
-
-func (s *Server) OnClose(conn *Connection) {
-	s.Clients.Delete(conn.Id)
-}
-
-func (s *Server) LoadPlugin() {
-	//重新加载
-	_, err:=plugin.Open(conf.GlobalConf.GameConf.PluginPath)
-	if err != nil {
-		logger.Error("load plugin err: %v, %s", err, conf.GlobalConf.GameConf.PluginPath)
-		return
-	}
-	logger.Debug("load plugin success")
-}
-
-func (s *Server) handleTimeOut() {
-	s.Clients.Range(func(key, value interface{}) bool {
-		client := value.(*Connection)
-		client.update()
-		return true
-	})
-
-	timewheel.TimeOut(1*time.Second, s.handleTimeOut)
-}
-
-func (s *Server)Start() error {
-	//mongo 初始化
-	db.MongoDatabase = db.MongoClient.Database(conf.GlobalConf.GameConf.DBName)
-	models.InitGameServerModels()
-
-	//Etcd 初始化
-	var err error
-	s.EtcdClient, err = etcd.NewEtcdClient(conf.GlobalConf.Etcd)
-	if err != nil {
-		return err
-	}
-	s.EtcdClient.PutWithLeasePrefix(conf.GlobalConf.GameConf.Name, conf.GlobalConf.GameConf.ID, fmt.Sprintf("%s:%d", conf.GlobalConf.GameConf.IP, conf.GlobalConf.GameConf.Port), 5)
-
-	//初始化plugin
-	//_, err = plugin.Open(conf.GlobalConf.GameConf.PluginPath)
-	//if err != nil {
-	//	return err
-	//}
-
-	port := fmt.Sprintf(":%d", s.SConf.Port)
-	l, err := net.Listen("tcp", port)
-	if err != nil {
-		return err
-	}
-
-	//启动定时器
-	s.handleTimeOut()
-
-	//监听端口
-	logger.Debug("listen on %s\n", port)
-	id := 0
-	for {
-		conn, err := l.Accept()
-		if err != nil {
-			return err
-		}
-
-		id++
-		client := NewConn(id, conn, s)
-		s.Clients.Store(id, client)
-		go client.Start()
-	}
-}
-
-func (s *Server)Stop()  {
-	timewheel.StopTimer()
-
-	s.Clients.Range(func(key, value interface{}) bool {
-		client := value.(*Connection)
-		client.Quiting()
-		return true
-	})
-
-	db.MongoClient.Disconnect(context.TODO())
-}
 \ No newline at end of file
@@ -8,7 +8,7 @@ import (
 	"go.mongodb.org/mongo-driver/mongo/options"
 	"go.mongodb.org/mongo-driver/mongo/readpref"
 	"go.mongodb.org/mongo-driver/x/bsonx"
-	"pro2d/src/utils"
+	"pro2d/utils"
 	"sort"
 	"strconv"
 	"strings"
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	clientv3 "go.etcd.io/etcd/client/v3"
 	"pro2d/conf"
-	"pro2d/src/components/logger"
+	"pro2d/utils/logger"
 	"time"
 )
@@ -6,7 +6,7 @@ import (
 	"go.etcd.io/etcd/api/v3/mvccpb"
 	clientv3 "go.etcd.io/etcd/client/v3"
 	"pro2d/conf"
-	"pro2d/src/components/logger"
+	"pro2d/utils/logger"
 	"testing"
 )