From 377482ce6d47c598dd5b395be0e25a9245efbc68 Mon Sep 17 00:00:00 2001
From: by <123456@qq.com>
Date: Mon, 26 Aug 2024 10:50:03 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A8=83=E5=A8=83=E6=9C=BAlog=E6=89=93?=
 =?UTF-8?q?=E5=8D=B0=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 machine/action/action_server.go   | 18 ++++++++----------
 machine/machinedoll/machinemgr.go | 12 ++++++------
 2 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/machine/action/action_server.go b/machine/action/action_server.go
index f42592d..7f7acd6 100644
--- a/machine/action/action_server.go
+++ b/machine/action/action_server.go
@@ -169,11 +169,11 @@ func DollMachineGrabResult(session *netlib.Session, conn *machinedoll.Conn, snid
 	num := int64(1)
 	for {
 		// 读取数据
-		fmt.Println("监听抓取结果返回!")
+		logger.Logger.Trace("监听抓取结果返回!")
 		buf := make([]byte, 1024)
 		n, err := conn.Read(buf)
 		if err != nil {
-			fmt.Println("Failed to read response from client:", err)
+			logger.Logger.Error("Failed to read response from client:", err)
 			return
 		}
 		// 将读取到的数据按照 221 进行分割
@@ -185,7 +185,7 @@ func DollMachineGrabResult(session *netlib.Session, conn *machinedoll.Conn, snid
 		for i, part := range parts {
 			if len(part) > 0 {
 				part = part[:len(part)-1] // 去除最后一个字节，该字节为分隔符
-				fmt.Println("比较返回结果 part = ", part)
+				//fmt.Println("比较返回结果 part = ", part)
 				if bytes.Contains(part, instruction) && num != 1 {
 					fmt.Printf("Part %d: %s\n", i+1, part)
 					//回应数据
@@ -200,7 +200,7 @@ func DollMachineGrabResult(session *netlib.Session, conn *machinedoll.Conn, snid
 						Result: 0,
 						TypeId: 2,
 					})
-					fmt.Println("没有抓到礼品！！！！！！！！snid = ", snid, "num = ", num)
+					logger.Logger.Trace("没有抓到礼品！！！！！！！！snid = ", snid, "num = ", num)
 					return
 				}
 				if bytes.Contains(part, instruction1) && num != 1 {
@@ -208,7 +208,7 @@ func DollMachineGrabResult(session *netlib.Session, conn *machinedoll.Conn, snid
 					//回应数据
 					_, err = conn.Write([]byte{0xAA, 0x04, 0x01, 0x50, 0x09, 0x5c, 0xdd})
 					if err != nil {
-						fmt.Println("Failed to read response from server:", err)
+						logger.Logger.Error("Failed to read response from server:", err)
 						return
 					}
 					session.Send(int(machine.DollMachinePacketID_PACKET_MSDollMachineoPerateResult), &machine.MSDollMachineoPerateResult{
@@ -217,14 +217,13 @@ func DollMachineGrabResult(session *netlib.Session, conn *machinedoll.Conn, snid
 						Result: 1,
 						TypeId: 2,
 					})
-					fmt.Println("抓到礼品了！！！！！！！！snid = ", snid, "num = ", num)
+					logger.Logger.Trace("抓到礼品了！！！！！！！！snid = ", snid, "num = ", num)
 					return
 				}
 				//上分成功
 				coinData := []byte{0xAA, 0x04, 0x02, 0x03, 0x01}
 				if bytes.Contains(part, coinData) {
 					//返回消息
-					fmt.Println("上分成功！")
 					session.Send(int(machine.DollMachinePacketID_PACKET_MSDollMachineoPerateResult), &machine.MSDollMachineoPerateResult{
 						Snid:   snid,
 						Id:     id,
@@ -236,7 +235,6 @@ func DollMachineGrabResult(session *netlib.Session, conn *machinedoll.Conn, snid
 				coinData = []byte{0xAA, 0x04, 0x02, 0x03, 0x00}
 				if bytes.Contains(part, coinData) {
 					//返回消息
-					fmt.Println("上分失败！")
 					session.Send(int(machine.DollMachinePacketID_PACKET_MSDollMachineoPerateResult), &machine.MSDollMachineoPerateResult{
 						Snid:   snid,
 						Id:     id,
@@ -295,10 +293,10 @@ func SMGetTokenHandler(session *netlib.Session, packetId int, data interface{})
 	//生成token
 	token, err := token04.GenerateToken04(appId, string(userId), serverSecret, effectiveTimeInSeconds, payload)
 	if err != nil {
-		fmt.Println(err)
+		logger.Logger.Error(err)
 		return err
 	}
-	fmt.Println(token)
+	logger.Logger.Trace(token)
 	info := &machine.MSSendToken{}
 	info.Snid = msg.Snid
 	info.Token = token
diff --git a/machine/machinedoll/machinemgr.go b/machine/machinedoll/machinemgr.go
index 57ad3d2..b385e46 100644
--- a/machine/machinedoll/machinemgr.go
+++ b/machine/machinedoll/machinemgr.go
@@ -46,11 +46,11 @@ func (this *MachineManager) Init() {
 	var serverAddrs []string
 	programDir, err := os.Getwd()
 	if err != nil {
-		fmt.Println("Error getting working directory:", err)
+		logger.Logger.Error("Error getting working directory:", err)
 		return
 	}
 	configFile := filepath.Join(programDir, "machineIPConfig.json")
-	fmt.Println("构建配置文件的路径", configFile)
+	logger.Logger.Trace("构建配置文件的路径", configFile)
 	fileData, err := os.ReadFile(configFile)
 	if err != nil {
 		logger.Logger.Error("Read robot account file error:", err)
@@ -66,7 +66,7 @@ func (this *MachineManager) Init() {
 	for i, addr := range serverAddrs {
 		conn, err := net.DialTimeout("tcp", addr, 5*time.Second)
 		if err != nil {
-			fmt.Println("Failed to connect to server:", err)
+			logger.Logger.Error("Failed to connect to server:", err)
 			continue
 		}
 		this.ConnMap[i+1] = &Conn{
@@ -75,7 +75,7 @@ func (this *MachineManager) Init() {
 			Addr: addr,
 		}
 		SetBaseParam(conn)
-		fmt.Println("设置每台娃娃机基础配置！")
+		logger.Logger.Trace("设置每台娃娃机基础配置！")
 
 	}
 	/*	fmt.Println("Connected to server:\n", this.ConnMap[1].RemoteAddr())
@@ -98,7 +98,7 @@ func (this *MachineManager) Update() {
 				delConn = append(delConn, v)
 				v.Close()
 				logger.Logger.Tracef("断开连接：%v", v.Addr)
-				fmt.Println("娃娃机断开连接！！！！！！！！！！！")
+				logger.Logger.Error("娃娃机断开连接！！！！！！！！！！！")
 				this.UpdateToGameServer(v, 0)
 			}
 		}
@@ -118,7 +118,7 @@ func (this *MachineManager) Update() {
 					continue
 				}
 				logger.Logger.Tracef("重连成功：%v", addr)
-				fmt.Println("娃娃机重连成功！！！！！！！！！！！")
+				logger.Logger.Trace("娃娃机重连成功！！！！！！！！！！！")
 				delIds = append(delIds, &Conn{
 					Id:   id,
 					Conn: conn,