feat: redis支持list查看&其他小优化

server/internal/db/api/db.go

@@ -130,37 +130,21 @@ func (d *Db) ExecSql(rc *ctx.ReqCtx) {
 	})
 
 	rc.ReqParam = fmt.Sprintf("db: %d:%s | sql: %s", id, db, sql)
-
 	biz.NotEmpty(sql, "sql不能为空")
-	if strings.HasPrefix(sql, "SELECT") || strings.HasPrefix(sql, "select") || strings.HasPrefix(sql, "show") || strings.HasPrefix(sql, "explain") {
-		colNames, res, err := dbInstance.SelectData(sql)
-		biz.ErrIsNilAppendErr(err, "查询失败: %s")
-		colAndRes := make(map[string]interface{})
-		colAndRes["colNames"] = colNames
-		colAndRes["res"] = res
-		rc.ResData = colAndRes
-	} else {
-		// 根据执行sql，生成执行记录
-		execRecord := d.DbSqlExecApp.GenExecLog(rc.LoginAccount, id, db, sql, dbInstance)
 
-		rowsAffected, err := dbInstance.Exec(sql)
-		biz.ErrIsNilAppendErr(err, "执行失败: %s")
-		res := make([]map[string]string, 0)
-		resData := make(map[string]string)
-		resData["影响条数"] = fmt.Sprintf("%d", rowsAffected)
-		res = append(res, resData)
-
-		colAndRes := make(map[string]interface{})
-		colAndRes["colNames"] = []string{"影响条数"}
-		colAndRes["res"] = res
-
-		rc.ResData = colAndRes
-		// 保存sql执行记录
-		if res[0]["影响条数"] > "0" {
-			execRecord.Remark = form.Remark
-			d.DbSqlExecApp.Save(execRecord)
-		}
-	}
+	execRes, err := d.DbSqlExecApp.Exec(&application.DbSqlExecReq{
+		DbId:         id,
+		Db:           db,
+		Sql:          sql,
+		Remark:       form.Remark,
+		DbInstance:   dbInstance,
+		LoginAccount: rc.LoginAccount,
+	})
+	biz.ErrIsNilAppendErr(err, "执行失败: %s")
+	colAndRes := make(map[string]interface{})
+	colAndRes["colNames"] = execRes.ColNames
+	colAndRes["res"] = execRes.Res
+	rc.ResData = colAndRes
 }
 
 // 执行sql文件
