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)