db_type is needed when get rules by audit result

actiontech · Oct 11, 2023 · 5b793a8 · 5b793a8
1 parent 7ce0e7d
commit 5b793a8
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 0 deletions.
diff --git a/sqle/api/controller/v2/audit_plan.go b/sqle/api/controller/v2/audit_plan.go
@@ -226,6 +226,7 @@ func GetAuditPlanReportSQLs(c echo.Context) error {
 				Level:    ar.Level,
 				Message:  ar.Message,
 				RuleName: ar.RuleName,
+				DbType:   ap.DBType,
 			})
 		}
 	}

diff --git a/sqle/api/controller/v2/sql_audit.go b/sqle/api/controller/v2/sql_audit.go
@@ -87,6 +87,7 @@ func convertTaskResultToAuditResV2(task *model.Task) *AuditResDataV2 {
 				Level:    sql.AuditResults[j].Level,
 				Message:  sql.AuditResults[j].Message,
 				RuleName: sql.AuditResults[j].RuleName,
+				DbType:   task.DBType,
 			}
 		}
 

diff --git a/sqle/api/controller/v2/task.go b/sqle/api/controller/v2/task.go
@@ -42,6 +42,7 @@ type AuditResult struct {
 	Level    string `json:"level" example:"warn"`
 	Message  string `json:"message" example:"避免使用不必要的内置函数md5()"`
 	RuleName string `json:"rule_name"`
+	DbType   string `json:"db_type"`
 }
 
 // @Summary 获取指定扫描任务的SQLs信息
@@ -114,6 +115,7 @@ func GetTaskSQLs(c echo.Context) error {
 				Level:    ar.Level,
 				Message:  ar.Message,
 				RuleName: ar.RuleName,
+				DbType:   task.DBType,
 			})
 		}
 

diff --git a/sqle/docs/docs.go b/sqle/docs/docs.go
@@ -16377,6 +16377,9 @@ var doc = `{
         "v2.AuditResult": {
             "type": "object",
             "properties": {
+                "db_type": {
+                    "type": "string"
+                },
                 "level": {
                     "type": "string",
                     "example": "warn"

diff --git a/sqle/docs/swagger.json b/sqle/docs/swagger.json
@@ -16361,6 +16361,9 @@
         "v2.AuditResult": {
             "type": "object",
             "properties": {
+                "db_type": {
+                    "type": "string"
+                },
                 "level": {
                     "type": "string",
                     "example": "warn"

diff --git a/sqle/docs/swagger.yaml b/sqle/docs/swagger.yaml
@@ -4421,6 +4421,8 @@ definitions:
     type: object
   v2.AuditResult:
     properties:
+      db_type:
+        type: string
       level:
         example: warn
         type: string