dujunchen 1 ヶ月 前
コミット
c6e9d74eab

+ 1 - 0
cmd/main.go

@@ -62,6 +62,7 @@ func main() {
 			},
 		))
 		lfshook.NewLogger().Logger.SetReportCaller(true)
+
 	}
 
 	app.StartApp()

+ 6 - 6
internal/app/ami/action/call.go

@@ -175,7 +175,7 @@ func InterruptRunningTask(toRunTask string) {
 	case "SPC":
 		if toRunTask == "C2C" {
 			HangupICP()
-			alstatus.PaStatus("", "SPC", "end")
+			//alstatus.PaStatus("", "SPC", "end")
 		} else {
 			ConfbridgeKick(task.ConfbridgeID, "all")
 			alstatus.PaStatus("", "SPC", "end")
@@ -184,7 +184,7 @@ func InterruptRunningTask(toRunTask string) {
 	case "CHK":
 		if toRunTask == "C2C" {
 			HangupICP()
-			alstatus.PaStatus("", "CHK", "end")
+			//alstatus.PaStatus("", "CHK", "end")
 		} else {
 			ConfbridgeKick(task.ConfbridgeID, "all")
 			alstatus.PaStatus("", "CHK", "end")
@@ -195,7 +195,7 @@ func InterruptRunningTask(toRunTask string) {
 			return
 		} else if toRunTask == "C2C" {
 			HangupICP()
-			alstatus.PaStatus("", "DCS", "end")
+			//alstatus.PaStatus("", "DCS", "end")
 		} else {
 			ConfbridgeKick(task.ConfbridgeID, "all")
 			alstatus.PaStatus("", "DCS", "end")
@@ -207,7 +207,7 @@ func InterruptRunningTask(toRunTask string) {
 			return
 		} else if toRunTask == "C2C" {
 			HangupICP()
-			alstatus.PaStatus("", "STN", "end")
+			//alstatus.PaStatus("", "STN", "end")
 		} else {
 			ConfbridgeKick(task.ConfbridgeID, "all")
 			alstatus.PaStatus("", "STN", "end")
@@ -220,7 +220,7 @@ func InterruptRunningTask(toRunTask string) {
 			alstatus.PaStatus("", "CPA", "end")
 		} else if toRunTask == "C2C" {
 			HangupICP()
-			alstatus.PaStatus("", "CPA", "end")
+			//alstatus.PaStatus("", "CPA", "end")
 		}
 		time.Sleep(time.Millisecond * 200)
 	case "EMG":
@@ -230,7 +230,7 @@ func InterruptRunningTask(toRunTask string) {
 			alstatus.PaStatus("", "EMG", "end")
 		} else if toRunTask == "C2C" {
 			HangupICP()
-			alstatus.PaStatus("", "EMG", "end")
+			//alstatus.PaStatus("", "EMG", "end")
 		}
 		time.Sleep(time.Millisecond * 200)
 	case "C2C": // Interrupt C2C task running,

+ 2 - 2
internal/app/ami/action/index.go

@@ -1137,7 +1137,7 @@ func HandleAMI(event map[string]string) {
 			if ok {
 				ICPConfbridgeReinvite(task.ConfbridgeID, taskName)
 				//check resume
-				if taskName == "CPA" {
+				/*if taskName == "CPA" {
 					alstatus.PaStatus("", "CPA", "start")
 				} else if taskName == "EMG" {
 					alstatus.PaStatus("", "EMG", "start")
@@ -1149,7 +1149,7 @@ func HandleAMI(event map[string]string) {
 					alstatus.PaStatus("", "STN", "start")
 				} else if taskName == "CHK" {
 					alstatus.PaStatus("", "CHK", "start")
-				}
+				}*/
 			}
 		}
 

+ 1 - 2
internal/app/index.go

@@ -6,7 +6,6 @@ import (
 	"pbx-api-gin/internal/app/stc/active"
 	"pbx-api-gin/internal/app/stc/priority"
 	"pbx-api-gin/internal/app/stc/socket"
-	"pbx-api-gin/pkg/lfshook"
 	"pbx-api-gin/pkg/utils"
 	"time"
 )
@@ -56,7 +55,7 @@ func StartApp() {
 	// 启动 AMI
 	go func() {
 		action.StartAMI(func() {
-			lfshook.NewLogger().Info("ami callback")
+			utils.LoggerDebug.Printf("AMI callback Start .")
 		}, []func(event map[string]string){})
 	}()
 

+ 5 - 5
internal/app/stc/active/index.go

@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"net/http"
 	"os"
-	"pbx-api-gin/pkg/lfshook"
+	"pbx-api-gin/pkg/utils"
 	"time"
 )
 
@@ -78,7 +78,7 @@ func NotifyPaiu(Exten, Action string) {
 		url = fmt.Sprintf("http://10.0.24.%s/api/sipphone?action=hangup", Exten[2:])
 	}
 
-	lfshook.NewLogger().Logger.Infof("Notify PAD URL:%+v ", url)
+	utils.LoggerDebug.Printf("Notify PAD URL:%+v ", url)
 	resp, err := http.Get(url)
 	if err != nil {
 		//lfshook.NewLogger().Logger.Infof("======Notify PAIU Alarm====:%+v ", err)
@@ -128,7 +128,7 @@ func GenerateXML(pt string) error {
 	// 创建文件(会覆盖同名文件)
 	file, err := os.Create(pt)
 	if err != nil {
-		fmt.Printf("创建文件失败: %v\n", err)
+		//fmt.Printf("创建文件失败: %v\n", err)
 		return err
 	}
 	defer file.Close() // 确保关闭
@@ -137,14 +137,14 @@ func GenerateXML(pt string) error {
 	encoder := xml.NewEncoder(file)
 	encoder.Indent("", "  ") // 启用缩进,等效于 MarshalIndent
 	if err := encoder.Encode(DeviceEndpoint); err != nil {
-		fmt.Printf("XML 编码写入失败: %v\n", err)
+		//fmt.Printf("XML 编码写入失败: %v\n", err)
 		return err
 	}
 	return err
 }
 
 func InitTrainInfoMap() {
-	lfshook.NewLogger().Infof("Init train info map ..... ")
+	utils.LoggerDebug.Printf("Init train info map ..... ")
 
 	for i, train := range TrainNumGr {
 		TrainInfoMap[train] = make(map[int]string)

+ 29 - 26
internal/app/stc/broadcast/stc-broadcast.go

@@ -6,14 +6,12 @@ import (
 	"encoding/binary"
 	"fmt"
 	"io"
-	"log"
 	"net"
 	"pbx-api-gin/internal/app/ami/action"
 	"pbx-api-gin/internal/app/stc/active"
 	msgdata "pbx-api-gin/internal/app/stc/data"
 	"pbx-api-gin/internal/app/stc/priority"
 	alstatus "pbx-api-gin/internal/app/stc/sendstatus"
-	"pbx-api-gin/pkg/lfshook"
 	"pbx-api-gin/pkg/utils"
 	"strconv"
 	"sync"
@@ -56,7 +54,7 @@ func HandleStcCmd(ctx context.Context, conn net.Conn) {
 			for {
 				packet, err := msgdata.ExtractPacket(&buf)
 				if err != nil {
-					log.Printf("parse error: %v, resetting buffer", err)
+					utils.LoggerDebug.Printf("Parse error: %v, resetting buffer", err)
 					buf.Reset() // 解析失败,清空避免污染
 					break
 				}
@@ -129,13 +127,13 @@ func processHeartbeat(info []byte) {
 func processPacket(packet []byte) {
 
 	if len(packet) < 6 {
-		lfshook.NewLogger().Logger.Infof("Get data wrong length from STC !")
+		utils.LoggerDebug.Printf("Get data wrong length from STC !")
 		return
 	}
 
 	//for recv data log debug
 	if packet[5] != 0x03 && packet[5] != 0x0c && packet[5] != 0x01 {
-		lfshook.NewLogger().Logger.Infof("Get data from STC:%x", packet)
+		utils.LoggerDebug.Printf("Get data from STC:%x", packet)
 	}
 
 	//check if the cmd type is avtive
@@ -147,7 +145,7 @@ func processPacket(packet []byte) {
 	//check if Master role
 	if !active.Master {
 		if tagLog == 0 {
-			lfshook.NewLogger().Logger.Infof("=========Not Master Role Ignore data !=============")
+			utils.LoggerDebug.Printf("Not Master Role , Ignore all data from STC !")
 			tagLog = 1
 		}
 		return
@@ -239,9 +237,9 @@ func processPacket(packet []byte) {
 
 			if active.QueueTimer != nil {
 				if active.QueueTimer.Stop() {
-					lfshook.NewLogger().Logger.Infof("=========Release PAD timer true !============")
+					utils.LoggerDebug.Printf("Stop PAD timer true !")
 				} else {
-					lfshook.NewLogger().Logger.Infof("=========Release PAD timer false ! ============")
+					utils.LoggerDebug.Printf("Stop PAD timer false !")
 				}
 			}
 
@@ -266,9 +264,9 @@ func processPacket(packet []byte) {
 
 			if active.QueueTimer != nil {
 				if active.QueueTimer.Stop() {
-					lfshook.NewLogger().Logger.Infof("=========Release PAD timer true !============")
+					utils.LoggerDebug.Printf("Stop PAD timer true !")
 				} else {
-					lfshook.NewLogger().Logger.Infof("=========Release PAD timer false ! ============")
+					utils.LoggerDebug.Printf("Stop PAD timer false !")
 				}
 			}
 
@@ -354,31 +352,31 @@ func Active(data [3]byte) {
 	master := int(data[1])
 	TrainInfo := int(data[2])
 
-	lfshook.NewLogger().Logger.Infof("=====active======cab=%s Master=%d=====data:%x======", active.CabNum, master, data)
+	utils.LoggerDebug.Printf("CabNumber:%s  Active:%x	Master:%x	Train devide & radiofault :%x", active.CabNum, Signal, master, TrainInfo)
 
 	//Set Master
 	if master == 1 && active.CabNum == "1" {
 
 		active.Master = true
-		lfshook.NewLogger().Logger.Infof("=====cab1 Master")
+		//lfshook.NewLogger().Logger.Infof("=====cab1 Master")
 		if !utils.CheckAsterisk() {
-			lfshook.NewLogger().Infof("Check asterisk , if not running , run cmd /usr/sbin/asterisk !")
+			utils.LoggerDebug.Printf("Check asterisk , not running , run cmd /usr/sbin/asterisk !")
 			utils.ExecCmdAsync("/usr/sbin/asterisk")
 			time.Sleep(3 * time.Second)
 		}
 	} else if master == 8 && active.CabNum == "8" {
 
 		active.Master = true
-		lfshook.NewLogger().Logger.Infof("=====cab8 Master")
+		//utils.LoggerDebug.Printf("=====cab8 Master")
 		if !utils.CheckAsterisk() {
-			lfshook.NewLogger().Infof("Check asterisk , if not running , run cmd /usr/sbin/asterisk !")
+			utils.LoggerDebug.Printf("Check asterisk , not running , run cmd /usr/sbin/asterisk !")
 			utils.ExecCmdAsync("/usr/sbin/asterisk")
 			time.Sleep(3 * time.Second)
 		}
 	} else if master == 8 && active.CabNum == "1" {
 
-		lfshook.NewLogger().Logger.Infof("=====cab1 slave check stop asterisk")
 		if utils.CheckAsterisk() {
+			utils.LoggerDebug.Printf("Master 8, cab1 ; Check asterisk , running , run cmd /etc/init.d/asterisk stop PBX !")
 			utils.ExecCmd("/etc/init.d/asterisk", "stop", "PBX")
 		}
 	} else if master == 1 && active.CabNum == "8" {
@@ -408,7 +406,7 @@ func Active(data [3]byte) {
 		} else {
 			active.RadioFault = 0
 		}
-		lfshook.NewLogger().Logger.Infof("==RadioFault1:%x==RadioFault1:%x=DevideInfo:%x", RadioFault1, RadioFault8, DevideInfo)
+		utils.LoggerDebug.Printf("RadioFault1:%x 	RadioFault1:%x		DevideInfo:%x", RadioFault1, RadioFault8, DevideInfo)
 
 	}
 
@@ -583,13 +581,13 @@ func AlarmHandleICP(data []byte) {
 	//PAD---->Chanspy(WEq)-->ICP1;PAD--->Call---->ICP2
 	if handler == 0x01 {
 		if _, loaded := suppressedExts.LoadOrStore(key, struct{}{}); loaded {
-			lfshook.NewLogger().Logger.Infof("Suppressed duplicate ICP Alarm (handler=0x01) for exten: %s within 4 seconds", exten)
+			utils.LoggerDebug.Printf("Suppressed duplicate ICP Alarm (handler=0x01) for PAD:%s within 4 seconds", exten)
 			return
 		}
 
 		time.AfterFunc(4*time.Second, func() {
 			suppressedExts.Delete(key)
-			lfshook.NewLogger().Logger.Debugf("Suppression released for key: %s", key)
+			utils.LoggerDebug.Printf("Suppression released for key: %s", key)
 		})
 	}
 
@@ -601,7 +599,8 @@ func AlarmHandleICP(data []byte) {
 			alstatus.PaStatus("", "PAD", "start")
 			priority.PADStart = 1
 		}
-		lfshook.NewLogger().Logger.Infof("================ ICP Answer PAD ================:%s ", exten)
+		utils.LoggerDebug.Printf("ICP Answer PAD:%s .", exten)
+
 		if active.ActivedCab == "1" {
 			action.Dial("0402", "0511", "pad-rule-pacus", "ani1", exten, "1") // PACUs dial ICP1
 			//goto ami event ConfbridgeJoin, ICP answer PAD
@@ -613,10 +612,11 @@ func AlarmHandleICP(data []byte) {
 		}
 
 	case 0x02: //hold  重新放回队列里面
+		utils.LoggerDebug.Printf("ICP Hold PAD-ICP PAD:%s !", exten)
 		active.NotifyPaiu(exten, "hold")
 		err := action.RedirectInQueue(exten, "0300", "queues-icp-redirect", "1")
 		if err != nil {
-			lfshook.NewLogger().Info(err)
+			utils.LoggerDebug.Printf("RedirectInQueue err:%+v", err)
 		}
 		action.InterruptRunningTask("")
 		time.Sleep(time.Millisecond * 100) //wait endpoimt release
@@ -624,7 +624,7 @@ func AlarmHandleICP(data []byte) {
 
 	case 0x03: //hangup
 		//NotifyPaiu(exten, "hangup")
-		lfshook.NewLogger().Logger.Infof("============ Hangup PAD-ICP =============== ")
+		utils.LoggerDebug.Printf("STC Hangup PAD-ICP !")
 		action.Hangup(exten) //Pad
 		//action.HangupICP()
 
@@ -648,14 +648,14 @@ func AlarmHandleTMS(data []byte) {
 	// 只对 handler == 0x01 做 2 秒去重
 	if handler == 0x01 {
 		if _, loaded := suppressedExts.LoadOrStore(key, struct{}{}); loaded {
-			lfshook.NewLogger().Logger.Infof("Suppressed duplicate ICP Alarm (handler=0x01) for exten: %s within 4 seconds", exten)
+			utils.LoggerDebug.Printf("Suppressed duplicate ICP Alarm (handler=0x01) for PAD:%s within 4 seconds", exten)
 			return // 已存在,说明在2秒窗口期内,直接丢弃
 		}
 
 		// 设置4秒后删除该 key,允许下次通过
 		time.AfterFunc(4*time.Second, func() {
 			suppressedExts.Delete(key)
-			lfshook.NewLogger().Logger.Debugf("Suppression released for key: %s", key)
+			utils.LoggerDebug.Printf("Suppression released for key: %s", key)
 		})
 	}
 
@@ -668,7 +668,8 @@ func AlarmHandleTMS(data []byte) {
 			priority.PADStart = 1
 		}
 		priority.ICPAnswer = 1
-		lfshook.NewLogger().Logger.Infof("==============TMS Answer PAD Exten:%s PACU:%s==========", exten, PacuNum)
+		utils.LoggerDebug.Printf("TMS Answer PAD:%s 	PACU:%s", exten, PacuNum)
+
 		if action.ExtenStatus(PacuNum) == "Idle" {
 			if active.ActivedCab == "1" {
 				action.Dial("0403", PacuNum, "pad-tms-dial-pacu", PacuNum, exten, "1") // PACU dial ICP1
@@ -684,15 +685,17 @@ func AlarmHandleTMS(data []byte) {
 		}
 
 	case 0x02: //hold  重新放回队列里面
+		utils.LoggerDebug.Printf("ICP Hold PAD-TMS PAD:%s !", exten)
 		active.NotifyPaiu(exten, "hold")
 		err := action.RedirectInQueue(exten, "0300", "queues-icp-redirect", "1")
 		if err != nil {
-			lfshook.NewLogger().Info(err)
+			utils.LoggerDebug.Printf("RedirectInQueue err:%+v", err)
 		}
 		action.HangupAllLocalChan()
 
 	case 0x03: //hangup
 		//NotifyPaiu(exten, "hangup")
+		utils.LoggerDebug.Printf("STC Hangup PAD-TMS !")
 		action.Hangup(exten) //Pad
 		action.HangupTask("PAD-TMS")
 		//action.HangupTask("PAD-ICP")

+ 5 - 5
internal/app/stc/data/msgdata.go

@@ -4,7 +4,7 @@ import (
 	"bytes"
 	"encoding/binary"
 	"fmt"
-	"pbx-api-gin/pkg/lfshook"
+	"pbx-api-gin/pkg/utils"
 )
 
 // Protocol 定义协议数据结构
@@ -147,14 +147,14 @@ func ExtractPacket(buf *bytes.Buffer) ([]byte, error) {
 		const MAX_LOOKAHEAD = 32
 		if leng > MAX_LOOKAHEAD {
 			buf.Next(leng - MAX_LOOKAHEAD)
-			lfshook.NewLogger().Logger.Warnf("no start marker found, trimmed buffer to last %d bytes", MAX_LOOKAHEAD)
+			utils.LoggerDebug.Printf("No start marker found, trimmed buffer to last %d bytes .", MAX_LOOKAHEAD)
 		}
 		return nil, nil // 明确告知:需继续读取
 	}
 
 	// Step 2: 安全读取 DataLength(偏移 startIdx+6 ~ startIdx+8)
 	if startIdx+8 > len(data) {
-		lfshook.NewLogger().Logger.Infof("startIdx=%d, need data[%d:%d] for DataLength but len=%d → insufficient data",
+		utils.LoggerDebug.Printf("startIdx=%d, need data[%d:%d] for DataLength but len=%d → insufficient data .",
 			startIdx, startIdx+6, startIdx+8, len(data))
 		return nil, nil // 数据不够,等下次读取
 	}
@@ -165,7 +165,7 @@ func ExtractPacket(buf *bytes.Buffer) ([]byte, error) {
 	// Step 3: 计算理论包结束位置:startIdx + 8(头长) + dataLen + 1(0xFE)
 	endPosTheo := startIdx + 8 + int(dataLen) + 1
 	if endPosTheo > len(data) {
-		lfshook.NewLogger().Logger.Infof("theoretical endPos=%d > data len=%d → need more data", endPosTheo, len(data))
+		utils.LoggerDebug.Printf("theoretical endPos=%d > data len=%d → need more data .", endPosTheo, len(data))
 		return nil, nil // 包未收全,等下次读取
 	}
 	//lfshook.NewLogger().Logger.Infof("t=================end================%x", data[endPosTheo])
@@ -185,7 +185,7 @@ func ExtractPacket(buf *bytes.Buffer) ([]byte, error) {
 	}
 
 	if endIdx == -1 {
-		lfshook.NewLogger().Logger.Infof("0xFE not found in expected range [%d,%d), dataLen=%d", searchStart, searchEnd, dataLen)
+		utils.LoggerDebug.Printf("0xFE not found in expected range [%d,%d), dataLen=%d .", searchStart, searchEnd, dataLen)
 		return nil, nil // 结束符缺失,但可能是延迟到达,继续等
 	}
 

+ 5 - 5
internal/app/stc/priority/index.go

@@ -2,7 +2,7 @@ package priority
 
 import (
 	"os"
-	"pbx-api-gin/pkg/lfshook"
+	"pbx-api-gin/pkg/utils"
 	"strconv"
 
 	"gopkg.in/ini.v1"
@@ -51,16 +51,16 @@ type Tasks struct {
 var AllTasks Tasks
 
 func GetPriority() {
-	lfshook.NewLogger().Infof("Init system priority !")
+	utils.LoggerDebug.Printf("Init system priority !")
 
 	_, err := os.Stat(filePath)
 	if err != nil {
-		lfshook.NewLogger().Logger.Infof("GetPriority err :%+v", err)
+		utils.LoggerDebug.Printf("GetPriority err :%+v", err)
 		return
 	}
 	iniFile, err := ini.Load(filePath)
 	if err != nil {
-		lfshook.NewLogger().Logger.Infof("GetPriority err :%+v", err)
+		utils.LoggerDebug.Printf("GetPriority err :%+v", err)
 		return
 	}
 
@@ -124,7 +124,7 @@ func CheckPriority(runType string) bool {
 
 	runingtaskName, taskRuning, ok := RegistryTask.HighestPriorityRunningTask()
 	if ok {
-		lfshook.NewLogger().Logger.Infof("CheckPriority runType:%s SpecialVoice:%d toRunpriority:%d runingpriority:%d ", runType, SpecialVoice, toRunpriority, taskRuning.Priority)
+		utils.LoggerDebug.Printf("CheckPriority  TorunType:%s 	SpecialVoice:%d 	toRunpriority:%d 	runingpriority:%d ", runType, SpecialVoice, toRunpriority, taskRuning.Priority)
 		//if the running task priority is lowwer
 		if toRunpriority < taskRuning.Priority && toRunpriority != 0 {
 			return true

+ 7 - 8
internal/app/stc/sendstatus/status.go

@@ -6,7 +6,6 @@ import (
 	"pbx-api-gin/internal/app/stc/active"
 	msgdata "pbx-api-gin/internal/app/stc/data"
 	"pbx-api-gin/internal/app/stc/socket"
-	"pbx-api-gin/pkg/lfshook"
 	"pbx-api-gin/pkg/utils"
 )
 
@@ -14,7 +13,7 @@ func SendToStc(conn net.Conn, data []byte) {
 
 	_, err := conn.Write(data)
 	if err != nil {
-		fmt.Println("send msg err:", err)
+		utils.LoggerDebug.Printf("Send To STC msg err:%+v", err)
 		conn.Close()
 	}
 	//lfshook.NewLogger().Logger.Infof("SendToStc data:%x", data)
@@ -78,7 +77,7 @@ func AlarmStatus(exten string, status string) {
 		return
 	}
 	//check if actived
-	lfshook.NewLogger().Logger.Infof("PAD number:%s carr:%x pos:%x status:%x", exten, protocol.Data[0], protocol.Data[1], protocol.Data[2])
+	utils.LoggerDebug.Printf("PAD number:%s		CarNum:%x 	 Pos:%x 	Status:%x", exten, protocol.Data[0], protocol.Data[1], protocol.Data[2])
 
 	if socket.Conn != nil {
 		SendToStc(socket.Conn, encoded)
@@ -97,7 +96,7 @@ func PaStatus(src string, patype string, operation string) {
 	if !active.Master {
 		return
 	}
-	lfshook.NewLogger().Logger.Infof("PA Status ext:%s type:%s status:%s", src, patype, operation)
+	utils.LoggerDebug.Printf("PA Status Src:%s 		Type:%s		Status:%s", src, patype, operation)
 	protocol := msgdata.NewProtocol()
 	protocol.MessageID = 0x22
 	protocol.DataLength = 0x04
@@ -157,7 +156,7 @@ func PaStatus(src string, patype string, operation string) {
 
 	encoded, errEn := protocol.Encode()
 	if errEn != nil {
-		fmt.Println("Encode error:", errEn)
+		utils.LoggerDebug.Printf("Encode error:%+v", errEn)
 		return
 	}
 
@@ -179,7 +178,7 @@ func OccPad(operation string) {
 		return
 	}
 
-	lfshook.NewLogger().Logger.Infof("OCC-PAD send status:%s", operation)
+	utils.LoggerDebug.Printf("OCC-PAD status:%s", operation)
 	protocol := msgdata.NewProtocol()
 	protocol.MessageID = 0x2A
 	protocol.DataLength = 0x04
@@ -197,7 +196,7 @@ func OccPad(operation string) {
 
 	encoded, errEn := protocol.Encode()
 	if errEn != nil {
-		fmt.Println("Encode error:", errEn)
+		utils.LoggerDebug.Printf("Encode error:%+v", errEn)
 		return
 	}
 
@@ -251,7 +250,7 @@ func SendRecordFile(filename, rcdtype string) {
 	}
 	encoded, errEn := protocol.Encode()
 	if errEn != nil {
-		fmt.Println("Encode error:", errEn)
+		utils.LoggerDebug.Printf("Encode error:%+v", errEn)
 		return
 	}
 

+ 3 - 2
internal/app/stc/socket/index.go

@@ -4,7 +4,6 @@ import (
 	"fmt"
 	"net"
 	"pbx-api-gin/internal/app/stc/active"
-	"pbx-api-gin/pkg/lfshook"
 	"pbx-api-gin/pkg/utils"
 	"time"
 )
@@ -61,6 +60,8 @@ func SetMasterCabNum() {
 	count := 0
 
 getIP:
+
+	utils.LoggerDebug.Printf("Checking system IP  ....")
 	ext1, err := IsIPExists("10.0.11.11")
 	if err != nil {
 		utils.LoggerDebug.Printf("Check IP 10.0.11.11 err :%+v", err)
@@ -89,7 +90,7 @@ getIP:
 			time.Sleep(time.Second * 2)
 			goto getIP
 		}
-		lfshook.NewLogger().Infof("Can not get device IP ! Set Cabnum=1  Master=true by default .")
+		utils.LoggerDebug.Printf("Can not get device IP ! Set Cabnum=1  Master=true by default .")
 
 		active.CabNum = "1"
 		active.Master = true

+ 1 - 17
pkg/utils/file.go

@@ -8,7 +8,6 @@ import (
 	"os"
 	"os/exec"
 	"path/filepath"
-	"pbx-api-gin/internal/pkg/configs"
 	"pbx-api-gin/pkg/lfshook"
 	"strconv"
 	"strings"
@@ -131,21 +130,6 @@ func extractFilenamesFromFFmpegOutput(prefix string) []string {
 	return matches
 }
 
-func WriteLogToFile(message string) {
-	// 打开文件,支持追加模式,如果文件不存在则创建
-	file, err := os.OpenFile(configs.ConfigGlobal.RecordEventLog, os.O_CREATE|os.O_WRONLY|os.O_APPEND, 0666)
-	if err != nil {
-		return
-	}
-	defer file.Close()
-
-	// 创建一个写入到文件的日志器
-	//logger := log.New(file, "", log.LstdFlags)
-	logger := log.New(file, "", log.LstdFlags|log.Lmicroseconds)
-	// 写入日志消息
-	logger.Println(message)
-}
-
 var Logger *log.Logger
 var LoggerDebug *log.Logger
 
@@ -157,7 +141,7 @@ func init() {
 
 	fileDebug, _ := os.OpenFile("/data/test/log/debug.log", os.O_CREATE|os.O_WRONLY|os.O_APPEND, 0666)
 	//Logger = log.New(file, "", log.LstdFlags) // 自动带时间戳
-	LoggerDebug = log.New(fileDebug, "", log.LstdFlags|log.Lmicroseconds)
+	LoggerDebug = log.New(fileDebug, "", log.LstdFlags|log.Lmicroseconds|log.Llongfile)
 }
 
 func GetPadInfo(base string) (padType, padNum, connectedCab string) {