From 986b187f0a5e39660b2b9bacb41c87d8d5e72ed9 Mon Sep 17 00:00:00 2001
From: "meilin.huang" <954537473@qq.com>
Date: Mon, 4 Mar 2024 20:33:04 +0800
Subject: [PATCH] feat: v1.7.4

---
 README.md                                  |   2 +-
 mayfly_go_web/src/views/ops/db/SqlExec.vue |  59 +++++++++------------
 server/internal/redis/api/cmd.go           |   7 ++-
 server/internal/redis/rdm/info.go          |   4 +-
 server/resources/data/mayfly-go.sqlite     | Bin 253952 -> 270336 bytes
 5 files changed, 33 insertions(+), 39 deletions(-)

diff --git a/README.md b/README.md
index 41b243d1..053edbc1 100644
--- a/README.md
+++ b/README.md
@@ -22,7 +22,7 @@
 
 ### 介绍
 
-web 版 **linux(终端[终端回放] 文件 脚本 进程 计划任务)、数据库（mysql postgres oracle sqlserver 达梦 高斯 sqlite）、redis(单机 哨兵 集群)、mongo 统一管理操作平台**
+web 版 **linux(终端[终端回放] 文件 脚本 进程 计划任务)、数据库（mysql postgres oracle sqlserver 达梦 高斯 sqlite）、redis(单机 哨兵 集群)、mongo 等集工单流程审批于一体的统一管理操作平台**
 
 ### 开发语言与主要框架
 
diff --git a/mayfly_go_web/src/views/ops/db/SqlExec.vue b/mayfly_go_web/src/views/ops/db/SqlExec.vue
index 720c773d..7bc81b1f 100644
--- a/mayfly_go_web/src/views/ops/db/SqlExec.vue
+++ b/mayfly_go_web/src/views/ops/db/SqlExec.vue
@@ -168,7 +168,7 @@
 
 <script lang="ts" setup>
 import { defineAsyncComponent, h, onBeforeUnmount, onMounted, reactive, ref, toRefs } from 'vue';
-import { ElCheckbox, ElInput, ElMessage, ElMessageBox } from 'element-plus';
+import { ElCheckbox, ElMessage, ElMessageBox } from 'element-plus';
 import { formatByteSize } from '@/common/utils/format';
 import { DbInst, registerDbCompletionItemProvider, TabInfo, TabType } from './db';
 import { NodeType, TagTreeNode } from '../component/tag';
