From 2118acf2445112ee5c18717d84c6ae5e54d0eea8 Mon Sep 17 00:00:00 2001
From: "meilin.huang" <954537473@qq.com>
Date: Wed, 23 Oct 2024 17:30:05 +0800
Subject: [PATCH] release: v1.9.0

---
 Dockerfile                                    |   2 +-
 mayfly_go_web/package.json                    |   5 ++--
 .../src/components/file/FileInfo.vue          |   4 ++--
 mayfly_go_web/src/views/flow/ProcdefEdit.vue  |   2 +-
 .../db/component/sqleditor/DbSqlEditor.vue    |   2 +-
 mayfly_go_web/src/views/ops/db/db.ts          |   5 ++--
 server/go.mod                                 |   2 +-
 server/internal/db/application/db.go          |   4 ----
 server/internal/db/application/db_instance.go |   4 ----
 server/internal/db/application/db_transfer.go |  11 ++++-----
 server/internal/db/router/db.go               |   2 +-
 server/internal/file/application/file.go      |  22 +++++++++++++-----
 server/internal/machine/api/machine_file.go   |   2 +-
 .../internal/machine/application/machine.go   |   3 ---
 .../machine/application/machine_term_op.go    |   3 ++-
 server/internal/mongo/application/mongo.go    |   7 +++---
 server/internal/redis/application/redis.go    |   4 ----
 server/internal/sys/application/syslog.go     |   2 +-
 server/pkg/biz/assert.go                      |   2 +-
 server/pkg/errorx/bizerror.go                 |  18 +++++++-------
 server/pkg/model/result.go                    |   2 +-
 server/pkg/req/log_handler.go                 |   2 +-
 server/pkg/req/req_ctx.go                     |   2 +-
 server/resources/data/mayfly-go.sqlite        | Bin 335872 -> 335872 bytes
 server/resources/script/sql/mayfly-go.sql     |   1 +
 .../script/sql/{v1.8 => v1.9}/v1.9.0.sql      |   6 +++++
 26 files changed, 60 insertions(+), 59 deletions(-)
 rename server/resources/script/sql/{v1.8 => v1.9}/v1.9.0.sql (91%)

diff --git a/Dockerfile b/Dockerfile
index e8fd8380..2cab9fe1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,7 +10,7 @@ RUN yarn config set registry 'https://registry.npmmirror.com' && \
     yarn build
 
 # 构建后端资源
-FROM golang:1.22 as be-builder
+FROM golang:1.23 as be-builder
 
 ENV GOPROXY https://goproxy.cn
 WORKDIR /mayfly
