From acd44da5e0ca4337a4abbcf6ed474eff2fbefa72 Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Thu, 26 Oct 2023 18:25:01 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E7=A7=BB=E5=8A=A8file=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E6=93=8D=E4=BD=9C=E5=8C=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 {lib/core => src/framework}/cmd/cmd.go                 |  0
 {lib/core => src/framework/utils}/file/csv.go          |  8 ++++----
 {lib/core => src/framework/utils}/file/txt.go          | 10 +++++-----
 lib/core/file/ssh.go => src/framework/utils/ssh/scp.go |  2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)
 rename {lib/core => src/framework}/cmd/cmd.go (100%)
 rename {lib/core => src/framework/utils}/file/csv.go (88%)
 rename {lib/core => src/framework/utils}/file/txt.go (86%)
 rename lib/core/file/ssh.go => src/framework/utils/ssh/scp.go (98%)

diff --git a/lib/core/cmd/cmd.go b/src/framework/cmd/cmd.go
similarity index 100%
rename from lib/core/cmd/cmd.go
rename to src/framework/cmd/cmd.go
diff --git a/lib/core/file/csv.go b/src/framework/utils/file/csv.go
similarity index 88%
rename from lib/core/file/csv.go
rename to src/framework/utils/file/csv.go
index 1473a79b..4ab4b344 100644
--- a/lib/core/file/csv.go
+++ b/src/framework/utils/file/csv.go
@@ -6,7 +6,7 @@ import (
 	"path/filepath"
 	"strings"
 
-	"ems.agt/lib/log"
+	"ems.agt/src/framework/logger"
 )
 
 // 写入CSV文件，需要转换数据
@@ -22,7 +22,7 @@ func WriterCSVFile(data [][]string, filePath string) error {
 	// 确保文件夹路径存在
 	err := os.MkdirAll(dirPath, os.ModePerm)
 	if err != nil {
-		log.Errorf("创建文件夹失败 CreateFile %v", err)
+		logger.Errorf("创建文件夹失败 CreateFile %v", err)
 	}
 
 	// 创建或打开文件
@@ -51,7 +51,7 @@ func ReadCSVFile(filePath string) []map[string]string {
 	// 打开 CSV 文件
 	file, err := os.Open(filePath)
 	if err != nil {
-		log.Fatal("无法打开 CSV 文件：", err)
+		logger.Errorf("无法打开 CSV 文件：%v", err)
 		return arr
 	}
 	defer file.Close()
@@ -62,7 +62,7 @@ func ReadCSVFile(filePath string) []map[string]string {
 	// 读取 CSV 头部行
 	header, err := reader.Read()
 	if err != nil {
-		log.Fatal("无法读取 CSV 头部行：", err)
+		logger.Errorf("无法读取 CSV 头部行：%v", err)
 		return arr
 	}
 
diff --git a/lib/core/file/txt.go b/src/framework/utils/file/txt.go
similarity index 86%
rename from lib/core/file/txt.go
rename to src/framework/utils/file/txt.go
index 1690e3e0..bb09144d 100644
--- a/lib/core/file/txt.go
+++ b/src/framework/utils/file/txt.go
@@ -7,7 +7,7 @@ import (
 	"path/filepath"
 	"strings"
 
-	"ems.agt/lib/log"
+	"ems.agt/src/framework/logger"
 )
 
 // 写入Txt文件用,号分割 需要转换数据
@@ -23,7 +23,7 @@ func WriterTxtFile(data [][]string, filePath string) error {
 	// 确保文件夹路径存在
 	err := os.MkdirAll(dirPath, os.ModePerm)
 	if err != nil {
-		log.Errorf("创建文件夹失败 CreateFile %v", err)
+		logger.Errorf("CreateFile MkdirAll %v", err)
 	}
 
 	// 创建或打开文件
@@ -43,7 +43,7 @@ func WriterTxtFile(data [][]string, filePath string) error {
 	// 将缓冲区中的数据刷新到文件中
 	err = writer.Flush()
 	if err != nil {
-		log.Errorf("刷新缓冲区时发生错误:", err)
+		logger.Errorf("CreateFile Flush %v", err)
 		return err
 	}
 	return nil
@@ -57,7 +57,7 @@ func ReadTxtFile(filePath string) [][]string {
 	// 打开文本文件
 	file, err := os.Open(filePath)
 	if err != nil {
-		log.Fatal("无法打开文件:", err)
+		logger.Errorf("ReadTxtFile Open %v", err)
 		return arr
 	}
 	defer file.Close()
@@ -65,7 +65,7 @@ func ReadTxtFile(filePath string) [][]string {
 	// 创建一个 Scanner 对象，用于逐行读取文件内容
 	scanner := bufio.NewScanner(file)
 	if scanner.Err() != nil {
-		log.Fatal("读取文件时出错:", scanner.Err())
+		logger.Errorf("ReadTxtFile NewScanner %v", scanner.Err())
 		return arr
 	}
 
diff --git a/lib/core/file/ssh.go b/src/framework/utils/ssh/scp.go
similarity index 98%
rename from lib/core/file/ssh.go
rename to src/framework/utils/ssh/scp.go
index c33a717a..de16b50e 100644
--- a/lib/core/file/ssh.go
+++ b/src/framework/utils/ssh/scp.go
@@ -1,4 +1,4 @@
-package file
+package ssh
 
 import (
 	"fmt"