fix: add archive skip count tracking and no-auditable-files error

LordofAvernus · LordofAvernus · commit cb70d4e6bf59 · 2026-04-08T04:59:28.000Z
BUG-003: When an archive (.zip/.rar/.7z) contains no auditable files
(all files are unsupported formats), return a clear error message
"no auditable files in the archive" instead of silently creating an
empty audit record. This satisfies AC-4.6.

OBS-004: Track the count of skipped unsupported-format files during
archive processing and include "skipped N unsupported format file(s)"
in the API response message field. This satisfies AC-4.5.

Changes:
- Add skippedCount return value to processRarContent, process7zContent,
  getSqlsFromZip, getSqlsFromRar, getSqlsFrom7z, getSqlsFromArchive
- Add Message field to GetSQLFromFileResp for user feedback
- Add newBaseResWithMessage helper for response message composition
- Update CreateSQLAuditRecord and CreateAuditTask handlers to surface
  the skip message in the API response
- Update tests for new function signatures
diff --git a/sqle/api/controller/v1/archive_7z.go b/sqle/api/controller/v1/archive_7z.go
@@ -21,47 +21,47 @@ import (
 // 使用 github.com/bodgit/sevenzip 库解压 7z 文件，遍历内部文件并调用 processArchiveEntry 处理。
 // 函数签名与 getSqlsFromZip / getSqlsFromRar 保持一致。
 // 注意：sevenzip 需要 io.ReaderAt + int64 size（不同于 RAR 的 io.Reader），需先将上传文件读入 bytes.Reader。
-func getSqlsFrom7z(c echo.Context) (sqlsFromSQLFile []SQLsFromSQLFile, sqlsFromXML []SQLFromXML, exist bool, err error) {
+func getSqlsFrom7z(c echo.Context) (sqlsFromSQLFile []SQLsFromSQLFile, sqlsFromXML []SQLFromXML, skippedCount int, exist bool, err error) {
 	file, err := c.FormFile(InputZipFileName)
 	if err == http.ErrMissingFile {
-		return nil, nil, false, nil
+		return nil, nil, 0, false, nil
 	}
 	if err != nil {
-		return nil, nil, false, err
+		return nil, nil, 0, false, err
 	}
 
 	f, err := file.Open()
 	if err != nil {
-		return nil, nil, false, err
+		return nil, nil, 0, false, err
 	}
 	defer f.Close()
 
 	// 使用 archiveConfig 进行压缩包总大小限制检查（上传文件大小预检）
 	if err := defaultArchiveConfig.checkSize(0, file.Size); err != nil {
-		return nil, nil, false, err
+		return nil, nil, 0, false, err
 	}
 
 	// sevenzip 需要 io.ReaderAt 接口，将上传文件内容读入 bytes.Reader
 	buf, err := io.ReadAll(f)
 	if err != nil {
-		return nil, nil, false, fmt.Errorf("read 7z file into memory failed: %v", err)
+		return nil, nil, 0, false, fmt.Errorf("read 7z file into memory failed: %v", err)
 	}
 
-	sqlsFromSQLFile, sqlsFromXML, err = process7zContent(bytes.NewReader(buf), int64(len(buf)))
+	sqlsFromSQLFile, sqlsFromXML, skippedCount, err = process7zContent(bytes.NewReader(buf), int64(len(buf)))
 	if err != nil {
-		return nil, nil, false, err
+		return nil, nil, 0, false, err
 	}
 
-	return sqlsFromSQLFile, sqlsFromXML, true, nil
+	return sqlsFromSQLFile, sqlsFromXML, skippedCount, true, nil
 }
 
 // process7zContent 从 io.ReaderAt 中读取 7z 内容，遍历 entry 并提取 SQL。
 // 该函数封装了 7z 解压的核心逻辑，独立于 echo.Context，便于单元测试。
-func process7zContent(r io.ReaderAt, size int64) (sqlsFromSQLFile []SQLsFromSQLFile, sqlsFromXML []SQLFromXML, err error) {
+func process7zContent(r io.ReaderAt, size int64) (sqlsFromSQLFile []SQLsFromSQLFile, sqlsFromXML []SQLFromXML, skippedCount int, err error) {
 	// 使用 sevenzip.NewReader 打开 7z 文件
 	szr, err := sevenzip.NewReader(r, size)
 	if err != nil {
-		return nil, nil, fmt.Errorf("open 7z file failed: %v", err)
+		return nil, nil, 0, fmt.Errorf("open 7z file failed: %v", err)
 	}
 
 	var xmlContents []xmlParser.XmlFile
@@ -77,7 +77,7 @@ func process7zContent(r io.ReaderAt, size int64) (sqlsFromSQLFile []SQLsFromSQLF
 		// 文件数量限制检查
 		fileCount++
 		if err := defaultArchiveConfig.checkFileCount(fileCount); err != nil {
-			return nil, nil, err
+			return nil, nil, 0, err
 		}
 
 		// 嵌套压缩包检查：depth=1 时跳过内层压缩包
@@ -89,18 +89,18 @@ func process7zContent(r io.ReaderAt, size int64) (sqlsFromSQLFile []SQLsFromSQLF
 		// 打开并读取文件内容
 		rc, err := f.Open()
 		if err != nil {
-			return nil, nil, fmt.Errorf("open 7z entry %q failed: %v", f.Name, err)
+			return nil, nil, 0, fmt.Errorf("open 7z entry %q failed: %v", f.Name, err)
 		}
 		content, err := io.ReadAll(rc)
 		rc.Close()
 		if err != nil {
-			return nil, nil, fmt.Errorf("read 7z entry %q content failed: %v", f.Name, err)
+			return nil, nil, 0, fmt.Errorf("read 7z entry %q content failed: %v", f.Name, err)
 		}
 
 		// 累计大小限制检查
 		totalSize += int64(len(content))
 		if err := defaultArchiveConfig.checkSize(0, totalSize); err != nil {
-			return nil, nil, err
+			return nil, nil, 0, err
 		}
 
 		// 委托 processArchiveEntry 按扩展名分发处理
@@ -110,9 +110,10 @@ func process7zContent(r io.ReaderAt, size int64) (sqlsFromSQLFile []SQLsFromSQLF
 				log.NewEntry().WithField("convert_to_utf8", f.Name).Errorf("convert to utf8 failed: %v", err)
 				continue
 			}
-			return nil, nil, err
+			return nil, nil, 0, err
 		}
 		if !isSupported {
+			skippedCount++
 			continue
 		}
 
@@ -131,7 +132,7 @@ func process7zContent(r io.ReaderAt, size int64) (sqlsFromSQLFile []SQLsFromSQLF
 	{
 		sqlsFromXmls, err := parseXMLsWithFilePath(xmlContents)
 		if err != nil {
-			return nil, nil, err
+			return nil, nil, 0, err
 		}
 		sqlsFromXML = append(sqlsFromXML, sqlsFromXmls...)
 	}
@@ -144,5 +145,5 @@ func process7zContent(r io.ReaderAt, size int64) (sqlsFromSQLFile []SQLsFromSQLF
 		return utils.CompareNatural(sqlsFromXML[i].FilePath, sqlsFromXML[j].FilePath)
 	})
 
-	return sqlsFromSQLFile, sqlsFromXML, nil
+	return sqlsFromSQLFile, sqlsFromXML, skippedCount, nil
 }
diff --git a/sqle/api/controller/v1/archive_7z_test.go b/sqle/api/controller/v1/archive_7z_test.go
@@ -97,7 +97,7 @@ func TestProcess7zContent(t *testing.T) {
 		t.Run(name, func(t *testing.T) {
 			r, size := openTest7z(t, tc.szFile)
 
-			sqlFiles, xmlFiles, err := process7zContent(r, size)
+			sqlFiles, xmlFiles, _, err := process7zContent(r, size)
 
 			// Check error
 			if tc.expectErr {
@@ -198,7 +198,7 @@ func TestProcess7zContentFileCountLimit(t *testing.T) {
 func TestProcess7zContentInvalid7z(t *testing.T) {
 	// Test with invalid 7z data
 	invalidData := bytes.NewReader([]byte("this is not a 7z file"))
-	_, _, err := process7zContent(invalidData, int64(len("this is not a 7z file")))
+	_, _, _, err := process7zContent(invalidData, int64(len("this is not a 7z file")))
 	if err == nil {
 		t.Error("expected error for invalid 7z data, got nil")
 	}
diff --git a/sqle/api/controller/v1/archive_rar.go b/sqle/api/controller/v1/archive_rar.go
@@ -19,41 +19,41 @@ import (
 // getSqlsFromRar 从 RAR 文件中提取 SQL 语句。
 // 使用 github.com/nwaples/rardecode 库解压 RAR 文件，遍历内部文件并调用 processArchiveEntry 处理。
 // 函数签名与 getSqlsFromZip 保持一致。
-func getSqlsFromRar(c echo.Context) (sqlsFromSQLFile []SQLsFromSQLFile, sqlsFromXML []SQLFromXML, exist bool, err error) {
+func getSqlsFromRar(c echo.Context) (sqlsFromSQLFile []SQLsFromSQLFile, sqlsFromXML []SQLFromXML, skippedCount int, exist bool, err error) {
 	file, err := c.FormFile(InputZipFileName)
 	if err == http.ErrMissingFile {
-		return nil, nil, false, nil
+		return nil, nil, 0, false, nil
 	}
 	if err != nil {
-		return nil, nil, false, err
+		return nil, nil, 0, false, err
 	}
 
 	f, err := file.Open()
 	if err != nil {
-		return nil, nil, false, err
+		return nil, nil, 0, false, err
 	}
 	defer f.Close()
 
 	// 使用 archiveConfig 进行压缩包总大小限制检查（上传文件大小预检）
 	if err := defaultArchiveConfig.checkSize(0, file.Size); err != nil {
-		return nil, nil, false, err
+		return nil, nil, 0, false, err
 	}
 
-	sqlsFromSQLFile, sqlsFromXML, err = processRarContent(f)
+	sqlsFromSQLFile, sqlsFromXML, skippedCount, err = processRarContent(f)
 	if err != nil {
-		return nil, nil, false, err
+		return nil, nil, 0, false, err
 	}
 
-	return sqlsFromSQLFile, sqlsFromXML, true, nil
+	return sqlsFromSQLFile, sqlsFromXML, skippedCount, true, nil
 }
 
 // processRarContent 从 io.Reader 中读取 RAR 内容，遍历 entry 并提取 SQL。
 // 该函数封装了 RAR 解压的核心逻辑，独立于 echo.Context，便于单元测试。
-func processRarContent(r io.Reader) (sqlsFromSQLFile []SQLsFromSQLFile, sqlsFromXML []SQLFromXML, err error) {
+func processRarContent(r io.Reader) (sqlsFromSQLFile []SQLsFromSQLFile, sqlsFromXML []SQLFromXML, skippedCount int, err error) {
 	// 使用 rardecode.NewReader 打开 RAR 文件，密码参数为空字符串（不支持加密 RAR）
 	rr, err := rardecode.NewReader(r, "")
 	if err != nil {
-		return nil, nil, fmt.Errorf("open rar file failed: %v", err)
+		return nil, nil, 0, fmt.Errorf("open rar file failed: %v", err)
 	}
 
 	var xmlContents []xmlParser.XmlFile
@@ -66,7 +66,7 @@ func processRarContent(r io.Reader) (sqlsFromSQLFile []SQLsFromSQLFile, sqlsFrom
 			break
 		}
 		if err != nil {
-			return nil, nil, fmt.Errorf("read rar entry failed: %v", err)
+			return nil, nil, 0, fmt.Errorf("read rar entry failed: %v", err)
 		}
 
 		// 跳过目录
@@ -77,7 +77,7 @@ func processRarContent(r io.Reader) (sqlsFromSQLFile []SQLsFromSQLFile, sqlsFrom
 		// 文件数量限制检查
 		fileCount++
 		if err := defaultArchiveConfig.checkFileCount(fileCount); err != nil {
-			return nil, nil, err
+			return nil, nil, 0, err
 		}
 
 		// 嵌套压缩包检查：depth=1 时跳过内层压缩包
@@ -89,13 +89,13 @@ func processRarContent(r io.Reader) (sqlsFromSQLFile []SQLsFromSQLFile, sqlsFrom
 		// 读取文件内容
 		content, err := io.ReadAll(rr)
 		if err != nil {
-			return nil, nil, fmt.Errorf("read rar entry content failed: %v", err)
+			return nil, nil, 0, fmt.Errorf("read rar entry content failed: %v", err)
 		}
 
 		// 累计大小限制检查
 		totalSize += int64(len(content))
 		if err := defaultArchiveConfig.checkSize(0, totalSize); err != nil {
-			return nil, nil, err
+			return nil, nil, 0, err
 		}
 
 		// 委托 processArchiveEntry 按扩展名分发处理
@@ -105,9 +105,10 @@ func processRarContent(r io.Reader) (sqlsFromSQLFile []SQLsFromSQLFile, sqlsFrom
 				log.NewEntry().WithField("convert_to_utf8", header.Name).Errorf("convert to utf8 failed: %v", err)
 				continue
 			}
-			return nil, nil, err
+			return nil, nil, 0, err
 		}
 		if !isSupported {
+			skippedCount++
 			continue
 		}
 
@@ -126,7 +127,7 @@ func processRarContent(r io.Reader) (sqlsFromSQLFile []SQLsFromSQLFile, sqlsFrom
 	{
 		sqlsFromXmls, err := parseXMLsWithFilePath(xmlContents)
 		if err != nil {
-			return nil, nil, err
+			return nil, nil, 0, err
 		}
 		sqlsFromXML = append(sqlsFromXML, sqlsFromXmls...)
 	}
@@ -139,5 +140,5 @@ func processRarContent(r io.Reader) (sqlsFromSQLFile []SQLsFromSQLFile, sqlsFrom
 		return utils.CompareNatural(sqlsFromXML[i].FilePath, sqlsFromXML[j].FilePath)
 	})
 
-	return sqlsFromSQLFile, sqlsFromXML, nil
+	return sqlsFromSQLFile, sqlsFromXML, skippedCount, nil
 }
diff --git a/sqle/api/controller/v1/archive_rar_test.go b/sqle/api/controller/v1/archive_rar_test.go
@@ -97,7 +97,7 @@ func TestProcessRarContent(t *testing.T) {
 			f := openTestRar(t, tc.rarFile)
 			defer f.Close()
 
-			sqlFiles, xmlFiles, err := processRarContent(f)
+			sqlFiles, xmlFiles, _, err := processRarContent(f)
 
 			// Check error
 			if tc.expectErr {
@@ -204,7 +204,7 @@ func TestProcessRarContentFileCountLimit(t *testing.T) {
 func TestProcessRarContentInvalidRar(t *testing.T) {
 	// Test with invalid RAR data
 	invalidData := bytes.NewReader([]byte("this is not a rar file"))
-	_, _, err := processRarContent(invalidData)
+	_, _, _, err := processRarContent(invalidData)
 	if err == nil {
 		t.Error("expected error for invalid RAR data, got nil")
 	}
diff --git a/sqle/api/controller/v1/sql_audit_record.go b/sqle/api/controller/v1/sql_audit_record.go
@@ -172,7 +172,7 @@ func CreateSQLAuditRecord(c echo.Context) error {
 	}
 
 	return c.JSON(http.StatusOK, &CreateSQLAuditRecordResV1{
-		BaseRes: controller.NewBaseReq(nil),
+		BaseRes: newBaseResWithMessage(sqls.Message),
 		Data: &SQLAuditRecordResData{
 			Id: record.AuditRecordId,
 			Task: &AuditTaskResV1{
@@ -203,6 +203,7 @@ type GetSQLFromFileResp struct {
 	SQLsFromFormData string
 	SQLsFromSQLFiles []SQLsFromSQLFile
 	SQLsFromXMLs     []SQLFromXML
+	Message          string // Optional message for user feedback (e.g., skipped file count)
 }
 
 type SQLsFromSQLFile struct {
@@ -349,27 +350,27 @@ func buildOfflineTaskForAudit(userId uint64, dbType string, sqls GetSQLFromFileR
 }
 
 // todo 此处跳过了不支持的编码格式文件
-func getSqlsFromZip(c echo.Context) (sqlsFromSQLFile []SQLsFromSQLFile, sqlsFromXML []SQLFromXML, exist bool, err error) {
+func getSqlsFromZip(c echo.Context) (sqlsFromSQLFile []SQLsFromSQLFile, sqlsFromXML []SQLFromXML, skippedCount int, exist bool, err error) {
 	file, err := c.FormFile(InputZipFileName)
 	if err == http.ErrMissingFile {
-		return nil, nil, false, nil
+		return nil, nil, 0, false, nil
 	}
 	if err != nil {
-		return nil, nil, false, err
+		return nil, nil, 0, false, err
 	}
 	f, err := file.Open()
 	if err != nil {
-		return nil, nil, false, err
+		return nil, nil, 0, false, err
 	}
 	defer f.Close()
 
 	// 使用 archiveConfig 进行压缩包总大小限制检查
 	if err := defaultArchiveConfig.checkSize(0, file.Size); err != nil {
-		return nil, nil, false, err
+		return nil, nil, 0, false, err
 	}
 	r, err := zip.NewReader(f, file.Size)
 	if err != nil {
-		return nil, nil, false, err
+		return nil, nil, 0, false, err
 	}
 
 	var xmlContents []xmlParser.XmlFile
@@ -384,7 +385,7 @@ func getSqlsFromZip(c echo.Context) (sqlsFromSQLFile []SQLsFromSQLFile, sqlsFrom
 		// 使用 archiveConfig 进行文件数量限制检查
 		fileCount++
 		if err := defaultArchiveConfig.checkFileCount(fileCount); err != nil {
-			return nil, nil, false, err
+			return nil, nil, 0, false, err
 		}
 
 		// 嵌套压缩包检查：depth=1 时跳过内层压缩包
@@ -396,18 +397,18 @@ func getSqlsFromZip(c echo.Context) (sqlsFromSQLFile []SQLsFromSQLFile, sqlsFrom
 		// 读取文件内容
 		rc, err := srcFile.Open()
 		if err != nil {
-			return nil, nil, false, fmt.Errorf("open src file failed:  %v", err)
+			return nil, nil, 0, false, fmt.Errorf("open src file failed:  %v", err)
 		}
 		content, err := io.ReadAll(rc)
 		rc.Close()
 		if err != nil {
-			return nil, nil, false, fmt.Errorf("read src file failed:  %v", err)
+			return nil, nil, 0, false, fmt.Errorf("read src file failed:  %v", err)
 		}
 
 		// 累计大小限制检查
 		totalSize += int64(len(content))
 		if err := defaultArchiveConfig.checkSize(0, totalSize); err != nil {
-			return nil, nil, false, err
+			return nil, nil, 0, false, err
 		}
 
 		// 委托 processArchiveEntry 按扩展名分发处理
@@ -417,9 +418,10 @@ func getSqlsFromZip(c echo.Context) (sqlsFromSQLFile []SQLsFromSQLFile, sqlsFrom
 				log.NewEntry().WithField("convert_to_utf8", srcFile.Name).Errorf("convert to utf8 failed: %v", err)
 				continue
 			}
-			return nil, nil, false, err
+			return nil, nil, 0, false, err
 		}
 		if !isSupported {
+			skippedCount++
 			continue
 		}
 
@@ -438,7 +440,7 @@ func getSqlsFromZip(c echo.Context) (sqlsFromSQLFile []SQLsFromSQLFile, sqlsFrom
 	{
 		sqlsFromXmls, err := parseXMLsWithFilePath(xmlContents)
 		if err != nil {
-			return nil, nil, false, err
+			return nil, nil, 0, false, err
 		}
 		sqlsFromXML = append(sqlsFromXML, sqlsFromXmls...)
 	}
@@ -451,7 +453,7 @@ func getSqlsFromZip(c echo.Context) (sqlsFromSQLFile []SQLsFromSQLFile, sqlsFrom
 		return utils.CompareNatural(sqlsFromXML[i].FilePath, sqlsFromXML[j].FilePath)
 	})
 
-	return sqlsFromSQLFile, sqlsFromXML, true, nil
+	return sqlsFromSQLFile, sqlsFromXML, skippedCount, true, nil
 }
 func parseXMLsWithFilePath(xmlContents []xmlParser.XmlFile) ([]SQLFromXML, error) {
 	allStmtsFromXml, err := xmlParser.ParseXMLs(xmlContents, xmlParser.SkipErrorQuery, xmlParser.RestoreOriginSql)
diff --git a/sqle/api/controller/v1/task.go b/sqle/api/controller/v1/task.go

Original file line number	Diff line number	Diff line change
`@@ -19,41 +19,41 @@ import (`
`19`	`19`	`// getSqlsFromRar 从 RAR 文件中提取 SQL 语句。`
`20`	`20`	`// 使用 github.com/nwaples/rardecode 库解压 RAR 文件，遍历内部文件并调用 processArchiveEntry 处理。`
`21`	`21`	`// 函数签名与 getSqlsFromZip 保持一致。`
`22`		`-func getSqlsFromRar(c echo.Context) (sqlsFromSQLFile []SQLsFromSQLFile, sqlsFromXML []SQLFromXML, exist bool, err error) {`
	`22`	`+func getSqlsFromRar(c echo.Context) (sqlsFromSQLFile []SQLsFromSQLFile, sqlsFromXML []SQLFromXML, skippedCount int, exist bool, err error) {`
`23`	`23`	`file, err := c.FormFile(InputZipFileName)`
`24`	`24`	`if err == http.ErrMissingFile {`
`25`		`- return nil, nil, false, nil`
	`25`	`+ return nil, nil, 0, false, nil`
`26`	`26`	`}`
`27`	`27`	`if err != nil {`
`28`		`- return nil, nil, false, err`
	`28`	`+ return nil, nil, 0, false, err`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`f, err := file.Open()`
`32`	`32`	`if err != nil {`
`33`		`- return nil, nil, false, err`
	`33`	`+ return nil, nil, 0, false, err`
`34`	`34`	`}`
`35`	`35`	`defer f.Close()`
`36`	`36`
`37`	`37`	`// 使用 archiveConfig 进行压缩包总大小限制检查（上传文件大小预检）`
`38`	`38`	`if err := defaultArchiveConfig.checkSize(0, file.Size); err != nil {`
`39`		`- return nil, nil, false, err`
	`39`	`+ return nil, nil, 0, false, err`
`40`	`40`	`}`
`41`	`41`
`42`		`- sqlsFromSQLFile, sqlsFromXML, err = processRarContent(f)`
	`42`	`+ sqlsFromSQLFile, sqlsFromXML, skippedCount, err = processRarContent(f)`
`43`	`43`	`if err != nil {`
`44`		`- return nil, nil, false, err`
	`44`	`+ return nil, nil, 0, false, err`
`45`	`45`	`}`
`46`	`46`
`47`		`- return sqlsFromSQLFile, sqlsFromXML, true, nil`
	`47`	`+ return sqlsFromSQLFile, sqlsFromXML, skippedCount, true, nil`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`// processRarContent 从 io.Reader 中读取 RAR 内容，遍历 entry 并提取 SQL。`
`51`	`51`	`// 该函数封装了 RAR 解压的核心逻辑，独立于 echo.Context，便于单元测试。`
`52`		`-func processRarContent(r io.Reader) (sqlsFromSQLFile []SQLsFromSQLFile, sqlsFromXML []SQLFromXML, err error) {`
	`52`	`+func processRarContent(r io.Reader) (sqlsFromSQLFile []SQLsFromSQLFile, sqlsFromXML []SQLFromXML, skippedCount int, err error) {`
`53`	`53`	`// 使用 rardecode.NewReader 打开 RAR 文件，密码参数为空字符串（不支持加密 RAR）`
`54`	`54`	`rr, err := rardecode.NewReader(r, "")`
`55`	`55`	`if err != nil {`
`56`		`- return nil, nil, fmt.Errorf("open rar file failed: %v", err)`
	`56`	`+ return nil, nil, 0, fmt.Errorf("open rar file failed: %v", err)`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`var xmlContents []xmlParser.XmlFile`
`@@ -66,7 +66,7 @@ func processRarContent(r io.Reader) (sqlsFromSQLFile []SQLsFromSQLFile, sqlsFrom`
`66`	`66`	`break`
`67`	`67`	`}`
`68`	`68`	`if err != nil {`
`69`		`- return nil, nil, fmt.Errorf("read rar entry failed: %v", err)`
	`69`	`+ return nil, nil, 0, fmt.Errorf("read rar entry failed: %v", err)`
`70`	`70`	`}`
`71`	`71`
`72`	`72`	`// 跳过目录`
`@@ -77,7 +77,7 @@ func processRarContent(r io.Reader) (sqlsFromSQLFile []SQLsFromSQLFile, sqlsFrom`
`77`	`77`	`// 文件数量限制检查`
`78`	`78`	`fileCount++`
`79`	`79`	`if err := defaultArchiveConfig.checkFileCount(fileCount); err != nil {`
`80`		`- return nil, nil, err`
	`80`	`+ return nil, nil, 0, err`
`81`	`81`	`}`
`82`	`82`
`83`	`83`	`// 嵌套压缩包检查：depth=1 时跳过内层压缩包`
`@@ -89,13 +89,13 @@ func processRarContent(r io.Reader) (sqlsFromSQLFile []SQLsFromSQLFile, sqlsFrom`
`89`	`89`	`// 读取文件内容`
`90`	`90`	`content, err := io.ReadAll(rr)`
`91`	`91`	`if err != nil {`
`92`		`- return nil, nil, fmt.Errorf("read rar entry content failed: %v", err)`
	`92`	`+ return nil, nil, 0, fmt.Errorf("read rar entry content failed: %v", err)`
`93`	`93`	`}`
`94`	`94`
`95`	`95`	`// 累计大小限制检查`
`96`	`96`	`totalSize += int64(len(content))`
`97`	`97`	`if err := defaultArchiveConfig.checkSize(0, totalSize); err != nil {`
`98`		`- return nil, nil, err`
	`98`	`+ return nil, nil, 0, err`
`99`	`99`	`}`
`100`	`100`
`101`	`101`	`// 委托 processArchiveEntry 按扩展名分发处理`
`@@ -105,9 +105,10 @@ func processRarContent(r io.Reader) (sqlsFromSQLFile []SQLsFromSQLFile, sqlsFrom`
`105`	`105`	`log.NewEntry().WithField("convert_to_utf8", header.Name).Errorf("convert to utf8 failed: %v", err)`
`106`	`106`	`continue`
`107`	`107`	`}`
`108`		`- return nil, nil, err`
	`108`	`+ return nil, nil, 0, err`
`109`	`109`	`}`
`110`	`110`	`if !isSupported {`
	`111`	`+ skippedCount++`
`111`	`112`	`continue`
`112`	`113`	`}`
`113`	`114`
`@@ -126,7 +127,7 @@ func processRarContent(r io.Reader) (sqlsFromSQLFile []SQLsFromSQLFile, sqlsFrom`
`126`	`127`	`{`
`127`	`128`	`sqlsFromXmls, err := parseXMLsWithFilePath(xmlContents)`
`128`	`129`	`if err != nil {`
`129`		`- return nil, nil, err`
	`130`	`+ return nil, nil, 0, err`
`130`	`131`	`}`
`131`	`132`	`sqlsFromXML = append(sqlsFromXML, sqlsFromXmls...)`
`132`	`133`	`}`
`@@ -139,5 +140,5 @@ func processRarContent(r io.Reader) (sqlsFromSQLFile []SQLsFromSQLFile, sqlsFrom`
`139`	`140`	`return utils.CompareNatural(sqlsFromXML[i].FilePath, sqlsFromXML[j].FilePath)`
`140`	`141`	`})`
`141`	`142`
`142`		`- return sqlsFromSQLFile, sqlsFromXML, nil`
	`143`	`+ return sqlsFromSQLFile, sqlsFromXML, skippedCount, nil`
`143`	`144`	`}`
Original file line number	Diff line number	Diff line change
`@@ -172,7 +172,7 @@ func CreateSQLAuditRecord(c echo.Context) error {`
`172`	`172`	`}`
`173`	`173`
`174`	`174`	`return c.JSON(http.StatusOK, &CreateSQLAuditRecordResV1{`
`175`		`- BaseRes: controller.NewBaseReq(nil),`
	`175`	`+ BaseRes: newBaseResWithMessage(sqls.Message),`
`176`	`176`	`Data: &SQLAuditRecordResData{`
`177`	`177`	`Id: record.AuditRecordId,`
`178`	`178`	`Task: &AuditTaskResV1{`
`@@ -203,6 +203,7 @@ type GetSQLFromFileResp struct {`
`203`	`203`	`SQLsFromFormData string`
`204`	`204`	`SQLsFromSQLFiles []SQLsFromSQLFile`
`205`	`205`	`SQLsFromXMLs []SQLFromXML`
	`206`	`+ Message string // Optional message for user feedback (e.g., skipped file count)`
`206`	`207`	`}`
`207`	`208`
`208`	`209`	`type SQLsFromSQLFile struct {`
`@@ -349,27 +350,27 @@ func buildOfflineTaskForAudit(userId uint64, dbType string, sqls GetSQLFromFileR`
`349`	`350`	`}`
`350`	`351`
`351`	`352`	`// todo 此处跳过了不支持的编码格式文件`
`352`		`-func getSqlsFromZip(c echo.Context) (sqlsFromSQLFile []SQLsFromSQLFile, sqlsFromXML []SQLFromXML, exist bool, err error) {`
	`353`	`+func getSqlsFromZip(c echo.Context) (sqlsFromSQLFile []SQLsFromSQLFile, sqlsFromXML []SQLFromXML, skippedCount int, exist bool, err error) {`
`353`	`354`	`file, err := c.FormFile(InputZipFileName)`
`354`	`355`	`if err == http.ErrMissingFile {`
`355`		`- return nil, nil, false, nil`
	`356`	`+ return nil, nil, 0, false, nil`
`356`	`357`	`}`
`357`	`358`	`if err != nil {`
`358`		`- return nil, nil, false, err`
	`359`	`+ return nil, nil, 0, false, err`
`359`	`360`	`}`
`360`	`361`	`f, err := file.Open()`
`361`	`362`	`if err != nil {`
`362`		`- return nil, nil, false, err`
	`363`	`+ return nil, nil, 0, false, err`
`363`	`364`	`}`
`364`	`365`	`defer f.Close()`
`365`	`366`
`366`	`367`	`// 使用 archiveConfig 进行压缩包总大小限制检查`
`367`	`368`	`if err := defaultArchiveConfig.checkSize(0, file.Size); err != nil {`
`368`		`- return nil, nil, false, err`
	`369`	`+ return nil, nil, 0, false, err`
`369`	`370`	`}`
`370`	`371`	`r, err := zip.NewReader(f, file.Size)`
`371`	`372`	`if err != nil {`
`372`		`- return nil, nil, false, err`
	`373`	`+ return nil, nil, 0, false, err`
`373`	`374`	`}`
`374`	`375`
`375`	`376`	`var xmlContents []xmlParser.XmlFile`
`@@ -384,7 +385,7 @@ func getSqlsFromZip(c echo.Context) (sqlsFromSQLFile []SQLsFromSQLFile, sqlsFrom`
`384`	`385`	`// 使用 archiveConfig 进行文件数量限制检查`
`385`	`386`	`fileCount++`
`386`	`387`	`if err := defaultArchiveConfig.checkFileCount(fileCount); err != nil {`
`387`		`- return nil, nil, false, err`
	`388`	`+ return nil, nil, 0, false, err`
`388`	`389`	`}`
`389`	`390`
`390`	`391`	`// 嵌套压缩包检查：depth=1 时跳过内层压缩包`
`@@ -396,18 +397,18 @@ func getSqlsFromZip(c echo.Context) (sqlsFromSQLFile []SQLsFromSQLFile, sqlsFrom`
`396`	`397`	`// 读取文件内容`
`397`	`398`	`rc, err := srcFile.Open()`
`398`	`399`	`if err != nil {`
`399`		`- return nil, nil, false, fmt.Errorf("open src file failed: %v", err)`
	`400`	`+ return nil, nil, 0, false, fmt.Errorf("open src file failed: %v", err)`
`400`	`401`	`}`
`401`	`402`	`content, err := io.ReadAll(rc)`
`402`	`403`	`rc.Close()`
`403`	`404`	`if err != nil {`
`404`		`- return nil, nil, false, fmt.Errorf("read src file failed: %v", err)`
	`405`	`+ return nil, nil, 0, false, fmt.Errorf("read src file failed: %v", err)`
`405`	`406`	`}`
`406`	`407`
`407`	`408`	`// 累计大小限制检查`
`408`	`409`	`totalSize += int64(len(content))`
`409`	`410`	`if err := defaultArchiveConfig.checkSize(0, totalSize); err != nil {`
`410`		`- return nil, nil, false, err`
	`411`	`+ return nil, nil, 0, false, err`
`411`	`412`	`}`
`412`	`413`
`413`	`414`	`// 委托 processArchiveEntry 按扩展名分发处理`
`@@ -417,9 +418,10 @@ func getSqlsFromZip(c echo.Context) (sqlsFromSQLFile []SQLsFromSQLFile, sqlsFrom`
`417`	`418`	`log.NewEntry().WithField("convert_to_utf8", srcFile.Name).Errorf("convert to utf8 failed: %v", err)`
`418`	`419`	`continue`
`419`	`420`	`}`
`420`		`- return nil, nil, false, err`
	`421`	`+ return nil, nil, 0, false, err`
`421`	`422`	`}`
`422`	`423`	`if !isSupported {`
	`424`	`+ skippedCount++`
`423`	`425`	`continue`
`424`	`426`	`}`
`425`	`427`
`@@ -438,7 +440,7 @@ func getSqlsFromZip(c echo.Context) (sqlsFromSQLFile []SQLsFromSQLFile, sqlsFrom`
`438`	`440`	`{`
`439`	`441`	`sqlsFromXmls, err := parseXMLsWithFilePath(xmlContents)`
`440`	`442`	`if err != nil {`
`441`		`- return nil, nil, false, err`
	`443`	`+ return nil, nil, 0, false, err`
`442`	`444`	`}`
`443`	`445`	`sqlsFromXML = append(sqlsFromXML, sqlsFromXmls...)`
`444`	`446`	`}`
`@@ -451,7 +453,7 @@ func getSqlsFromZip(c echo.Context) (sqlsFromSQLFile []SQLsFromSQLFile, sqlsFrom`
`451`	`453`	`return utils.CompareNatural(sqlsFromXML[i].FilePath, sqlsFromXML[j].FilePath)`
`452`	`454`	`})`
`453`	`455`
`454`		`- return sqlsFromSQLFile, sqlsFromXML, true, nil`
	`456`	`+ return sqlsFromSQLFile, sqlsFromXML, skippedCount, true, nil`
`455`	`457`	`}`
`456`	`458`	`func parseXMLsWithFilePath(xmlContents []xmlParser.XmlFile) ([]SQLFromXML, error) {`
`457`	`459`	`allStmtsFromXml, err := xmlParser.ParseXMLs(xmlContents, xmlParser.SkipErrorQuery, xmlParser.RestoreOriginSql)`