diff --git a/mayfly_go_web/package.json b/mayfly_go_web/package.json
index 64dfe508..b44e3461 100644
--- a/mayfly_go_web/package.json
+++ b/mayfly_go_web/package.json
@@ -1,6 +1,7 @@
 {
     "name": "mayfly",
     "version": "1.0.0",
+    "type": "module",
     "scripts": {
       "dev": "vite",
       "build": "vite build",
@@ -32,7 +33,7 @@
       "screenfull": "^6.0.2",
       "sortablejs": "^1.15.3",
       "splitpanes": "^3.1.5",
-      "sql-formatter": "^15.4.2",
+      "sql-formatter": "^15.4.5",
       "trzsz": "^1.1.5",
       "uuid": "^9.0.1",
       "vue": "^3.5.12",
@@ -59,7 +60,7 @@
       "prettier": "^3.2.5",
       "sass": "^1.80.3",
       "typescript": "^5.6.3",
-      "vite": "^5.4.9",
+      "vite": "^5.4.10",
       "vue-eslint-parser": "^9.4.3"
     },
     "browserslist": [
diff --git a/mayfly_go_web/src/components/file/FileInfo.vue b/mayfly_go_web/src/components/file/FileInfo.vue
index 71cb48d4..087f7c51 100644
--- a/mayfly_go_web/src/components/file/FileInfo.vue
+++ b/mayfly_go_web/src/components/file/FileInfo.vue
@@ -1,9 +1,9 @@
 <template>
-    <el-tooltip :content="formatByteSize(fileDetail.size)" placement="left">
+    <el-tooltip :content="formatByteSize(fileDetail?.size)" placement="left">
         <el-link v-if="props.canDownload" target="_blank" rel="noopener noreferrer" icon="Download" type="primary" :href="getFileUrl(props.fileKey)"></el-link>
     </el-tooltip>
 
-    {{ fileDetail.filename }}
+    {{ fileDetail?.filename }}
 </template>
 
 <script lang="ts" setup>
diff --git a/mayfly_go_web/src/views/flow/ProcdefEdit.vue b/mayfly_go_web/src/views/flow/ProcdefEdit.vue
index 365fe0cd..253dc06c 100755
--- a/mayfly_go_web/src/views/flow/ProcdefEdit.vue
+++ b/mayfly_go_web/src/views/flow/ProcdefEdit.vue
@@ -162,7 +162,7 @@ watch(props, (newValue: any) => {
     } else {
         state.form = { status: ProcdefStatus.Enable.value } as any;
         state.form.condition = `{{/* DBMS-执行sql规则;  param参数描述如下 */}}
-{{/* stmtType: select / read / insert / update / delete ;  */}}
+{{/* stmtType: select / read / insert / update / delete / ddl ;  */}}
 {{ if eq .bizType "db_sql_exec_flow"}}
     {{/* 不是select和read语句时，开启流程审批 */}}
     {{ if and (ne .param.stmtType "select") (ne .param.stmtType "read") }}
diff --git a/mayfly_go_web/src/views/ops/db/component/sqleditor/DbSqlEditor.vue b/mayfly_go_web/src/views/ops/db/component/sqleditor/DbSqlEditor.vue
index 381a2dfc..3660be0d 100644
--- a/mayfly_go_web/src/views/ops/db/component/sqleditor/DbSqlEditor.vue
+++ b/mayfly_go_web/src/views/ops/db/component/sqleditor/DbSqlEditor.vue
@@ -28,7 +28,7 @@
                         :limit="100"
                     >
                         <el-tooltip :show-after="1000" class="box-item" effect="dark" content="SQL脚本执行" placement="top">
-                            <el-link type="success" :underline="false" icon="Document"></el-link>
+                            <el-link v-auth="'db:sqlscript:run'" type="success" :underline="false" icon="Document"></el-link>
                         </el-tooltip>
                     </el-upload>
                 </div>
diff --git a/mayfly_go_web/src/views/ops/db/db.ts b/mayfly_go_web/src/views/ops/db/db.ts
index b1763424..2cdd4807 100644
--- a/mayfly_go_web/src/views/ops/db/db.ts
+++ b/mayfly_go_web/src/views/ops/db/db.ts
@@ -403,8 +403,9 @@ export class DbInst {
         dbInst.type = inst.type;
         dbInst.databases = inst.databases;
 
-        // 获取兼容版本信息
-        dbInst.version = await dbApi.getCompatibleDbVersion.request({ id: inst.id, db: dbInst.databases[0] });
+        if (dbInst.databases?.[0]) {
+            dbInst.version = await dbApi.getCompatibleDbVersion.request({ id: inst.id, db: dbInst.databases?.[0] });
+        }
 
         dbInstCache.set(dbInst.id, dbInst);
         return dbInst;
diff --git a/server/go.mod b/server/go.mod
index 3d1e4b04..826fe660 100644
--- a/server/go.mod
+++ b/server/go.mod
@@ -25,7 +25,7 @@ require (
 	github.com/pkg/errors v0.9.1
 	github.com/pkg/sftp v1.13.6
 	github.com/pquerna/otp v1.4.0
-	github.com/redis/go-redis/v9 v9.6.1
+	github.com/redis/go-redis/v9 v9.7.0
 	github.com/robfig/cron/v3 v3.0.1 // 定时任务
 	github.com/sijms/go-ora/v2 v2.8.22
 	github.com/stretchr/testify v1.9.0
diff --git a/server/internal/db/application/db.go b/server/internal/db/application/db.go
index 4e3cc2c2..f6207977 100644
--- a/server/internal/db/application/db.go
+++ b/server/internal/db/application/db.go
@@ -84,10 +84,6 @@ func (d *dbAppImpl) SaveDb(ctx context.Context, dbEntity *entity.Db) error {
 		if err == nil {
 			return errorx.NewBiz("该实例下数据库名已存在")
 		}
-		if d.CountByCond(&entity.Db{Name: dbEntity.Name}) > 0 {
-			return errorx.NewBiz("该编码已存在")
-		}
-
 		dbEntity.Code = stringx.Rand(10)
 
 		return d.Tx(ctx, func(ctx context.Context) error {
diff --git a/server/internal/db/application/db_instance.go b/server/internal/db/application/db_instance.go
index d44e63fe..d71dc407 100644
--- a/server/internal/db/application/db_instance.go
+++ b/server/internal/db/application/db_instance.go
@@ -105,10 +105,6 @@ func (app *instanceAppImpl) SaveDbInstance(ctx context.Context, instance *dto.Sa
 		if err == nil {
 			return 0, errorx.NewBiz("该数据库实例已存在")
 		}
-		if app.CountByCond(&entity.DbInstance{Name: instanceEntity.Name}) > 0 {
-			return 0, errorx.NewBiz("该名称已存在")
-		}
-
 		instanceEntity.Code = stringx.Rand(10)
 
 		return instanceEntity.Id, app.Tx(ctx, func(ctx context.Context) error {
diff --git a/server/internal/db/application/db_transfer.go b/server/internal/db/application/db_transfer.go
index 90b189e1..b214701b 100644
--- a/server/internal/db/application/db_transfer.go
+++ b/server/internal/db/application/db_transfer.go
@@ -184,7 +184,6 @@ func (app *dbTransferAppImpl) CreateLog(ctx context.Context, taskId uint64) (uin
 }
 
 func (app *dbTransferAppImpl) Run(ctx context.Context, taskId uint64, logId uint64) {
-
 	task, err := app.GetById(taskId)
 	if err != nil {
 		logx.Errorf("创建DBMS-执行数据迁移日志失败：%v", err)
@@ -288,15 +287,16 @@ func (app *dbTransferAppImpl) transfer2File(ctx context.Context, taskId uint64,
 	}
 	// 2、把源库数据迁移到文件
 	app.Log(ctx, logId, fmt.Sprintf("开始迁移表数据到文件： %s", filename))
-
 	app.Log(ctx, logId, fmt.Sprintf("目标库文件语言类型： %s", task.TargetFileDbType))
 
 	go func() {
-		defer saveFileFunc()
+		var err error
+		defer saveFileFunc(&err)
 		defer app.MarkStop(taskId)
 		defer app.logApp.Flush(logId, true)
 		ctx = context.Background()
-		err := app.dbApp.DumpDb(ctx, &dto.DumpDb{
+
+		err = app.dbApp.DumpDb(ctx, &dto.DumpDb{
 			LogId:        logId,
 			DbId:         uint64(task.SrcDbId),
 			DbName:       task.SrcDbName,
@@ -313,8 +313,6 @@ func (app *dbTransferAppImpl) transfer2File(ctx context.Context, taskId uint64,
 			app.EndTransfer(ctx, logId, taskId, "数据库迁移失败", err, nil)
 			tFile.Status = entity.DbTransferFileStatusFail
 			_ = app.transferFileApp.UpdateById(ctx, tFile)
-			// 删除文件
-			_ = app.fileApp.Remove(ctx, fileKey)
 			return
 		}
 		app.EndTransfer(ctx, logId, taskId, "数据库迁移完成", err, nil)
@@ -323,7 +321,6 @@ func (app *dbTransferAppImpl) transfer2File(ctx context.Context, taskId uint64,
 		tFile.FileKey = fileKey
 		_ = app.transferFileApp.UpdateById(ctx, tFile)
 	}()
-
 }
 
 func (app *dbTransferAppImpl) Stop(ctx context.Context, taskId uint64) error {
diff --git a/server/internal/db/router/db.go b/server/internal/db/router/db.go
index e41a42f4..f769136e 100644
--- a/server/internal/db/router/db.go
+++ b/server/internal/db/router/db.go
@@ -36,7 +36,7 @@ func InitDbRouter(router *gin.RouterGroup) {
 
 		req.NewPost(":dbId/exec-sql", d.ExecSql).Log(req.NewLog("db-执行Sql")),
 
-		req.NewPost(":dbId/exec-sql-file", d.ExecSqlFile).Log(req.NewLogSave("db-执行Sql文件")),
+		req.NewPost(":dbId/exec-sql-file", d.ExecSqlFile).Log(req.NewLogSave("db-执行Sql文件")).RequiredPermissionCode("db:sqlscript:run"),
 
 		req.NewGet(":dbId/dump", d.DumpSql).Log(req.NewLogSave("db-导出sql文件")).NoRes(),
 
diff --git a/server/internal/file/application/file.go b/server/internal/file/application/file.go
index e3f01eaf..8f441eb6 100644
--- a/server/internal/file/application/file.go
+++ b/server/internal/file/application/file.go
@@ -41,8 +41,8 @@ type File interface {
 	//
 	// @return writer 文件writer
 	//
-	// @return saveFunc 保存文件信息的回调函数 (必须要defer中调用才会入库保存该文件信息)
-	NewWriter(ctx context.Context, canEmptyFileKey string, filename string) (fileKey string, writer *writerx.CountingWriteCloser, saveFunc func() error, err error)
+	// @return saveFunc(*error) 保存文件信息的回调函数 (必须要defer中调用才会入库保存该文件信息)，若*error不为nil则表示业务逻辑处理失败，不需要保存文件信息并将创建的文件删除
+	NewWriter(ctx context.Context, canEmptyFileKey string, filename string) (fileKey string, writer *writerx.CountingWriteCloser, saveFunc func(*error) error, err error)
 
 	// GetReader 获取文件reader
 	//
@@ -66,19 +66,20 @@ func (f *fileAppImpl) InjectFileRepo(repo repository.File) {
 }
 
 func (f *fileAppImpl) Upload(ctx context.Context, fileKey string, filename string, r io.Reader) (string, error) {
+	var err error
 	fileKey, writer, saveFileFunc, err := f.NewWriter(ctx, fileKey, filename)
 	if err != nil {
 		return fileKey, err
 	}
-	defer saveFileFunc()
+	defer saveFileFunc(&err)
 
-	if _, err := io.Copy(writer, r); err != nil {
+	if _, err = io.Copy(writer, r); err != nil {
 		return fileKey, err
 	}
 	return fileKey, nil
 }
 
-func (f *fileAppImpl) NewWriter(ctx context.Context, canEmptyFileKey string, filename string) (fileKey string, writer *writerx.CountingWriteCloser, saveFunc func() error, err error) {
+func (f *fileAppImpl) NewWriter(ctx context.Context, canEmptyFileKey string, filename string) (fileKey string, writer *writerx.CountingWriteCloser, saveFunc func(*error) error, err error) {
 	isNewFile := true
 	file := &entity.File{}
 
@@ -109,7 +110,16 @@ func (f *fileAppImpl) NewWriter(ctx context.Context, canEmptyFileKey string, fil
 	fileKey = canEmptyFileKey
 	writer = writerx.NewCountingWriteCloser(w)
 	// 创建回调函数
-	saveFunc = func() error {
+	saveFunc = func(e *error) error {
+		if e != nil {
+			err := *e
+			if err != nil {
+				logx.Errorf("写入文件业务逻辑处理失败: %s", err.Error())
+				// 删除已经创建的文件
+				f.remove(ctx, file)
+				return err
+			}
+		}
 		// 获取已写入的字节数
 		file.Size = writer.BytesWritten()
 		writer.Close()
diff --git a/server/internal/machine/api/machine_file.go b/server/internal/machine/api/machine_file.go
index ca0d850b..70e6e836 100644
--- a/server/internal/machine/api/machine_file.go
+++ b/server/internal/machine/api/machine_file.go
@@ -323,7 +323,7 @@ func (m *MachineFile) UploadFolder(rc *req.Ctx) {
 					isSuccess = false
 					logx.Errorf("文件上传失败: %s", err)
 					switch t := err.(type) {
-					case errorx.BizError:
+					case *errorx.BizError:
 						m.MsgApp.CreateAndSend(la, msgdto.ErrSysMsg("文件上传失败", fmt.Sprintf("执行文件上传失败：\n<-e errCode: %d, errMsg: %s", t.Code(), t.Error())))
 					}
 				}
diff --git a/server/internal/machine/application/machine.go b/server/internal/machine/application/machine.go
index 66836f0e..bc550b8e 100644
--- a/server/internal/machine/application/machine.go
+++ b/server/internal/machine/application/machine.go
@@ -105,9 +105,6 @@ func (m *machineAppImpl) SaveMachine(ctx context.Context, param *dto.SaveMachine
 		if err == nil {
 			return errorx.NewBiz("该机器信息已存在")
 		}
-		if m.CountByCond(&entity.Machine{Name: me.Name}) > 0 {
-			return errorx.NewBiz("该名称已存在")
-		}
 
 		// 新增机器，默认启用状态
 		me.Status = entity.MachineStatusEnable
diff --git a/server/internal/machine/application/machine_term_op.go b/server/internal/machine/application/machine_term_op.go
index fade0851..fb7a8beb 100644
--- a/server/internal/machine/application/machine_term_op.go
+++ b/server/internal/machine/application/machine_term_op.go
@@ -49,6 +49,7 @@ func (m *machineTermOpAppImpl) InjectMachineTermOpRepo(repo repository.MachineTe
 func (m *machineTermOpAppImpl) TermConn(ctx context.Context, cli *mcm.Cli, wsConn *websocket.Conn, rows, cols int) error {
 	var recorder *mcm.Recorder
 	var termOpRecord *entity.MachineTermOp
+	var err error
 
 	// 开启终端操作记录
 	if cli.Info.EnableRecorder == 1 {
@@ -68,7 +69,7 @@ func (m *machineTermOpAppImpl) TermConn(ctx context.Context, cli *mcm.Cli, wsCon
 		if err != nil {
 			return errorx.NewBiz("创建终端回放记录文件失败: %s", err.Error())
 		}
-		defer saveFileFunc()
+		defer saveFileFunc(&err)
 
 		termOpRecord.FileKey = fileKey
 		recorder = mcm.NewRecorder(wc)
diff --git a/server/internal/mongo/application/mongo.go b/server/internal/mongo/application/mongo.go
index a123b04f..9fe93e01 100644
--- a/server/internal/mongo/application/mongo.go
+++ b/server/internal/mongo/application/mongo.go
@@ -78,14 +78,13 @@ func (d *mongoAppImpl) TestConn(me *entity.Mongo) error {
 }
 
 func (d *mongoAppImpl) SaveMongo(ctx context.Context, m *entity.Mongo, tagCodePaths ...string) error {
-	oldMongo := &entity.Mongo{Name: m.Name, SshTunnelMachineId: m.SshTunnelMachineId}
+	oldMongo := &entity.Mongo{Uri: m.Uri, SshTunnelMachineId: m.SshTunnelMachineId}
 	err := d.GetByCond(oldMongo)
 
 	if m.Id == 0 {
 		if err == nil {
-			return errorx.NewBiz("该名称已存在")
+			return errorx.NewBiz("该信息已存在")
 		}
-
 		// 生成随机编号
 		m.Code = stringx.Rand(10)
 
@@ -105,7 +104,7 @@ func (d *mongoAppImpl) SaveMongo(ctx context.Context, m *entity.Mongo, tagCodePa
 
 	// 如果存在该库，则校验修改的库是否为该库
 	if err == nil && oldMongo.Id != m.Id {
-		return errorx.NewBiz("该名称已存在")
+		return errorx.NewBiz("该信息已存在")
 	}
 	// 如果调整了ssh等会查不到旧数据，故需要根据id获取旧信息将code赋值给标签进行关联
 	if oldMongo.Code == "" {
diff --git a/server/internal/redis/application/redis.go b/server/internal/redis/application/redis.go
index 869c5bbf..add4879c 100644
--- a/server/internal/redis/application/redis.go
+++ b/server/internal/redis/application/redis.go
@@ -103,10 +103,6 @@ func (r *redisAppImpl) SaveRedis(ctx context.Context, param *dto.SaveRedis) erro
 		if err == nil {
 			return errorx.NewBiz("该实例已存在")
 		}
-		if r.CountByCond(&entity.Redis{Name: re.Name}) > 0 {
-			return errorx.NewBiz("该名称已存在")
-		}
-
 		// 生成随机编号
 		re.Code = stringx.Rand(10)
 
diff --git a/server/internal/sys/application/syslog.go b/server/internal/sys/application/syslog.go
index d8aa8ae7..6b279fa7 100644
--- a/server/internal/sys/application/syslog.go
+++ b/server/internal/sys/application/syslog.go
@@ -96,7 +96,7 @@ func (m *syslogAppImpl) SaveFromReq(req *req.Ctx) {
 		syslog.Type = entity.SyslogTypeError
 		var errMsg string
 		switch t := err.(type) {
-		case errorx.BizError:
+		case *errorx.BizError:
 			errMsg = fmt.Sprintf("errCode: %d, errMsg: %s", t.Code(), t.Error())
 		case error:
 			errMsg = t.Error()
diff --git a/server/pkg/biz/assert.go b/server/pkg/biz/assert.go
index 94ecdf59..efc4745c 100644
--- a/server/pkg/biz/assert.go
+++ b/server/pkg/biz/assert.go
@@ -42,7 +42,7 @@ func IsTrue(exp bool, msg string, params ...any) {
 	}
 }
 
-func IsTrueBy(exp bool, err errorx.BizError) {
+func IsTrueBy(exp bool, err *errorx.BizError) {
 	if !exp {
 		panic(err)
 	}
diff --git a/server/pkg/errorx/bizerror.go b/server/pkg/errorx/bizerror.go
index 981e5ebf..bc29e619 100644
--- a/server/pkg/errorx/bizerror.go
+++ b/server/pkg/errorx/bizerror.go
@@ -11,11 +11,11 @@ type BizError struct {
 }
 
 var (
-	Success            BizError = NewBizCode(200, "success")
-	BizErr             BizError = NewBizCode(400, "biz error")
-	ServerError        BizError = NewBizCode(500, "server error")
-	PermissionErr      BizError = NewBizCode(501, "token error")
-	AccessTokenInvalid BizError = NewBizCode(502, "access token invalid")
+	Success            *BizError = NewBizCode(200, "success")
+	BizErr             *BizError = NewBizCode(400, "biz error")
+	ServerError        *BizError = NewBizCode(500, "server error")
+	PermissionErr      *BizError = NewBizCode(501, "token error")
+	AccessTokenInvalid *BizError = NewBizCode(502, "access token invalid")
 )
 
 // 错误消息
@@ -33,11 +33,11 @@ func (e BizError) String() string {
 }
 
 // 创建业务逻辑错误结构体，默认为业务逻辑错误
-func NewBiz(msg string, formats ...any) BizError {
-	return BizError{code: BizErr.code, err: fmt.Sprintf(msg, formats...)}
+func NewBiz(msg string, formats ...any) *BizError {
+	return &BizError{code: BizErr.code, err: fmt.Sprintf(msg, formats...)}
 }
 
 // 创建业务逻辑错误结构体，可设置指定错误code
-func NewBizCode(code int16, msg string, formats ...any) BizError {
-	return BizError{code: code, err: fmt.Sprintf(msg, formats...)}
+func NewBizCode(code int16, msg string, formats ...any) *BizError {
+	return &BizError{code: code, err: fmt.Sprintf(msg, formats...)}
 }
diff --git a/server/pkg/model/result.go b/server/pkg/model/result.go
index c94e37c6..8f4878b0 100644
--- a/server/pkg/model/result.go
+++ b/server/pkg/model/result.go
@@ -44,7 +44,7 @@ func SuccessNoData() *Result {
 	return &Result{Code: SuccessCode, Msg: SuccessMsg}
 }
 
-func Error(bizerr errorx.BizError) *Result {
+func Error(bizerr *errorx.BizError) *Result {
 	return &Result{Code: bizerr.Code(), Msg: bizerr.Error()}
 }
 
diff --git a/server/pkg/req/log_handler.go b/server/pkg/req/log_handler.go
index 9ca9b960..abe4f38c 100644
--- a/server/pkg/req/log_handler.go
+++ b/server/pkg/req/log_handler.go
@@ -125,7 +125,7 @@ func getErrMsg(rc *Ctx, err any) string {
 	nFrames := DefaultLogFrames
 	var errMsg string
 	switch t := err.(type) {
-	case errorx.BizError:
+	case *errorx.BizError:
 		errMsg = fmt.Sprintf("\n<-e %s", t.String())
 		nFrames = nFrames / 2
 	case error:
diff --git a/server/pkg/req/req_ctx.go b/server/pkg/req/req_ctx.go
index 6acee802..3b10393a 100644
--- a/server/pkg/req/req_ctx.go
+++ b/server/pkg/req/req_ctx.go
@@ -102,7 +102,7 @@ func (rc *Ctx) GetLogInfo() *LogInfo {
 func (rc *Ctx) res() {
 	if err := rc.Error; err != nil {
 		switch t := err.(type) {
-		case errorx.BizError:
+		case *errorx.BizError:
 			rc.JSONRes(http.StatusOK, model.Error(t))
 		default:
 			logx.ErrorTrace("服务器错误", t)
diff --git a/server/resources/data/mayfly-go.sqlite b/server/resources/data/mayfly-go.sqlite
index df189dffa6eeb202f03f93233f737cf66a2543fe..f85a20fad26abbec2b57eb5fb688ea150164833c 100644
GIT binary patch
delta 1911
zcmah}e{2-T72cV7vwOdH?X!It>|o<K#Iet3&QKx{#OA=pfiwputxDC}=kpot+@10H
z9BhNJeLEo{X#;dahqkm;Nm~9%Yo|v&q*99&B`WG44VBuoe^e=@h?pn@s3IyAOgigJ
zDpjh~UA?EbpWeLr=FPWnYQAJ@zU0L6V$H88%5G`fr6ENjZ=Y-kS4gz6??WmfO@B{%
zWw-u`epO%4|D}KY#(1~>2&<D|lvPP@m=n@(VVd+$vVioOIVk-O=KHyU3|-%(xb)Sk
zzFJS}d-X`(s0!$lC7VbPWxG<b`2PNMqH8#w=|7OA`b|ZJY-tOrgKXFE*l<@SF+4bu
zi6{0gd#%QJg4D_-HXI*J_x0~{8k@;#X90=D<AWpVEH&Depll+R>PjV2J&BBS8!4Ab
zHd3;cgzPZ3Z%0=)lSs(&$yhewjgaaByo8o*A<dsv%?u{(qyh(DE2;i$e;d~%EvGzY
zasEzdxj~-R@8ydO74jupZ?0I0XBAK`Df-X6Z+Zq~@cC;hORrVc-G{bWi;G)GubIvt
z?z@h#^OyPF{Z|my{+w?cm`7MGvmD7DP!u{Ve&?qjAQ_T(_?xBlYj)Hto-LyuEJL(M
z99l-BC_j+o=1R%PsU#I|+P%?r(dp18)O++O+?A01v|2?*wbgpN9*(KzME=0tV}K6x
zBj1GM=#cQe3`2-an&Z}k`;&&LnPXa@xfwmbE*tAfCit!#`16rF&mwd%Kl6_~B4cLO
znpzB@4r_L?16ar$&Wl(WqXYR5<1gd$$UTp~C_MA%eZ6ew(V3}xK}n!(+NQD17TaT0
zXHPV}hG)Mu59B#g!L=5+<{Tl<kaqF~QX!l9DCSQ@;43w&NCbL&Qp4fq*k~v*8cW1u
z;nC2Z_O@ti^S1GjtqpNH0!h!SaH8r3xPk>-A&a3($1TN$n4-Q;u8|BW!4xsy8u$0z
zLFW&gr)2$ZbSg?!a)c2+It@o4=Vn+O&VdK145@*dTI&u9@E@DdLI#<_PacOscz&xn
zDQ=kX8;p*KH;zIp#>$L!;O^OSl{r-VY>Me-TA^{93XO|>0Dd7|3Sp-5%L_1w85ONJ
z-~<M92LsVC1s#abYSgeU_WOC&E$BLrz!1;`_w~8UfDD0V;Zq&C^2qp9KN)pbJ}x&}
zFKwN)ozmK*HAt(pO<wXJ?4t=h1P^@3^(r!q6|RgF#u>$NP;H01WEJ|8&+nOVy`!9Q
z2V{ONxH9P5{BI-hWyq~(0r7DL)+5NZGr#B^gLVXFloj)tafpbyZYdYcig;@`H1hBD
zfJaRCK&gZbaXJo-7&Bd5O29vD$ts=JuWmmL=2})J>as8=vr2{B<`v{*C0ZaDL@!XQ
z+x1h+)9<w&a_{CZj>3DdASlz6vx@76<L_z{eTy8#_vPnzlusnpoP9K4Ut&I4Ic{C<
zYqTEpXyU8;;i4?=<rM=kj+sZC9)RtVikn|eLJBjN*p-4A3=A`;)qcBHJb4BFDi=6J
z{Z;VOxhQ~f4(7oiMf4-C&EjfIKawhWi|W(r(F<2E)f6izf}Hh1?*1cG#{Q!}+_`J#
z0{iauGp}Dic5dNE-{|exFg%njOtcM|k+iMP^hh!p>rM5imt43hyf(O|DHv|9TC;9L
zIJ{v^_<ulRY!1KV6kx!jUg_SbI51J1o$6(E0QS&ZnE1|lo>O*s$~}f`N)X%|(FHN&
zpua%mDfW=ad+AeBUIA7irVar|WRz8MI0U04&X)7#6Oh2HTue{Eq|EAN%Y-@v*X#>J
z8@asu-+NS6Q_%BXwu<{5v>LVZbq@MCupp}vbuJo`&0Q(>dgwFgVXy1giW7AzzU{7<
z<1dbJtr>1X8lOX*-XD55yE|PsUDsqU>z4jF$VFM5J+pSp_CG4#EvIkGU^PFrg04jk
z{I@HpoF*;o5%DgfEf{hURx7Rp-71qF<_#*1VOArKt28Hp|E4DA;)`7NV3lMaDzJ~U
zM!wHa<!OWV7+sKS8u*1$+J#v?FE67}%pT)%l<u)5T5UJ*Jd*M&*0c`Ad;4?t&U&pw
g@^99_{5orrgZh2>Lu_Ut@slEItM32rQ5e_%1|26T>i_@%

delta 1775
zcmZ8hYitx%6u$S)nVH?$9cD{wS02)>SOKLEp|w2hi}EU^bU^{@gKfKPq0ptJ-NsTZ
zeO#ax5-ALE@P`J9g0VrWqulsMtI=pg6HN>;F+w#egalI%OK2;2rmgWYH}~8-U(UJb
zJLlYc+WHgP`V+dRPF4&;$U2-WaZ*C0;=^<2O-D4X>Z**8YFt1`))_w;zZt{EP2<Yj
z&E>{}Jd9wFmpK|d1LX={iqgjyp)BRgQ5Nz1ck00B)r=gMQEjX@t{FMDFW@&02VJeR
zAr@-b)ex$WG}JcM-}9(6=RZI=QuX<wb8cUzG|N4%SP>4_HtvX3*CouCQfVv{tq5<e
z-Vq5kgzKy8VzTeCG0j+{A{vTDqLq<)_hM-Z+B!(WA}QV3R%{8y>LU?!T3AyNi|7lb
z<bT153#9oI&gyGx94&`hI5H_)N=AocY!O!xa{IER6#IJmRG+lO7_sAg3fKutuT4vG
zl@o>9#CS`8-@8p|l76N3_#pe7VFt>pB;xtS{-Ek13VYLehMhMukGWD+|IC@RD{Out
zpD+WXY33_RoLzS3GzGqyKWu+l{wrmmi4wnjkpdxXwn(2Mf8cCMm33W{EA4GH7Egjo
zqS64-TUaj*ct<?@wIQVjbqIol6qs?oWV2xKVKmda%(}rM+_=wMr;bAyxXK^3+ixA9
zG}HFpwkhbhnTF&P23-nYWY-OL0bOVg-#kPY*a!Y-pfuaOGt?^W;*Xdg52w>rX2z|1
zOm!sFp{JUi<x8YoK4+ZfyVTQ9=L&B>y=WvZ-+#7kBo*nbZbw1ZIM?o>Ku>qZYpm}`
z8%RE7m!*CU$(Yo&ir94l4!Tc5cc2pnn1BK4&-BxD0DOW5;BJztp>d;>XQ_ScXSGS%
zCY4EfXjsCm={749$81*PJq>-}yVp%>iC*Hpq#f0!s2|FoNJm*Ashu?QaKSWdPaG(q
z4@>RV@KHzu9^|Fg*=8sd)g~OGjIR-hm*S>G6u$&%jPccC_c6GI72Lp!1?F!fVympX
zJ<!Z}k=T6_RwA&{`t)^(GQL7&o`SP%wiE8ew*c2HoXc>|#pyhk)f4~sVVS-i<0RNl
zxHD<4PKWSPH4^2F^o#ML)XAFgCk?fo@9!12Mk@=7tQk;5r9C{~>WqUu;2I<y=G~z^
z(Ba{E!aW(hRN=Xbe`bn#o%*eL@sJPumh#8Mm3a7!(Z!-K5egVnUj2W;chbp@3x9eR
zZBMD*u{qLI%X6&8c&MeCP5bU9VeJG2VbnO+4_F^O_fO*i&o@LN$wcpS=eWL7bJ;AC
z?7if@K=v~3kayPQ;_@2+n672w+M5tB`?!ZMRsHkl(|tLyiprXZ_0bfF7bv1wfkG=|
z8q_krM4Xrg-3*LYddZ2IQm?{`l(9p%|C4zOGamw8%nKZ)^J5RD-FhJoT4v~4FL6^w
z+~sP6`~#%0tCZ<2y5IA>hiW&l1{cTg1wO#_V&iT2nL<Z4e?lDZhHQM6nf!4vCkE$`
z(>n2EBOIk}zE<_8rqWK?EZ5FhXC{Mg&hV_W4m81cj0eT{hhYV^dYfTo9DjP8Dfja-
z)!)RQvS7D!b;?BBZa9WVZnUC95Mg|SXm5d57SQ1U(dc;shJMz&K}&H(T|VWYG6#M_
za04kpx*6ki2~n~{FOzrT<;>?{@jJ-*Oqy`f<TQ*YEp+k(bQJPRk*&&0(Orer;*u*E
zFBbzYxdVZaHGLG4X|a_%3JaWIH;K|gc#le{{8`aF3h7v{XGHHESdVT>_|rnY0VV8y
z-5ZZIdx+<V`@HKpWs8z1zbAbmZKgewW;msxFXQ8ErW1+H<uy)!_z?YVw+1yC<K2dh
z@iLV*@oK9;mqUziwR&_p$oLjptM)SJ2=Xd>>h>TOppZwLI6pz_&DKtkGwCwx6v$3b
QV;(1Ll>y(xqvK8UFB|3r00000

diff --git a/server/resources/script/sql/mayfly-go.sql b/server/resources/script/sql/mayfly-go.sql
index 8af3598c..1be3c88b 100644
--- a/server/resources/script/sql/mayfly-go.sql
+++ b/server/resources/script/sql/mayfly-go.sql
@@ -859,6 +859,7 @@ INSERT INTO `t_sys_resource` (`id`, `pid`, `type`, `status`, `name`, `code`, `we
 INSERT INTO t_sys_resource (id, pid, ui_path, `type`, status, name, code, weight, meta, creator_id, creator, modifier_id, modifier, create_time, update_time, is_deleted, delete_time) VALUES(1714032002, 1713875842, '12sSjal1/UnWIUhW0/0tJwC3Gf/', 2, 1, '命令配置-删除', 'cmdconf:del', 1714032002, 'null', 1, 'admin', 1, 'admin', '2024-04-25 16:00:02', '2024-04-25 16:00:02', 0, NULL);
 INSERT INTO t_sys_resource (id, pid, ui_path, `type`, status, name, code, weight, meta, creator_id, creator, modifier_id, modifier, create_time, update_time, is_deleted, delete_time) VALUES(1714031981, 1713875842, '12sSjal1/UnWIUhW0/tEzIKecl/', 2, 1, '命令配置-保存', 'cmdconf:save', 1714031981, 'null', 1, 'admin', 1, 'admin', '2024-04-25 15:59:41', '2024-04-25 15:59:41', 0, NULL);
 INSERT INTO t_sys_resource (id, pid, ui_path, `type`, status, name, code, weight, meta, creator_id, creator, modifier_id, modifier, create_time, update_time, is_deleted, delete_time) VALUES(1713875842, 2, '12sSjal1/UnWIUhW0/', 1, 1, '安全配置', 'security', 1713875842, '{"component":"ops/machine/security/SecurityConfList","icon":"Setting","isKeepAlive":true,"routeName":"SecurityConfList"}', 1, 'admin', 1, 'admin', '2024-04-23 20:37:22', '2024-04-23 20:37:22', 0, NULL);
+INSERT INTO `t_sys_resource` (`id`, `pid`, `ui_path`, `type`, `status`, `name`, `code`, `weight`, `meta`, `creator_id`, `creator`, `modifier_id`, `modifier`, `create_time`, `update_time`, `is_deleted`, `delete_time`) VALUES(1729668131, 38, 'dbms23ax/exaeca2x/TGFPA3Ez/', 2, 1, 'SQL脚本执行', 'db:sqlscript:run', 1729668131, 'null', 1, 'admin', 1, 'admin', '2024-10-23 15:22:12', '2024-10-23 15:22:12', 0, NULL);
 COMMIT;
 
 -- ----------------------------
diff --git a/server/resources/script/sql/v1.8/v1.9.0.sql b/server/resources/script/sql/v1.9/v1.9.0.sql
similarity index 91%
rename from server/resources/script/sql/v1.8/v1.9.0.sql
rename to server/resources/script/sql/v1.9/v1.9.0.sql
index c84f411f..5bcee71a 100644
--- a/server/resources/script/sql/v1.8/v1.9.0.sql
+++ b/server/resources/script/sql/v1.9/v1.9.0.sql
@@ -8,6 +8,7 @@ INSERT INTO `t_sys_resource` (`id`, `pid`, `type`, `status`, `name`, `code`, `we
 INSERT INTO `t_sys_resource` (`id`, `pid`, `type`, `status`, `name`, `code`, `weight`, `meta`, `creator_id`, `creator`, `modifier_id`, `modifier`, `create_time`, `update_time`, `ui_path`, `is_deleted`, `delete_time`) VALUES(1724395850, 1709194669, 2, 1, '文件-下载', 'db:transfer:files:down', 1724395850, 'null', 12, 'liuzongyang', 12, 'liuzongyang', '2024-08-23 14:50:51', '2024-08-23 14:50:51', 'SmLcpu6c/FmqK4azt/', 0, NULL);
 INSERT INTO `t_sys_resource` (`id`, `pid`, `type`, `status`, `name`, `code`, `weight`, `meta`, `creator_id`, `creator`, `modifier_id`, `modifier`, `create_time`, `update_time`, `ui_path`, `is_deleted`, `delete_time`) VALUES(1724398262, 1709194669, 2, 1, '文件', 'db:transfer:files', 1724376021, 'null', 12, 'liuzongyang', 12, 'liuzongyang', '2024-08-23 15:31:02', '2024-08-23 15:31:16', 'SmLcpu6c/btVtrbhk/', 0, NULL);
 INSERT INTO `t_sys_resource` (`id`, `pid`, `type`, `status`, `name`, `code`, `weight`, `meta`, `creator_id`, `creator`, `modifier_id`, `modifier`, `create_time`, `update_time`, `ui_path`, `is_deleted`, `delete_time`) VALUES(1724998419, 1709194669, 2, 1, '文件-执行', 'db:transfer:files:run', 1724998419, 'null', 12, 'liuzongyang', 12, 'liuzongyang', '2024-08-30 14:13:39', '2024-08-30 14:13:39', 'SmLcpu6c/qINungml/', 0, NULL);
+INSERT INTO `t_sys_resource` (`id`, `pid`, `ui_path`, `type`, `status`, `name`, `code`, `weight`, `meta`, `creator_id`, `creator`, `modifier_id`, `modifier`, `create_time`, `update_time`, `is_deleted`, `delete_time`) VALUES(1729668131, 38, 'dbms23ax/exaeca2x/TGFPA3Ez/', 2, 1, 'SQL脚本执行', 'db:sqlscript:run', 1729668131, 'null', 1, 'admin', 1, 'admin', '2024-10-23 15:22:12', '2024-10-23 15:22:12', 0, NULL);
 
 -- 新增数据库迁移相关的系统配置
 DELETE FROM `t_sys_config` WHERE `key` = 'DbBackupRestore';
@@ -46,6 +47,11 @@ CREATE TABLE `t_db_transfer_files` (
 ALTER TABLE `t_flow_procdef`
     ADD COLUMN `condition` text NULL comment '触发审批的条件（计算结果返回1则需要启用该流程）';
 
+UPDATE `t_flow_procinst` 
+SET `biz_type` = 'redis_run_cmd_flow' 
+WHERE
+	`biz_type` = 'redis_run_write_cmd_flow';
+
 CREATE TABLE `t_sys_file`  (
   `id` bigint UNSIGNED NOT NULL AUTO_INCREMENT,
   `file_key` varchar(32)  NOT NULL COMMENT 'key',