diff --git a/cmd/cmd/csv.go b/cmd/cmd/csv.go index c002486..887defb 100644 --- a/cmd/cmd/csv.go +++ b/cmd/cmd/csv.go @@ -162,5 +162,9 @@ func (e *Csv) mergeCsvToExcel(path string, max int, out string) error { Reader{Path: path, Index: max}, Writer{File: out, Limit: 500000}, ) - return m.Merge() + if err := m.Merge(); err != nil { + return err + } + + return m.Clear() } diff --git a/cmd/cmd/merge.go b/cmd/cmd/merge.go index 36bb17c..835dace 100644 --- a/cmd/cmd/merge.go +++ b/cmd/cmd/merge.go @@ -156,7 +156,11 @@ func (m *Merge) Save() error { return m.file.SaveAs(m.writer.GetFileName(m.fileIndex)) } -//GetFileName 获取文件名 +func (m *Merge) Clear() error { + return os.RemoveAll(m.reader.Path) +} + +// GetFileName 获取文件名 func (w *Writer) GetFileName(fileIndex int) string { ex := regexp.MustCompile("(\\..*)") name := ex.ReplaceAllFunc([]byte(w.File), func(b []byte) []byte {