From dd4e34052e1f6b3acfd158898298529119968e75 Mon Sep 17 00:00:00 2001 From: "zhipeng.hu" Date: Sat, 18 Dec 2021 14:48:37 +0800 Subject: [PATCH] =?UTF-8?q?zinx=20tcp=E5=BA=93=20=E6=94=B9=E5=88=B0?= =?UTF-8?q?=E6=9C=AC=E5=9C=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 14 +++++++------- examples/zinx_client/main.go | 2 +- examples/zinx_server/main.go | 9 ++++----- examples/zinx_server/zrouter/hello.go | 7 +++---- examples/zinx_server/zrouter/ping.go | 6 +++--- examples/zinx_version_ex/ZinxV0.10Test/Client0.go | 2 +- examples/zinx_version_ex/ZinxV0.10Test/Client1.go | 2 +- examples/zinx_version_ex/ZinxV0.10Test/Server.go | 4 ++-- examples/zinx_version_ex/ZinxV0.11Test/Client0.go | 2 +- examples/zinx_version_ex/ZinxV0.11Test/Client1.go | 2 +- examples/zinx_version_ex/ZinxV0.11Test/Server.go | 6 +++--- examples/zinx_version_ex/ZinxV0.1Test/Server.go | 2 +- examples/zinx_version_ex/ZinxV0.2Test/Server.go | 2 +- examples/zinx_version_ex/ZinxV0.3Test/Server.go | 4 ++-- examples/zinx_version_ex/ZinxV0.4Test/Server.go | 4 ++-- examples/zinx_version_ex/ZinxV0.5Test/Client.go | 2 +- examples/zinx_version_ex/ZinxV0.5Test/Server.go | 4 ++-- .../ZinxV0.6Test-V0.7Test/Client0.go | 2 +- .../ZinxV0.6Test-V0.7Test/Client1.go | 2 +- .../ZinxV0.6Test-V0.7Test/Server.go | 4 ++-- examples/zinx_version_ex/ZinxV0.8Test/Client0.go | 2 +- examples/zinx_version_ex/ZinxV0.8Test/Client1.go | 2 +- examples/zinx_version_ex/ZinxV0.8Test/Server.go | 4 ++-- examples/zinx_version_ex/ZinxV0.9Test/Client0.go | 2 +- examples/zinx_version_ex/ZinxV0.9Test/Client1.go | 2 +- examples/zinx_version_ex/ZinxV0.9Test/Server.go | 4 ++-- examples/zinx_version_ex/datapackDemo/Client.go | 2 +- examples/zinx_version_ex/datapackDemo/Server.go | 2 +- examples/zinx_version_ex/protoDemo/main.go | 2 +- go.mod | 2 +- utils/globalobj.go | 4 ++-- zinx_app_demo/mmo_game/api/move.go | 8 ++++---- zinx_app_demo/mmo_game/api/world_chat.go | 8 ++++---- zinx_app_demo/mmo_game/client_AI_robot.go | 2 +- zinx_app_demo/mmo_game/core/player.go | 4 ++-- zinx_app_demo/mmo_game/server.go | 8 ++++---- zlog/zlogger_test.go | 2 +- znet/connection.go | 4 ++-- znet/connmanager.go | 2 +- znet/datapack.go | 4 ++-- znet/msghandler.go | 4 ++-- znet/options.go | 2 +- znet/request.go | 2 +- znet/router.go | 2 +- znet/server.go | 4 ++-- znet/server_test.go | 2 +- ztimer/delayfunc.go | 2 +- ztimer/timerscheduler.go | 2 +- ztimer/timerscheduler_test.go | 2 +- ztimer/timewheel.go | 2 +- 50 files changed, 87 insertions(+), 89 deletions(-) diff --git a/README.md b/README.md index 23abbb6..a4d7bd9 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ Zinx 是一个基于Golang的轻量级并发服务器框架 --- ## zinx源码地址 ### Github -Git: https://github.com/aceld/zinx +Git: https://zinx ### 码云(Gitee) Git: https://gitee.com/Aceld/zinx @@ -68,7 +68,7 @@ Zinx框架的项目制作采用编码和学习教程同步进行，将开发的 ```bash # 克隆项目 -$ git clone https://github.com/aceld/zinx.git +$ git clone https://zinx.git # 进入服务端样例目录 $ cd ./zinx/examples/zinx_server @@ -179,8 +179,8 @@ func main() { ```go import ( "fmt" - "github.com/aceld/zinx/ziface" - "github.com/aceld/zinx/znet" + "zinx/ziface" + "zinx/znet" ) //ping test 自定义路由 @@ -211,7 +211,7 @@ import ( "io" "net" "time" - "github.com/aceld/zinx/znet" + "zinx/znet" ) /* @@ -398,7 +398,7 @@ func (c *Connection) RemoveProperty(key string) - 胡琪([@huqitt](https://github.com/huqitt)) --- -[zinx(websocket版本)](https://github.com/aceld/zinx/tree/wsserver) +[zinx(websocket版本)](https://zinx/tree/wsserver) #### 开发者 - 胡贵建([@huguijian](https://github.com/huguijian)) @@ -407,7 +407,7 @@ func (c *Connection) RemoveProperty(key string) 感谢所有为zinx贡献的开发者 - + diff --git a/examples/zinx_client/main.go b/examples/zinx_client/main.go index 9d14cdf..fb42419 100644 --- a/examples/zinx_client/main.go +++ b/examples/zinx_client/main.go @@ -6,7 +6,7 @@ import ( "net" "time" - "github.com/aceld/zinx/znet" + "zinx/znet" ) /* diff --git a/examples/zinx_server/main.go b/examples/zinx_server/main.go index f7f9e00..c6b5cdc 100644 --- a/examples/zinx_server/main.go +++ b/examples/zinx_server/main.go @@ -7,13 +7,12 @@ package main import ( - "github.com/aceld/zinx/examples/zinx_server/zrouter" - "github.com/aceld/zinx/ziface" - "github.com/aceld/zinx/zlog" - "github.com/aceld/zinx/znet" + "zinx/examples/zinx_server/zrouter" + "zinx/ziface" + "zinx/zlog" + "zinx/znet" ) - //创建连接的时候执行 func DoConnectionBegin(conn ziface.IConnection) { zlog.Debug("DoConnecionBegin is Called ... ") diff --git a/examples/zinx_server/zrouter/hello.go b/examples/zinx_server/zrouter/hello.go index f403e15..e5edc3b 100644 --- a/examples/zinx_server/zrouter/hello.go +++ b/examples/zinx_server/zrouter/hello.go @@ -1,9 +1,9 @@ package zrouter import ( - "github.com/aceld/zinx/ziface" - "github.com/aceld/zinx/zlog" - "github.com/aceld/zinx/znet" + "zinx/ziface" + "zinx/zlog" + "zinx/znet" ) type HelloZinxRouter struct { @@ -21,4 +21,3 @@ func (this *HelloZinxRouter) Handle(request ziface.IRequest) { zlog.Error(err) } } - diff --git a/examples/zinx_server/zrouter/ping.go b/examples/zinx_server/zrouter/ping.go index 465afb5..e046738 100644 --- a/examples/zinx_server/zrouter/ping.go +++ b/examples/zinx_server/zrouter/ping.go @@ -1,9 +1,9 @@ package zrouter import ( - "github.com/aceld/zinx/ziface" - "github.com/aceld/zinx/zlog" - "github.com/aceld/zinx/znet" + "zinx/ziface" + "zinx/zlog" + "zinx/znet" ) //ping test 自定义路由 diff --git a/examples/zinx_version_ex/ZinxV0.10Test/Client0.go b/examples/zinx_version_ex/ZinxV0.10Test/Client0.go index 17923be..34255e7 100644 --- a/examples/zinx_version_ex/ZinxV0.10Test/Client0.go +++ b/examples/zinx_version_ex/ZinxV0.10Test/Client0.go @@ -6,7 +6,7 @@ import ( "net" "time" - "github.com/aceld/zinx/znet" + "zinx/znet" ) /* diff --git a/examples/zinx_version_ex/ZinxV0.10Test/Client1.go b/examples/zinx_version_ex/ZinxV0.10Test/Client1.go index 4aee73d..a729c0d 100644 --- a/examples/zinx_version_ex/ZinxV0.10Test/Client1.go +++ b/examples/zinx_version_ex/ZinxV0.10Test/Client1.go @@ -6,7 +6,7 @@ import ( "net" "time" - "github.com/aceld/zinx/znet" + "zinx/znet" ) /* diff --git a/examples/zinx_version_ex/ZinxV0.10Test/Server.go b/examples/zinx_version_ex/ZinxV0.10Test/Server.go index 2964281..0969817 100644 --- a/examples/zinx_version_ex/ZinxV0.10Test/Server.go +++ b/examples/zinx_version_ex/ZinxV0.10Test/Server.go @@ -2,8 +2,8 @@ package main import ( "fmt" - "github.com/aceld/zinx/ziface" - "github.com/aceld/zinx/znet" + "zinx/ziface" + "zinx/znet" ) //ping test 自定义路由 diff --git a/examples/zinx_version_ex/ZinxV0.11Test/Client0.go b/examples/zinx_version_ex/ZinxV0.11Test/Client0.go index 17923be..34255e7 100644 --- a/examples/zinx_version_ex/ZinxV0.11Test/Client0.go +++ b/examples/zinx_version_ex/ZinxV0.11Test/Client0.go @@ -6,7 +6,7 @@ import ( "net" "time" - "github.com/aceld/zinx/znet" + "zinx/znet" ) /* diff --git a/examples/zinx_version_ex/ZinxV0.11Test/Client1.go b/examples/zinx_version_ex/ZinxV0.11Test/Client1.go index 4aee73d..a729c0d 100644 --- a/examples/zinx_version_ex/ZinxV0.11Test/Client1.go +++ b/examples/zinx_version_ex/ZinxV0.11Test/Client1.go @@ -6,7 +6,7 @@ import ( "net" "time" - "github.com/aceld/zinx/znet" + "zinx/znet" ) /* diff --git a/examples/zinx_version_ex/ZinxV0.11Test/Server.go b/examples/zinx_version_ex/ZinxV0.11Test/Server.go index 4a85e1e..be44404 100644 --- a/examples/zinx_version_ex/ZinxV0.11Test/Server.go +++ b/examples/zinx_version_ex/ZinxV0.11Test/Server.go @@ -7,9 +7,9 @@ package main import ( - "github.com/aceld/zinx/ziface" - "github.com/aceld/zinx/zlog" - "github.com/aceld/zinx/znet" + "zinx/ziface" + "zinx/zlog" + "zinx/znet" ) //ping test 自定义路由 diff --git a/examples/zinx_version_ex/ZinxV0.1Test/Server.go b/examples/zinx_version_ex/ZinxV0.1Test/Server.go index 4acdd71..8827e2e 100644 --- a/examples/zinx_version_ex/ZinxV0.1Test/Server.go +++ b/examples/zinx_version_ex/ZinxV0.1Test/Server.go @@ -1,7 +1,7 @@ package main import ( - "github.com/aceld/zinx/znet" + "zinx/znet" ) //Server 模块的测试函数 diff --git a/examples/zinx_version_ex/ZinxV0.2Test/Server.go b/examples/zinx_version_ex/ZinxV0.2Test/Server.go index b0775a6..89d272b 100644 --- a/examples/zinx_version_ex/ZinxV0.2Test/Server.go +++ b/examples/zinx_version_ex/ZinxV0.2Test/Server.go @@ -1,7 +1,7 @@ package main import ( - "github.com/aceld/zinx/znet" + "zinx/znet" ) //Server 模块的测试函数 diff --git a/examples/zinx_version_ex/ZinxV0.3Test/Server.go b/examples/zinx_version_ex/ZinxV0.3Test/Server.go index 4203929..d89523b 100644 --- a/examples/zinx_version_ex/ZinxV0.3Test/Server.go +++ b/examples/zinx_version_ex/ZinxV0.3Test/Server.go @@ -3,8 +3,8 @@ package main import ( "fmt" - "github.com/aceld/zinx/ziface" - "github.com/aceld/zinx/znet" + "zinx/ziface" + "zinx/znet" ) //ping test 自定义路由 diff --git a/examples/zinx_version_ex/ZinxV0.4Test/Server.go b/examples/zinx_version_ex/ZinxV0.4Test/Server.go index e9c597f..14cb549 100644 --- a/examples/zinx_version_ex/ZinxV0.4Test/Server.go +++ b/examples/zinx_version_ex/ZinxV0.4Test/Server.go @@ -3,8 +3,8 @@ package main import ( "fmt" - "github.com/aceld/zinx/ziface" - "github.com/aceld/zinx/znet" + "zinx/ziface" + "zinx/znet" ) //ping test 自定义路由 diff --git a/examples/zinx_version_ex/ZinxV0.5Test/Client.go b/examples/zinx_version_ex/ZinxV0.5Test/Client.go index 94f2e0b..0c161d4 100644 --- a/examples/zinx_version_ex/ZinxV0.5Test/Client.go +++ b/examples/zinx_version_ex/ZinxV0.5Test/Client.go @@ -6,7 +6,7 @@ import ( "net" "time" - "github.com/aceld/zinx/znet" + "zinx/znet" ) /* diff --git a/examples/zinx_version_ex/ZinxV0.5Test/Server.go b/examples/zinx_version_ex/ZinxV0.5Test/Server.go index 39080a1..a27c26a 100644 --- a/examples/zinx_version_ex/ZinxV0.5Test/Server.go +++ b/examples/zinx_version_ex/ZinxV0.5Test/Server.go @@ -3,8 +3,8 @@ package main import ( "fmt" - "github.com/aceld/zinx/ziface" - "github.com/aceld/zinx/znet" + "zinx/ziface" + "zinx/znet" ) //ping test 自定义路由 diff --git a/examples/zinx_version_ex/ZinxV0.6Test-V0.7Test/Client0.go b/examples/zinx_version_ex/ZinxV0.6Test-V0.7Test/Client0.go index 3a93964..df3a0cb 100644 --- a/examples/zinx_version_ex/ZinxV0.6Test-V0.7Test/Client0.go +++ b/examples/zinx_version_ex/ZinxV0.6Test-V0.7Test/Client0.go @@ -6,7 +6,7 @@ import ( "net" "time" - "github.com/aceld/zinx/znet" + "zinx/znet" ) /* diff --git a/examples/zinx_version_ex/ZinxV0.6Test-V0.7Test/Client1.go b/examples/zinx_version_ex/ZinxV0.6Test-V0.7Test/Client1.go index 471d2f0..28bc49d 100644 --- a/examples/zinx_version_ex/ZinxV0.6Test-V0.7Test/Client1.go +++ b/examples/zinx_version_ex/ZinxV0.6Test-V0.7Test/Client1.go @@ -6,7 +6,7 @@ import ( "net" "time" - "github.com/aceld/zinx/znet" + "zinx/znet" ) /* diff --git a/examples/zinx_version_ex/ZinxV0.6Test-V0.7Test/Server.go b/examples/zinx_version_ex/ZinxV0.6Test-V0.7Test/Server.go index a8e25c7..0f3d974 100644 --- a/examples/zinx_version_ex/ZinxV0.6Test-V0.7Test/Server.go +++ b/examples/zinx_version_ex/ZinxV0.6Test-V0.7Test/Server.go @@ -2,8 +2,8 @@ package main import ( "fmt" - "github.com/aceld/zinx/ziface" - "github.com/aceld/zinx/znet" + "zinx/ziface" + "zinx/znet" ) //ping test 自定义路由 diff --git a/examples/zinx_version_ex/ZinxV0.8Test/Client0.go b/examples/zinx_version_ex/ZinxV0.8Test/Client0.go index 17923be..34255e7 100644 --- a/examples/zinx_version_ex/ZinxV0.8Test/Client0.go +++ b/examples/zinx_version_ex/ZinxV0.8Test/Client0.go @@ -6,7 +6,7 @@ import ( "net" "time" - "github.com/aceld/zinx/znet" + "zinx/znet" ) /* diff --git a/examples/zinx_version_ex/ZinxV0.8Test/Client1.go b/examples/zinx_version_ex/ZinxV0.8Test/Client1.go index 792210c..c803f86 100644 --- a/examples/zinx_version_ex/ZinxV0.8Test/Client1.go +++ b/examples/zinx_version_ex/ZinxV0.8Test/Client1.go @@ -6,7 +6,7 @@ import ( "net" "time" - "github.com/aceld/zinx/znet" + "zinx/znet" ) /* diff --git a/examples/zinx_version_ex/ZinxV0.8Test/Server.go b/examples/zinx_version_ex/ZinxV0.8Test/Server.go index 234a903..0c14854 100644 --- a/examples/zinx_version_ex/ZinxV0.8Test/Server.go +++ b/examples/zinx_version_ex/ZinxV0.8Test/Server.go @@ -2,8 +2,8 @@ package main import ( "fmt" - "github.com/aceld/zinx/ziface" - "github.com/aceld/zinx/znet" + "zinx/ziface" + "zinx/znet" ) //ping test 自定义路由 diff --git a/examples/zinx_version_ex/ZinxV0.9Test/Client0.go b/examples/zinx_version_ex/ZinxV0.9Test/Client0.go index 17923be..34255e7 100644 --- a/examples/zinx_version_ex/ZinxV0.9Test/Client0.go +++ b/examples/zinx_version_ex/ZinxV0.9Test/Client0.go @@ -6,7 +6,7 @@ import ( "net" "time" - "github.com/aceld/zinx/znet" + "zinx/znet" ) /* diff --git a/examples/zinx_version_ex/ZinxV0.9Test/Client1.go b/examples/zinx_version_ex/ZinxV0.9Test/Client1.go index 4aee73d..a729c0d 100644 --- a/examples/zinx_version_ex/ZinxV0.9Test/Client1.go +++ b/examples/zinx_version_ex/ZinxV0.9Test/Client1.go @@ -6,7 +6,7 @@ import ( "net" "time" - "github.com/aceld/zinx/znet" + "zinx/znet" ) /* diff --git a/examples/zinx_version_ex/ZinxV0.9Test/Server.go b/examples/zinx_version_ex/ZinxV0.9Test/Server.go index c8b4356..e0228e9 100644 --- a/examples/zinx_version_ex/ZinxV0.9Test/Server.go +++ b/examples/zinx_version_ex/ZinxV0.9Test/Server.go @@ -2,8 +2,8 @@ package main import ( "fmt" - "github.com/aceld/zinx/ziface" - "github.com/aceld/zinx/znet" + "zinx/ziface" + "zinx/znet" ) //ping test 自定义路由 diff --git a/examples/zinx_version_ex/datapackDemo/Client.go b/examples/zinx_version_ex/datapackDemo/Client.go index 41b64de..8910dee 100644 --- a/examples/zinx_version_ex/datapackDemo/Client.go +++ b/examples/zinx_version_ex/datapackDemo/Client.go @@ -4,7 +4,7 @@ import ( "fmt" "net" - "github.com/aceld/zinx/znet" + "zinx/znet" ) func main() { diff --git a/examples/zinx_version_ex/datapackDemo/Server.go b/examples/zinx_version_ex/datapackDemo/Server.go index 7c5a750..c9fbee4 100644 --- a/examples/zinx_version_ex/datapackDemo/Server.go +++ b/examples/zinx_version_ex/datapackDemo/Server.go @@ -5,7 +5,7 @@ import ( "io" "net" - "github.com/aceld/zinx/znet" + "zinx/znet" ) //只是负责测试datapack拆包，封包功能 diff --git a/examples/zinx_version_ex/protoDemo/main.go b/examples/zinx_version_ex/protoDemo/main.go index a8af4aa..e1cdb0a 100644 --- a/examples/zinx_version_ex/protoDemo/main.go +++ b/examples/zinx_version_ex/protoDemo/main.go @@ -2,8 +2,8 @@ package main import ( "fmt" - "github.com/aceld/zinx/examples/zinx_version_ex/protoDemo/pb" "github.com/golang/protobuf/proto" + "zinx/examples/zinx_version_ex/protoDemo/pb" ) func main() { diff --git a/go.mod b/go.mod index d27693c..8085382 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/aceld/zinx +module zinx go 1.13 diff --git a/utils/globalobj.go b/utils/globalobj.go index 6110263..b355ee5 100644 --- a/utils/globalobj.go +++ b/utils/globalobj.go @@ -14,8 +14,8 @@ import ( "io/ioutil" "os" - "github.com/aceld/zinx/ziface" - "github.com/aceld/zinx/zlog" + "zinx/ziface" + "zinx/zlog" ) /* diff --git a/zinx_app_demo/mmo_game/api/move.go b/zinx_app_demo/mmo_game/api/move.go index 862dbca..68a658a 100644 --- a/zinx_app_demo/mmo_game/api/move.go +++ b/zinx_app_demo/mmo_game/api/move.go @@ -3,11 +3,11 @@ package api import ( "fmt" - "github.com/aceld/zinx/ziface" - "github.com/aceld/zinx/zinx_app_demo/mmo_game/core" - "github.com/aceld/zinx/zinx_app_demo/mmo_game/pb" - "github.com/aceld/zinx/znet" "github.com/golang/protobuf/proto" + "zinx/ziface" + "zinx/zinx_app_demo/mmo_game/core" + "zinx/zinx_app_demo/mmo_game/pb" + "zinx/znet" ) //玩家移动 diff --git a/zinx_app_demo/mmo_game/api/world_chat.go b/zinx_app_demo/mmo_game/api/world_chat.go index 7d9eeb9..4984acd 100644 --- a/zinx_app_demo/mmo_game/api/world_chat.go +++ b/zinx_app_demo/mmo_game/api/world_chat.go @@ -3,11 +3,11 @@ package api import ( "fmt" - "github.com/aceld/zinx/ziface" - "github.com/aceld/zinx/zinx_app_demo/mmo_game/core" - "github.com/aceld/zinx/zinx_app_demo/mmo_game/pb" - "github.com/aceld/zinx/znet" "github.com/golang/protobuf/proto" + "zinx/ziface" + "zinx/zinx_app_demo/mmo_game/core" + "zinx/zinx_app_demo/mmo_game/pb" + "zinx/znet" ) //世界聊天 路由业务 diff --git a/zinx_app_demo/mmo_game/client_AI_robot.go b/zinx_app_demo/mmo_game/client_AI_robot.go index 30f0bb5..de3de7c 100644 --- a/zinx_app_demo/mmo_game/client_AI_robot.go +++ b/zinx_app_demo/mmo_game/client_AI_robot.go @@ -11,8 +11,8 @@ import ( "sync" "time" - "github.com/aceld/zinx/zinx_app_demo/mmo_game/pb" "github.com/golang/protobuf/proto" + "zinx/zinx_app_demo/mmo_game/pb" ) type Message struct { diff --git a/zinx_app_demo/mmo_game/core/player.go b/zinx_app_demo/mmo_game/core/player.go index 53f56f2..dcf6984 100644 --- a/zinx_app_demo/mmo_game/core/player.go +++ b/zinx_app_demo/mmo_game/core/player.go @@ -6,9 +6,9 @@ import ( "sync" "time" - "github.com/aceld/zinx/ziface" - "github.com/aceld/zinx/zinx_app_demo/mmo_game/pb" "github.com/golang/protobuf/proto" + "zinx/ziface" + "zinx/zinx_app_demo/mmo_game/pb" ) //玩家对象 diff --git a/zinx_app_demo/mmo_game/server.go b/zinx_app_demo/mmo_game/server.go index d1a4631..d9ae957 100644 --- a/zinx_app_demo/mmo_game/server.go +++ b/zinx_app_demo/mmo_game/server.go @@ -3,10 +3,10 @@ package main import ( "fmt" - "github.com/aceld/zinx/ziface" - "github.com/aceld/zinx/zinx_app_demo/mmo_game/api" - "github.com/aceld/zinx/zinx_app_demo/mmo_game/core" - "github.com/aceld/zinx/znet" + "zinx/ziface" + "zinx/zinx_app_demo/mmo_game/api" + "zinx/zinx_app_demo/mmo_game/core" + "zinx/znet" ) //当客户端建立连接的时候的hook函数 diff --git a/zlog/zlogger_test.go b/zlog/zlogger_test.go index cc84b76..258e9aa 100644 --- a/zlog/zlogger_test.go +++ b/zlog/zlogger_test.go @@ -1,8 +1,8 @@ package zlog_test import ( - "github.com/aceld/zinx/zlog" "testing" + "zinx/zlog" ) func TestStdZLog(t *testing.T) { diff --git a/znet/connection.go b/znet/connection.go index ede5239..9dd1cd9 100644 --- a/znet/connection.go +++ b/znet/connection.go @@ -8,8 +8,8 @@ import ( "net" "sync" - "github.com/aceld/zinx/utils" - "github.com/aceld/zinx/ziface" + "zinx/utils" + "zinx/ziface" ) //Connection 链接 diff --git a/znet/connmanager.go b/znet/connmanager.go index c374faa..7581b83 100644 --- a/znet/connmanager.go +++ b/znet/connmanager.go @@ -5,7 +5,7 @@ import ( "fmt" "sync" - "github.com/aceld/zinx/ziface" + "zinx/ziface" ) //ConnManager 连接管理模块 diff --git a/znet/datapack.go b/znet/datapack.go index 7549cbe..394e0f9 100644 --- a/znet/datapack.go +++ b/znet/datapack.go @@ -5,8 +5,8 @@ import ( "encoding/binary" "errors" - "github.com/aceld/zinx/utils" - "github.com/aceld/zinx/ziface" + "zinx/utils" + "zinx/ziface" ) var defaultHeaderLen uint32 = 8 diff --git a/znet/msghandler.go b/znet/msghandler.go index 101fe53..1856d11 100644 --- a/znet/msghandler.go +++ b/znet/msghandler.go @@ -4,8 +4,8 @@ import ( "fmt" "strconv" - "github.com/aceld/zinx/utils" - "github.com/aceld/zinx/ziface" + "zinx/utils" + "zinx/ziface" ) // MsgHandle - diff --git a/znet/options.go b/znet/options.go index fbbf779..544f07f 100644 --- a/znet/options.go +++ b/znet/options.go @@ -1,6 +1,6 @@ package znet -import "github.com/aceld/zinx/ziface" +import "zinx/ziface" type Option func(s *Server) diff --git a/znet/request.go b/znet/request.go index 406b7b9..13cf0d0 100644 --- a/znet/request.go +++ b/znet/request.go @@ -1,6 +1,6 @@ package znet -import "github.com/aceld/zinx/ziface" +import "zinx/ziface" //Request 请求 type Request struct { diff --git a/znet/router.go b/znet/router.go index 417e027..ce2f99f 100644 --- a/znet/router.go +++ b/znet/router.go @@ -1,6 +1,6 @@ package znet -import "github.com/aceld/zinx/ziface" +import "zinx/ziface" //BaseRouter 实现router时，先嵌入这个基类，然后根据需要对这个基类的方法进行重写 type BaseRouter struct{} diff --git a/znet/server.go b/znet/server.go index 526770a..87c3e7f 100644 --- a/znet/server.go +++ b/znet/server.go @@ -4,8 +4,8 @@ import ( "fmt" "net" - "github.com/aceld/zinx/utils" - "github.com/aceld/zinx/ziface" + "zinx/utils" + "zinx/ziface" ) var zinxLogo = ` diff --git a/znet/server_test.go b/znet/server_test.go index 8e305fc..ede53b9 100644 --- a/znet/server_test.go +++ b/znet/server_test.go @@ -7,7 +7,7 @@ import ( "testing" "time" - "github.com/aceld/zinx/ziface" + "zinx/ziface" ) // run in terminal: diff --git a/ztimer/delayfunc.go b/ztimer/delayfunc.go index da1499e..22cfce5 100644 --- a/ztimer/delayfunc.go +++ b/ztimer/delayfunc.go @@ -9,7 +9,7 @@ import ( "fmt" "reflect" - "github.com/aceld/zinx/zlog" + "zinx/zlog" ) /* diff --git a/ztimer/timerscheduler.go b/ztimer/timerscheduler.go index 3f3401a..f021738 100644 --- a/ztimer/timerscheduler.go +++ b/ztimer/timerscheduler.go @@ -14,7 +14,7 @@ import ( "sync" "time" - "github.com/aceld/zinx/zlog" + "zinx/zlog" ) const ( diff --git a/ztimer/timerscheduler_test.go b/ztimer/timerscheduler_test.go index 7dd630b..b0615b0 100644 --- a/ztimer/timerscheduler_test.go +++ b/ztimer/timerscheduler_test.go @@ -14,7 +14,7 @@ import ( "testing" "time" - "github.com/aceld/zinx/zlog" + "zinx/zlog" ) //触发函数 diff --git a/ztimer/timewheel.go b/ztimer/timewheel.go index ad5299a..4e26901 100644 --- a/ztimer/timewheel.go +++ b/ztimer/timewheel.go @@ -12,7 +12,7 @@ import ( "sync" "time" - "github.com/aceld/zinx/zlog" + "zinx/zlog" ) /*