Sncot123 · nuts-plp · Aug 15, 2023 · Aug 16, 2023 · Aug 16, 2023 · Aug 16, 2023
diff --git a/README.md b/README.md
@@ -1,3 +1,3 @@
 # go_study
-person study
-study git
+person study  
+ git&&log
diff --git a/tcpboxV0.8/Client.go → TcpBox/Client.go b/tcpboxV0.8/Client.go → TcpBox/Client.go
@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"io"
 	"net"
+	"tcpbox/tcpnet"
 	"time"
-	"zinx/znet"
 )
 
 func main() {
@@ -18,8 +18,8 @@ func main() {
 	defer conn.Close()
 	for {
 		//发送封包的msg消息
-		dp := znet.NewDataPack()
-		ms := znet.NewMsgPackage(0, []byte("zinx0.5 client test message!"))
+		dp := tcpnet.NewDataPack()
+		ms := tcpnet.NewMsgPackage(0, []byte("zinx0.5 client test message!"))
 		binaryMsg, err := dp.Pack(ms)
 		if nil != err {
 			fmt.Println("Pack error:", err)
@@ -50,7 +50,7 @@ func main() {
 		}
 		if msgHead.GetMsgLen() > 0 {
 			//再根据datalen进行二次读取，将data读出来
-			msg := msgHead.(*znet.Message)
+			msg := msgHead.(*tcpnet.Message)
 			msg.MsgData = make([]byte, msg.GetMsgLen())
 
 			if _, err := io.ReadFull(conn, msg.MsgData); nil != err {

diff --git a/tcpboxV0.6/Client1.go → TcpBox/Client1.go b/tcpboxV0.6/Client1.go → TcpBox/Client1.go
diff --git a/tcpboxV0.9/Server.go → TcpBox/Server.go b/tcpboxV0.9/Server.go → TcpBox/Server.go
diff --git a/tcpboxV0.9/conf/zinx.json → TcpBox/conf/tcpbox.json b/tcpboxV0.9/conf/zinx.json → TcpBox/conf/tcpbox.json
@@ -1,5 +1,5 @@
 {
-  "Name": "ZinxApp",
+  "Name": "TcpBoxApp",
   "Host": "0.0.0.0",
   "Version": 0.6,
   "IPVersion": "tcp4",

diff --git a/tcpboxV0.1/go.mod → TcpBox/go.mod b/tcpboxV0.1/go.mod → TcpBox/go.mod
diff --git a/uxic.txt → TcpBox/go.sum b/uxic.txt → TcpBox/go.sum
diff --git a/tcpboxV0.4/tcpiface/IMessage.go → TcpBox/tcpiface/IMessage.go b/tcpboxV0.4/tcpiface/IMessage.go → TcpBox/tcpiface/IMessage.go
diff --git a/tcpboxV0.6/tcpiface/iMsgHandle.go → TcpBox/tcpiface/iMsgHandle.go b/tcpboxV0.6/tcpiface/iMsgHandle.go → TcpBox/tcpiface/iMsgHandle.go
diff --git a/tcpboxV0.8/tcpiface/iconnection.go → TcpBox/tcpiface/iconnection.go b/tcpboxV0.8/tcpiface/iconnection.go → TcpBox/tcpiface/iconnection.go
diff --git a/tcpboxV0.7/tcpiface/iconnmanager.go → TcpBox/tcpiface/iconnmanager.go b/tcpboxV0.7/tcpiface/iconnmanager.go → TcpBox/tcpiface/iconnmanager.go
diff --git a/tcpboxV0.5/tcpiface/imsgpack.go → TcpBox/tcpiface/imsgpack.go b/tcpboxV0.5/tcpiface/imsgpack.go → TcpBox/tcpiface/imsgpack.go
diff --git a/tcpboxV0.5/tcpiface/irequest.go → TcpBox/tcpiface/irequest.go b/tcpboxV0.5/tcpiface/irequest.go → TcpBox/tcpiface/irequest.go
diff --git a/tcpboxV0.5/tcpiface/irouter.go → TcpBox/tcpiface/irouter.go b/tcpboxV0.5/tcpiface/irouter.go → TcpBox/tcpiface/irouter.go
diff --git a/tcpboxV0.8/tcpiface/iserver.go → TcpBox/tcpiface/iserver.go b/tcpboxV0.8/tcpiface/iserver.go → TcpBox/tcpiface/iserver.go
diff --git a/tcpboxV0.9/tcpnet/connection.go → TcpBox/tcpnet/connection.go b/tcpboxV0.9/tcpnet/connection.go → TcpBox/tcpnet/connection.go
@@ -18,7 +18,7 @@ type Connection struct {
 	//当前conn隶属于哪个server
 	TcpServer tcpiface.IServer
 
-	//当球按连接的socket
+	//当前按连接的socket
 	Conn *net.TCPConn
 
 	//连接的ID
@@ -43,7 +43,7 @@ type Connection struct {
 	propertyLock sync.RWMutex
 }
 
-//初始化链接模块的方法
+// 初始化链接模块的方法
 func NewConnection(server tcpiface.IServer, conn *net.TCPConn, connID uint32, msgHandler tcpiface.IMsgHandle) *Connection {
 	c := &Connection{
 		TcpServer: server,
@@ -59,7 +59,7 @@ func NewConnection(server tcpiface.IServer, conn *net.TCPConn, connID uint32, ms
 	return c
 }
 
-//链接的读数据方法
+// 链接的读数据方法
 func (c *Connection) StartReader() {
 
 	fmt.Println("Reader goroutine is running...")
@@ -118,7 +118,7 @@ func (c *Connection) StartReader() {
 	}
 }
 
-//写消息的goroutine，专门将消息发送给客户端的模块
+// 写消息的goroutine，专门将消息发送给客户端的模块
 func (c *Connection) StartWriter() {
 	fmt.Println("Writer Goroutine is running!!!")
 	defer fmt.Println(c.RemoteAddr().String(), "[conn writer exit!]")
@@ -140,7 +140,7 @@ func (c *Connection) StartWriter() {
 	}
 }
 
-//启动链接，让当前的链接准备工作
+// 启动链接，让当前的链接准备工作
 func (c *Connection) Start() {
 
 	fmt.Println(" Conn Start()... ConnID:", c.ConnID)
@@ -157,7 +157,7 @@ func (c *Connection) Start() {
 
 }
 
-//停止链接，结束当前链接的工作
+// 停止链接，结束当前链接的工作
 func (c *Connection) Stop() {
 
 	fmt.Println(" Conn Stop()... ConnID:", c.ConnID)
@@ -184,22 +184,22 @@ func (c *Connection) Stop() {
 
 }
 
-//获取当前链接绑定的socket conn
+// 获取当前链接绑定的socket conn
 func (c *Connection) GetTCPConnection() *net.TCPConn {
 	return c.Conn
 }
 
-//获取当前连接模块的连接ID
+// 获取当前连接模块的连接ID
 func (c *Connection) GetConnID() uint32 {
 	return c.ConnID
 }
 
-//获取远程客户端的TCP状态 IP PORT
+// 获取远程客户端的TCP状态 IP PORT
 func (c *Connection) RemoteAddr() net.Addr {
 	return c.Conn.RemoteAddr()
 }
 
-//发送数据，将数据发送给远程的客户端
+// 发送数据，将数据发送给远程的客户端
 func (c *Connection) SendMsg(msgID uint32, data []byte) error {
 	if c.isClosed == true {
 		return errors.New("Connection closed when send msg")
@@ -218,7 +218,7 @@ func (c *Connection) SendMsg(msgID uint32, data []byte) error {
 	return nil
 }
 
-//设置连接属性
+// 设置连接属性
 func (c *Connection) SetProperty(key string, value interface{}) {
 	c.propertyLock.Lock()
 	defer c.propertyLock.Unlock()
@@ -227,7 +227,7 @@ func (c *Connection) SetProperty(key string, value interface{}) {
 	c.property[key] = value
 }
 
-//获取连接属性
+// 获取连接属性
 func (c *Connection) GetProperty(key string) (interface{}, error) {
 	c.propertyLock.RLock()
 	defer c.propertyLock.RUnlock()
@@ -239,7 +239,7 @@ func (c *Connection) GetProperty(key string) (interface{}, error) {
 	}
 }
 
-//删除连接属性
+// 删除连接属性
 func (c *Connection) RemoveProperty(key string) {
 	c.propertyLock.RLock()
 	defer c.propertyLock.RUnlock()

diff --git a/tcpboxV0.7/tcpnet/connmanager.go → TcpBox/tcpnet/connmanager.go b/tcpboxV0.7/tcpnet/connmanager.go → TcpBox/tcpnet/connmanager.go
diff --git a/tcpboxV0.5/tcpnet/message.go → TcpBox/tcpnet/message.go b/tcpboxV0.5/tcpnet/message.go → TcpBox/tcpnet/message.go
diff --git a/tcpboxV0.6/tcpnet/msgHandle.go → TcpBox/tcpnet/msgHandle.go b/tcpboxV0.6/tcpnet/msgHandle.go → TcpBox/tcpnet/msgHandle.go
diff --git a/tcpboxV0.6/tcpnet/msgpack.go → TcpBox/tcpnet/msgpack.go b/tcpboxV0.6/tcpnet/msgpack.go → TcpBox/tcpnet/msgpack.go
diff --git a/tcpboxV0.6/tcpnet/msgpack_test.go → TcpBox/tcpnet/msgpack_test.go b/tcpboxV0.6/tcpnet/msgpack_test.go → TcpBox/tcpnet/msgpack_test.go
diff --git a/tcpboxV0.5/tcpnet/request.go → TcpBox/tcpnet/request.go b/tcpboxV0.5/tcpnet/request.go → TcpBox/tcpnet/request.go
diff --git a/tcpboxV0.2/tcpnet/router.go → TcpBox/tcpnet/router.go b/tcpboxV0.2/tcpnet/router.go → TcpBox/tcpnet/router.go
diff --git a/tcpboxV0.8/tcpnet/server.go → TcpBox/tcpnet/server.go b/tcpboxV0.8/tcpnet/server.go → TcpBox/tcpnet/server.go
diff --git a/tcpboxV0.9/utils/globalobj.go → TcpBox/utils/globalobj.go b/tcpboxV0.9/utils/globalobj.go → TcpBox/utils/globalobj.go
@@ -43,7 +43,7 @@ type GlobalObj struct {
 
 var GlobalObject *GlobalObj
 
-//提供一个init方法，初始化GlobalObject对象
+// 提供一个init方法，初始化GlobalObject对象
 func init() {
 	//如果配置文件没有加载，此为默认的配置
 	GlobalObject = &GlobalObj{
@@ -63,9 +63,9 @@ func init() {
 	GlobalObject.Reload()
 }
 
-//从zinx.json去加载用户自定义的参数
+// 从zinx.json去加载用户自定义的参数
 func (g *GlobalObj) Reload() {
-	data, err := ioutil.ReadFile("./conf/zinx.json")
+	data, err := ioutil.ReadFile("./conf/tcpbox.json")
 	if nil != err {
 		panic("[Reload] Reload failed")
 	}

diff --git a/go_basic/dataStruct/BubbleSort/main.go → dataStruct/BubbleSort/main.go b/go_basic/dataStruct/BubbleSort/main.go → dataStruct/BubbleSort/main.go
diff --git a/go_basic/dataStruct/GraphBFS/main.go → dataStruct/GraphBFS/main.go b/go_basic/dataStruct/GraphBFS/main.go → dataStruct/GraphBFS/main.go
diff --git a/go_basic/dataStruct/GraphDFS/main.go → dataStruct/GraphDFS/main.go b/go_basic/dataStruct/GraphDFS/main.go → dataStruct/GraphDFS/main.go
diff --git a/...sic/dataStruct/GraphDFSWithWeight/main.go → dataStruct/GraphDFSWithWeight/main.go b/...sic/dataStruct/GraphDFSWithWeight/main.go → dataStruct/GraphDFSWithWeight/main.go
diff --git a/go_basic/dataStruct/GraphStoreChain/main.go → dataStruct/GraphStoreChain/main.go b/go_basic/dataStruct/GraphStoreChain/main.go → dataStruct/GraphStoreChain/main.go
diff --git a/go_basic/dataStruct/GraphStoreMatrix/main.go → dataStruct/GraphStoreMatrix/main.go b/go_basic/dataStruct/GraphStoreMatrix/main.go → dataStruct/GraphStoreMatrix/main.go
diff --git a/go_basic/dataStruct/InsertSort/main.go → dataStruct/InsertSort/main.go b/go_basic/dataStruct/InsertSort/main.go → dataStruct/InsertSort/main.go
diff --git a/...truct/list/linkedListMgr/linkedListMgr.go → ...truct/list/linkedListMgr/linkedListMgr.go b/...truct/list/linkedListMgr/linkedListMgr.go → ...truct/list/linkedListMgr/linkedListMgr.go
diff --git a/go_basic/dataStruct/list/main.go → dataStruct/list/main.go b/go_basic/dataStruct/list/main.go → dataStruct/list/main.go
diff --git a/...uct/list/seqListMgr_map/seqListMgr_map.go → ...uct/list/seqListMgr_map/seqListMgr_map.go b/...uct/list/seqListMgr_map/seqListMgr_map.go → ...uct/list/seqListMgr_map/seqListMgr_map.go
diff --git a/...list/seqListMgr_slice/seqListMgr_slice.go → ...list/seqListMgr_slice/seqListMgr_slice.go b/...list/seqListMgr_slice/seqListMgr_slice.go → ...list/seqListMgr_slice/seqListMgr_slice.go
diff --git a/go_basic/dataStruct/list/standard/node.go → dataStruct/list/standard/node.go b/go_basic/dataStruct/list/standard/node.go → dataStruct/list/standard/node.go
diff --git a/...taStruct/list/standard/structInterface.go → dataStruct/list/standard/structInterface.go b/...taStruct/list/standard/structInterface.go → dataStruct/list/standard/structInterface.go
diff --git a/...taStruct/queue/linkedQueue/linkedQueue.go → dataStruct/queue/linkedQueue/linkedQueue.go b/...taStruct/queue/linkedQueue/linkedQueue.go → dataStruct/queue/linkedQueue/linkedQueue.go
diff --git a/.../dataStruct/queue/queueInterface/queue.go → dataStruct/queue/queueInterface/queue.go b/.../dataStruct/queue/queueInterface/queue.go → dataStruct/queue/queueInterface/queue.go
diff --git a/...sic/dataStruct/queue/seqQueue/seqQueue.go → dataStruct/queue/seqQueue/seqQueue.go b/...sic/dataStruct/queue/seqQueue/seqQueue.go → dataStruct/queue/seqQueue/seqQueue.go
diff --git a/...uct/stackStore/linkedStack/linkedStack.go → ...uct/stackStore/linkedStack/linkedStack.go b/...uct/stackStore/linkedStack/linkedStack.go → ...uct/stackStore/linkedStack/linkedStack.go
diff --git a/...ataStruct/stackStore/seqStack/seqStack.go → dataStruct/stackStore/seqStack/seqStack.go b/...ataStruct/stackStore/seqStack/seqStack.go → dataStruct/stackStore/seqStack/seqStack.go
diff --git a/...aStruct/stackStore/stackStandard/Stack.go → dataStruct/stackStore/stackStandard/Stack.go b/...aStruct/stackStore/stackStandard/Stack.go → dataStruct/stackStore/stackStandard/Stack.go
diff --git a/go_basic/dataStruct/test.go → dataStruct/test.go b/go_basic/dataStruct/test.go → dataStruct/test.go
diff --git a/go_basic/dataStruct/tree/AVLtree/AVLtree.go → dataStruct/tree/AVLtree/AVLtree.go b/go_basic/dataStruct/tree/AVLtree/AVLtree.go → dataStruct/tree/AVLtree/AVLtree.go
diff --git a/go_basic/dataStruct/tree/RBTree/RBTree.go → dataStruct/tree/RBTree/RBTree.go b/go_basic/dataStruct/tree/RBTree/RBTree.go → dataStruct/tree/RBTree/RBTree.go
diff --git a/go_basic/dataStruct/tree/RBTree/util.go → dataStruct/tree/RBTree/util.go b/go_basic/dataStruct/tree/RBTree/util.go → dataStruct/tree/RBTree/util.go
diff --git a/.../dataStruct/tree/binaryTree/binaryTree.go → dataStruct/tree/binaryTree/binaryTree.go b/.../dataStruct/tree/binaryTree/binaryTree.go → dataStruct/tree/binaryTree/binaryTree.go
diff --git a/go_basic/dataStruct/tree/node/node.go → dataStruct/tree/node/node.go b/go_basic/dataStruct/tree/node/node.go → dataStruct/tree/node/node.go
diff --git a/...aStruct/tree/treeStandard/treeStandard.go → dataStruct/tree/treeStandard/treeStandard.go b/...aStruct/tree/treeStandard/treeStandard.go → dataStruct/tree/treeStandard/treeStandard.go
diff --git a/demo/redis_test/likui.go b/demo/redis_test/likui.go
@@ -0,0 +1,33 @@
+package main
+
+import (
+	"context"
+	"github.com/redis/go-redis/v9"
+	"log"
+	"os"
+)
+
+func main() {
+	client := redis.NewClient(&redis.Options{
+		Addr:     "123.249.105.59:6379",
+		DB:       0,
+		Password: "950629",
+		PoolSize: 10,
+	})
+	result, err := client.Ping(context.Background()).Result()
+	if err != nil {
+		log.Printf("connect to redis failed err:%v", err)
+		panic("wrong")
+	}
+	log.Print(result)
+	log.SetFlags(log.Ldate | log.Ltime)
+	log.SetPrefix("[likui]")
+	log.SetOutput(os.Stdout)
+	test1(client)
+}
+func test1(client *redis.Client) {
+	set := client.Set(context.Background(), "test", "不再喜欢", 0)
+	log.Printf("operation:%v     result:%v", set.String(), set.Val())
+	get := client.Get(context.Background(), "test")
+	log.Printf("operation:%v     result:%v", get.String(), get.Val())
+}