From f85a45ad326ee47151bcb1e7d7a2faf86e3774be Mon Sep 17 00:00:00 2001
From: danial <danial@gmail.com>
Date: Mon, 15 Sep 2025 00:30:09 +0800
Subject: [PATCH] =?UTF-8?q?fix(internal/controllers):=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E5=8D=A1=E5=AF=86=E6=95=B0=E6=8D=AE=E8=A7=A3=E6=9E=90=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 增加对行内容的 TrimSpace处理，去除前后空格- 添加对空格分隔的卡密数据支持
- 优化卡密数据错误处理逻辑
---
 internal/controllers/gen_link.go | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/internal/controllers/gen_link.go b/internal/controllers/gen_link.go
index f62ecce..8a03481 100644
--- a/internal/controllers/gen_link.go
+++ b/internal/controllers/gen_link.go
@@ -104,15 +104,23 @@ func (c *GenLink) UploadFile() {
 
 	slice.ForEachConcurrent(lines, func(i int, line string) {
 		i += 1
-		parts := strings.Split(line, "\t")
+		line = strings.TrimSpace(line)
+		var parts []string
+		if strings.Contains(line, "\t") {
+			parts = strings.Split(line, "\t")
+		}
+		if strings.Contains(line, " ") {
+			parts = strings.Split(line, " ")
+		}
+
 		if len(parts) < 2 {
 			_ = excelFile.SetCellValue("Sheet1", fmt.Sprintf("A%d", i+1), "上传卡数据错误")
 			logs.Error("卡密数据错误", line)
 			return
 		}
 		//price := strutil.Trim(parts[0])
-		cardNo := strutil.Trim(parts[0])
-		cardPasswd := strutil.Trim(parts[1])
+		cardNo := strutil.Trim(strings.TrimSpace(parts[0]))
+		cardPasswd := strutil.Trim(strings.TrimSpace(parts[1]))
 
 		orderNo := xid.New().String() + "-" + fmt.Sprintf("%04d", i)
 		_ = excelFile.SetCellValue("Sheet1", fmt.Sprintf("A%d", i+1), orderNo)