@@ -706,39 +706,30 @@ const onRenameTable = async (data: any) => {
     let tableData = { db, oldTableName: tableName, tableName };
 
     let value = ref(tableName);
-    // 弹出确认框，并选择是否复制数据
-    await ElMessageBox({
-        title: `重命名表【${db}.${tableName}】`,
-        type: 'warning',
-        message: () =>
-            h(ElInput, {
-                modelValue: value.value,
-                'onUpdate:modelValue': (val: string) => {
-                    value.value = val;
-                },
-            }),
-        callback: (action: string) => {
-            if (action === 'confirm') {
-                tableData.tableName = value.value;
-                let sql = nowDbInst.value.getDialect().getModifyTableInfoSql(tableData);
-                if (sql) {
-                    SqlExecBox({
-                        sql: sql,
-                        dbId: id as any,
-                        db: db as any,
-                        dbType: nowDbInst.value.getDialect().getInfo().formatSqlDialect,
-                        flowProcdefKey: flowProcdefKey,
-                        runSuccessCallback: () => {
-                            setTimeout(() => {
-                                parentKey && reloadNode(parentKey);
-                            }, 1000);
-                        },
-                    });
-                } else {
-                    ElMessage.error('无更改');
-                    return;
-                }
-            }
+    // 弹出确认框
+    const promptValue = await ElMessageBox.prompt('', `重命名表【${db}.${tableName}】`, {
+        inputValue: value.value,
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+    });
+
+    tableData.tableName = promptValue.value;
+    let sql = nowDbInst.value.getDialect().getModifyTableInfoSql(tableData);
+    if (!sql) {
+        ElMessage.warning('无更改');
+        return;
+    }
+
+    SqlExecBox({
+        sql: sql,
+        dbId: id as any,
+        db: db as any,
+        dbType: nowDbInst.value.getDialect().getInfo().formatSqlDialect,
+        flowProcdefKey: flowProcdefKey,
+        runSuccessCallback: () => {
+            setTimeout(() => {
+                parentKey && reloadNode(parentKey);
+            }, 1000);
         },
     });
 };
diff --git a/server/internal/redis/api/cmd.go b/server/internal/redis/api/cmd.go
index b03debc6..48e7b816 100644
--- a/server/internal/redis/api/cmd.go
+++ b/server/internal/redis/api/cmd.go
@@ -5,15 +5,18 @@ import (
 	"mayfly-go/internal/redis/application"
 	"mayfly-go/pkg/biz"
 	"mayfly-go/pkg/req"
+	"mayfly-go/pkg/utils/collx"
 )
 
 func (r *Redis) RunCmd(rc *req.Ctx) {
 	var cmdReq form.RunCmdForm
 	runCmdParam := req.BindJsonAndCopyTo(rc, &cmdReq, new(application.RunCmdParam))
 	biz.IsTrue(len(cmdReq.Cmd) > 0, "redis命令不能为空")
-	rc.ReqParam = cmdReq
 
-	res, err := r.RedisApp.RunCmd(rc.MetaCtx, r.getRedisConn(rc), runCmdParam)
+	redisConn := r.getRedisConn(rc)
+	rc.ReqParam = collx.Kvs("redis", redisConn.Info, "cmd", cmdReq.Cmd)
+
+	res, err := r.RedisApp.RunCmd(rc.MetaCtx, redisConn, runCmdParam)
 	biz.ErrIsNil(err)
 	rc.ResData = res
 }
diff --git a/server/internal/redis/rdm/info.go b/server/internal/redis/rdm/info.go
index 66ea4758..7e0b1c1e 100644
--- a/server/internal/redis/rdm/info.go
+++ b/server/internal/redis/rdm/info.go
@@ -27,7 +27,7 @@ type RedisInfo struct {
 
 	Host     string    `json:"host"`
 	Db       int       `json:"db"` // 库号
-	Mode     RedisMode `json:"-"`
+	Mode     RedisMode `json:"mode"`
 	Username string    `json:"-"`
 	Password string    `json:"-"`
 
@@ -35,7 +35,7 @@ type RedisInfo struct {
 	TagPath            []string `json:"tagPath"`
 	SshTunnelMachineId int      `json:"-"`
 
-	FlowProcdefKey string // 工单流程定义key
+	FlowProcdefKey string `json:"flowProcdefKey"` // 工单流程定义key
 }
 
 func (r *RedisInfo) Conn() (*RedisConn, error) {
diff --git a/server/resources/data/mayfly-go.sqlite b/server/resources/data/mayfly-go.sqlite
index ba29e17ee3862b803a7437332e63141c1dfc8975..7dade145ab43e3d5bff98804b4b69ae5bb5c1e30 100644
GIT binary patch
delta 2808
zcmeHJUrbw77{BM9dueyI9R3U{6z2h4+6K0?g%)@j6sbzYj!Mg#CUPxn(E|Nrdv)Lv
zTcUFsovFFW&fAi?JuI0)9h&P1nl0*L$P(kD54dEB;bn>QMIYva=U!Tn(gF|0_^>8T
zZ_oET-}!y_{(j$gb2m`#Mor#SJHar_ApI6UcRuRudVGR8dJ^z-sS4dy0|V#*`UCxr
z?xA&bcd51}hFI6=TkA+!N1*vLBSq-h7DiY+kYQVNnE%@F>!Z`$GzD_(?Ay=v>x^zU
zc(+vwPtHa~NlZs0v5c6UjfnOhTc6X})zjPCXLnVOJn_^E9=G3v{qDgL4{oarB;W|Z
z<d-@25hZsEd<B%|n?TPiJwJdyS!Mb*xOkak7;s;?5`y=D@*vGttu;~dJh#eltA<Yn
zyY5)kGQY;Z2;Kp2Qu;50tX{33Lb{DUANa7oSi{t8@|2iLCr`!_8EIQB_HKKZlTzFR
zacoCTWj6@g{n2u&#nqF=AT$#>0P*>60sp+pAQGJt6XAHY4NK8E30qv<R_s0Q$KJrm
zNT+~tn-tE>h%?doBEW95Q3Q?RA<xt9z=$84)qiFJ#$iLYOhC&r8GA#N=2MlAQ33xr
zWd{v4o{_@RYZ*!;mY9zvq%tgknY=#^o1VdzN;EY#>1aHhp4qIZ&tA5oPJ!gdU}Jrm
zn$DkqriL=>bjzJF*eVZPt81nlDkPS{)fPGbNwxgVih;c3hYbXUAUafegGySt9D?_O
zLVR!zW>0%{s-iv!@2M!4%jW3WRZ$y=-u)>`6_m@xsX4b4rBFrH^3?{abcn7q=x6jj
zx=syn6+J6JXwnx<TgSo<dc94lhXM5I_tv{%31Em7E)W0ezh>ibosMf{&{@=8eMz{j
zJIY<)8ZXg)kzL?}I^%E$SZI$WB2>@Y57R8C3O*JQhlheC(ZRwU81@c%g197DvK1fq
zmLjkvl{RnqDHgGwF`UpDO(yW(tJ)JP+=0T6n+)6nmJKt~b|diE(&ey{g;sFTge?xI
zb3=}rR9{JEq=Hc8o1fQ{(eFTYP{VIoG!@QdP9@WkO+gnes%3~w7S}aX6@48~MmF6@
zPuH@^i_7Mgt-K{RaX77VYQ<P!>stkfAl)eESB&JhF({CqPP2`LVDfeLNqOmu236ex
zfkAjs#$O&L=R)v+Q?-poY*Ps8BPsPh1qs%(rg5FIqXV3alg9$E9rTlI5H^uO08Tt?
zVE?-YwoAt&_7Losf4tI6&V*p?u2W(vnT{6(t15+xz#q_>-M=?J9nO8u&xhl)bjoYS
nE$Istrrdu#KKHG@BW33{ebZ52F?Ohr<V2Vw%cF4Z;~M-o9VsvL

delta 416
zcmZoTAkc7te}c4NFaraF9T3C7^@%#h(!mUR{<W+?Ay)q9APF=6-~8YBKk~off4*5z
zpn$*m760~E{EXroq`CDNI2a`vIEy&U*_4>iGv)9;<;h}{<ke#EoGd6{z{vs9&aKBJ
z4dfl!o^^zglU1%o$evwXTAH!Fx+F0vC$%KLC^aRs7)r@c-}8l8WBLbGM&9Z7Dwwz@
z>#Y&qe(VtAQpW8iCmFvnu`n<&+5jD4!MHu^4CBHjEId;fKLGh}7`Oi}Vq&{1$uot4
zlfj*VYY9g%D<6|I<8($jhFuKq{0%@C=(-jLvx{qLGd4<R=B1=oWTsTa7Zl|ur=+IE
zXQq_Ir{(0Ag9S44ic9RAgIpa$TopY1TwEg*l#tX;fB%nJf=5X~gG&jjd%EO*=I7gY
zg)vt!b2|C4i)(8$_E=B1_|B}%XfZwJJ9GJV{%GcpEG*5rKJ4513z^<90{y}C2I%e=
bOw$+tV{TyN-OQ-KY_OeW0`njHMG67{D5iZy