@@ -271,9 +255,9 @@ func (d *Db) DumpSql(rc *ctx.ReqCtx) {
 
 		var sqlTmp string
 		switch dbInstance.Type {
-		case "mysql":
+		case entity.DbTypeMysql:
 			sqlTmp = "SELECT * FROM %s LIMIT %d, %d"
-		case "postgres":
+		case entity.DbTypePostgres:
 			sqlTmp = "SELECT * FROM %s OFFSET %d LIMIT %d"
 		}
 		for index := 0; index < pageNum; index++ {

server/internal/db/application/db.go

@@ -3,7 +3,6 @@ package application
 import (
 	"context"
 	"database/sql"
-	"errors"
 	"fmt"
 	"mayfly-go/internal/constant"
 	"mayfly-go/internal/db/domain/entity"
@@ -234,7 +233,7 @@ var dbCache = cache.NewTimedCache(constant.DbConnExpireTime, 5*time.Second).
 
 func init() {
 	machine.AddCheckSshTunnelMachineUseFunc(func(machineId uint64) bool {
-		// 遍历所有db连接实例，若存在redis实例使用该ssh隧道机器，则返回true，表示还在使用中...
+		// 遍历所有db连接实例，若存在db实例使用该ssh隧道机器，则返回true，表示还在使用中...
 		items := dbCache.Items()
 		for _, v := range items {
 			if v.Value.(*DbInstance).sshTunnelMachineId == machineId {
@@ -412,14 +411,6 @@ type DbInstance struct {
 // 执行查询语句
 // 依次返回 列名数组，结果map，错误
 func (d *DbInstance) SelectData(execSql string) ([]string, []map[string]interface{}, error) {
-	execSql = strings.Trim(execSql, " ")
-	isSelect := strings.HasPrefix(execSql, "SELECT") || strings.HasPrefix(execSql, "select")
-	isShow := strings.HasPrefix(execSql, "show")
-	isExplain := strings.HasPrefix(execSql, "explain")
-
-	if !isSelect && !isShow && !isExplain {
-		return nil, nil, errors.New("该sql非查询语句")
-	}
 	return SelectDataByDb(d.db, execSql)
 }
 

server/internal/db/application/db_sql_exec.go

@@ -13,13 +13,23 @@ import (
 	"github.com/xwb1989/sqlparser"
 )
 
+type DbSqlExecReq struct {
+	DbId         uint64
+	Db           string
+	Sql          string
+	Remark       string
+	LoginAccount *model.LoginAccount
+	DbInstance   *DbInstance
+}
+
+type DbSqlExecRes struct {
+	ColNames []string
+	Res      []map[string]interface{}
+}
+
 type DbSqlExec interface {
-
-	// 生成sql执行记录
-	GenExecLog(loginAccount *model.LoginAccount, dbId uint64, db string, sql string, dbInstance *DbInstance) *entity.DbSqlExec
-
-	// 保存sql执行记录
-	Save(*entity.DbSqlExec)
+	// 执行sql
+	Exec(execSqlReq *DbSqlExecReq) (*DbSqlExecRes, error)
 
 	// 根据条件删除sql执行记录
 	DeleteBy(condition *entity.DbSqlExec)
@@ -38,37 +48,58 @@ type dbSqlExecAppImpl struct {
 	dbSqlExecRepo repository.DbSqlExec
 }
 
-func (d *dbSqlExecAppImpl) GenExecLog(loginAccount *model.LoginAccount, dbId uint64, db string, sql string, dbInstance *DbInstance) *entity.DbSqlExec {
-	defer func() {
-		if err := recover(); err != nil {
-			global.Log.Error("生成sql执行记录失败", err)
-		}
-	}()
+func (d *dbSqlExecAppImpl) Exec(execSqlReq *DbSqlExecReq) (*DbSqlExecRes, error) {
+	sql := execSqlReq.Sql
+	loginAccount := execSqlReq.LoginAccount
+
+	// 如果是pgsql并且为查询语句，则直接返回，sqlparser不支持解析pgsql select语句
+	if execSqlReq.DbInstance.Type == entity.DbTypePostgres && (strings.HasPrefix(sql, "SELECT") || strings.HasPrefix(sql, "select")) {
+		return doSelect(nil, execSqlReq, nil)
+	}
+
 	stmt, err := sqlparser.Parse(sql)
 	if err != nil {
-		global.Log.Error("记录数据库sql执行记录失败", err)
+		global.Log.Error("sql解析失败: ", err)
+		return nil, err
 	}
 
 	dbSqlExecRecord := new(entity.DbSqlExec)
-	dbSqlExecRecord.DbId = dbId
-	dbSqlExecRecord.Db = db
+	dbSqlExecRecord.DbId = execSqlReq.DbId
+	dbSqlExecRecord.Db = execSqlReq.Db
 	dbSqlExecRecord.Sql = sql
+	dbSqlExecRecord.Remark = execSqlReq.Remark
 	dbSqlExecRecord.SetBaseInfo(loginAccount)
 
+	var execRes *DbSqlExecRes
+	isSelect := false
 	switch stmt := stmt.(type) {
+	case *sqlparser.Select:
+		isSelect = true
+		execRes, err = doSelect(stmt, execSqlReq, dbSqlExecRecord)
+	case *sqlparser.Show:
+		isSelect = true
+		execRes, err = doSelect(nil, execSqlReq, dbSqlExecRecord)
+	case *sqlparser.OtherRead:
+		isSelect = true
+		execRes, err = doSelect(nil, execSqlReq, dbSqlExecRecord)
 	case *sqlparser.Update:
-		doUpdate(stmt, dbInstance, dbSqlExecRecord)
+		execRes, err = doUpdate(stmt, execSqlReq, dbSqlExecRecord)
 	case *sqlparser.Delete:
-		doDelete(stmt, dbInstance, dbSqlExecRecord)
+		execRes, err = doDelete(stmt, execSqlReq, dbSqlExecRecord)
 	case *sqlparser.Insert:
-		doInsert(stmt, dbSqlExecRecord)
+		execRes, err = doInsert(stmt, execSqlReq, dbSqlExecRecord)
+	default:
+		execRes, err = doExec(execSqlReq.Sql, execSqlReq.DbInstance)
+	}
+	if err != nil {
+		return nil, err
 	}
 
-	return dbSqlExecRecord
-}
-
-func (d *dbSqlExecAppImpl) Save(dse *entity.DbSqlExec) {
-	d.dbSqlExecRepo.Insert(dse)
+	if !isSelect {
+		// 保存执行记录
+		d.dbSqlExecRepo.Insert(dbSqlExecRecord)
+	}
+	return execRes, nil
 }
 
 func (d *dbSqlExecAppImpl) DeleteBy(condition *entity.DbSqlExec) {
@@ -79,7 +110,22 @@ func (d *dbSqlExecAppImpl) GetPageList(condition *entity.DbSqlExec, pageParam *m
 	return d.dbSqlExecRepo.GetPageList(condition, pageParam, toEntity, orderBy...)
 }
 
-func doUpdate(update *sqlparser.Update, dbInstance *DbInstance, dbSqlExec *entity.DbSqlExec) {
+func doSelect(selectStmt *sqlparser.Select, execSqlReq *DbSqlExecReq, dbSqlExec *entity.DbSqlExec) (*DbSqlExecRes, error) {
+	dbInstance := execSqlReq.DbInstance
+	sql := execSqlReq.Sql
+	colNames, res, err := dbInstance.SelectData(sql)
+	if err != nil {
+		return nil, err
+	}
+	return &DbSqlExecRes{
+		ColNames: colNames,
+		Res:      res,
+	}, nil
+}
+
+func doUpdate(update *sqlparser.Update, execSqlReq *DbSqlExecReq, dbSqlExec *entity.DbSqlExec) (*DbSqlExecRes, error) {
+	dbInstance := execSqlReq.DbInstance
+
 	tableStr := sqlparser.String(update.TableExprs)
 	// 可能使用别名，故空格切割
 	tableName := strings.Split(tableStr, " ")[0]
@@ -103,9 +149,13 @@ func doUpdate(update *sqlparser.Update, dbInstance *DbInstance, dbSqlExec *entit
 	dbSqlExec.OldValue = string(bytes)
 	dbSqlExec.Table = tableName
 	dbSqlExec.Type = entity.DbSqlExecTypeUpdate
+
+	return doExec(execSqlReq.Sql, dbInstance)
 }
 
-func doDelete(delete *sqlparser.Delete, dbInstance *DbInstance, dbSqlExec *entity.DbSqlExec) {
+func doDelete(delete *sqlparser.Delete, execSqlReq *DbSqlExecReq, dbSqlExec *entity.DbSqlExec) (*DbSqlExecRes, error) {
+	dbInstance := execSqlReq.DbInstance
+
 	tableStr := sqlparser.String(delete.TableExprs)
 	// 可能使用别名，故空格切割
 	table := strings.Split(tableStr, " ")[0]
@@ -119,12 +169,32 @@ func doDelete(delete *sqlparser.Delete, dbInstance *DbInstance, dbSqlExec *entit
 	dbSqlExec.OldValue = string(bytes)
 	dbSqlExec.Table = table
 	dbSqlExec.Type = entity.DbSqlExecTypeDelete
+
+	return doExec(execSqlReq.Sql, dbInstance)
 }
 
-func doInsert(insert *sqlparser.Insert, dbSqlExec *entity.DbSqlExec) {
+func doInsert(insert *sqlparser.Insert, execSqlReq *DbSqlExecReq, dbSqlExec *entity.DbSqlExec) (*DbSqlExecRes, error) {
 	tableStr := sqlparser.String(insert.Table)
 	// 可能使用别名，故空格切割
 	table := strings.Split(tableStr, " ")[0]
 	dbSqlExec.Table = table
 	dbSqlExec.Type = entity.DbSqlExecTypeInsert
+
+	return doExec(execSqlReq.Sql, execSqlReq.DbInstance)
+}
+
+func doExec(sql string, dbInstance *DbInstance) (*DbSqlExecRes, error) {
+	rowsAffected, err := dbInstance.Exec(sql)
+	if err != nil {
+		return nil, err
+	}
+	res := make([]map[string]interface{}, 0)
+	resData := make(map[string]interface{})
+	resData["影响条数"] = rowsAffected
+	res = append(res, resData)
+
+	return &DbSqlExecRes{
+		ColNames: []string{"影响条数"},
+		Res:      res,
+	}, nil
 }