fix: 自定义扫描任务TOKEN没有展示到页面

go.mod

@@ -184,7 +184,7 @@ replace (
 	cloud.google.com/go/compute/metadata => cloud.google.com/go/compute/metadata v0.1.0
 	github.com/labstack/echo/v4 => github.com/labstack/echo/v4 v4.6.1
 	github.com/pingcap/log => github.com/pingcap/log v0.0.0-20191012051959-b742a5d432e9
-	github.com/pingcap/parser => github.com/sjjian/parser v0.0.0-20240305095250-688ad439ef31
+	github.com/pingcap/parser => github.com/sjjian/parser v0.0.0-20240704052347-b6199b7bccae
 	github.com/swaggo/swag => github.com/swaggo/swag v1.6.7
 	google.golang.org/grpc => google.golang.org/grpc v1.29.0
 )

go.sum

@@ -793,8 +793,8 @@ github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrf
 github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
 github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0=
 github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
-github.com/sjjian/parser v0.0.0-20240305095250-688ad439ef31 h1:E3JSX1FjUlg8ep8XQlLkdTFbZhM4tmecpdfZhUuubLs=
-github.com/sjjian/parser v0.0.0-20240305095250-688ad439ef31/go.mod h1:Qq2tnreUXwVo7NAKAHmbWFsgqpDUkxwhJCClY+ZCudA=
+github.com/sjjian/parser v0.0.0-20240704052347-b6199b7bccae h1:rTwogc7Uq0/7zMHNhpQTqjtGKdccVh8Z8vHReIlsXG0=
+github.com/sjjian/parser v0.0.0-20240704052347-b6199b7bccae/go.mod h1:Qq2tnreUXwVo7NAKAHmbWFsgqpDUkxwhJCClY+ZCudA=
 github.com/skeema/knownhosts v1.2.0 h1:h9r9cf0+u7wSE+M183ZtMGgOJKiL96brpaz5ekfJCpM=
 github.com/skeema/knownhosts v1.2.0/go.mod h1:g4fPeYpque7P0xefxtGzV81ihjC8sX2IqpAoNkjxbMo=
 github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=

sqle/api/app.go

@@ -281,6 +281,11 @@ func StartApi(net *gracenet.Net, exitChan chan struct{}, config *config.SqleOpti
 		v1ProjectOpRouter.POST("/:project_name/pipelines", v1.CreatePipeline)
 		v1ProjectOpRouter.DELETE("/:project_name/pipelines/:pipeline_id/", v1.DeletePipeline)
 		v1ProjectOpRouter.PATCH("/:project_name/pipelines/:pipeline_id/", v1.UpdatePipeline)
+
+		// database_compare
+		v1ProjectOpRouter.POST("/:project_name/database_comparison/execute_comparison", v1.ExecuteDatabaseComparison)
+		v1ProjectOpRouter.POST("/:project_name/database_comparison/comparison_statements", v1.GetComparisonStatement)
+		v1ProjectOpRouter.POST("/:project_name/database_comparison/modify_sql_statements", v1.GenDatabaseDiffModifySQLs)
 	}
 
 	// project member router
@@ -428,12 +433,8 @@ func StartApi(net *gracenet.Net, exitChan chan struct{}, config *config.SqleOpti
 
 		v1Router.POST("/rule_templates/parse", v1.ParseProjectRuleTemplateFile)
 		v1Router.GET("/import_rule_template", v1.GetImportRuleTemplateFile)
-
-		// 全局 sql manage
-		v1Router.GET("/sql_manages", v1.GetGlobalSqlManageList)
-
+
 		// 全局 workflow
-		v1Router.GET("/workflows", v1.GetGlobalWorkflowsV1)
 		v1Router.GET("/rule_knowledge/db_types/:db_type/rules/:rule_name/", v1.GetRuleKnowledge)
 		v1Router.GET("/rule_knowledge/db_types/:db_type/custom_rules/:rule_name/", v1.GetCustomRuleKnowledge)
 		v1Router.GET("/workflows/statistic_of_instances", v1.GetWorkflowStatisticOfInstances)
@@ -463,6 +464,11 @@ func StartApi(net *gracenet.Net, exitChan chan struct{}, config *config.SqleOpti
 
 		// dashboard
 		v1Router.GET("/dashboard", v1.Dashboard)
+		// 全局 sql manage
+		v1Router.GET("/dashboard/sql_manages", v1.GetGlobalSqlManageList)
+		v1Router.GET("/dashboard/sql_manages/statistics", v1.GetGlobalSqlManageStatistics)
+		v1Router.GET("/dashboard/workflows", v1.GetGlobalWorkflowsV1)
+		v1Router.GET("/dashboard/workflows/statistics", v1.GetGlobalWorkflowStatistics)
 
 		// configurations
 		v1Router.GET("/configurations/drivers", v1.GetDrivers)
@@ -483,6 +489,7 @@ func StartApi(net *gracenet.Net, exitChan chan struct{}, config *config.SqleOpti
 		v1Router.GET("/company_notice", v1.GetCompanyNotice)
 		// 系统功能开关
 		v1Router.GET("/system/module_status", v1.GetSystemModuleStatus)
+		v1Router.GET("/system/module_red_dots", v1.GetSystemModuleRedDots)
 	}
 
 	// enterprise customized apis

sqle/api/controller/v1/database_compare.go

@@ -0,0 +1,140 @@
+package v1
+
+import (
+	"github.com/actiontech/sqle/sqle/api/controller"
+	"github.com/actiontech/sqle/sqle/model"
+	"github.com/labstack/echo/v4"
+)
+
+type GetDatabaseComparisonReqV1 struct {
+	BaseDBObject       *DatabaseComparisonObject `json:"base_db_object" query:"base_db_object"`
+	ComparisonDBObject *DatabaseComparisonObject `json:"comparison_db_object" query:"comparison_db_object"`
+}
+
+type DatabaseComparisonObject struct {
+	InstanceId string  `json:"instance_id" query:"instance_id"`
+	SchemaName *string `json:"schema_name,omitempty" query:"schema_name"`
+}
+type DatabaseComparisonResV1 struct {
+	controller.BaseRes
+	Data []*SchemaObject `json:"data"`
+}
+
+type SchemaObject struct {
+	BaseSchemaName       string                `json:"base_schema_name"`
+	ComparisonSchemaName string                `json:"comparison_schema_name"`
+	ComparisonResult     string                `json:"comparison_result" enums:"same,inconsistent,base_not_exist,comparison_not_exist"`
+	DatabaseDiffObjects  []*DatabaseDiffObject `json:"database_diff_objects,omitempty"`
+	InconsistentNum      int                   `json:"inconsistent_num"`
+}
+
+type DatabaseDiffObject struct {
+	InconsistentNum    int                 `json:"inconsistent_num"`
+	ObjectType         string              `json:"object_type" enums:"TABLE,VIEW,PROCEDURE,TIGGER,EVENT,FUNCTION"`
+	ObjectsDiffResults []*ObjectDiffResult `json:"objects_diff_result,omitempty"`
+}
+
+type ObjectDiffResult struct {
+	ComparisonResult string `json:"comparison_result" enums:"same,inconsistent,base_not_exist,comparison_not_exist"`
+	ObjectName       string `json:"object_name"`
+}
+
+// @Summary 执行数据库结构对比并获取结果
+// @Description get database comparison
+// @Id executeDatabaseComparisonV1
+// @Tags database_comparison
+// @Security ApiKeyAuth
+// @Accept json
+// @Param project_name path string true "project name"
+// @Param database_comparison body v1.GetDatabaseComparisonReqV1 true "get database comparison request"
+// @Success 200 {object} v1.DatabaseComparisonResV1
+// @router /v1/projects/{project_name}/database_comparison/execute_comparison [post]
+func ExecuteDatabaseComparison(c echo.Context) error {
+
+	return getDatabaseComparison(c)
+}
+
+type DatabaseObject struct {
+	ObjectName string `json:"object_name"`
+	ObjectType string `json:"object_type" enums:"TABLE,VIEW,PROCEDURE,TIGGER,EVENT,FUNCTION"`
+}
+
+type GetComparisonStatementsReqV1 struct {
+	DatabaseComparisonObject GetDatabaseComparisonReqV1 `json:"database_comparison_object"`
+	DatabaseObject           *DatabaseObject            `json:"database_object"`
+}
+
+type DatabaseComparisonStatementsResV1 struct {
+	controller.BaseRes
+	Data *DatabaseComparisonStatements `json:"data"`
+}
+
+type DatabaseComparisonStatements struct {
+	BaseSQL        *SQLStatementWithAuditResult `json:"base_sql"`
+	ComparisondSQL *SQLStatementWithAuditResult `json:"comparison_sql"`
+}
+
+type SQLStatementWithAuditResult struct {
+	SQLStatement string            `json:"sql_statement"`
+	AuditResults []*SQLAuditResult `json:"audit_results"`
+}
+
+type SQLAuditResult struct {
+	Level               string                    `json:"level" example:"warn"`
+	Message             string                    `json:"message" example:"避免使用不必要的内置函数md5()"`
+	RuleName            string                    `json:"rule_name"`
+	DbType              string                    `json:"db_type"`
+	I18nAuditResultInfo model.I18nAuditResultInfo `json:"i18n_audit_result_info"`
+}
+
+// @Summary 获取对比语句
+// @Description get database comparison detail
+// @Id getComparisonStatementV1
+// @Tags database_comparison
+// @Security ApiKeyAuth
+// @Accept json
+// @Param project_name path string true "project name"
+// @Param database_comparison_object body v1.GetComparisonStatementsReqV1 true "get database comparison statement request"
+// @Success 200 {object} v1.DatabaseComparisonStatementsResV1
+// @router /v1/projects/{project_name}/database_comparison/comparison_statements [post]
+func GetComparisonStatement(c echo.Context) error {
+
+	return getComparisonStatement(c)
+}
+
+type GenModifylSQLReqV1 struct {
+	BaseInstanceId        string                  `json:"base_instance_id"`
+	ComparisonInstanceId  string                  `json:"comparison_instance_id"`
+	DatabaseSchemaObjects []*DatabaseSchemaObject `json:"database_schema_objects"`
+}
+
+type DatabaseSchemaObject struct {
+	BaseSchemaName       string            `json:"base_schema_name"`
+	ComparisonSchemaName string            `json:"comparison_schema_name"`
+	DatabaseObjects      []*DatabaseObject `json:"database_objects"`
+}
+
+type GenModifySQLResV1 struct {
+	controller.BaseRes
+	Data []*DatabaseDiffModifySQL `json:"data"`
+}
+
+type DatabaseDiffModifySQL struct {
+	SchemaName string                         `json:"schema_name"`
+	ModifySQLs []*SQLStatementWithAuditResult `json:"modify_sqls"`
+}
+
+// @Summary 生成变更SQL
+// @Description generate database diff modify sqls
+// @Id genDatabaseDiffModifySQLsV1
+// @Tags database_comparison
+// @Security ApiKeyAuth
+// @Accept json
+// @Param project_name path string true "project name"
+// @Param gen_modify_sql body v1.GenModifylSQLReqV1 true "generate database diff modify sqls request"
+// @Success 200 {object} v1.GenModifySQLResV1
+// @router /v1/projects/{project_name}/database_comparison/modify_sql_statements [post]
+func GenDatabaseDiffModifySQLs(c echo.Context) error {
+
+	return genDatabaseDiffModifySQLs(c)
+}

sqle/api/controller/v1/database_compare_ce.go

@@ -0,0 +1,25 @@
+//go:build !enterprise
+// +build !enterprise
+
+package v1
+
+import (
+	e "errors"
+
+	"github.com/actiontech/sqle/sqle/errors"
+	"github.com/labstack/echo/v4"
+)
+
+var ErrCommunityEditionNotSupportDatabaseStructComparison = errors.New(errors.EnterpriseEditionFeatures, e.New("database struct comparison is enterprise version feature"))
+
+func getDatabaseComparison(c echo.Context) error {
+	return ErrCommunityEditionNotSupportDatabaseStructComparison
+}
+
+func getComparisonStatement(c echo.Context) error {
+	return ErrCommunityEditionNotSupportDatabaseStructComparison
+}
+
+func genDatabaseDiffModifySQLs(c echo.Context) error {
+	return ErrCommunityEditionNotSupportDatabaseStructComparison
+}

sqle/api/controller/v1/instance_audit_plan.go

@@ -418,6 +418,7 @@ type AuditPlanTypeResBase struct {
 	AuditPlanId       uint   `json:"audit_plan_id"`
 	AuditPlanType     string `json:"type"`
 	AuditPlanTypeDesc string `json:"desc"`
+	Token             string `json:"token"`
 }
 
 type GetInstanceAuditPlansReqV1 struct {
@@ -519,7 +520,7 @@ func GetInstanceAuditPlans(c echo.Context) error {
 		typeBases := make([]AuditPlanTypeResBase, 0, len(auditPlanIds))
 		for _, auditPlanId := range auditPlanIds {
 			if auditPlanId != "" {
-				typeBase, err := ConvertAuditPlanTypeToResByID(c.Request().Context(), auditPlanId)
+				typeBase, err := ConvertAuditPlanTypeToResByID(c.Request().Context(), auditPlanId, v.Token)
 				if err != nil {
 					return controller.JSONBaseErrorReq(c, err)
 				}
@@ -547,7 +548,7 @@ func GetInstanceAuditPlans(c echo.Context) error {
 	})
 }
 
-func ConvertAuditPlanTypeToResByID(ctx context.Context, id string) (AuditPlanTypeResBase, error) {
+func ConvertAuditPlanTypeToResByID(ctx context.Context, id string, token string) (AuditPlanTypeResBase, error) {
 	auditPlanID, err := strconv.Atoi(id)
 	if err != nil {
 		return AuditPlanTypeResBase{}, err
@@ -566,6 +567,7 @@ func ConvertAuditPlanTypeToResByID(ctx context.Context, id string) (AuditPlanTyp
 				AuditPlanType:     auditPlan.Type,
 				AuditPlanTypeDesc: locale.Bundle.LocalizeMsgByCtx(ctx, meta.Desc),
 				AuditPlanId:       auditPlan.ID,
+				Token:             token,
 			}, nil
 		}
 	}
@@ -822,6 +824,11 @@ func GetAuditPlanExecCmd(projectName string, iap *model.InstanceAuditPlan, ap *m
 		return ""
 	}
 
+	if ap.Type == "default" {
+		cmdTpl := "--project=%s --audit_plan_id=%d --token=%s"
+		return fmt.Sprintf(cmdTpl, iap.ProjectId, ap.ID, iap.Token)
+	}
+
 	address := config.GetOptions().SqleOptions.DMSServerAddress
 	parsedURL, err := url.Parse(address)
 	if err != nil {
@@ -834,22 +841,32 @@ func GetAuditPlanExecCmd(projectName string, iap *model.InstanceAuditPlan, ap *m
 		return ""
 	}
 
-	scannerd, err := scannerCmd.GetScannerdCmd(ap.Type)
-	if err != nil {
-		logger.Infof("get scannerd %s failed %s", ap.Type, err)
-		return ""
-	}
-	cmd, err := scannerd.GenCommand("./scannerd", map[string]string{
-		scannerCmd.FlagHost:        ip,
-		scannerCmd.FlagPort:        port,
-		scannerCmd.FlagProject:     projectName,
-		scannerCmd.FlagToken:       iap.Token,
-		scannerCmd.FlagAuditPlanID: fmt.Sprint(ap.ID),
-	})
-	if err != nil {
-		logger.Infof("generate scannerd %s command failed %s", ap.Type, err)
-		return ""
+	var cmd string
+	switch ap.Type {
+	case auditplan.TypeAllAppExtract:
+		cmd = fmt.Sprintf(`SQLE_PROJECT_NAME=%s \
+PROJECT_APP_NAME=<Please provide the business parameters here> \
+java -<Please provide the java agent name parameters here> \
+-jar <Please provide the java app name parameters here>`, projectName)
+	default:
+		scannerd, err := scannerCmd.GetScannerdCmd(ap.Type)
+		if err != nil {
+			logger.Infof("get scannerd %s failed %s", ap.Type, err)
+			return ""
+		}
+		cmd, err = scannerd.GenCommand("./scannerd", map[string]string{
+			scannerCmd.FlagHost:        ip,
+			scannerCmd.FlagPort:        port,
+			scannerCmd.FlagProject:     projectName,
+			scannerCmd.FlagToken:       iap.Token,
+			scannerCmd.FlagAuditPlanID: fmt.Sprint(ap.ID),
+		})
+		if err != nil {
+			logger.Infof("generate scannerd %s command failed %s", ap.Type, err)
+			return ""
+		}
 	}
+
 	return cmd
 }