feat: redis支持设置多库操作

fix: store mongodb password incorrectly

LICENSE

@@ -1,6 +1,6 @@
                                  Apache License
                            Version 2.0, January 2004
-                        http://www.apache.org/licenses/
+                        http://www.apache.org/licenses/ 
 
    TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
 

README.en.md

@@ -1,36 +0,0 @@
-# mayfly-go
-
-#### Description
-golang实现linux运维等
-
-#### Software Architecture
-Software architecture description
-
-#### Installation
-
-1.  xxxx
-2.  xxxx
-3.  xxxx
-
-#### Instructions
-
-1.  xxxx
-2.  xxxx
-3.  xxxx
-
-#### Contribution
-
-1.  Fork the repository
-2.  Create Feat_xxx branch
-3.  Commit your code
-4.  Create Pull Request
-
-
-#### Gitee Feature
-
-1.  You can use Readme\_XXX.md to support different languages, such as Readme\_en.md, Readme\_zh.md
-2.  Gitee blog [blog.gitee.com](https://blog.gitee.com)
-3.  Explore open source project [https://gitee.com/explore](https://gitee.com/explore)
-4.  The most valuable open source project [GVP](https://gitee.com/gvp)
-5.  The manual of Gitee [https://gitee.com/help](https://gitee.com/help)
-6.  The most popular members  [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/)

README.md

@@ -1,7 +1,25 @@
 # 🌈mayfly-go
 
+<p align="center">
+  <a href="https://gitee.com/objs/mayfly-go" target="_blank">
+    <img src="https://gitee.com/objs/mayfly-go/badge/star.svg?theme=white" alt="star"/>
+    <img src="https://gitee.com/objs/mayfly-go/badge/fork.svg" alt="fork"/>
+  </a>
+  <a href="https://github.com/may-fly/mayfly-go" target="_blank">
+    <img src="https://img.shields.io/github/stars/may-fly/mayfly-go.svg?style=social" alt="github star"/>
+    <img src="https://img.shields.io/github/forks/may-fly/mayfly-go.svg?style=social" alt="github fork"/>
+  </a>
+  <a href="https://github.com/golang/go" target="_blank">
+    <img src="https://img.shields.io/badge/Golang-1.18%2B-yellow.svg" alt="golang"/>
+  </a>
+  <a href="https://cn.vuejs.org" target="_blank">
+    <img src="https://img.shields.io/badge/Vue-3.x-green.svg" alt="vue">
+  </a>
+</p>
+
+
 ### 介绍
-简单基于DDD(领域驱动设计)分层架构实现的web版 **linux、数据库（mysql）、redis、mongo统一管理操作平台**
+web版 **linux(终端[终端回放] 文件 脚本 进程)、数据库（mysql postgres）、redis(单机 哨兵 集群)、mongo统一管理操作平台**
 
 
 ### 开发语言与主要框架
@@ -10,7 +28,7 @@
 
 
 ### 交流及问题反馈加 QQ 群
-<a target="_blank" href="https://qm.qq.com/cgi-bin/qm/qr?jump_from=webapi">119699946</a>
+<a target="_blank" href="https://qm.qq.com/cgi-bin/qm/qr?k=IdJSHW0jTMhmWFHBUS9a83wxtrxDDhFj&jump_from=webapi">119699946</a>
 
 
 ### 系统相关资料

build_release.sh

@@ -30,9 +30,9 @@ function buildWeb() {
 
     echo_yellow "-------------------打包前端开始-------------------"
     yarn run build
-    if [ "${copy2Server}" == "1" ] ; then
+    if [ "${copy2Server}" == "2" ] ; then
-        echo_green '将打包后的静态文件拷贝至server/static'
+        echo_green '将打包后的静态文件拷贝至server/static/static'
-        rm -rf ${server_folder}/static && mkdir -p ${server_folder}/static && cp -r ${web_folder}/dist/* ${server_folder}/static
+        rm -rf ${server_folder}/static/static && mkdir -p ${server_folder}/static/static && cp -r ${web_folder}/dist/* ${server_folder}/static/static
     fi
     echo_yellow ">>>>>>>>>>>>>>>>>>>打包前端结束<<<<<<<<<<<<<<<<<<<<\n"
 }
@@ -44,6 +44,7 @@ function build() {
     toFolder=$1
     os=$2
     arch=$3
+    copyStatic=$4
 
     echo_yellow "-------------------${os}-${arch}打包构建开始-------------------"
 
@@ -67,8 +68,10 @@ function build() {
     echo_green "移动二进制文件至'${toFolder}'"
     mv ${server_folder}/${execFileName} ${toFolder}
 
-    echo_green "拷贝前端静态页面至'${toFolder}/static'"
+    if [ "${copy2Server}" == "1" ] ; then
-    mkdir -p ${toFolder}/static && cp -r ${web_folder}/dist/* ${toFolder}/static
+        echo_green "拷贝前端静态页面至'${toFolder}/static'"
+        mkdir -p ${toFolder}/static && cp -r ${web_folder}/dist/* ${toFolder}/static
+    fi
 
     echo_green "拷贝脚本等资源文件[config.yml、mayfly-go.sql、readme.txt、startup.sh、shutdown.sh]"
     cp ${server_folder}/config.yml ${toFolder}
@@ -81,15 +84,19 @@ function build() {
 }
 
 function buildLinuxAmd64() {
-    build "$1/mayfly-go-linux-amd64" "linux" "amd64"
+    build "$1/mayfly-go-linux-amd64" "linux" "amd64" $2
 }
 
 function buildLinuxArm64() {
-    build "$1/mayfly-go-linux-arm64" "linux" "arm64"
+    build "$1/mayfly-go-linux-arm64" "linux" "arm64" $2
 }
 
 function buildWindows() {
-    build "$1/mayfly-go-windows" "windows" "amd64"
+    build "$1/mayfly-go-windows" "windows" "amd64" $2
+}
+
+function buildMac() {
+    build "$1/mayfly-go-mac" "darwin" "amd64" $2
 }
 
 function runBuild() {
@@ -103,34 +110,34 @@ function runBuild() {
     cd ${toPath}
     toPath=`pwd`
 
-    read -p "是否构建前端[0|其他->否 1->是 2->构建并拷贝至server/static]: " runBuildWeb
+    read -p "是否构建前端[0|其他->否 1->是 2->构建并拷贝至server/static/static]: " runBuildWeb
-    read -p "请选择构建版本[0|其他->全部 1->linux-amd64 2->linux-arm64 3->windows]: " buildType
+    read -p "请选择构建版本[0|其他->全部 1->linux-amd64 2->linux-arm64 3->windows 4->mac]: " buildType
     
-    if [ "${runBuildWeb}" == "1" ];then
+    
-        buildWeb
+    if [ "${runBuildWeb}" == "1" ] || [ "${runBuildWeb}" == "2" ] ; then
-    fi
+        buildWeb ${runBuildWeb}
-    if [ "${runBuildWeb}" == "2" ];then
-        buildWeb 1
     fi
 
-    if [ "${buildType}" == "1" ];then
+    case ${buildType} in
-        buildLinuxAmd64 ${toPath}
+         "1")
-        exit;
+            buildLinuxAmd64 ${toPath} ${runBuildWeb}
-    fi
+        ;;
-
+         "2")
-    if [ "${buildType}" == "2" ];then
+            buildLinuxArm64 ${toPath} ${runBuildWeb}
-        buildLinuxArm64 ${toPath}
+        ;;
-        exit;
+        "3")
-    fi
+            buildWindows ${toPath} ${runBuildWeb}
-
+        ;;
-    if [ "${buildType}" == "3" ];then
+        "4")
-        buildWindows ${toPath}
+            buildMac ${toPath} ${runBuildWeb}
-        exit;
+        ;;
-    fi
+        *)
-
+            buildLinuxAmd64 ${toPath} ${runBuildWeb}
-    buildLinuxAmd64 ${toPath}
+            buildLinuxArm64 ${toPath} ${runBuildWeb}
-    buildLinuxArm64 ${toPath}
+            buildWindows ${toPath} ${runBuildWeb}
-    buildWindows ${toPath}
+            buildMac ${toPath} ${runBuildWeb}
+        ;;
+    esac
 }
 
 runBuild

mayfly_go_web/index.html

@@ -18,8 +18,7 @@
 	</head>
 	<body>
 		<div id="app"></div>
-        <script type="text/javascript" src="./config.js"></script>
+        <script type="application/javascript" src="./config.js"></script>
 		<script type="module" src="/src/main.ts"></script>
-		<!-- <script type="text/javascript" src="https://api.map.baidu.com/api?v=3.0&ak=wsijQt8sLXrCW71YesmispvYHitfG9gv&s=1"></script> -->
 	</body>
 </html>

mayfly_go_web/package.json

@@ -7,26 +7,28 @@
     "lint-fix": "eslint --fix --ext .js --ext .jsx --ext .vue src/"
   },
   "dependencies": {
-    "@element-plus/icons-vue": "^2.0.6",
+    "@element-plus/icons-vue": "^2.0.9",
+    "asciinema-player": "^3.0.1",
     "axios": "^0.27.2",
     "codemirror": "^5.65.5",
     "countup.js": "^2.0.7",
     "cropperjs": "^1.5.11",
     "echarts": "^5.3.3",
-    "element-plus": "^2.2.8",
+    "element-plus": "^2.2.17",
+    "jsencrypt": "^3.2.1",
     "jsoneditor": "^9.9.0",
     "lodash": "^4.17.21",
     "mitt": "^3.0.0",
     "nprogress": "^0.2.0",
-    "screenfull": "^5.1.0",
+    "screenfull": "^6.0.2",
     "sortablejs": "^1.13.0",
-    "sql-formatter": "^7.0.3",
+    "sql-formatter": "^9.2.0",
-    "vue": "^3.2.37",
+    "vue": "^3.2.39",
     "vue-clipboard3": "^1.0.1",
-    "vue-router": "^4.0.16",
+    "vue-router": "^4.1.5",
     "vuex": "^4.0.2",
-    "xterm": "^4.19.0",
+    "xterm": "^5.0.0",
-    "xterm-addon-fit": "^0.5.0"
+    "xterm-addon-fit": "^0.6.0"
   },
   "devDependencies": {
     "@types/lodash": "^4.14.178",

mayfly_go_web/public/config.js

@@ -1,4 +1,5 @@
 window.globalConfig = {
-    "BaseApiUrl": "http://localhost:8888",
+    // 默认为空，以访问根目录为api请求地址。若前后端分离部署可单独配置该后端api请求地址
-    "BaseWsUrl": "ws://localhost:8888"
+    "BaseApiUrl": "",
+    "BaseWsUrl": ""
 }

mayfly_go_web/shim.d.ts

@@ -6,4 +6,5 @@ declare module '*.vue' {
 }
 declare module 'codemirror';
 declare module 'sql-formatter';
-declare module 'jsoneditor';
+declare module 'jsoneditor';
+declare module 'asciinema-player';

mayfly_go_web/src/App.vue

@@ -11,6 +11,8 @@ import { useStore } from '@/store/index.ts';
 import { getLocal } from '@/common/utils/storage.ts';
 import LockScreen from '@/views/layout/lockScreen/index.vue';
 import Setings from '@/views/layout/navBars/breadcrumb/setings.vue';
+import Watermark from '@/common/utils/wartermark.ts';
+
 export default defineComponent({
     name: 'app',
     components: { LockScreen, Setings },
@@ -57,6 +59,8 @@ export default defineComponent({
             () => route.path,
             () => {
                 nextTick(() => {
+                    // 路由变化更新水印
+                    Watermark.use();
                     document.title = `${route.meta.title} - ${getThemeConfig.value.globalTitle}` || getThemeConfig.value.globalTitle;
                 });
             }

mayfly_go_web/src/common/config.ts

@@ -1,6 +1,6 @@
 const config = {
-    baseApiUrl:  `${(window as any).globalConfig.BaseApiUrl}/api`,
+    baseApiUrl: `${(window as any).globalConfig.BaseApiUrl}/api`,
-    baseWsUrl: `${(window as any).globalConfig.BaseWsUrl}/api`
+    baseWsUrl: `${(window as any).globalConfig.BaseWsUrl || `${location.protocol == 'https:' ? 'wss:' : 'ws:'}//${location.host}`}/api`
 }
 
 export default config

mayfly_go_web/src/common/openApi.ts

@@ -1,8 +1,11 @@
 import request from './request'
 
 export default {
-    login: (param: any) => request.request('POST', '/sys/accounts/login', param, null),
+    login: (param: any) => request.request('POST', '/sys/accounts/login', param),
-    captcha: () => request.request('GET', '/sys/captcha', null, null),
+    changePwd: (param: any) => request.request('POST', '/sys/accounts/change-pwd', param),
-    logout: (param: any) => request.request('POST', '/sys/accounts/logout/{token}', param, null),
+    getPublicKey: () => request.request('GET', '/common/public-key'),
-    getMenuRoute: (param: any) => request.request('Get', '/sys/resources/account', param, null)
+    getConfigValue: (param: any) => request.request('GET', '/sys/configs/value', param),
+    captcha: () => request.request('GET', '/sys/captcha'),
+    logout: (param: any) => request.request('POST', '/sys/accounts/logout/{token}', param),
+    getMenuRoute: (param: any) => request.request('Get', '/sys/resources/account', param)
 }

mayfly_go_web/src/common/rsa.ts

@@ -0,0 +1,36 @@
+import openApi from './openApi';
+import JSEncrypt from 'jsencrypt'
+import { notBlank } from './assert';
+
+var encryptor: any = null
+
+export async function getRsaPublicKey() {
+    let publicKey = sessionStorage.getItem('RsaPublicKey')
+    if (publicKey) {
+        return publicKey
+    }
+    publicKey = await openApi.getPublicKey() as string
+    sessionStorage.setItem('RsaPublicKey', publicKey)
+    return publicKey
+}
+
+/**
+ * 公钥加密指定值
+ * 
+ * @param value value
+ * @returns 加密后的值
+ */
+export async function RsaEncrypt(value: any) {
+    // 不存在则返回空值
+    if (!value) {
+        return ""
+    }
+    if (encryptor != null) {
+        return encryptor.encrypt(value)
+    }
+    encryptor = new JSEncrypt()
+    const publicKey = await getRsaPublicKey() as string;
+    notBlank(publicKey, "获取公钥失败")
+    encryptor.setPublicKey(publicKey)//设置公钥
+    return encryptor.encrypt(value)
+}

mayfly_go_web/src/common/sysconfig.ts

@@ -0,0 +1,48 @@
+import openApi from './openApi';
+
+// 登录是否使用验证码配置key
+const UseLoginCaptchaConfigKey = "UseLoginCaptcha"
+const UseWartermarkConfigKey = "UseWartermark"
+
+/**
+ * 获取系统配置值
+ * 
+ * @param key 配置key
+ * @returns 配置值
+ */
+export async function getConfigValue(key: string) : Promise<string> {
+    return await openApi.getConfigValue({key}) as string
+}
+
+/**
+ * 获取bool类型系统配置值
+ * 
+ * @param key 配置key
+ * @param defaultValue 默认值
+ * @returns 是否为ture，1: true；其他: false
+ */
+export async function getBoolConfigValue(key :string, defaultValue :boolean) : Promise<boolean> {
+    const value = await getConfigValue(key)
+    if (!value) {
+        return defaultValue;
+    }
+    return value == "1";
+}
+
+/**
+ * 是否使用登录验证码
+ * 
+ * @returns 
+ */
+export async function useLoginCaptcha() : Promise<boolean> {
+    return await getBoolConfigValue(UseLoginCaptchaConfigKey, true)
+}
+
+/**
+ * 是否启用水印
+ * 
+ * @returns 
+ */
+ export async function useWartermark() : Promise<boolean> {
+    return await getBoolConfigValue(UseWartermarkConfigKey, true)
+}

mayfly_go_web/src/common/utils/storage.ts

@@ -35,3 +35,22 @@ export function removeSession(key: string) {
 export function clearSession() {
     window.sessionStorage.clear();
 }
+
+
+
+export function getUserInfo4Session() {
+    return getSession("userInfo")
+}
+
+export function setUserInfo2Session(userinfo: any) {
+    setSession("userInfo", userinfo)
+}
+
+// 获取是否开启水印
+export function getUseWatermark4Session() {
+    return getSession("useWatermark")
+}
+
+export function setUseWatermark2Session(useWatermark: boolean) {
+    setSession("useWatermark", useWatermark)
+}

mayfly_go_web/src/common/utils/wartermark.ts

@@ -1,21 +1,26 @@
+import { getUseWatermark4Session, getUserInfo4Session } from '@/common/utils/storage.ts';
+import { dateFormat } from '@/common/utils/date.ts'
+
 // 页面添加水印效果
 const setWatermark = (str: any) => {
     const id = '1.23452384164.123412416';
     if (document.getElementById(id) !== null) document.body.removeChild(document.getElementById(id) as any);
     const can = document.createElement('canvas');
-    can.width = 250;
+    can.width = 400;
-    can.height = 180;
+    can.height = 250;
     const cans: any = can.getContext('2d');
     cans.rotate((-20 * Math.PI) / 180);
-    cans.font = '12px Vedana';
+    cans.font = '14px Vedana';
-    cans.fillStyle = 'rgba(200, 200, 200, 0.30)';
+    cans.fillStyle = 'rgba(200, 200, 200, 0.35)';
-    cans.textAlign = 'center';
+    cans.textAlign = 'left';
     cans.textBaseline = 'Middle';
-    cans.fillText(str, can.width / 10, can.height / 2);
+    // cans.fillText('mayfly go', can.width / 4, can.height )
+    cans.fillText(str, can.width / 8, can.height / 2);
+
     const div = document.createElement('div');
     div.id = id;
     div.style.pointerEvents = 'none';
-    div.style.top = '35px';
+    div.style.top = '30px';
     div.style.left = '0px';
     div.style.position = 'fixed';
     div.style.zIndex = '10000000';
@@ -26,16 +31,34 @@ const setWatermark = (str: any) => {
     return id;
 };
 
+function set(str: any) {
+    let id = setWatermark(str);
+    if (document.getElementById(id) === null) id = setWatermark(str);
+}
+
+function del() {
+    let id = '1.23452384164.123412416';
+    if (document.getElementById(id) !== null) document.body.removeChild(document.getElementById(id) as any);
+}
+
 const watermark = {
+    use: () => {
+        setTimeout(() => {
+            const userinfo = getUserInfo4Session()
+            if (userinfo && getUseWatermark4Session()) {
+                set(`${userinfo.username} ${dateFormat('yyyy-MM-dd HH:mm:ss', new Date())}`)
+            } else {
+                del();
+            }
+        }, 1500)
+    },
     // 设置水印
     set: (str: any) => {
-        let id = setWatermark(str);
+        set(str)
-        if (document.getElementById(id) === null) id = setWatermark(str);
     },
     // 删除水印
     del: () => {
-        let id = '1.23452384164.123412416';
+        del();
-        if (document.getElementById(id) !== null) document.body.removeChild(document.getElementById(id) as any);
     },
 };
 

mayfly_go_web/src/router/imports.ts

@@ -2,6 +2,7 @@ import RouterParent from '@/views/layout/routerView/parent.vue';
 
 export const imports = {
     'RouterParent': RouterParent,
+    
     "Home": () => import('@/views/home/index.vue'),
     'Personal': () => import('@/views/personal/index.vue'),
     // machine
@@ -10,6 +11,9 @@ export const imports = {
     "ResourceList": () => import('@/views/system/resource'),
     "RoleList": () => import('@/views/system/role'),
     "AccountList": () => import('@/views/system/account'),
+    "SyslogList": () => import('@/views/system/syslog/SyslogList.vue'),
+    "ConfigList": () => import('@/views/system/config/ConfigList.vue'),
+
     // project
     "ProjectList": () => import('@/views/ops/project/ProjectList.vue'),
     // db

mayfly_go_web/src/router/route.ts

@@ -163,7 +163,17 @@ export const staticRoutes: Array<RouteRecordRaw> = [
             title: '终端 | {name}',
             // 是否根据query对标题名进行参数替换，即最终显示为‘终端_机器名’
             titleRename: true,
-            icon: 'iconfont icon-caidan',
+        },
+    },
+    {
+        path: '/machine/terminal-rec',
+        name: 'machineTerminalRec',
+        component: () => import('@/views/ops/machine/MachineRec.vue'),
+        meta: {
+            // 将路径 'xxx?name=名字' 里的name字段值替换到title里
+            title: '终端回放 | {name}',
+            // 是否根据query对标题名进行参数替换，即最终显示为‘终端_机器名’
+            titleRename: true,
         },
     },
 ];

mayfly_go_web/src/store/interface/index.ts

@@ -52,6 +52,7 @@ export interface ThemeConfigState {
         terminalBackground: string;
         terminalCursor: string;
         terminalFontSize: number;
+        terminalFontWeight: string;
     };
 }
 

mayfly_go_web/src/store/modules/themeConfig.ts

@@ -113,6 +113,7 @@ const themeConfigModule: Module<ThemeConfigState, RootStateTypes> = {
             // ssh终端cursor色
             terminalCursor: '#268F81',
             terminalFontSize: 15,
+            terminalFontWeight: 'normal',
 
 
             /* 后端控制路由

mayfly_go_web/src/theme/app.scss

@@ -14,7 +14,7 @@ body,
 	padding: 0;
 	width: 100%;
 	height: 100%;
-	font-family: Microsoft YaHei, Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, SimSun, sans-serif;
+	font-family: 'Helvetica Neue', Helvetica, 'PingFang SC', 'Hiragino Sans GB', 'Microsoft YaHei', '微软雅黑', Arial, sans-serif;
 	font-weight: 450;
 	-webkit-font-smoothing: antialiased;
 	-webkit-tap-highlight-color: transparent;

mayfly_go_web/src/theme/element.scss

@@ -947,12 +947,6 @@
 .el-select-dropdown .el-scrollbar__wrap {
 	overflow-x: scroll !important;
 }
-.el-select-dropdown__wrap {
-	max-height: 274px !important; /*修复Select 选择器高度问题*/
-}
-.el-cascader-menu__wrap.el-scrollbar__wrap {
-	height: 204px !important; /*修复Cascader 级联选择器高度问题*/
-}
 
 /* Drawer 抽屉
 ------------------------------- */

mayfly_go_web/src/theme/iconSelector.scss

@@ -1,87 +0,0 @@
-/* Popover 弹出框(图标选择器)
-------------------------------- */
-.icon-selector-popper {
-	padding: 0 !important;
-	.icon-selector-warp {
-		.icon-selector-warp-title {
-			height: 40px;
-			line-height: 40px;
-			padding: 0 15px;
-		}
-		.icon-selector-warp-row {
-			max-height: 260px;
-			overflow-y: auto;
-			padding: 15px 15px 5px;
-			border-top: 1px solid #ebeef5;
-			.ele-col:nth-last-child(1),
-			.ele-col:nth-last-child(2) {
-				display: none;
-			}
-			.awe-col:nth-child(-n + 24) {
-				display: none;
-			}
-			.icon-selector-warp-item {
-				display: flex;
-				border: 1px solid #ebeef5;
-				padding: 10px;
-				border-radius: 5px;
-				margin-bottom: 10px;
-				transition: all 0.3s ease;
-				.icon-selector-warp-item-value {
-					transition: all 0.3s ease;
-					i {
-						font-size: 20px;
-						color: #606266;
-					}
-				}
-				&:hover {
-					border: 1px solid var(--color-primary);
-					cursor: pointer;
-					transition: all 0.3s ease;
-					.icon-selector-warp-item-value {
-						i {
-							color: var(--color-primary);
-							transition: all 0.3s ease;
-						}
-					}
-				}
-			}
-			.icon-selector-active {
-				border: 1px solid var(--color-primary);
-				.icon-selector-warp-item-value {
-					i {
-						color: var(--color-primary);
-					}
-				}
-			}
-		}
-		.icon-selector-all {
-			.el-input {
-				padding: 0 15px;
-				margin-bottom: 10px;
-			}
-			&-tabs {
-				display: flex;
-				height: 30px;
-				line-height: 30px;
-				padding: 0 15px;
-				margin-bottom: 5px;
-				&-item {
-					flex: 1;
-					text-align: center;
-					cursor: pointer;
-					&:hover {
-						color: var(--color-primary);
-					}
-				}
-				&-active {
-					background: var(--color-primary);
-					border-radius: 5px;
-					.label {
-						color: #ffffff;
-					}
-				}
-			}
-		}
-	}
-}

mayfly_go_web/src/theme/index.scss

@@ -2,6 +2,5 @@
 @import './base.scss';
 @import './other.scss';
 @import './element.scss';
-@import './iconSelector.scss';
 @import './media/media.scss';
 @import './waves.scss';

mayfly_go_web/src/views/layout/navBars/breadcrumb/search.vue

@@ -44,7 +44,9 @@ export default defineComponent({
             state.isShowSearch = true;
             initTageView();
             nextTick(() => {
-                layoutMenuAutocompleteRef.value.focus();
+                setTimeout(() => {
+                    layoutMenuAutocompleteRef.value.focus();
+                });
             });
         };
         // 搜索弹窗关闭

mayfly_go_web/src/views/layout/navBars/breadcrumb/setings.vue

@@ -40,7 +40,7 @@
                         </el-input-number>
                     </div>
                 </div>
-                <!-- <div class="layout-breadcrumb-seting-bar-flex mt15">
+                <div class="layout-breadcrumb-seting-bar-flex mt15">
                     <div class="layout-breadcrumb-seting-bar-flex-label">字体粗细</div>
                     <div class="layout-breadcrumb-seting-bar-flex-value">
                         <el-select @change="setLocalThemeConfig" v-model="getThemeConfig.terminalFontWeight" size="small" style="width: 90px">
@@ -48,7 +48,7 @@
                             <el-option label="bold" value="bold"> </el-option>
                         </el-select>
                     </div>
-                </div> -->
+                </div>
 
                 <!-- 全局主题 -->
                 <el-divider content-position="left">全局主题</el-divider>
@@ -273,23 +273,6 @@
                         <el-switch v-model="getThemeConfig.isInvert" @change="onAddFilterChange('invert')"></el-switch>
                     </div>
                 </div>
-                <div class="layout-breadcrumb-seting-bar-flex mt15">
-                    <div class="layout-breadcrumb-seting-bar-flex-label">开启水印</div>
-                    <div class="layout-breadcrumb-seting-bar-flex-value">
-                        <el-switch v-model="getThemeConfig.isWartermark" @change="onWartermarkChange"></el-switch>
-                    </div>
-                </div>
-                <div class="layout-breadcrumb-seting-bar-flex mt14">
-                    <div class="layout-breadcrumb-seting-bar-flex-label">水印文案</div>
-                    <div class="layout-breadcrumb-seting-bar-flex-value">
-                        <el-input
-                            v-model="getThemeConfig.wartermarkText"
-                            size="small"
-                            style="width: 90px"
-                            @input="onWartermarkTextInput($event)"
-                        ></el-input>
-                    </div>
-                </div>
 
                 <!-- 其它设置 -->
                 <el-divider content-position="left">其他设置</el-divider>
@@ -440,8 +423,6 @@ import { ElMessage } from 'element-plus';
 import ClipboardJS from 'clipboard';
 import { useStore } from '@/store/index.ts';
 import { getLightColor } from '@/common/utils/theme.ts';
-import Watermark from '@/common/utils/wartermark.ts';
-import { verifyAndSpace } from '@/common/utils/toolsValidate.ts';
 import { setLocal, getLocal, removeLocal } from '@/common/utils/storage.ts';
 export default defineComponent({
     name: 'layoutBreadcrumbSeting',
@@ -572,18 +553,6 @@ export default defineComponent({
             setLocalThemeConfig();
             setLocal('appFilterStyle', appEle.style.cssText);
         };
-        // 4、界面显示 --> 开启水印
-        const onWartermarkChange = () => {
-            getThemeConfig.value.isWartermark ? Watermark.set(getThemeConfig.value.wartermarkText) : Watermark.del();
-            setLocalThemeConfig();
-        };
-        // 4、界面显示 --> 水印文案
-        const onWartermarkTextInput = (val: string) => {
-            getThemeConfig.value.wartermarkText = verifyAndSpace(val);
-            if (getThemeConfig.value.wartermarkText === '') return false;
-            if (getThemeConfig.value.isWartermark) Watermark.set(getThemeConfig.value.wartermarkText);
-            setLocalThemeConfig();
-        };
         // 5、布局切换
         const onSetLayout = (layout: string) => {
             setLocal('oldLayout', layout);
@@ -735,8 +704,6 @@ export default defineComponent({
                             const appEl: any = document.querySelector('#app');
                             appEl.style.cssText = getLocal('appFilterStyle');
                         }
-                        // 开启水印
-                        onWartermarkChange();
                         // // 语言国际化
                         // if (getLocal('themeConfig')) proxy.$i18n.locale = getLocal('themeConfig').globalI18n;
                     }, 1100);
@@ -762,8 +729,6 @@ export default defineComponent({
             getThemeConfig,
             onDrawerClose,
             onAddFilterChange,
-            onWartermarkChange,
-            onWartermarkTextInput,
             onSetLayout,
             setLocalThemeConfig,
             onClassicSplitMenuChange,

mayfly_go_web/src/views/layout/navBars/breadcrumb/user.vue

@@ -14,11 +14,11 @@
                 </el-dropdown-menu>
             </template>
         </el-dropdown>
-        <div class="layout-navbars-breadcrumb-user-icon" @click="onSearchClick">
+        <!-- <div class="layout-navbars-breadcrumb-user-icon" @click="onSearchClick">
             <el-icon title="菜单搜索">
                 <search />
             </el-icon>
-        </div>
+        </div> -->
         <div class="layout-navbars-breadcrumb-user-icon" @click="onLayoutSetingClick">
             <el-icon title="布局设置">
                 <setting />
@@ -28,7 +28,7 @@
             <el-popover
                 placement="bottom"
                 trigger="click"
-                v-model:visible="isShowUserNewsPopover"
+                :visible="isShowUserNewsPopover"
                 :width="300"
                 popper-class="el-popover-pupop-user-news"
             >

mayfly_go_web/src/views/login/component/AccountLogin.vue

@@ -1,66 +1,90 @@
 <template>
-    <el-form ref="loginFormRef" :model="loginForm" :rules="rules" class="login-content-form" size="large">
+    <div>
-        <el-form-item prop="username">
+        <el-form ref="loginFormRef" :model="loginForm" :rules="rules" class="login-content-form" size="large">
-            <el-input type="text" placeholder="请输入用户名" prefix-icon="user" v-model="loginForm.username" clearable autocomplete="off">
+            <el-form-item prop="username">
-            </el-input>
+                <el-input type="text" placeholder="请输入用户名" prefix-icon="user" v-model="loginForm.username" clearable autocomplete="off">
-        </el-form-item>
+                </el-input>
-        <el-form-item prop="password">
+            </el-form-item>
-            <el-input
+            <el-form-item prop="password">
-                type="password"
+                <el-input type="password" placeholder="请输入密码" prefix-icon="lock" v-model="loginForm.password" autocomplete="off" show-password>
-                placeholder="请输入密码"
+                </el-input>
-                prefix-icon="lock"
+            </el-form-item>
-                v-model="loginForm.password"
+            <el-form-item v-if="useLoginCaptcha" prop="captcha">
-                autocomplete="off"
+                <el-row :gutter="15">
-                show-password
+                    <el-col :span="16">
-            >
+                        <el-input
-            </el-input>
+                            type="text"
-        </el-form-item>
+                            maxlength="6"
-        <el-form-item prop="captcha">
+                            placeholder="请输入验证码"
-            <el-row :gutter="15">
+                            prefix-icon="position"
-                <el-col :span="16">
+                            v-model="loginForm.captcha"
+                            clearable
+                            autocomplete="off"
+                            @keyup.enter="login"
+                        ></el-input>
+                    </el-col>
+                    <el-col :span="8">
+                        <div class="login-content-code">
+                            <img
+                                class="login-content-code-img"
+                                @click="getCaptcha"
+                                width="130px"
+                                height="40px"
+                                :src="captchaImage"
+                                style="cursor: pointer"
+                            />
+                        </div>
+                    </el-col>
+                </el-row>
+            </el-form-item>
+            <el-form-item>
+                <el-button type="primary" class="login-content-submit" round @click="login" :loading="loading.signIn">
+                    <span>登 录</span>
+                </el-button>
+            </el-form-item>
+        </el-form>
+
+        <el-dialog title="修改密码" v-model="changePwdDialog.visible" :close-on-click-modal="false" width="450px" :destroy-on-close="true">
+            <el-form :model="changePwdDialog.form" :rules="changePwdDialog.rules" ref="changePwdFormRef" label-width="65px">
+                <el-form-item prop="username" label="用户名" required>
+                    <el-input v-model.trim="changePwdDialog.form.username" disabled></el-input>
+                </el-form-item>
+                <el-form-item prop="oldPassword" label="旧密码" required>
+                    <el-input v-model.trim="changePwdDialog.form.oldPassword" autocomplete="new-password" type="password"></el-input>
+                </el-form-item>
+                <el-form-item prop="newPassword" label="新密码" required>
                     <el-input
-                        type="text"
+                        v-model.trim="changePwdDialog.form.newPassword"
-                        maxlength="6"
+                        placeholder="须为8位以上且包含字⺟⼤⼩写+数字+特殊符号"
-                        placeholder="请输入验证码"
+                        type="password"
-                        prefix-icon="position"
+                        autocomplete="new-password"
-                        v-model="loginForm.captcha"
-                        clearable
-                        autocomplete="off"
-                        @keyup.enter="login"
                     ></el-input>
-                </el-col>
+                </el-form-item>
-                <el-col :span="8">
+            </el-form>
-                    <div class="login-content-code">
+
-                        <img
+            <template #footer>
-                            class="login-content-code-img"
+                <div class="dialog-footer">
-                            @click="getCaptcha"
+                    <el-button @click="cancelChangePwd">取 消</el-button>
-                            width="130px"
+                    <el-button @click="changePwd" type="primary" :loading="loading.changePwd">确 定</el-button>
-                            height="40px"
+                </div>
-                            :src="captchaImage"
+            </template>
-                            style="cursor: pointer"
+        </el-dialog>
-                        />
+    </div>
-                    </div>
-                </el-col>
-            </el-row>
-        </el-form-item>
-        <el-form-item>
-            <el-button type="primary" class="login-content-submit" round @click="login" :loading="loading.signIn">
-                <span>登 录</span>
-            </el-button>
-        </el-form-item>
-    </el-form>
 </template>
 
 <script lang="ts">
-import { onMounted, ref, toRefs, reactive, defineComponent, computed } from 'vue';
+import { nextTick, onMounted, ref, toRefs, reactive, defineComponent, computed } from 'vue';
 import { useRoute, useRouter } from 'vue-router';
 import { ElMessage } from 'element-plus';
 import { initBackEndControlRoutesFun } from '@/router/index.ts';
 import { useStore } from '@/store/index.ts';
-import { setSession } from '@/common/utils/storage.ts';
+import { setSession, setUserInfo2Session, setUseWatermark2Session } from '@/common/utils/storage.ts';
 import { formatAxis } from '@/common/utils/formatTime.ts';
 import openApi from '@/common/openApi';
+import { RsaEncrypt } from '@/common/rsa';
+import { useLoginCaptcha, useWartermark } from '@/common/sysconfig';
 import { letterAvatar } from '@/common/utils/string';
+
 export default defineComponent({
     name: 'AccountLogin',
     setup() {
@@ -68,7 +92,10 @@ export default defineComponent({
         const route = useRoute();
         const router = useRouter();
         const loginFormRef: any = ref(null);
+        const changePwdFormRef: any = ref(null);
+
         const state = reactive({
+            useLoginCaptcha: false,
             captchaImage: '',
             loginForm: {
                 username: '',
@@ -76,6 +103,24 @@ export default defineComponent({
                 captcha: '',
                 cid: '',
             },
+            changePwdDialog: {
+                visible: false,
+                form: {
+                    username: '',
+                    oldPassword: '',
+                    newPassword: '',
+                },
+                rules: {
+                    newPassword: [
+                        { required: true, message: '请输入新密码', trigger: 'blur' },
+                        {
+                            pattern: /^(?=.*[A-Za-z])(?=.*\d)(?=.*[`~!@#$%^&*()_+<>?:"{},.\/\\;'[\]])[A-Za-z\d`~!@#$%^&*()_+<>?:"{},.\/\\;'[\]]{8,}$/,
+                            message: '须为8位以上且包含字⺟⼤⼩写+数字+特殊符号',
+                            trigger: 'blur',
+                        },
+                    ],
+                },
+            },
             rules: {
                 username: [{ required: true, message: '请输入用户名', trigger: 'blur' }],
                 password: [{ required: true, message: '请输入密码', trigger: 'blur' }],
@@ -83,14 +128,23 @@ export default defineComponent({
             },
             loading: {
                 signIn: false,
+                changePwd: false,
             },
         });
 
-        onMounted(() => {
+        onMounted(async () => {
-            getCaptcha();
+            nextTick(async () => {
+                state.useLoginCaptcha = await useLoginCaptcha();
+                getCaptcha();
+            });
+            // 移除公钥, 方便后续重新获取
+            sessionStorage.removeItem('RsaPublicKey');
         });
 
         const getCaptcha = async () => {
+            if (!state.useLoginCaptcha) {
+                return;
+            }
             let res: any = await openApi.captcha();
             state.captchaImage = res.base64Captcha;
             state.loginForm.cid = res.cid;
@@ -116,15 +170,26 @@ export default defineComponent({
         const onSignIn = async () => {
             state.loading.signIn = true;
             let loginRes;
+            const originPwd = state.loginForm.password;
             try {
-                loginRes = await openApi.login(state.loginForm);
+                const loginReq = { ...state.loginForm };
-                // // 存储 token 到浏览器缓存
+                loginReq.password = await RsaEncrypt(originPwd);
+                loginRes = await openApi.login(loginReq);
+                // 存储 token 到浏览器缓存
                 setSession('token', loginRes.token);
                 setSession('menus', loginRes.menus);
-            } catch (e) {
+            } catch (e: any) {
                 state.loading.signIn = false;
                 state.loginForm.captcha = '';
-                getCaptcha();
+                // 密码强度不足
+                if (e.code && e.code == 401) {
+                    state.changePwdDialog.form.username = state.loginForm.username;
+                    state.changePwdDialog.form.oldPassword = originPwd;
+                    state.changePwdDialog.form.newPassword = '';
+                    state.changePwdDialog.visible = true;
+                } else {
+                    getCaptcha();
+                }
                 return;
             }
             // 用户信息
@@ -141,7 +206,7 @@ export default defineComponent({
             };
 
             // 存储用户信息到浏览器缓存
-            setSession('userInfo', userInfos);
+            setUserInfo2Session(userInfos);
             // 1、请注意执行顺序(存储用户信息到vuex)
             store.dispatch('userInfos/setUserInfos', userInfos);
             if (!store.state.themeConfig.themeConfig.isRequestRoutes) {
@@ -167,18 +232,54 @@ export default defineComponent({
             // 如果是复制粘贴的路径，非首页/登录页，那么登录成功后重定向到对应的路径中
             route.query?.redirect ? router.push(route.query.redirect as string) : router.push('/');
             // 登录成功提示
-            setTimeout(() => {
+            setTimeout(async () => {
                 // 关闭 loading
                 state.loading.signIn = true;
                 ElMessage.success(`${currentTimeInfo}，欢迎回来！`);
+                if (await useWartermark()) {
+                    setUseWatermark2Session(true);
+                }
             }, 300);
         };
 
+        const changePwd = () => {
+            changePwdFormRef.value.validate(async (valid: boolean) => {
+                if (!valid) {
+                    return false;
+                }
+                try {
+                    state.loading.changePwd = true;
+                    const form = state.changePwdDialog.form;
+                    const changePwdReq: any = { ...form };
+                    changePwdReq.oldPassword = await RsaEncrypt(form.oldPassword);
+                    changePwdReq.newPassword = await RsaEncrypt(form.newPassword);
+                    await openApi.changePwd(changePwdReq);
+                    ElMessage.success('密码修改成功, 新密码已填充至登录密码框');
+                    state.loginForm.password = state.changePwdDialog.form.newPassword;
+                    state.changePwdDialog.visible = false;
+                    getCaptcha();
+                } finally {
+                    state.loading.changePwd = false;
+                }
+            });
+        };
+
+        const cancelChangePwd = () => {
+            state.changePwdDialog.visible = false;
+            state.changePwdDialog.form.newPassword = '';
+            state.changePwdDialog.form.oldPassword = '';
+            state.changePwdDialog.form.username = '';
+            getCaptcha();
+        };
+
         return {
             getCaptcha,
             currentTime,
             loginFormRef,
+            changePwdFormRef,
             login,
+            changePwd,
+            cancelChangePwd,
             ...toRefs(state),
         };
     },

mayfly_go_web/src/views/ops/db/DbEdit.vue

@@ -1,7 +1,7 @@
 <template>
     <div>
-        <el-dialog :title="title" v-model="dialogVisible" :before-close="cancel" :close-on-click-modal="false" :destroy-on-close="true" width="35%">
+        <el-dialog :title="title" v-model="dialogVisible" :before-close="cancel" :close-on-click-modal="false" :destroy-on-close="true" width="38%">
-            <el-form :model="form" ref="dbForm" :rules="rules" label-width="85px">
+            <el-form :model="form" ref="dbForm" :rules="rules" label-width="95px">
                 <el-form-item prop="projectId" label="项目:" required>
                     <el-select style="width: 100%" v-model="form.projectId" placeholder="请选择项目" @change="changeProject" filterable>
                         <el-option v-for="item in projects" :key="item.id" :label="`${item.name} [${item.remark}]`" :value="item.id"> </el-option>
@@ -19,13 +19,17 @@
                 <el-form-item prop="type" label="类型:" required>
                     <el-select style="width: 100%" v-model="form.type" placeholder="请选择数据库类型">
                         <el-option key="item.id" label="mysql" value="mysql"> </el-option>
+                        <el-option key="item.id" label="postgres" value="postgres"> </el-option>
                     </el-select>
                 </el-form-item>
                 <el-form-item prop="host" label="host:" required>
-                    <el-input v-model.trim="form.host" placeholder="请输入主机ip" auto-complete="off"></el-input>
+                    <el-col :span="18">
-                </el-form-item>
+                        <el-input :disabled="form.id" v-model.trim="form.host" placeholder="请输入主机ip" auto-complete="off"></el-input>
-                <el-form-item prop="port" label="port:" required>
+                    </el-col>
-                    <el-input type="number" v-model.trim="form.port" placeholder="请输入端口"></el-input>
+                    <el-col style="text-align: center" :span="1">:</el-col>
+                    <el-col :span="5">
+                        <el-input type="number" v-model.number="form.port" placeholder="请输入端口"></el-input>
+                    </el-col>
                 </el-form-item>
                 <el-form-item prop="username" label="用户名:" required>
                     <el-input v-model.trim="form.username" placeholder="请输入用户名"></el-input>
@@ -37,31 +41,57 @@
                         v-model.trim="form.password"
                         placeholder="请输入密码，修改操作可不填"
                         autocomplete="new-password"
-                    ></el-input>
+                    >
+                        <template v-if="form.id && form.id != 0" #suffix>
+                            <el-popover @hide="pwd = ''" placement="right" title="原密码" :width="200" trigger="click" :content="pwd">
+                                <template #reference>
+                                    <el-link @click="getDbPwd" :underline="false" type="primary" class="mr5">原密码</el-link>
+                                </template>
+                            </el-popover>
+                        </template>
+                    </el-input>
+                </el-form-item>
+                <el-form-item prop="params" label="连接参数:">
+                    <el-input v-model="form.params" placeholder="其他连接参数，形如: key1=value1&key2=value2"></el-input>
                 </el-form-item>
                 <el-form-item prop="database" label="数据库名:" required>
-                    <el-tag
+                    <el-col :span="19">
-                        v-for="db in databaseList"
+                        <el-select
-                        :key="db"
+                            @change="changeDatabase"
-                        class="ml5 mt5"
+                            v-model="databaseList"
-                        type="success"
+                            multiple
-                        effect="plain"
+                            collapse-tags
-                        closable
+                            collapse-tags-tooltip
-                        :disable-transitions="false"
+                            filterable
-                        @close="handleClose(db)"
+                            allow-create
-                    >
+                            placeholder="请确保数据库实例信息填写完整后获取库名"
-                        {{ db }}
+                            style="width: 100%"
-                    </el-tag>
+                        >
-                    <el-input
+                            <el-option v-for="db in allDatabases" :key="db" :label="db" :value="db" />
-                        v-if="inputDbVisible"
+                        </el-select>
-                        ref="InputDbRef"
+                    </el-col>
-                        v-model="inputDbValue"
+                    <el-col style="text-align: center" :span="1"><el-divider direction="vertical" border-style="dashed" /></el-col>
-                        style="width: 120px; margin-left: 5px; margin-top: 5px"
+                    <el-col :span="4">
-                        size="small"
+                        <el-link @click="getAllDatabase" :underline="false" type="success">获取库名</el-link>
-                        @keyup.enter="handleInputDbConfirm"
+                    </el-col>
-                        @blur="handleInputDbConfirm"
+                </el-form-item>
-                    />
+
-                    <el-button v-else class="ml5 mt5" size="small" @click="showInputDb"> + 添加数据库 </el-button>
+                <el-form-item prop="enableSshTunnel" label="SSH隧道:">
+                    <el-col :span="3">
+                        <el-checkbox @change="getSshTunnelMachines" v-model="form.enableSshTunnel" :true-label="1" :false-label="-1"></el-checkbox>
+                    </el-col>
+                    <el-col :span="2" v-if="form.enableSshTunnel == 1"> 机器: </el-col>
+                    <el-col :span="19" v-if="form.enableSshTunnel == 1">
+                        <el-select style="width: 100%" v-model="form.sshTunnelMachineId" placeholder="请选择SSH隧道机器">
+                            <el-option
+                                v-for="item in sshTunnelMachineList"
+                                :key="item.id"
+                                :label="`${item.ip}:${item.port} [${item.name}]`"
+                                :value="item.id"
+                            >
+                            </el-option>
+                        </el-select>
+                    </el-col>
                 </el-form-item>
             </el-form>
 
@@ -76,12 +106,13 @@
 </template>
 
 <script lang="ts">
-import { toRefs, reactive, nextTick, watch, defineComponent, ref } from 'vue';
+import { toRefs, reactive, watch, defineComponent, ref } from 'vue';
 import { dbApi } from './api';
 import { projectApi } from '../project/api.ts';
+import { machineApi } from '../machine/api.ts';
 import { ElMessage } from 'element-plus';
-import type { ElInput } from 'element-plus';
 import { notBlank } from '@/common/assert';
+import { RsaEncrypt } from '@/common/rsa';
 
 export default defineComponent({
     name: 'DbEdit',
@@ -101,27 +132,31 @@ export default defineComponent({
     },
     setup(props: any, { emit }) {
         const dbForm: any = ref(null);
-        const InputDbRef = ref<InstanceType<typeof ElInput>>();
 
         const state = reactive({
             dialogVisible: false,
             projects: [],
             envs: [],
+            allDatabases: [] as any,
             databaseList: [] as any,
-            inputDbVisible: false,
+            sshTunnelMachineList: [],
-            inputDbValue: '',
             form: {
                 id: null,
                 name: null,
                 port: 3306,
                 username: null,
                 password: null,
+                params: null,
                 database: '',
                 project: null,
                 projectId: null,
                 envId: null,
                 env: null,
+                enableSshTunnel: null,
+                sshTunnelMachineId: null,
             },
+            // 原密码
+            pwd: '',
             btnLoading: false,
             rules: {
                 projectId: [
@@ -155,14 +190,7 @@ export default defineComponent({
                 host: [
                     {
                         required: true,
-                        message: '请输入主机ip',
+                        message: '请输入主机ip和port',
-                        trigger: ['change', 'blur'],
-                    },
-                ],
-                port: [
-                    {
-                        required: true,
-                        message: '请输入端口',
                         trigger: ['change', 'blur'],
                     },
                 ],
@@ -173,13 +201,6 @@ export default defineComponent({
                         trigger: ['change', 'blur'],
                     },
                 ],
-                // password: [
-                //     {
-                //         required: true,
-                //         message: '请输入密码',
-                //         trigger: ['change', 'blur'],
-                //     },
-                // ],
                 database: [
                     {
                         required: true,
@@ -191,6 +212,10 @@ export default defineComponent({
         });
 
         watch(props, (newValue) => {
+            state.dialogVisible = newValue.visible;
+            if (!state.dialogVisible) {
+                return;
+            }
             state.projects = newValue.projects;
             if (newValue.db) {
                 getEnvs(newValue.db.projectId);
@@ -199,33 +224,12 @@ export default defineComponent({
                 state.databaseList = newValue.db.database.split(' ');
             } else {
                 state.envs = [];
-                state.form = { port: 3306 } as any;
+                state.form = { port: 3306, enableSshTunnel: -1 } as any;
                 state.databaseList = [];
             }
-            state.dialogVisible = newValue.visible;
+            getSshTunnelMachines();
         });
 
-        const handleClose = (db: string) => {
-            state.databaseList.splice(state.databaseList.indexOf(db), 1);
-            changeDatabase();
-        };
-
-        const showInputDb = () => {
-            state.inputDbVisible = true;
-            nextTick(() => {
-                InputDbRef.value!.input!.focus();
-            });
-        };
-
-        const handleInputDbConfirm = () => {
-            if (state.inputDbValue) {
-                state.databaseList.push(state.inputDbValue);
-                changeDatabase();
-            }
-            state.inputDbVisible = false;
-            state.inputDbValue = '';
-        };
-
         /**
          * 改变表单中的数据库字段，方便表单错误提示。如全部删光，可提示请添加数据库
          */
@@ -233,6 +237,13 @@ export default defineComponent({
             state.form.database = state.databaseList.length == 0 ? '' : state.databaseList.join(' ');
         };
 
+        const getSshTunnelMachines = async () => {
+            if (state.form.enableSshTunnel == 1 && state.sshTunnelMachineList.length == 0) {
+                const res = await machineApi.list.request({ pageNum: 1, pageSize: 100 });
+                state.sshTunnelMachineList = res.list;
+            }
+        };
+
         const getEnvs = async (projectId: any) => {
             state.envs = await projectApi.projectEnvs.request({ projectId });
         };
@@ -257,14 +268,26 @@ export default defineComponent({
             }
         };
 
+        const getAllDatabase = async () => {
+            const reqForm = { ...state.form };
+            reqForm.password = await RsaEncrypt(reqForm.password);
+            state.allDatabases = await dbApi.getAllDatabase.request(reqForm);
+            ElMessage.success('获取成功, 请选择需要管理操作的数据库')
+        };
+
+        const getDbPwd = async () => {
+            state.pwd = await dbApi.getDbPwd.request({ id: state.form.id });
+        };
+
         const btnOk = async () => {
             if (!state.form.id) {
                 notBlank(state.form.password, '新增操作，密码不可为空');
             }
-            dbForm.value.validate((valid: boolean) => {
+            dbForm.value.validate(async (valid: boolean) => {
                 if (valid) {
-                    state.form.port = Number.parseInt(state.form.port as any);
+                    const reqForm = { ...state.form };
-                    dbApi.saveDb.request(state.form).then(() => {
+                    reqForm.password = await RsaEncrypt(reqForm.password);
+                    dbApi.saveDb.request(reqForm).then(() => {
                         ElMessage.success('保存成功');
                         emit('val-change', state.form);
                         state.btnLoading = true;
@@ -282,9 +305,8 @@ export default defineComponent({
         };
 
         const resetInputDb = () => {
-            state.inputDbVisible = false;
             state.databaseList = [];
-            state.inputDbValue = '';
+            state.allDatabases = [];
         };
 
         const cancel = () => {
@@ -298,10 +320,10 @@ export default defineComponent({
         return {
             ...toRefs(state),
             dbForm,
-            InputDbRef,
+            getAllDatabase,
-            handleClose,
+            getDbPwd,
-            showInputDb,
+            changeDatabase,
-            handleInputDbConfirm,
+            getSshTunnelMachines,
             changeProject,
             changeEnv,
             btnOk,

mayfly_go_web/src/views/ops/db/DbList.vue

@@ -7,7 +7,7 @@
                 >删除</el-button
             >
             <div style="float: right">
-                <el-select v-model="query.projectId" placeholder="请选择项目" filterable clearable>
+                <el-select @focus="getProjects" v-model="query.projectId" placeholder="请选择项目" filterable clearable>
                     <el-option v-for="item in projects" :key="item.id" :label="`${item.name} [${item.remark}]`" :value="item.id"> </el-option>
                 </el-select>
                 <el-button v-waves type="primary" icon="search" @click="search()" class="ml5">查询</el-button>
@@ -20,33 +20,38 @@
                         </el-radio>
                     </template>
                 </el-table-column>
-                <el-table-column prop="project" label="项目" min-width="100"></el-table-column>
+                <el-table-column prop="project" label="项目" min-width="100" show-overflow-tooltip></el-table-column>
                 <el-table-column prop="env" label="环境" min-width="100"></el-table-column>
-                <el-table-column prop="name" label="名称" min-width="200"></el-table-column>
+                <el-table-column prop="name" label="名称" min-width="160" show-overflow-tooltip></el-table-column>
-                <el-table-column min-width="160" label="host:port">
+                <el-table-column min-width="170" label="host:port" show-overflow-tooltip>
                     <template #default="scope">
                         {{ `${scope.row.host}:${scope.row.port}` }}
                     </template>
                 </el-table-column>
-                <el-table-column prop="type" label="类型" min-width="80"></el-table-column>
+                <el-table-column prop="type" label="类型" min-width="90"></el-table-column>
-                <el-table-column prop="database" label="数据库" min-width="160">
+                <el-table-column prop="database" label="数据库" min-width="80">
                     <template #default="scope">
-                        <el-tag
+                        <el-popover :width="250" placement="right" trigger="click">
-                            @click="showTableInfo(scope.row, db)"
+                            <template #reference>
-                            effect="plain"
+                                <el-link type="primary" :underline="false" plain>查看</el-link>
-                            type="success"
+                            </template>
-                            size="small"
+                            <el-tag
-                            v-for="db in scope.row.dbs"
+                                @click="showTableInfo(scope.row, db)"
-                            :key="db"
+                                effect="plain"
-                            style="cursor: pointer; margin-left: 3px"
+                                type="success"
-                            >{{ db }}</el-tag
+                                size="small"
-                        >
+                                v-for="db in scope.row.dbs"
+                                :key="db"
+                                style="cursor: pointer; margin-left: 3px; margin-bottom: 3px;"
+                                >{{ db }}</el-tag
+                            >
+                        </el-popover>
                     </template>
                 </el-table-column>
                 <el-table-column prop="username" label="用户名" min-width="100"></el-table-column>
 
                 <el-table-column min-width="115" prop="creator" label="创建账号"></el-table-column>
-                <el-table-column min-width="160" prop="createTime" label="创建时间">
+                <el-table-column min-width="160" prop="createTime" label="创建时间" show-overflow-tooltip>
                     <template #default="scope">
                         {{ $filters.dateFormat(scope.row.createTime) }}
                     </template>
@@ -100,9 +105,17 @@
 
                 <el-button type="primary" size="small" @click="tableCreateDialog.visible = true">创建表</el-button>
             </el-row>
-            <el-table v-loading="tableInfoDialog.loading" border stripe :data="tableInfoDialog.infos" size="small">
+            <el-table v-loading="tableInfoDialog.loading" border stripe :data="filterTableInfos" size="small">
-                <el-table-column property="tableName" label="表名" min-width="150" show-overflow-tooltip></el-table-column>
+                <el-table-column property="tableName" label="表名" min-width="150" show-overflow-tooltip>
-                <el-table-column property="tableComment" label="备注" min-width="150" show-overflow-tooltip></el-table-column>
+                    <template #header>
+                        <el-input v-model="tableInfoDialog.tableNameSearch" size="small" placeholder="表名: 输入可过滤" clearable />
+                    </template>
+                </el-table-column>
+                <el-table-column property="tableComment" label="备注" min-width="150" show-overflow-tooltip>
+                    <template #header>
+                        <el-input v-model="tableInfoDialog.tableCommentSearch" size="small" placeholder="备注: 输入可过滤" clearable />
+                    </template>
+                </el-table-column>
                 <el-table-column
                     prop="tableRows"
                     label="Rows"
@@ -153,8 +166,10 @@
             v-model="sqlExecLogDialog.visible"
         >
             <div class="toolbar">
-                <el-input v-model="sqlExecLogDialog.query.db" placeholder="请输入数据库名" clearable style="width: 150px" />
+                <el-select v-model="sqlExecLogDialog.query.db" placeholder="请选择数据库" filterable clearable>
-                <el-input v-model="sqlExecLogDialog.query.table" placeholder="请输入表名" clearable class="ml5" style="width: 150px" />
+                    <el-option v-for="item in sqlExecLogDialog.dbs" :key="item" :label="`${item}`" :value="item"> </el-option>
+                </el-select>
+                <el-input v-model="sqlExecLogDialog.query.table" placeholder="请输入表名" clearable class="ml5" style="width: 180px" />
                 <el-select v-model="sqlExecLogDialog.query.type" placeholder="请选择操作类型" clearable class="ml5">
                     <el-option v-for="item in enums.DbSqlExecTypeEnum" :key="item.value" :label="item.label" :value="item.value"> </el-option>
                 </el-select>
@@ -224,6 +239,7 @@
                 <el-table-column prop="columnName" label="列名" show-overflow-tooltip> </el-table-column>
                 <el-table-column prop="seqInIndex" label="列序列号" show-overflow-tooltip> </el-table-column>
                 <el-table-column prop="indexType" label="类型"> </el-table-column>
+                <el-table-column prop="indexComment" label="备注" min-width="230" show-overflow-tooltip> </el-table-column>
             </el-table>
         </el-dialog>
 
@@ -243,7 +259,7 @@
 </template>
 
 <script lang='ts'>
-import { toRefs, reactive, onMounted, defineComponent } from 'vue';
+import { toRefs, reactive, computed, onMounted, defineComponent } from 'vue';
 import { ElMessage, ElMessageBox } from 'element-plus';
 import { formatByteSize } from '@/common/utils/format';
 import DbEdit from './DbEdit.vue';
@@ -298,6 +314,7 @@ export default defineComponent({
                 visible: false,
                 data: [],
                 total: 0,
+                dbs: [],
                 query: {
                     dbId: 0,
                     db: '',
@@ -316,6 +333,8 @@ export default defineComponent({
                 loading: false,
                 visible: false,
                 infos: [],
+                tableNameSearch: '',
+                tableCommentSearch: '',
             },
             columnDialog: {
                 visible: false,
@@ -341,7 +360,26 @@ export default defineComponent({
 
         onMounted(async () => {
             search();
-            state.projects = (await projectApi.projects.request({ pageNum: 1, pageSize: 100 })).list;
+        });
+
+        const filterTableInfos = computed(() => {
+            const infos = state.tableInfoDialog.infos;
+            const tableNameSearch = state.tableInfoDialog.tableNameSearch;
+            const tableCommentSearch = state.tableInfoDialog.tableCommentSearch;
+            if (!tableNameSearch && !tableCommentSearch) {
+                return infos;
+            }
+            return infos.filter((data: any) => {
+                let tnMatch = true;
+                let tcMatch = true;
+                if (tableNameSearch) {
+                    tnMatch = data.tableName.toLowerCase().includes(tableNameSearch.toLowerCase());
+                }
+                if (tableCommentSearch) {
+                    tcMatch = data.tableComment.includes(tableCommentSearch);
+                }
+                return tnMatch && tcMatch;
+            });
         });
 
         const choose = (item: any) => {
@@ -368,7 +406,12 @@ export default defineComponent({
             search();
         };
 
-        const editDb = (isAdd = false) => {
+        const getProjects = async () => {
+            state.projects = await projectApi.accountProjects.request(null);
+        };
+
+        const editDb = async (isAdd = false) => {
+            await getProjects();
             if (isAdd) {
                 state.dbEditDialog.data = null;
                 state.dbEditDialog.title = '新增数据库资源';
@@ -403,6 +446,7 @@ export default defineComponent({
         const onShowSqlExec = async (row: any) => {
             state.sqlExecLogDialog.title = `${row.name}[${row.host}:${row.port}]`;
             state.sqlExecLogDialog.query.dbId = row.id;
+            state.sqlExecLogDialog.dbs = row.database.split(' ');
             searchSqlExecLog();
             state.sqlExecLogDialog.visible = true;
         };
@@ -410,6 +454,7 @@ export default defineComponent({
         const onBeforeCloseSqlExecDialog = () => {
             state.sqlExecLogDialog.visible = false;
             state.sqlExecLogDialog.data = [];
+            state.sqlExecLogDialog.dbs = [];
             state.sqlExecLogDialog.total = 0;
             state.sqlExecLogDialog.query.dbId = 0;
             state.sqlExecLogDialog.query.pageNum = 1;
@@ -501,6 +546,8 @@ export default defineComponent({
                 state.tableInfoDialog.infos = await dbApi.tableInfos.request({ id: row.id, db });
                 state.dbId = row.id;
                 state.db = db;
+            } catch (e) {
+                state.tableInfoDialog.visible = false;
             } finally {
                 state.tableInfoDialog.loading = false;
             }
@@ -569,6 +616,8 @@ export default defineComponent({
 
         return {
             ...toRefs(state),
+            getProjects,
+            filterTableInfos,
             enums,
             search,
             choose,

mayfly_go_web/src/views/ops/db/SqlExec.vue

@@ -1,9 +1,5 @@
 <template>
     <div>
-        <el-button-group :style="btnStyle">
-            <el-button @click="onRunSql" type="success" icon="video-play" size="small" plain>执行</el-button>
-            <el-button @click="formatSql" type="primary" icon="magic-stick" size="small" plain>格式化</el-button>
-        </el-button-group>
         <div class="toolbar">
             <el-row type="flex" justify="space-between">
                 <el-col :span="24">
@@ -58,6 +54,19 @@
                         <div>
                             <div class="toolbar">
                                 <div class="fl">
+                                    <el-link @click="onRunSql" :underline="false" class="ml15" icon="VideoPlay"></el-link>
+                                    <el-divider direction="vertical" border-style="dashed" />
+
+                                    <el-tooltip class="box-item" effect="dark" content="format sql" placement="top">
+                                        <el-link @click="formatSql" type="primary" :underline="false" icon="MagicStick"></el-link>
+                                    </el-tooltip>
+                                    <el-divider direction="vertical" border-style="dashed" />
+
+                                    <el-tooltip class="box-item" effect="dark" content="commit" placement="top">
+                                        <el-link @click="onCommit" type="success" :underline="false" icon="CircleCheck"></el-link>
+                                    </el-tooltip>
+                                    <el-divider direction="vertical" border-style="dashed" />
+
                                     <el-upload
                                         style="display: inline-block"
                                         :before-upload="beforeUpload"
@@ -72,11 +81,10 @@
                                         multiple
                                         :limit="100"
                                     >
-                                        <el-button type="success" icon="video-play" plain size="small">sql脚本执行</el-button>
+                                        <el-tooltip class="box-item" effect="dark" content="SQL脚本执行" placement="top">
+                                            <el-link type="success" :underline="false" icon="Document"></el-link>
+                                        </el-tooltip>
                                     </el-upload>
-                                    <el-button @click="onCommit" class="ml5 mb5" type="success" icon="CircleCheck" plain size="small"
-                                        >commit</el-button
-                                    >
                                 </div>
 
                                 <div style="float: right" class="fl">
@@ -101,13 +109,25 @@
                             </div>
                         </div>
 
-                        <div @click="closeExecBtns" class="mt5 sqlEditor" @contextmenu="showExecBtns">
+                        <div class="mt5 sqlEditor">
                             <textarea ref="codeTextarea"></textarea>
                         </div>
 
                         <div class="mt5">
-                            <el-row v-if="queryTab.nowTableName">
+                            <el-row>
-                                <el-link @click="onDeleteData" class="ml5" type="danger" icon="delete" :underline="false"></el-link>
+                                <el-link
+                                    v-if="queryTab.nowTableName"
+                                    @click="onDeleteData"
+                                    class="ml5"
+                                    type="danger"
+                                    icon="delete"
+                                    :underline="false"
+                                ></el-link>
+
+                                <span v-if="queryTab.execRes.data.length > 0">
+                                    <el-divider direction="vertical" border-style="dashed" />
+                                    <el-link type="success" :underline="false" @click="exportData"><span style="font-size: 12px">导出</span></el-link>
+                                </span>
                             </el-row>
                             <el-table
                                 @cell-dblclick="cellClick"
@@ -145,46 +165,60 @@
 
                 <el-tab-pane closable v-for="dt in dataTabs" :key="dt.name" :label="dt.label" :name="dt.name">
                     <el-row v-if="dbId">
-                        <el-link @click="onRefresh(dt.name)" icon="refresh" :underline="false" class="ml5"></el-link>
+                        <el-col :span="8">
-                        <el-link @click="addRow" class="ml5" type="primary" icon="plus" :underline="false"></el-link>
+                            <el-link @click="onRefresh(dt.name)" icon="refresh" :underline="false" class="ml5"></el-link>
-                        <el-link @click="onDeleteData" class="ml5" type="danger" icon="delete" :underline="false"></el-link>
+                            <el-divider direction="vertical" border-style="dashed" />
 
-                        <el-tooltip class="box-item" effect="dark" content="commit" placement="top">
+                            <el-link @click="addRow" type="primary" icon="plus" :underline="false"></el-link>
-                            <el-link @click="onCommit" class="ml5" type="success" icon="check" :underline="false"></el-link>
+                            <el-divider direction="vertical" border-style="dashed" />
-                        </el-tooltip>
-                    </el-row>
-                    <el-row class="mt5">
-                        <el-input
-                            v-model="dt.condition"
-                            placeholder="若需条件过滤，可选择列并点击对应的字段并输入需要过滤的内容点击查询按钮即可"
-                            clearable
-                            size="small"
-                        >
-                            <template #prepend>
-                                <el-popover trigger="click" :width="270" placement="right">
-                                    <template #reference>
-                                        <el-link type="success" :underline="false">选择列</el-link>
-                                    </template>
-                                    <el-table
-                                        :data="getColumns4Map(dt.name)"
-                                        max-height="500"
-                                        size="small"
-                                        @row-click="
-                                            (...event) => {
-                                                onConditionRowClick(event, dt);
-                                            }
-                                        "
-                                    >
-                                        <el-table-column property="columnName" label="列名" show-overflow-tooltip> </el-table-column>
-                                        <el-table-column property="columnComment" label="备注" show-overflow-tooltip> </el-table-column>
-                                    </el-table>
-                                </el-popover>
-                            </template>
 
-                            <template #append>
+                            <el-link @click="onDeleteData" type="danger" icon="delete" :underline="false"></el-link>
-                                <el-button @click="selectByCondition(dt.name, dt.condition)" icon="search" size="small"></el-button>
+                            <el-divider direction="vertical" border-style="dashed" />
-                            </template>
+
-                        </el-input>
+                            <el-tooltip class="box-item" effect="dark" content="commit" placement="top">
+                                <el-link @click="onCommit" type="success" icon="CircleCheck" :underline="false"></el-link>
+                            </el-tooltip>
+                            <el-divider direction="vertical" border-style="dashed" />
+
+                            <el-tooltip class="box-item" effect="dark" content="生成insert sql" placement="top">
+                                <el-link @click="onGenerateInsertSql" type="success" :underline="false">gi</el-link>
+                            </el-tooltip>
+                        </el-col>
+                        <el-col :span="16">
+                            <el-input
+                                v-model="dt.condition"
+                                placeholder="若需条件过滤，可选择列并点击对应的字段并输入需要过滤的内容点击查询按钮即可"
+                                clearable
+                                size="small"
+                                style="width: 100%"
+                            >
+                                <template #prepend>
+                                    <el-popover trigger="click" :width="320" placement="right">
+                                        <template #reference>
+                                            <el-link type="success" :underline="false">选择列</el-link>
+                                        </template>
+                                        <el-table
+                                            :data="getColumns4Map(dt.name)"
+                                            max-height="500"
+                                            size="small"
+                                            @row-click="
+                                                (...event) => {
+                                                    onConditionRowClick(event, dt);
+                                                }
+                                            "
+                                            style="cursor: pointer"
+                                        >
+                                            <el-table-column property="columnName" label="列名" show-overflow-tooltip> </el-table-column>
+                                            <el-table-column property="columnComment" label="备注" show-overflow-tooltip> </el-table-column>
+                                        </el-table>
+                                    </el-popover>
+                                </template>
+
+                                <template #append>
+                                    <el-button @click="selectByCondition(dt.name, dt.condition)" icon="search" size="small"></el-button>
+                                </template>
+                            </el-input>
+                        </el-col>
                     </el-row>
                     <el-table
                         @cell-dblclick="cellClick"
@@ -233,6 +267,34 @@
                 </el-tab-pane>
             </el-tabs>
         </el-container>
+
+        <el-dialog v-model="conditionDialog.visible" :title="conditionDialog.title" width="420px">
+            <el-row>
+                <el-col :span="5">
+                    <el-select v-model="conditionDialog.condition">
+                        <el-option label="=" value="="> </el-option>
+                        <el-option label="LIKE" value="LIKE"> </el-option>
+                        <el-option label=">" value=">"> </el-option>
+                        <el-option label=">=" value=">="> </el-option>
+                        <el-option label="<" value="<"> </el-option>
+                        <el-option label="<=" value="<="> </el-option>
+                    </el-select>
+                </el-col>
+                <el-col :span="19">
+                    <el-input v-model="conditionDialog.value" :placeholder="conditionDialog.placeholder" />
+                </el-col>
+            </el-row>
+            <template #footer>
+                <span class="dialog-footer">
+                    <el-button @click="onCancelCondition">取消</el-button>
+                    <el-button type="primary" @click="onConfirmCondition">确定</el-button>
+                </span>
+            </template>
+        </el-dialog>
+
+        <el-dialog @close="genSqlDialog.visible = false" v-model="genSqlDialog.visible" title="SQL" width="1000px">
+            <el-input v-model="genSqlDialog.sql" type="textarea" rows="20" />
+        </el-dialog>
     </div>
 </template>
 
@@ -258,6 +320,7 @@ import ProjectEnvSelect from '../component/ProjectEnvSelect.vue';
 import config from '@/common/config';
 import { getSession } from '@/common/utils/storage';
 import SqlExecBox from './component/SqlExecBox';
+import { dateStrFormat } from '@/common/utils/date.ts';
 
 export default defineComponent({
     name: 'SqlExec',
@@ -276,6 +339,7 @@ export default defineComponent({
             dbs: [], // 数据库实例列表
             databaseList: [], // 数据库实例拥有的数据库列表，1数据库实例  -> 多数据库
             db: '', // 当前操作的数据库
+            dbType: '',
             tables: [],
             dbId: null, // 当前选中操作的数据库实例
             tableName: '',
@@ -305,12 +369,18 @@ export default defineComponent({
                 pageSize: 10,
                 envId: null,
             },
-            btnStyle: {
+            conditionDialog: {
-                position: 'absolute',
+                title: '',
-                zIndex: 1000,
+                placeholder: '',
-                display: 'none',
+                columnRow: null,
-                left: '',
+                dataTab: null,
-                top: '',
+                visible: false,
+                condition: '=',
+                value: null,
+            },
+            genSqlDialog: {
+                visible: false,
+                sql: '',
             },
             cmOptions: {
                 tabSize: 4,
@@ -364,7 +434,7 @@ export default defineComponent({
         const setHeight = () => {
             // 默认300px
             codemirror.setSize('auto', `${window.innerHeight - 538}px`);
-            state.dataTabsTableHeight = window.innerHeight - 258 - 33;
+            state.dataTabsTableHeight = window.innerHeight - 274;
         };
 
         /**
@@ -433,7 +503,6 @@ export default defineComponent({
             } catch (e: any) {
                 state.queryTab.loading = false;
             }
-            closeExecBtns();
 
             // 即只有以该字符串开头的sql才可修改表数据内容
             if (sql.startsWith('SELECT *') || sql.startsWith('select *') || sql.startsWith('SELECT\n  *')) {
@@ -453,6 +522,36 @@ export default defineComponent({
             }
         };
 
+        const exportData = () => {
+            const dataList = state.queryTab.execRes.data;
+            isTrue(dataList.length > 0, '没有数据可导出');
+
+            const tableColumn = state.queryTab.execRes.tableColumn;
+            // 二维数组
+            const cvsData = [tableColumn];
+            for (let data of dataList) {
+                // 数据值组成的一维数组
+                let dataValueArr: any = [];
+                for (let column of tableColumn) {
+                    dataValueArr.push(data[column]);
+                }
+                cvsData.push(dataValueArr);
+            }
+            const csvString = cvsData.map((e) => e.join(',')).join('\n');
+
+            // 导出
+            let link = document.createElement('a');
+            let exportContent = '\uFEFF';
+            let blob = new Blob([exportContent + csvString], {
+                type: 'text/plain;charset=utrf-8',
+            });
+            link.id = 'download-csv';
+            link.setAttribute('href', URL.createObjectURL(blob));
+            link.setAttribute('download', `查询数据导出-${dateStrFormat('yyyyMMddHHmmss', new Date())}.csv`);
+            document.body.appendChild(link);
+            link.click();
+        };
+
         /**
          * 执行sql str
          *
@@ -622,7 +721,9 @@ export default defineComponent({
          */
         const changeDbInstance = (dbId: any) => {
             state.db = '';
-            state.databaseList = (state.dbs.find((e: any) => e.id == dbId) as any).database.split(' ');
+            const dbInfo = state.dbs.find((e: any) => e.id == dbId) as any;
+            state.dbType = dbInfo.type;
+            state.databaseList = dbInfo.database.split(' ');
             clearDb();
         };
 
@@ -714,23 +815,34 @@ export default defineComponent({
          */
         const onConditionRowClick = (event: any, dataTab: any) => {
             const row = event[0];
-            ElMessageBox.prompt(`请输入 [${row.columnName}] 的值`, '查询条件', {
+            state.conditionDialog.title = `请输入 [${row.columnName}] 的值`;
-                confirmButtonText: '确定',
+            state.conditionDialog.placeholder = `${row.columnType}  ${row.columnComment}`;
-                cancelButtonText: '取消',
+            state.conditionDialog.columnRow = row;
-                inputPlaceholder: `${row.columnType}  ${row.columnComment}`,
+            state.conditionDialog.dataTab = dataTab;
-            })
+            state.conditionDialog.visible = true;
-                .then(({ value }) => {
+        };
-                    if (!value) {
+
-                        value = '';
+        // 确认条件
-                    }
+        const onConfirmCondition = () => {
-                    let condition = dataTab.condition;
+            const conditionDialog = state.conditionDialog;
-                    if (condition) {
+            const dataTab = state.conditionDialog.dataTab as any;
-                        condition += ` AND `;
+            let condition = dataTab.condition;
-                    }
+            if (condition) {
-                    condition += `${row.columnName} = `;
+                condition += ` AND `;
-                    dataTab.condition = condition + wrapColumnValue(row, value);
+            }
-                })
+            const row = conditionDialog.columnRow as any;
-                .catch(() => {});
+            condition += `${row.columnName} ${conditionDialog.condition} `;
+            dataTab.condition = condition + wrapColumnValue(row, conditionDialog.value);
+            onCancelCondition();
+        };
+
+        const onCancelCondition = () => {
+            state.conditionDialog.visible = false;
+            state.conditionDialog.title = ``;
+            state.conditionDialog.placeholder = ``;
+            state.conditionDialog.value = null;
+            state.conditionDialog.columnRow = null;
+            state.conditionDialog.dataTab = null;
         };
 
         const onRefresh = async (tableName: string) => {
@@ -788,16 +900,21 @@ export default defineComponent({
          * 获取默认查询语句
          */
         const getDefaultSelectSql = (tableName: string, where: string = '', orderBy: string = '', pageNum: number = 1) => {
-            return `SELECT * FROM \`${tableName}\` ${where ? 'WHERE ' + where : ''} ${orderBy ? orderBy : ''} LIMIT ${
+            const baseSql = `SELECT * FROM ${tableName} ${where ? 'WHERE ' + where : ''} ${orderBy ? orderBy : ''}`;
-                (pageNum - 1) * state.defalutLimit
+            if (state.dbType == 'mysql') {
-            }, ${state.defalutLimit}`;
+                return `${baseSql} LIMIT ${(pageNum - 1) * state.defalutLimit}, ${state.defalutLimit};`;
+            }
+            if (state.dbType == 'postgres') {
+                return `${baseSql} OFFSET ${(pageNum - 1) * state.defalutLimit} LIMIT ${state.defalutLimit};`;
+            }
+            return baseSql;
         };
 
         /**
          * 获取默认查询统计语句
          */
         const getDefaultCountSql = (tableName: string, where: string = '') => {
-            return `SELECT COUNT(*) count FROM \`${tableName}\` ${where ? 'WHERE ' + where : ''}`;
+            return `SELECT COUNT(*) count FROM ${tableName} ${where ? 'WHERE ' + where : ''}`;
         };
 
         /**
@@ -819,7 +936,7 @@ export default defineComponent({
             const tableName = state.activeName;
             const sortType = sort.order == 'descending' ? 'DESC' : 'ASC';
 
-            const orderBy = `ORDER BY \`${sort.prop}\` ${sortType}`;
+            const orderBy = `ORDER BY ${sort.prop} ${sortType}`;
             state.dataTabs[state.activeName].orderBy = orderBy;
 
             onRefresh(tableName);
@@ -920,7 +1037,6 @@ export default defineComponent({
             state.queryTab.execRes.tableColumn = [];
             state.cmOptions.hintOptions.tables = [];
             tableMap.clear();
-            closeExecBtns();
         };
 
         const onDataSelectionChange = (datas: []) => {
@@ -955,6 +1071,38 @@ export default defineComponent({
             });
         };
 
+        const onGenerateInsertSql = async () => {
+            const queryTab = isQueryTab();
+            const datas = queryTab ? state.queryTab.selectionDatas : state.dataTabs[state.activeName].selectionDatas;
+            isTrue(datas && datas.length > 0, '请先选择要生成insert语句的数据');
+            const tableName = state.nowTableName;
+            const columns: any = await getColumns(tableName);
+
+            const sqls = [];
+            for (let data of datas) {
+                let colNames = [];
+                let values = [];
+                for (let column of columns) {
+                    const colName = column.columnName;
+                    colNames.push(colName);
+                    values.push(wrapValueByType(data[colName]));
+                }
+                sqls.push(`INSERT INTO ${tableName} (${colNames.join(', ')}) VALUES(${values.join(', ')})`);
+            }
+            state.genSqlDialog.sql = sqls.join(';\n') + ';';
+            state.genSqlDialog.visible = true;
+        };
+
+        const wrapValueByType = (val: any) => {
+            if (val == null) {
+                return 'NULL';
+            }
+            if (typeof val == 'number') {
+                return val;
+            }
+            return `'${val}'`;
+        };
+
         /**
          * 是否为查询tab
          */
@@ -1064,7 +1212,6 @@ export default defineComponent({
             let selectSql = codemirror.getSelection();
             isTrue(selectSql, '请选中需要格式化的sql');
             codemirror.replaceSelection(sqlFormatter(selectSql));
-            closeExecBtns();
         };
 
         const search = async () => {
@@ -1072,31 +1219,6 @@ export default defineComponent({
             state.dbs = res.list;
         };
 
-        /**
-         * 显示执行sql和格式化按钮
-         */
-        const showExecBtns = (event: any) => {
-            if (event.preventDefault) {
-                event.preventDefault();
-            } else {
-                event.returnValue = false;
-            }
-            state.btnStyle.display = 'inline';
-            state.btnStyle.left = event.offsetX + 15 + 'px';
-            state.btnStyle.top = event.clientY - 80 + 'px';
-        };
-
-        /**
-         * 关闭执行sql和格式化按钮
-         */
-        const closeExecBtns = () => {
-            if (state.btnStyle.left) {
-                state.btnStyle.display = 'none';
-                state.btnStyle.left = '';
-                state.btnStyle.top = '';
-            }
-        };
-
         return {
             ...toRefs(state),
             codeTextarea,
@@ -1104,6 +1226,7 @@ export default defineComponent({
             changeTable,
             cellClick,
             onRunSql,
+            exportData,
             removeDataTab,
             onDataTabClick,
             beforeUpload,
@@ -1113,6 +1236,8 @@ export default defineComponent({
             getColumnTip,
             getColumns4Map,
             onConditionRowClick,
+            onConfirmCondition,
+            onCancelCondition,
             changeSqlTemplate,
             deleteSql,
             saveSql,
@@ -1129,8 +1254,7 @@ export default defineComponent({
             onDataSelectionChange,
             onDeleteData,
             onTableSortChange,
-            showExecBtns,
+            onGenerateInsertSql,
-            closeExecBtns,
         };
     },
 });

mayfly_go_web/src/views/ops/db/api.ts

@@ -4,6 +4,8 @@ export const dbApi = {
     // 获取权限列表
     dbs: Api.create("/dbs", 'get'),
     saveDb: Api.create("/dbs", 'post'),
+    getAllDatabase: Api.create("/dbs/databases", 'post'),
+    getDbPwd: Api.create("/dbs/{id}/pwd", 'get'),
     deleteDb: Api.create("/dbs/{id}", 'delete'),
     dumpDb: Api.create("/dbs/{id}/dump", 'post'),
     tableInfos: Api.create("/dbs/{id}/t-infos", 'get'),
@@ -22,5 +24,5 @@ export const dbApi = {
     getSqlNames: Api.create("/dbs/{id}/sql-names", 'get'),
     deleteDbSql: Api.create("/dbs/{id}/sql", 'delete'),
     // 获取数据库sql执行记录
-    getSqlExecs: Api.create("/dbs/{id}/sql-execs", 'get'),
+    getSqlExecs: Api.create("/dbs/{dbId}/sql-execs", 'get'),
 }

mayfly_go_web/src/views/ops/db/component/SqlExecDialog.vue

@@ -135,7 +135,9 @@ export default defineComponent({
             state.db = props.db;
             state.dialogVisible = true;
             nextTick(() => {
-                remarkInputRef.value?.focus();
+                setTimeout(() => {
+                    remarkInputRef.value?.focus();
+                });
             });
         };
 

mayfly_go_web/src/views/ops/machine/FileManage.vue

@@ -57,7 +57,7 @@
             </el-row>
         </el-dialog>
 
-        <el-dialog :title="tree.title" v-model="tree.visible" :close-on-click-modal="false" width="680px">
+        <el-dialog :title="tree.title" v-model="tree.visible" :close-on-click-modal="false" width="70%">
             <el-progress
                 v-if="uploadProgressShow"
                 style="width: 90%; margin-left: 20px"
@@ -66,7 +66,16 @@
                 :percentage="progressNum"
             />
             <div style="height: 45vh; overflow: auto">
-                <el-tree v-if="tree.visible" ref="fileTree" :load="loadNode" :props="props" lazy node-key="id" :expand-on-click-node="true">
+                <el-tree
+                    v-if="tree.visible"
+                    ref="fileTree"
+                    :highlight-current="true"
+                    :load="loadNode"
+                    :props="props"
+                    lazy
+                    node-key="id"
+                    :expand-on-click-node="true"
+                >
                     <template #default="{ node, data }">
                         <span class="custom-tree-node">
                             <el-dropdown size="small" @visible-change="getFilePath(data, $event)" trigger="contextmenu">
@@ -81,9 +90,8 @@
                                         <SvgIcon name="document" />
                                     </span>
 
-                                    <span style="display: inline-block">
+                                    <span>
                                         {{ node.label }}
-                                        <span style="color: #67c23a" v-if="data.type == '-'">&nbsp;&nbsp;[{{ formatFileSize(data.size) }}]</span>
                                     </span>
                                 </span>
 
@@ -96,6 +104,12 @@
                                             <el-link type="info" icon="view" :underline="false">查看</el-link>
                                         </el-dropdown-item>
 
+                                        <span v-auth="'machine:file:write'">
+                                            <el-dropdown-item @click="showCreateFileDialog(node, data)" v-if="data.type == 'd'">
+                                                <el-link type="primary" icon="document" :underline="false" style="margin-left: 2px">新建</el-link>
+                                            </el-dropdown-item>
+                                        </span>
+
                                         <span v-auth="'machine:file:upload'">
                                             <el-dropdown-item v-if="data.type == 'd'">
                                                 <el-upload
@@ -127,12 +141,45 @@
                                     </el-dropdown-menu>
                                 </template>
                             </el-dropdown>
+                            <span style="display: inline-block" class="ml15">
+                                <span style="color: #67c23a" v-if="data.type == '-'">[{{ formatFileSize(data.size) }}]</span>
+                                <span v-if="data.mode" style="color: #67c23a">&nbsp;[{{ data.mode }} {{ data.modTime }}]</span>
+                            </span>
                         </span>
                     </template>
                 </el-tree>
             </div>
         </el-dialog>
 
+        <el-dialog
+            :destroy-on-close="true"
+            title="新建文件"
+            v-model="createFileDialog.visible"
+            :before-close="closeCreateFileDialog"
+            :close-on-click-modal="false"
+            top="5vh"
+            width="400px"
+        >
+            <div>
+                <el-form-item prop="name" label="名称:">
+                    <el-input v-model.trim="createFileDialog.name" placeholder="请输入名称" auto-complete="off"></el-input>
+                </el-form-item>
+                <el-form-item prop="type" label="类型:">
+                    <el-radio-group v-model="createFileDialog.type">
+                        <el-radio label="d" size="small">文件夹</el-radio>
+                        <el-radio label="-" size="small">文件</el-radio>
+                    </el-radio-group>
+                </el-form-item>
+            </div>
+
+            <template #footer>
+                <div>
+                    <el-button @click="closeCreateFileDialog">关闭</el-button>
+                    <el-button v-auth="'machine:file:write'" type="primary" @click="createFile">确定</el-button>
+                </div>
+            </template>
+        </el-dialog>
+
         <el-dialog
             :destroy-on-close="true"
             :title="fileContent.dialogTitle"
@@ -164,6 +211,7 @@ import { codemirror } from '@/components/codemirror';
 import { getSession } from '@/common/utils/storage';
 import enums from './enums';
 import config from '@/common/config';
+import { isTrue } from '@/common/assert';
 
 export default defineComponent({
     name: 'FileManage',
@@ -184,26 +232,8 @@ export default defineComponent({
         const fileTree: any = ref(null);
         const token = getSession('token');
 
-        const cmOptions = {
+        const folderType = 'd';
-            tabSize: 2,
+        const fileType = '-';
-            mode: 'text/x-sh',
-            theme: 'panda-syntax',
-            line: true,
-            // 开启校验
-            lint: true,
-            gutters: ['CodeMirror-lint-markers'],
-            indentWithTabs: true,
-            smartIndent: true,
-            matchBrackets: true,
-            autofocus: true,
-            styleSelectedText: true,
-            styleActiveLine: true, // 高亮选中行
-            foldGutter: true, // 块槽
-            hintOptions: {
-                // 当匹配只有一项的时候是否自动补全
-                completeSingle: true,
-            },
-        };
 
         const state = reactive({
             dialogVisible: false,
@@ -250,12 +280,18 @@ export default defineComponent({
                 path: '',
                 type: '',
             },
+            createFileDialog: {
+                visible: false,
+                name: '',
+                type: folderType,
+                node: null as any,
+            },
             file: null as any,
         });
 
-        watch(props, (newValue) => {
+        watch(props, async (newValue) => {
-            if (newValue.machineId) {
+            if (newValue.machineId && newValue.visible) {
-                getFiles();
+                await getFiles();
             }
             state.dialogVisible = newValue.visible;
         });
@@ -272,18 +308,6 @@ export default defineComponent({
             getFiles();
         };
 
-        /**
-         * tab切换触发事件
-         * @param {Object} tab
-         * @param {Object} event
-         */
-        // handleClick(tab, event) {
-        //   // if (tab.name == 'file-manage') {
-        //   //   this.fileManage.node.childNodes = [];
-        //   //   this.loadNode(this.fileManage.node, this.fileManage.resolve);
-        //   // }
-        // }
-
         const add = () => {
             // 往数组头部添加元素
             state.fileTable = [{}].concat(state.fileTable);
@@ -311,7 +335,6 @@ export default defineComponent({
                         })
                         .then(() => {
                             getFiles();
-                            // state.fileTable.splice(idx, 1);
                         });
                 });
             } else {
@@ -388,7 +411,6 @@ export default defineComponent({
             emit('update:visible', false);
             emit('update:machineId', null);
             emit('cancel');
-            // state.activeName = 'conf-file'
             state.fileTable = [];
             state.tree.folder = { id: 0 };
         };
@@ -413,7 +435,7 @@ export default defineComponent({
                 return resolve([
                     {
                         name: path,
-                        type: 'd',
+                        type: folderType,
                         path: path,
                     },
                 ]);
@@ -435,13 +457,42 @@ export default defineComponent({
             });
             for (const file of res) {
                 const type = file.type;
-                if (type != 'd') {
+                if (type == fileType) {
                     file.leaf = true;
                 }
             }
             return resolve(res);
         };
 
+        const showCreateFileDialog = (node: any) => {
+            isTrue(node.expanded, '请先点击展开该节点后再创建');
+            state.createFileDialog.node = node;
+            state.createFileDialog.visible = true;
+        };
+
+        const createFile = async () => {
+            const node = state.createFileDialog.node;
+            console.log(node.data);
+            const name = state.createFileDialog.name;
+            const type = state.createFileDialog.type;
+            const path = node.data.path + '/' + name;
+            await machineApi.createFile.request({
+                machineId: props.machineId,
+                id: state.tree.folder.id,
+                path,
+                type,
+            });
+            fileTree.value.append({ name: name, path: path, type: type, leaf: type === fileType, size: 0 }, node);
+            closeCreateFileDialog();
+        };
+
+        const closeCreateFileDialog = () => {
+            state.createFileDialog.visible = false;
+            state.createFileDialog.node = null;
+            state.createFileDialog.name = '';
+            state.createFileDialog.type = folderType;
+        };
+
         const deleteFile = (node: any, data: any) => {
             const file = data.path;
             ElMessageBox.confirm(`此操作将删除 [${file}], 是否继续?`, '提示', {
@@ -468,7 +519,6 @@ export default defineComponent({
 
         const downloadFile = (node: any, data: any) => {
             const a = document.createElement('a');
-            // a.setAttribute('target', '_blank')
             a.setAttribute(
                 'href',
                 `${config.baseApiUrl}/machines/${props.machineId}/files/${state.tree.folder.id}/read?type=1&path=${data.path}&token=${token}`
@@ -516,7 +566,6 @@ export default defineComponent({
 
         const beforeUpload = (file: File) => {
             state.file = file;
-            // ElMessage.success(`'${file.name}' 上传中,请关注结果通知`);
         };
         const getFilePath = (data: object, visible: boolean) => {
             if (visible) {
@@ -572,7 +621,6 @@ export default defineComponent({
             fileTree,
             enums,
             token,
-            cmOptions,
             add,
             getFiles,
             handlePageChange,
@@ -583,6 +631,9 @@ export default defineComponent({
             updateContent,
             handleClose,
             loadNode,
+            showCreateFileDialog,
+            closeCreateFileDialog,
+            createFile,
             deleteFile,
             downloadFile,
             getUploadFile,

mayfly_go_web/src/views/ops/machine/MachineEdit.vue

@@ -1,6 +1,6 @@
 <template>
     <div>
-        <el-dialog :title="title" v-model="dialogVisible" :close-on-click-modal="false" :destroy-on-close="true" :before-close="cancel" width="35%">
+        <el-dialog :title="title" v-model="dialogVisible" :close-on-click-modal="false" :destroy-on-close="true" :before-close="cancel" width="38%">
             <el-form :model="form" ref="machineForm" :rules="rules" label-width="85px">
                 <el-form-item prop="projectId" label="项目:" required>
                     <el-select style="width: 100%" v-model="form.projectId" placeholder="请选择项目" @change="changeProject" filterable>
@@ -11,26 +11,68 @@
                     <el-input v-model.trim="form.name" placeholder="请输入机器别名" auto-complete="off"></el-input>
                 </el-form-item>
                 <el-form-item prop="ip" label="ip:" required>
-                    <el-input v-model.trim="form.ip" placeholder="请输入主机ip" auto-complete="off"></el-input>
+                    <el-col :span="18">
-                </el-form-item>
+                        <el-input :disabled="form.id" v-model.trim="form.ip" placeholder="主机ip" auto-complete="off"></el-input>
-                <el-form-item prop="port" label="port:" required>
+                    </el-col>
-                    <el-input type="number" v-model.number="form.port" placeholder="请输入端口"></el-input>
+                    <el-col style="text-align: center" :span="1">:</el-col>
+                    <el-col :span="5">
+                        <el-input type="number" v-model.number="form.port" placeholder="端口"></el-input>
+                    </el-col>
                 </el-form-item>
                 <el-form-item prop="username" label="用户名:" required>
                     <el-input v-model.trim="form.username" placeholder="请输入用户名"></el-input>
                 </el-form-item>
-                <el-form-item prop="password" label="密码:">
+                <el-form-item prop="authMethod" label="认证方式:" required>
+                    <el-select style="width: 100%" v-model="form.authMethod" placeholder="请选择认证方式">
+                        <el-option key="1" label="Password" :value="1"> </el-option>
+                        <el-option key="2" label="PublicKey" :value="2"> </el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item v-if="form.authMethod == 1" prop="password" label="密码:">
                     <el-input
                         type="password"
                         show-password
                         v-model.trim="form.password"
                         placeholder="请输入密码，修改操作可不填"
                         autocomplete="new-password"
-                    ></el-input>
+                    >
+                        <template v-if="form.id && form.id != 0" #suffix>
+                            <el-popover @hide="pwd = ''" placement="right" title="原密码" :width="200" trigger="click" :content="pwd">
+                                <template #reference>
+                                    <el-link @click="getPwd" :underline="false" type="primary" class="mr5">原密码</el-link>
+                                </template>
+                            </el-popover>
+                        </template>
+                    </el-input>
+                </el-form-item>
+                <el-form-item v-if="form.authMethod == 2" prop="password" label="秘钥:">
+                    <el-input type="textarea" :rows="3" v-model="form.password" placeholder="请将私钥文件内容拷贝至此，修改操作可不填"></el-input>
                 </el-form-item>
                 <el-form-item prop="remark" label="备注:">
                     <el-input type="textarea" v-model="form.remark"></el-input>
                 </el-form-item>
+
+                <el-form-item prop="enableRecorder" label="终端回放:">
+                    <el-checkbox v-model="form.enableRecorder" :true-label="1" :false-label="-1"></el-checkbox>
+                </el-form-item>
+
+                <el-form-item prop="enableSshTunnel" label="SSH隧道:">
+                    <el-col :span="3">
+                        <el-checkbox @change="getSshTunnelMachines" v-model="form.enableSshTunnel" :true-label="1" :false-label="-1"></el-checkbox>
+                    </el-col>
+                    <el-col :span="2" v-if="form.enableSshTunnel == 1"> 机器: </el-col>
+                    <el-col :span="19" v-if="form.enableSshTunnel == 1">
+                        <el-select style="width: 100%" v-model="form.sshTunnelMachineId" placeholder="请选择SSH隧道机器">
+                            <el-option
+                                v-for="item in sshTunnelMachineList"
+                                :key="item.id"
+                                :label="`${item.ip}:${item.port} [${item.name}]`"
+                                :value="item.id"
+                            >
+                            </el-option>
+                        </el-select>
+                    </el-col>
+                </el-form-item>
             </el-form>
 
             <template #footer>
@@ -48,6 +90,7 @@ import { toRefs, reactive, watch, defineComponent, ref } from 'vue';
 import { machineApi } from './api';
 import { ElMessage } from 'element-plus';
 import { notBlank } from '@/common/assert';
+import { RsaEncrypt } from '@/common/rsa';
 
 export default defineComponent({
     name: 'MachineEdit',
@@ -70,16 +113,22 @@ export default defineComponent({
         const state = reactive({
             dialogVisible: false,
             projects: [],
+            sshTunnelMachineList: [],
             form: {
                 id: null,
                 projectId: null,
                 projectName: null,
                 name: null,
+                authMethod: 1,
                 port: 22,
-                username: null,
+                username: '',
-                password: null,
+                password: '',
                 remark: '',
+                enableSshTunnel: null,
+                sshTunnelMachineId: null,
+                enableRecorder: -1,
             },
+            pwd: '',
             btnLoading: false,
             rules: {
                 projectId: [
@@ -106,14 +155,7 @@ export default defineComponent({
                 ip: [
                     {
                         required: true,
-                        message: '请输入主机ip',
+                        message: '请输入主机ip和端口',
-                        trigger: ['change', 'blur'],
-                    },
-                ],
-                port: [
-                    {
-                        required: true,
-                        message: '请输入端口',
                         trigger: ['change', 'blur'],
                     },
                 ],
@@ -124,19 +166,46 @@ export default defineComponent({
                         trigger: ['change', 'blur'],
                     },
                 ],
+                authMethod: [
+                    {
+                        required: true,
+                        message: '请选择认证方式',
+                        trigger: ['change', 'blur'],
+                    },
+                ],
             },
         });
 
         watch(props, async (newValue) => {
             state.dialogVisible = newValue.visible;
+            if (!state.dialogVisible) {
+                return;
+            }
             state.projects = newValue.projects;
             if (newValue.machine) {
                 state.form = { ...newValue.machine };
             } else {
-                state.form = { port: 22 } as any;
+                state.form = { port: 22, authMethod: 1 } as any;
             }
+            getSshTunnelMachines();
         });
 
+        const getSshTunnelMachines = async () => {
+            if (state.form.enableSshTunnel == 1 && state.sshTunnelMachineList.length == 0) {
+                const res = await machineApi.list.request({ pageNum: 1, pageSize: 100 });
+                state.sshTunnelMachineList = res.list;
+            }
+        };
+
+        const getSshTunnelMachine = (machineId: any) => {
+            notBlank(machineId, '请选择或先创建一台隧道机器');
+            return state.sshTunnelMachineList.find((x: any) => x.id == machineId);
+        };
+
+        const getPwd = async () => {
+            state.pwd = await machineApi.getMachinePwd.request({ id: state.form.id });
+        };
+
         const changeProject = (projectId: number) => {
             for (let p of state.projects as any) {
                 if (p.id == projectId) {
@@ -149,18 +218,29 @@ export default defineComponent({
             if (!state.form.id) {
                 notBlank(state.form.password, '新增操作，密码不可为空');
             }
-            machineForm.value.validate((valid: boolean) => {
+            machineForm.value.validate(async (valid: boolean) => {
                 if (valid) {
-                    machineApi.saveMachine.request(state.form).then(() => {
+                    const form: any = state.form;
+                    if (form.enableSshTunnel == 1) {
+                        const tunnelMachine: any = getSshTunnelMachine(form.sshTunnelMachineId);
+                        if (tunnelMachine.ip == form.ip && tunnelMachine.port == form.port) {
+                            ElMessage.error('隧道机器不能与本机器一致');
+                            return;
+                        }
+                    }
+                    const reqForm: any = { ...form };
+                    if (reqForm.authMethod == 1) {
+                        reqForm.password = await RsaEncrypt(state.form.password);
+                    }
+                    state.btnLoading = true;
+                    try {
+                        await machineApi.saveMachine.request(reqForm);
                         ElMessage.success('保存成功');
                         emit('val-change', state.form);
-                        state.btnLoading = true;
-                        setTimeout(() => {
-                            state.btnLoading = false;
-                        }, 1000);
-
                         cancel();
-                    });
+                    } finally {
+                        state.btnLoading = false;
+                    }
                 } else {
                     ElMessage.error('请正确填写信息');
                     return false;
@@ -176,6 +256,8 @@ export default defineComponent({
         return {
             ...toRefs(state),
             machineForm,
+            getSshTunnelMachines,
+            getPwd,
             changeProject,
             btnOk,
             cancel,

mayfly_go_web/src/views/ops/machine/MachineList.vue

@@ -16,7 +16,7 @@
                     >删除</el-button
                 >
                 <div style="float: right">
-                    <el-select v-model="params.projectId" placeholder="请选择项目" @clear="search" filterable clearable>
+                    <el-select @focus="getProjects" v-model="params.projectId" placeholder="请选择项目" @clear="search" filterable clearable>
                         <el-option v-for="item in projects" :key="item.id" :label="`${item.name} [${item.remark}]`" :value="item.id"> </el-option>
                     </el-select>
                     <el-input
@@ -42,7 +42,7 @@
                     </template>
                 </el-table-column>
                 <el-table-column prop="name" label="名称" min-width="140" show-overflow-tooltip></el-table-column>
-                <el-table-column prop="ip" label="ip:port" min-width="140">
+                <el-table-column prop="ip" label="ip:port" min-width="150">
                     <template #default="scope">
                         <el-link :disabled="scope.row.status == -1" @click="showMachineStats(scope.row)" type="primary" :underline="false">{{
                             `${scope.row.ip}:${scope.row.port}`
@@ -68,41 +68,45 @@
                 <el-table-column prop="username" label="用户名" min-width="90"></el-table-column>
                 <el-table-column prop="projectName" label="项目" min-width="120"></el-table-column>
                 <el-table-column prop="remark" label="备注" min-width="250" show-overflow-tooltip></el-table-column>
-                <el-table-column prop="ip" label="hasCli" width="70">
-                    <template #default="scope">
-                        {{ `${scope.row.hasCli ? '是' : '否'}` }}
-                    </template>
-                </el-table-column>
                 <el-table-column prop="createTime" label="创建时间" min-width="165">
                     <template #default="scope">
                         {{ $filters.dateFormat(scope.row.createTime) }}
                     </template>
                 </el-table-column>
                 <el-table-column prop="creator" label="创建者" min-width="80"></el-table-column>
-                <el-table-column label="操作" min-width="280" fixed="right">
+                <el-table-column label="操作" min-width="335" fixed="right">
                     <template #default="scope">
-                        <el-link
+                        <span v-auth="'machine:terminal'">
-                            v-auth="'machine:terminal'"
+                            <el-link
-                            :disabled="scope.row.status == -1"
+                                :disabled="scope.row.status == -1"
-                            type="primary"
+                                type="primary"
-                            @click="showTerminal(scope.row)"
+                                @click="showTerminal(scope.row)"
-                            plain
+                                plain
-                            size="small"
+                                size="small"
-                            :underline="false"
+                                :underline="false"
-                            >终端</el-link
+                                >终端</el-link
-                        >
+                            >
-                        <el-divider v-auth="'machine:terminal'" direction="vertical" border-style="dashed" />
+                            <el-divider direction="vertical" border-style="dashed" />
-                        <el-link
+                        </span>
-                            v-auth="'machine:file'"
+
-                            type="success"
+                        <span v-auth="'machine:update'" v-if="scope.row.enableRecorder == 1">
-                            :disabled="scope.row.status == -1"
+                            <el-link @click="showRec(scope.row)" plain :underline="false" size="small">终端回放</el-link>
-                            @click="fileManage(scope.row)"
+                            <el-divider direction="vertical" border-style="dashed" />
-                            plain
+                        </span>
-                            size="small"
+
-                            :underline="false"
+                        <span v-auth="'machine:file'">
-                            >文件</el-link
+                            <el-link
-                        >
+                                type="success"
-                        <el-divider v-auth="'machine:file'" direction="vertical" border-style="dashed" />
+                                :disabled="scope.row.status == -1"
+                                @click="fileManage(scope.row)"
+                                plain
+                                size="small"
+                                :underline="false"
+                                >文件</el-link
+                            >
+                            <el-divider direction="vertical" border-style="dashed" />
+                        </span>
+
                         <el-link
                             :disabled="scope.row.status == -1"
                             type="warning"
@@ -113,10 +117,12 @@
                             >脚本</el-link
                         >
                         <el-divider direction="vertical" border-style="dashed" />
+
                         <el-link @click="showProcess(scope.row)" :disabled="scope.row.status == -1" plain :underline="false" size="small"
                             >进程</el-link
                         >
                         <el-divider direction="vertical" border-style="dashed" />
+
                         <el-link
                             :disabled="!scope.row.hasCli || scope.row.status == -1"
                             type="danger"
@@ -228,11 +234,15 @@ export default defineComponent({
                 data: null,
                 title: '新增机器',
             },
+            machineRecDialog: {
+                visible: false,
+                machineId: 0,
+                title: '',
+            },
         });
 
         onMounted(async () => {
             search();
-            state.projects = await projectApi.accountProjects.request(null);
         });
 
         const choose = (item: any) => {
@@ -255,18 +265,28 @@ export default defineComponent({
         };
 
         const closeCli = async (row: any) => {
+            await ElMessageBox.confirm(`确定关闭该机器客户端连接?`, '提示', {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                type: 'warning',
+            });
             await machineApi.closeCli.request({ id: row.id });
             ElMessage.success('关闭成功');
             search();
         };
 
-        const openFormDialog = (redis: any) => {
+        const getProjects = async () => {
+            state.projects = await projectApi.accountProjects.request(null);
+        };
+
+        const openFormDialog = async (machine: any) => {
+            await getProjects();
             let dialogTitle;
-            if (redis) {
+            if (machine) {
                 state.machineEditDialog.data = state.currentData as any;
                 dialogTitle = '编辑机器';
             } else {
-                state.machineEditDialog.data = { port: 22 } as any;
+                state.machineEditDialog.data = null;
                 dialogTitle = '添加机器';
             }
 
@@ -338,9 +358,21 @@ export default defineComponent({
             state.processDialog.visible = true;
         };
 
+        const showRec = (row: any) => {
+            const { href } = router.resolve({
+                path: `/machine/terminal-rec`,
+                query: {
+                    id: row.id,
+                    name: `${row.name}[${row.ip}]-终端回放记录`,
+                },
+            });
+            window.open(href, '_blank');
+        };
+
         return {
             ...toRefs(state),
             choose,
+            getProjects,
             showTerminal,
             openFormDialog,
             deleteMachine,
@@ -352,6 +384,7 @@ export default defineComponent({
             submitSuccess,
             fileManage,
             search,
+            showRec,
             handlePageChange,
         };
     },

mayfly_go_web/src/views/ops/machine/MachineRec.vue

@@ -0,0 +1,120 @@
+<template>
+    <div>
+        <div class="toolbar">
+            <span style="dispaly: inline-block" class="ml10">{{ title }}</span>
+            <el-divider direction="vertical" border-style="dashed" />
+            <el-select @change="getUsers" v-model="operateDate" placeholder="操作日期" filterable>
+                <el-option v-for="item in operateDates" :key="item" :label="item" :value="item"> </el-option>
+            </el-select>
+            <el-select class="ml10" @change="getRecs" filterable v-model="user" placeholder="请选择操作人">
+                <el-option v-for="item in users" :key="item" :label="item" :value="item"> </el-option>
+            </el-select>
+            <el-select class="ml10" @change="playRec" filterable v-model="rec" placeholder="请选择操作记录">
+                <el-option v-for="item in recs" :key="item" :label="item" :value="item"> </el-option>
+            </el-select>
+            <el-divider direction="vertical" border-style="dashed" />
+            快捷键-> space[空格键]: 暂停/播放  |  f: 全屏/取消全屏
+        </div>
+        <div ref="playerRef" id="rc-player"></div>
+    </div>
+</template>
+
+<script lang="ts">
+import { toRefs, onMounted, ref, reactive, defineComponent } from 'vue';
+import { machineApi } from './api';
+import * as AsciinemaPlayer from 'asciinema-player';
+import 'asciinema-player/dist/bundle/asciinema-player.css';
+import { useRoute } from 'vue-router';
+export default defineComponent({
+    name: 'MachineRec',
+    components: {},
+    props: {
+        visible: { type: Boolean },
+        machineId: { type: Number },
+        title: { type: String },
+    },
+    setup(props: any, context) {
+        const route = useRoute();
+        const playerRef = ref(null);
+        const state = reactive({
+            dialogVisible: false,
+            title: '',
+            machineId: 0,
+            operateDates: [],
+            users: [],
+            recs: [],
+            operateDate: '',
+            user: '',
+            rec: '',
+        });
+
+        onMounted(() => {
+            state.machineId = Number.parseInt(route.query.id as string);
+            state.title = route.query.name as string;
+            getOperateDate();
+        });
+
+        const getOperateDate = async () => {
+            const res = await machineApi.recDirNames.request({ path: state.machineId });
+            state.operateDates = res as any;
+        };
+
+        const getUsers = async (operateDate: string) => {
+            state.users = [];
+            state.user = '';
+            state.recs = [];
+            state.rec = '';
+            const res = await machineApi.recDirNames.request({ path: `${state.machineId}/${operateDate}` });
+            state.users = res as any;
+        };
+
+        const getRecs = async (user: string) => {
+            state.recs = [];
+            state.rec = '';
+            const res = await machineApi.recDirNames.request({ path: `${state.machineId}/${state.operateDate}/${user}` });
+            state.recs = res as any;
+        };
+
+        let player: any = null;
+
+        const playRec = async (rec: string) => {
+            if (player) {
+                player.dispose();
+            }
+            const content = await machineApi.recDirNames.request({
+                isFile: '1',
+                path: `${state.machineId}/${state.operateDate}/${state.user}/${rec}`,
+            });
+            player = AsciinemaPlayer.create(`data:text/plain;base64,${content}`, playerRef.value, {
+                autoPlay: true,
+                speed: 1.0,
+                idleTimeLimit: 2,
+            });
+        };
+
+        /**
+         * 关闭取消按钮触发的事件
+         */
+        const handleClose = () => {
+            context.emit('update:visible', false);
+            context.emit('update:machineId', null);
+            context.emit('cancel');
+            state.operateDates = [];
+            state.users = [];
+            state.recs = [];
+            state.operateDate = '';
+            state.user = '';
+            state.rec = '';
+        };
+
+        return {
+            ...toRefs(state),
+            playerRef,
+            getUsers,
+            getRecs,
+            playRec,
+            handleClose,
+        };
+    },
+});
+</script>

mayfly_go_web/src/views/ops/machine/ScriptEdit.vue

@@ -7,9 +7,9 @@
             :before-close="cancel"
             :show-close="true"
             :destroy-on-close="true"
-            width="800px"
+            width="900px"
         >
-            <el-form :model="form" ref="mockDataForm" label-width="70px">
+            <el-form :model="form" ref="scriptForm" label-width="70px" size="small">
                 <el-form-item prop="method" label="名称">
                     <el-input v-model.trim="form.name" placeholder="请输入名称"></el-input>
                 </el-form-item>
@@ -24,8 +24,23 @@
                     </el-select>
                 </el-form-item>
 
-                <el-form-item prop="params" label="参数">
+                <el-row style="margin-left: 30px; margin-bottom: 5px">
-                    <el-input v-model.trim="form.params" placeholder="参数数组json，若无可不填"></el-input>
+                    <el-button @click="onAddParam" size="small" type="success">新增占位符参数</el-button>
+                </el-row>
+                <el-form-item :key="param" v-for="(param, index) in params" prop="params" :label="`参数${index + 1}`">
+                    <el-row>
+                        <el-col :span="5"><el-input v-model="param.model" placeholder="内容中用{{.model}}替换"></el-input></el-col>
+                        <el-divider :span="1" direction="vertical" border-style="dashed" />
+                        <el-col :span="4"><el-input v-model="param.name" placeholder="字段名"></el-input></el-col>
+                        <el-divider :span="1" direction="vertical" border-style="dashed" />
+                        <el-col :span="4"><el-input v-model="param.placeholder" placeholder="字段说明"></el-input></el-col>
+                        <el-divider :span="1" direction="vertical" border-style="dashed" />
+                        <el-col :span="4">
+                            <el-input v-model="param.options" placeholder="可选值 ,分割"></el-input>
+                        </el-col>
+                        <el-divider :span="1" direction="vertical" border-style="dashed" />
+                        <el-col :span="2"><el-button @click="onDeleteParam(index)" size="small" type="danger">删除</el-button></el-col>
+                    </el-row>
                 </el-form-item>
 
                 <el-form-item prop="script" label="内容" id="content">
@@ -35,13 +50,12 @@
 
             <template #footer>
                 <div class="dialog-footer">
-                    <el-button @click="cancel()" :disabled="submitDisabled" size="small">关 闭</el-button>
+                    <el-button @click="cancel()" :disabled="submitDisabled">关 闭</el-button>
                     <el-button
                         v-auth="'machine:script:save'"
                         type="primary"
                         :loading="btnLoading"
                         @click="btnOk"
-                        size="small"
                         :disabled="submitDisabled"
                         >保 存</el-button
                     >
@@ -84,41 +98,59 @@ export default defineComponent({
     },
     setup(props: any, { emit }) {
         const { isCommon, machineId } = toRefs(props);
-        const mockDataForm: any = ref(null);
+        const scriptForm: any = ref(null);
 
         const state = reactive({
             dialogVisible: false,
             submitDisabled: false,
+            params: [] as any,
             form: {
                 id: null,
                 name: '',
                 machineId: 0,
                 description: '',
                 script: '',
-                params: null,
+                params: '',
                 type: null,
             },
             btnLoading: false,
         });
 
         watch(props, (newValue) => {
+            state.dialogVisible = newValue.visible;
+            if (!newValue.visible) {
+                return;
+            }
             if (newValue.data) {
                 state.form = { ...newValue.data };
+                if (state.form.params) {
+                    state.params = JSON.parse(state.form.params);
+                }
             } else {
                 state.form = {} as any;
                 state.form.script = '';
             }
-            state.dialogVisible = newValue.visible;
         });
 
+        const onAddParam = () => {
+            state.params.push({ name: '', model: '', placeholder: '' });
+        };
+
+        const onDeleteParam = (idx: number) => {
+            state.params.splice(idx, 1);
+        };
+
         const btnOk = () => {
             state.form.machineId = isCommon.value ? 9999999 : (machineId.value as any);
             console.log('machineid:', machineId);
-            mockDataForm.value.validate((valid: any) => {
+            scriptForm.value.validate((valid: any) => {
                 if (valid) {
                     notEmpty(state.form.name, '名称不能为空');
                     notEmpty(state.form.description, '描述不能为空');
                     notEmpty(state.form.script, '内容不能为空');
+                    if (state.params) {
+                        state.form.params = JSON.stringify(state.params);
+                    }
                     machineApi.saveScript.request(state.form).then(
                         () => {
                             ElMessage.success('保存成功');
@@ -139,12 +171,15 @@ export default defineComponent({
         const cancel = () => {
             emit('update:visible', false);
             emit('cancel');
+            state.params = [];
         };
 
         return {
             ...toRefs(state),
             enums,
-            mockDataForm,
+            onAddParam,
+            onDeleteParam,
+            scriptForm,
             btnOk,
             cancel,
         };

mayfly_go_web/src/views/ops/machine/ServiceManage.vue

@@ -76,7 +76,24 @@
         <el-dialog title="脚本参数" v-model="scriptParamsDialog.visible" width="400px">
             <el-form ref="paramsForm" :model="scriptParamsDialog.params" label-width="70px" size="small">
                 <el-form-item v-for="item in scriptParamsDialog.paramsFormItem" :key="item.name" :prop="item.model" :label="item.name" required>
-                    <el-input v-model="scriptParamsDialog.params[item.model]" :placeholder="item.placeholder" autocomplete="off"></el-input>
+                    <el-input
+                        v-if="!item.options"
+                        v-model="scriptParamsDialog.params[item.model]"
+                        :placeholder="item.placeholder"
+                        autocomplete="off"
+                        clearable
+                    ></el-input>
+                    <el-select
+                        v-else
+                        v-model="scriptParamsDialog.params[item.model]"
+                        :placeholder="item.placeholder"
+                        filterable
+                        autocomplete="off"
+                        clearable
+                        style="width: 100%"
+                    >
+                        <el-option v-for="option in item.options.split(',')" :key="option" :label="option" :value="option" />
+                    </el-select>
                 </el-form-item>
             </el-form>
             <template #footer>
@@ -88,7 +105,6 @@
 
         <el-dialog title="执行结果" v-model="resultDialog.visible" width="50%">
             <div style="white-space: pre-line; padding: 10px; color: #000000">
-                <!-- {{ resultDialog.result }} -->
                 <el-input v-model="resultDialog.result" :rows="20" type="textarea" />
             </div>
         </el-dialog>
@@ -97,12 +113,12 @@
             v-if="terminalDialog.visible"
             title="终端"
             v-model="terminalDialog.visible"
-            width="70%"
+            width="80%"
             :close-on-click-modal="false"
             :modal="false"
             @close="closeTermnial"
         >
-            <ssh-terminal ref="terminal" :cmd="terminalDialog.cmd" :machineId="terminalDialog.machineId" height="600px" />
+            <ssh-terminal ref="terminal" :cmd="terminalDialog.cmd" :machineId="terminalDialog.machineId" height="560px" />
         </el-dialog>
 
         <script-edit
@@ -171,9 +187,9 @@ export default defineComponent({
             },
         });
 
-        watch(props, (newValue) => {
+        watch(props, async (newValue) => {
-            if (props.machineId) {
+            if (props.machineId && newValue.visible) {
-                getScripts();
+                await getScripts();
             }
             state.dialogVisible = newValue.visible;
         });
@@ -196,8 +212,10 @@ export default defineComponent({
             // 如果存在参数，则弹窗输入参数后执行
             if (script.params) {
                 state.scriptParamsDialog.paramsFormItem = JSON.parse(script.params);
-                state.scriptParamsDialog.visible = true;
+                if (state.scriptParamsDialog.paramsFormItem && state.scriptParamsDialog.paramsFormItem.length > 0) {
-                return;
+                    state.scriptParamsDialog.visible = true;
+                    return;
+                }
             }
 
             run(script);
@@ -268,8 +286,6 @@ export default defineComponent({
         const closeTermnial = () => {
             state.terminalDialog.visible = false;
             state.terminalDialog.machineId = 0;
-            // const t: any = this.$refs['terminal']
-            // t.closeAll()
         };
 
         /**
@@ -295,8 +311,6 @@ export default defineComponent({
         };
 
         const submitSuccess = () => {
-            // this.delChoose()
-            // this.search()
             getScripts();
         };
 
@@ -326,6 +340,7 @@ export default defineComponent({
             context.emit('update:machineId', null);
             context.emit('cancel');
             state.scriptTable = [];
+            state.scriptParamsDialog.paramsFormItem = [];
         };
 
         return {

mayfly_go_web/src/views/ops/machine/SshTerminal.vue

@@ -9,7 +9,7 @@ import { FitAddon } from 'xterm-addon-fit';
 import { getSession } from '@/common/utils/storage.ts';
 import config from '@/common/config';
 import { useStore } from '@/store/index.ts';
-import { toRefs, watch, computed, reactive, defineComponent, onMounted, onBeforeUnmount } from 'vue';
+import { nextTick, toRefs, watch, computed, reactive, defineComponent, onMounted, onBeforeUnmount } from 'vue';
 
 export default defineComponent({
     name: 'SshTerminal',
@@ -27,22 +27,20 @@ export default defineComponent({
             socket: null as any,
         });
 
+        const resize = 1;
+        const data = 2;
+        const ping = 3;
+
         watch(props, (newValue) => {
             state.machineId = newValue.machineId;
             state.cmd = newValue.cmd;
             state.height = newValue.height;
-            if (state.machineId) {
-                initSocket();
-            }
         });
 
         onMounted(() => {
             state.machineId = props.machineId;
             state.height = props.height;
             state.cmd = props.cmd;
-            if (state.machineId) {
-                initSocket();
-            }
         });
 
         onBeforeUnmount(() => {
@@ -56,18 +54,23 @@ export default defineComponent({
             return store.state.themeConfig.themeConfig;
         });
 
+        nextTick(() => {
+            initXterm();
+            initSocket();
+        });
+
         function initXterm() {
             const term: any = new Terminal({
                 fontSize: getThemeConfig.value.terminalFontSize || 15,
-                // fontWeight: getThemeConfig.value.terminalFontWeight || 'normal',
+                fontWeight: getThemeConfig.value.terminalFontWeight || 'normal',
-                fontFamily: 'JetBrainsMono, Consolas, Menlo, Monaco',
+                fontFamily: 'JetBrainsMono, monaco, Consolas, Lucida Console, monospace',
                 cursorBlink: true,
-                // cursorStyle: 'underline', //光标样式
                 disableStdin: false,
                 theme: {
                     foreground: getThemeConfig.value.terminalForeground || '#7e9192', //字体
                     background: getThemeConfig.value.terminalBackground || '#002833', //背景色
                     cursor: getThemeConfig.value.terminalCursor || '#268F81', //设置光标
+                    // cursorAccent: "red",  // 光标停止颜色
                 } as any,
             });
             const fitAddon = new FitAddon();
@@ -82,6 +85,14 @@ export default defineComponent({
                 try {
                     // 窗口大小改变时，触发xterm的resize方法使自适应
                     fitAddon.fit();
+                    if (state.term) {
+                        state.term.focus();
+                        send({
+                            type: resize,
+                            Cols: parseInt(state.term.cols),
+                            Rows: parseInt(state.term.rows),
+                        });
+                    }
                 } catch (e) {
                     console.log(e);
                 }
@@ -104,69 +115,52 @@ export default defineComponent({
             term.onData((key: any) => {
                 sendCmd(key);
             });
-            // 为解决窗体resize方法才会向后端发送列数和行数，所以页面加载时也要触发此方法
-            send({
-                type: 'resize',
-                Cols: parseInt(term.cols),
-                Rows: parseInt(term.rows),
-            });
-            // 如果有初始要执行的命令，则发送执行命令
-            if (state.cmd) {
-                sendCmd(state.cmd + ' \r');
-            }
         }
 
+        let pingInterval: any;
         function initSocket() {
-            state.socket = new WebSocket(`${config.baseWsUrl}/machines/${state.machineId}/terminal?token=${getSession('token')}`);
+            state.socket = new WebSocket(
+                `${config.baseWsUrl}/machines/${state.machineId}/terminal?token=${getSession('token')}&cols=${state.term.cols}&rows=${
+                    state.term.rows
+                }`
+            );
+
             // 监听socket连接
-            state.socket.onopen = open;
+            state.socket.onopen = () => {
+                // 如果有初始要执行的命令，则发送执行命令
+                if (state.cmd) {
+                    sendCmd(state.cmd + ' \r');
+                }
+                // 开启心跳
+                pingInterval = setInterval(() => {
+                    send({ type: ping, msg: 'ping' });
+                }, 8000);
+            };
+
             // 监听socket错误信息
-            state.socket.onerror = error;
+            state.socket.onerror = (e: any) => {
-            // 监听socket消息
+                console.log('连接错误', e);
-            state.socket.onmessage = getMessage;
+            };
+
+            state.socket.onclose = () => {
+                if (state.term) {
+                    state.term.writeln('\r\n\x1b[31m提示: 连接已关闭...');
+                }
+                if (pingInterval) {
+                    clearInterval(pingInterval);
+                }
+            };
+
             // 发送socket消息
             state.socket.onsend = send;
+
+            // 监听socket消息
+            state.socket.onmessage = getMessage;
         }
 
-        function open() {
+        function getMessage(msg: any) {
-            console.log('socket连接成功');
+            // msg.data是真正后端返回的数据
-            initXterm();
+            state.term.write(msg.data);
-            //开启心跳
-            //   this.start();
-        }
-
-        function error() {
-            console.log('连接错误');
-            //重连
-            // reconnect();
-        }
-
-        function close() {
-            if (state.socket) {
-                state.socket.close();
-                console.log('socket关闭');
-            }
-
-            //重连
-            //   this.reconnect()
-        }
-
-        function getMessage(msg: string) {
-            //   console.log(msg)
-            state.term.write(msg['data']);
-            //msg是返回的数据
-            //   msg = JSON.parse(msg.data);
-            //   this.socket.send("ping");//有事没事ping一下，看看ws还活着没
-            //   //switch用于处理返回的数据，根据返回数据的格式去判断
-            //   switch (msg["operation"]) {
-            //     case "stdout":
-            //       this.term.write(msg["data"]);//这里write也许不是固定的，失败后找后端看一下该怎么往term里面write
-            //       break;
-            //     default:
-            //       console.error("Unexpected message type:", msg);//但是错误是固定的。。。。
-            //   }
-            //收到服务器信息，心跳重置
-            //   this.reset();
         }
 
         function send(msg: any) {
@@ -175,11 +169,18 @@ export default defineComponent({
 
         function sendCmd(key: any) {
             send({
-                type: 'cmd',
+                type: data,
                 msg: key,
             });
         }
 
+        function close() {
+            if (state.socket) {
+                state.socket.close();
+                console.log('socket关闭');
+            }
+        }
+
         function closeAll() {
             close();
             if (state.term) {

mayfly_go_web/src/views/ops/machine/api.ts

@@ -3,6 +3,7 @@ import Api from '@/common/Api';
 export const machineApi = {
     // 获取权限列表
     list: Api.create("/machines", 'get'),
+    getMachinePwd: Api.create("/machines/{id}/pwd", 'get'),
     info: Api.create("/machines/{id}/sysinfo", 'get'),
     stats: Api.create("/machines/{id}/stats", 'get'),
     process: Api.create("/machines/{id}/process", 'get'),
@@ -25,11 +26,13 @@ export const machineApi = {
     rmFile: Api.create("/machines/{machineId}/files/{fileId}/remove", 'delete'),
     uploadFile: Api.create("/machines/{machineId}/files/{fileId}/upload?token={token}", 'post'),
     fileContent: Api.create("/machines/{machineId}/files/{fileId}/read", 'get'),
+    createFile: Api.create("/machines/{machineId}/files/{id}/create-file", 'post'),
     // 修改文件内容
     updateFileContent: Api.create("/machines/{machineId}/files/{id}/write", 'post'),
     // 添加文件or目录
     addConf: Api.create("/machines/{machineId}/files", 'post'),
     // 删除配置的文件or目录
     delConf: Api.create("/machines/{machineId}/files/{id}", 'delete'),
-    terminal: Api.create("/api/machines/{id}/terminal", 'get')
+    terminal: Api.create("/api/machines/{id}/terminal", 'get'),
+    recDirNames: Api.create("/machines/rec/names", 'get')
 }

mayfly_go_web/src/views/ops/mongo/MongoDataOp.vue

@@ -15,7 +15,7 @@
                             </el-form-item>
 
                             <el-form-item label="库" label-width="20px">
-                                <el-select v-model="database" placeholder="请选择库" @change="changeDatabase">
+                                <el-select v-model="database" placeholder="请选择库" @change="changeDatabase" filterable>
                                     <el-option v-for="item in databases" :key="item.Name" :label="item.Name" :value="item.Name">
                                         <span style="float: left">{{ item.Name }}</span>
                                         <span style="float: right; color: #8492a6; margin-left: 4px; font-size: 13px">{{
@@ -26,12 +26,8 @@
                             </el-form-item>
 
                             <el-form-item label="集合" label-width="40px">
-                                <el-select v-model="collection" placeholder="请选择集合" @change="changeCollection">
+                                <el-select v-model="collection" placeholder="请选择集合" @change="changeCollection" filterable>
                                     <el-option v-for="item in collections" :key="item" :label="item" :value="item">
-                                        <!-- <span style="float: left">{{ item.uri }}</span>
-                                            <span style="float: right; color: #8492a6; margin-left: 6px; font-size: 13px">{{
-                                                ` [${item.name}]`
-                                            }}</span> -->
                                     </el-option>
                                 </el-select>
                             </el-form-item>
@@ -124,7 +120,7 @@
             </template>
         </el-dialog>
 
-        <el-dialog width="800px" title="json编辑器" v-model="jsoneditorDialog.visible" @close="onCloseJsonEditDialog" :close-on-click-modal="false">
+        <el-dialog width="70%" title="json编辑器" v-model="jsoneditorDialog.visible" @close="onCloseJsonEditDialog" :close-on-click-modal="false">
             <json-edit v-model="jsoneditorDialog.doc" />
         </el-dialog>
 

mayfly_go_web/src/views/ops/mongo/MongoEdit.vue

@@ -1,7 +1,7 @@
 <template>
     <div>
-        <el-dialog :title="title" v-model="dialogVisible" :before-close="cancel" :close-on-click-modal="false" width="35%" :destroy-on-close="true">
+        <el-dialog :title="title" v-model="dialogVisible" :before-close="cancel" :close-on-click-modal="false" width="38%" :destroy-on-close="true">
-            <el-form :model="form" ref="mongoForm" :rules="rules" label-width="65px">
+            <el-form :model="form" ref="mongoForm" :rules="rules" label-width="85px">
                 <el-form-item prop="projectId" label="项目" required>
                     <el-select style="width: 100%" v-model="form.projectId" placeholder="请选择项目" @change="changeProject" filterable>
                         <el-option v-for="item in projects" :key="item.id" :label="`${item.name} [${item.remark}]`" :value="item.id"> </el-option>
@@ -25,6 +25,24 @@
                         auto-complete="off"
                     ></el-input>
                 </el-form-item>
+
+                <el-form-item prop="enableSshTunnel" label="SSH隧道:">
+                    <el-col :span="3">
+                        <el-checkbox @change="getSshTunnelMachines" v-model="form.enableSshTunnel" :true-label="1" :false-label="-1"></el-checkbox>
+                    </el-col>
+                    <el-col :span="2" v-if="form.enableSshTunnel == 1"> 机器: </el-col>
+                    <el-col :span="19" v-if="form.enableSshTunnel == 1">
+                        <el-select style="width: 100%" v-model="form.sshTunnelMachineId" placeholder="请选择SSH隧道机器">
+                            <el-option
+                                v-for="item in sshTunnelMachineList"
+                                :key="item.id"
+                                :label="`${item.ip}:${item.port} [${item.name}]`"
+                                :value="item.id"
+                            >
+                            </el-option>
+                        </el-select>
+                    </el-col>
+                </el-form-item>
             </el-form>
 
             <template #footer>
@@ -41,6 +59,7 @@
 import { toRefs, reactive, watch, defineComponent, ref } from 'vue';
 import { mongoApi } from './api';
 import { projectApi } from '../project/api.ts';
+import { machineApi } from '../machine/api.ts';
 import { ElMessage } from 'element-plus';
 
 export default defineComponent({
@@ -65,10 +84,13 @@ export default defineComponent({
             dialogVisible: false,
             projects: [],
             envs: [],
+            sshTunnelMachineList: [],
             form: {
                 id: null,
                 name: null,
                 uri: null,
+                enableSshTunnel: -1,
+                sshTunnelMachineId: null,
                 project: null,
                 projectId: null,
                 envId: null,
@@ -109,6 +131,9 @@ export default defineComponent({
 
         watch(props, async (newValue) => {
             state.dialogVisible = newValue.visible;
+            if (!state.dialogVisible) {
+                return;
+            }
             state.projects = newValue.projects;
             if (newValue.mongo) {
                 getEnvs(newValue.mongo.projectId);
@@ -117,8 +142,16 @@ export default defineComponent({
                 state.envs = [];
                 state.form = { db: 0 } as any;
             }
+            getSshTunnelMachines();
         });
 
+        const getSshTunnelMachines = async () => {
+            if (state.form.enableSshTunnel == 1 && state.sshTunnelMachineList.length == 0) {
+                const res = await machineApi.list.request({ pageNum: 1, pageSize: 100 });
+                state.sshTunnelMachineList = res.list;
+            }
+        };
+
         const getEnvs = async (projectId: any) => {
             state.envs = await projectApi.projectEnvs.request({ projectId });
         };
@@ -144,9 +177,11 @@ export default defineComponent({
         };
 
         const btnOk = async () => {
-            mongoForm.value.validate((valid: boolean) => {
+            mongoForm.value.validate(async (valid: boolean) => {
                 if (valid) {
-                    mongoApi.saveMongo.request(state.form).then(() => {
+                    const reqForm = { ...state.form };
+                    // reqForm.uri = await RsaEncrypt(reqForm.uri);
+                    mongoApi.saveMongo.request(reqForm).then(() => {
                         ElMessage.success('保存成功');
                         emit('val-change', state.form);
                         state.btnLoading = true;
@@ -172,6 +207,7 @@ export default defineComponent({
             ...toRefs(state),
             mongoForm,
             changeProject,
+            getSshTunnelMachines,
             changeEnv,
             btnOk,
             cancel,

mayfly_go_web/src/views/ops/mongo/MongoList.vue

@@ -5,7 +5,7 @@
             <el-button type="primary" icon="edit" :disabled="currentId == null" @click="editMongo(false)" plain>编辑</el-button>
             <el-button type="danger" icon="delete" :disabled="currentId == null" @click="deleteMongo" plain>删除</el-button>
             <div style="float: right">
-                <el-select v-model="query.projectId" placeholder="请选择项目" filterable clearable>
+                <el-select @focus="getProjects" v-model="query.projectId" placeholder="请选择项目" filterable clearable>
                     <el-option v-for="item in projects" :key="item.id" :label="`${item.name} [${item.remark}]`" :value="item.id"> </el-option>
                 </el-select>
                 <el-button class="ml5" @click="search" type="success" icon="search"></el-button>
@@ -250,7 +250,6 @@ export default defineComponent({
 
         onMounted(async () => {
             search();
-            state.projects = (await projectApi.projects.request({ pageNum: 1, pageSize: 100 })).list;
         });
 
         const handlePageChange = (curPage: number) => {
@@ -266,12 +265,6 @@ export default defineComponent({
             state.currentData = item;
         };
 
-        // connect() {
-        //   Req.post('/open/redis/connect', this.form, res => {
-        //     this.redisInfo = res
-        //   })
-        // }
-
         const showDatabases = async (id: number) => {
             state.databaseDialog.data = (await mongoApi.databases.request({ id })).Databases;
             state.databaseDialog.title = `数据库列表`;
@@ -371,21 +364,18 @@ export default defineComponent({
             } catch (err) {}
         };
 
-        // const info = (redis: any) => {
-        //     redisApi.redisInfo.request({ id: redis.id }).then((res: any) => {
-        //         state.infoDialog.info = res;
-        //         state.infoDialog.title = `'${redis.host}' info`;
-        //         state.infoDialog.visible = true;
-        //     });
-        // };
-
         const search = async () => {
             const res = await mongoApi.mongoList.request(state.query);
             state.list = res.list;
             state.total = res.total;
         };
 
-        const editMongo = (isAdd = false) => {
+        const getProjects = async () => {
+            state.projects = await projectApi.accountProjects.request(null);
+        };
+
+        const editMongo = async (isAdd = false) => {
+            await getProjects();
             if (isAdd) {
                 state.mongoEditDialog.data = null;
                 state.mongoEditDialog.title = '新增mongo';
@@ -404,6 +394,7 @@ export default defineComponent({
 
         return {
             ...toRefs(state),
+            getProjects,
             search,
             handlePageChange,
             choose,

mayfly_go_web/src/views/ops/project/ProjectList.vue

@@ -25,7 +25,7 @@
                 </div>
             </div>
             <el-table :data="projects" @current-change="choose" ref="table" style="width: 100%">
-                <el-table-column label="选择" width="50px">
+                <el-table-column label="选择" width="55px">
                     <template #default="scope">
                         <el-radio v-model="chooseId" :label="scope.row.id">
                             <i></i>
@@ -80,9 +80,18 @@
         <el-dialog width="500px" :title="showEnvDialog.title" v-model="showEnvDialog.visible">
             <div class="toolbar">
                 <el-button @click="showAddEnvDialog" v-auth="permissions.saveMember" type="primary" icon="plus">添加</el-button>
-                <!-- <el-button v-auth="'role:update'" :disabled="chooseId == null" type="danger" icon="delete">删除</el-button> -->
+                <el-button @click="deleteEnv" v-auth="permissions.delProject" :disabled="showEnvDialog.chooseId == null" type="danger" icon="delete"
+                    >删除</el-button
+                >
             </div>
-            <el-table border :data="showEnvDialog.envs">
+            <el-table @current-change="chooseEnv" border :data="showEnvDialog.envs">
+                <el-table-column label="选择" width="50px">
+                    <template #default="scope">
+                        <el-radio v-model="showEnvDialog.chooseId" :label="scope.row.id">
+                            <i></i>
+                        </el-radio>
+                    </template>
+                </el-table-column>
                 <el-table-column property="name" label="环境名" width="125"></el-table-column>
                 <el-table-column property="remark" label="描述" width="125"></el-table-column>
                 <el-table-column property="createTime" label="创建时间">
@@ -152,7 +161,7 @@
                             :remote-method="getAccount"
                             v-model="showMemDialog.memForm.accountId"
                             filterable
-                            placeholder="请选择"
+                            placeholder="请输入账号模糊搜索并选择"
                         >
                             <el-option v-for="item in showMemDialog.accounts" :key="item.id" :label="item.username" :value="item.id"> </el-option>
                         </el-select>
@@ -207,6 +216,8 @@ export default defineComponent({
             },
             showEnvDialog: {
                 visible: false,
+                chooseId: null,
+                chooseData: null,
                 envs: [],
                 title: '',
                 addVisible: false,
@@ -340,6 +351,21 @@ export default defineComponent({
             state.showEnvDialog.visible = true;
         };
 
+        const chooseEnv = (item: any) => {
+            if (!item) {
+                return;
+            }
+            state.showEnvDialog.chooseData = item;
+            state.showEnvDialog.chooseId = item.id;
+        };
+
+        const deleteEnv = async () => {
+            notNull(state.showEnvDialog.chooseData, '请选选择环境');
+            await projectApi.delProjectEnvs.request({ id: state.showEnvDialog.chooseId });
+            ElMessage.success('删除成功');
+            state.showEnvDialog.envs = await projectApi.projectEnvs.request({ projectId: state.chooseId });
+        };
+
         const showAddMemberDialog = () => {
             state.showMemDialog.addVisible = true;
         };
@@ -398,12 +424,14 @@ export default defineComponent({
             showMembers,
             setMemebers,
             showEnv,
+            deleteEnv,
             showAddMemberDialog,
             addMember,
             chooseMember,
             deleteMember,
             cancelAddMember,
             showAddEnvDialog,
+            chooseEnv,
             addEnv,
             cancelAddEnv,
             getAccount,

mayfly_go_web/src/views/ops/project/api.ts

@@ -8,6 +8,7 @@ export const projectApi = {
     delProject: Api.create("/projects", 'delete'),
     // 获取项目下的环境信息
     projectEnvs:  Api.create("/projects/{projectId}/envs", 'get'),
+    delProjectEnvs:  Api.create("/projects/envs", 'delete'),
     saveProjectEnv:  Api.create("/projects/{projectId}/envs", 'post'),
     // 获取项目下的成员信息
     projectMems:  Api.create("/projects/{projectId}/members", 'get'),

mayfly_go_web/src/views/ops/redis/DataEdit.vue

@@ -1,313 +0,0 @@
-<template>
-    <el-dialog :title="title" v-model="dialogVisible" :before-close="cancel" :show-close="false" width="750px" :destroy-on-close="true">
-        <el-form label-width="85px">
-            <el-form-item prop="key" label="key:">
-                <el-input :disabled="operationType == 2" v-model="key.key"></el-input>
-            </el-form-item>
-            <el-form-item prop="timed" label="过期时间:">
-                <el-input v-model.number="key.timed" type="number"></el-input>
-            </el-form-item>
-            <el-form-item prop="dataType" label="数据类型:">
-                <el-select :disabled="operationType == 2" style="width: 100%" v-model="key.type" placeholder="请选择数据类型">
-                    <el-option key="string" label="string" value="string"> </el-option>
-                    <el-option key="hash" label="hash" value="hash"> </el-option>
-                    <el-option key="set" label="set" value="set"> </el-option>
-                </el-select>
-            </el-form-item>
-
-            <el-form-item v-if="key.type == 'string'" prop="value" label="内容:">
-                <div id="string-value-text" style="width: 100%">
-                    <el-input class="json-text" v-model="string.value" type="textarea" :autosize="{ minRows: 10, maxRows: 20 }"></el-input>
-                    <el-select class="text-type-select" @change="onChangeTextType" v-model="string.type">
-                        <el-option key="text" label="text" value="text"> </el-option>
-                        <el-option key="json" label="json" value="json"> </el-option>
-                    </el-select>
-                </div>
-            </el-form-item>
-
-            <span v-if="key.type == 'hash'">
-                <el-button @click="onAddHashValue" icon="plus" size="small" plain class="mt10">添加</el-button>
-                <el-table :data="hash.value" stripe style="width: 100%">
-                    <el-table-column prop="key" label="key" width>
-                        <template #default="scope">
-                            <el-input v-model="scope.row.key" clearable size="small"></el-input>
-                        </template>
-                    </el-table-column>
-                    <el-table-column prop="value" label="value" min-width="200">
-                        <template #default="scope">
-                            <el-input
-                                v-model="scope.row.value"
-                                clearable
-                                type="textarea"
-                                :autosize="{ minRows: 2, maxRows: 10 }"
-                                size="small"
-                            ></el-input>
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="操作" width="90">
-                        <template #default="scope">
-                            <el-button type="danger" @click="hash.value.splice(scope.$index, 1)" icon="delete" size="small" plain>删除</el-button>
-                        </template>
-                    </el-table-column>
-                </el-table>
-            </span>
-
-            <span v-if="key.type == 'set'">
-                <el-button @click="onAddSetValue" icon="plus" size="small" plain class="mt10">添加</el-button>
-                <el-table :data="set.value" stripe style="width: 100%">
-                    <el-table-column prop="value" label="value" min-width="200">
-                        <template #default="scope">
-                            <el-input
-                                v-model="scope.row.value"
-                                clearable
-                                type="textarea"
-                                :autosize="{ minRows: 2, maxRows: 10 }"
-                                size="small"
-                            ></el-input>
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="操作" width="90">
-                        <template #default="scope">
-                            <el-button type="danger" @click="set.value.splice(scope.$index, 1)" icon="delete" size="small" plain>删除</el-button>
-                        </template>
-                    </el-table-column>
-                </el-table>
-            </span>
-        </el-form>
-        <template #footer>
-            <div class="dialog-footer">
-                <el-button @click="cancel()">取 消</el-button>
-                <el-button @click="saveValue" type="primary" v-auth="'redis:data:save'">确 定</el-button>
-            </div>
-        </template>
-    </el-dialog>
-</template>
-<script lang="ts">
-import { defineComponent, reactive, watch, toRefs } from 'vue';
-import { redisApi } from './api';
-import { ElMessage } from 'element-plus';
-import { isTrue, notEmpty } from '@/common/assert';
-import { formatJsonString } from '@/common/utils/format';
-
-export default defineComponent({
-    name: 'DateEdit',
-    components: {},
-    props: {
-        visible: {
-            type: Boolean,
-        },
-        title: {
-            type: String,
-        },
-        redisId: {
-            type: [Number],
-            require: true,
-        },
-        keyInfo: {
-            type: [Object],
-        },
-        // 操作类型，1：新增，2：修改
-        operationType: {
-            type: [Number],
-        },
-        stringValue: {
-            type: [String],
-        },
-        setValue: {
-            type: [Array, Object],
-        },
-        hashValue: {
-            type: [Array, Object],
-        },
-    },
-    emits: ['valChange', 'cancel', 'update:visible'],
-    setup(props: any, { emit }) {
-        const state = reactive({
-            dialogVisible: false,
-            operationType: 1,
-            redisId: '',
-            key: {
-                key: '',
-                type: 'string',
-                timed: -1,
-            },
-            string: {
-                type: 'text',
-                value: '',
-            },
-            hash: {
-                value: [
-                    {
-                        key: '',
-                        value: '',
-                    },
-                ],
-            },
-            set: {
-                value: [{ value: '' }],
-            },
-        });
-
-        const cancel = () => {
-            emit('update:visible', false);
-            emit('cancel');
-            setTimeout(() => {
-                state.key = {
-                    key: '',
-                    type: 'string',
-                    timed: -1,
-                };
-                state.string.value = '';
-                state.string.type = 'text';
-                state.hash.value = [
-                    {
-                        key: '',
-                        value: '',
-                    },
-                ];
-            }, 500);
-        };
-
-        watch(
-            () => props.visible,
-            (val) => {
-                state.dialogVisible = val;
-            }
-        );
-
-        watch(
-            () => props.redisId,
-            (val) => {
-                state.redisId = val;
-            }
-        );
-
-        watch(
-            () => props.operationType,
-            (val) => {
-                state.operationType = val;
-            }
-        );
-
-        watch(
-            () => props.keyInfo,
-            (val) => {
-                if (val) {
-                    state.key = { ...val };
-                }
-            },
-            {
-                deep: true, // 深度监听的参数
-            }
-        );
-
-        watch(
-            () => props.stringValue,
-            (val) => {
-                if (val) {
-                    state.string.value = val;
-                }
-            },
-            {
-                deep: true, // 深度监听的参数
-            }
-        );
-
-        watch(
-            () => props.setValue,
-            (val) => {
-                if (val) {
-                    state.set.value = val;
-                }
-            },
-            {
-                deep: true, // 深度监听的参数
-            }
-        );
-
-        watch(
-            () => props.hashValue,
-            (val) => {
-                if (val) {
-                    state.hash.value = val;
-                }
-            },
-            {
-                deep: true, // 深度监听的参数
-            }
-        );
-
-        const saveValue = async () => {
-            notEmpty(state.key.key, 'key不能为空');
-
-            if (state.key.type == 'string') {
-                notEmpty(state.string.value, 'value不能为空');
-                const sv = { value: formatJsonString(state.string.value, true), id: state.redisId };
-                Object.assign(sv, state.key);
-                await redisApi.saveStringValue.request(sv);
-            }
-
-            if (state.key.type == 'hash') {
-                isTrue(state.hash.value.length > 0, 'hash内容不能为空');
-                const sv = { value: state.hash.value, id: state.redisId };
-                Object.assign(sv, state.key);
-                await redisApi.saveHashValue.request(sv);
-            }
-
-            if (state.key.type == 'set') {
-                isTrue(state.set.value.length > 0, 'set内容不能为空');
-                const sv = { value: state.set.value.map((x) => x.value), id: state.redisId };
-                Object.assign(sv, state.key);
-                await redisApi.saveSetValue.request(sv);
-            }
-
-            ElMessage.success('数据保存成功');
-            cancel();
-            emit('valChange');
-        };
-
-        const onAddHashValue = () => {
-            state.hash.value.push({ key: '', value: '' });
-        };
-
-        const onAddSetValue = () => {
-            state.set.value.push({ value: '' });
-        };
-
-        // 更改文本类型
-        const onChangeTextType = (val: string) => {
-            if (val == 'json') {
-                state.string.value = formatJsonString(state.string.value, false);
-                return;
-            }
-            if (val == 'text') {
-                state.string.value = formatJsonString(state.string.value, true);
-            }
-        };
-
-        return {
-            ...toRefs(state),
-            saveValue,
-            cancel,
-            onAddHashValue,
-            onAddSetValue,
-            onChangeTextType,
-        };
-    },
-});
-</script>
-<style lang="scss">
-#string-value-text {
-    flex-grow: 1;
-    display: flex;
-    position: relative;
-
-    .text-type-select {
-        position: absolute;
-        z-index: 2;
-        right: 10px;
-        top: 10px;
-        max-width: 70px;
-    }
-}
-</style>

mayfly_go_web/src/views/ops/redis/DataOperation.vue

@@ -8,12 +8,12 @@
                             <template #default>
                                 <el-form-item label="redis" label-width="40px">
                                     <el-select v-model="scanParam.id" placeholder="请选择redis" @change="changeRedis" @clear="clearRedis" clearable>
-                                        <el-option v-for="item in redisList" :key="item.id" :label="item.host" :value="item.id">
+                                        <el-option v-for="item in redisList" :key="item.id" :label="item.host" :value="item.id"> </el-option>
-                                            <span style="float: left">{{ item.host }}</span>
+                                    </el-select>
-                                            <span style="float: right; color: #8492a6; margin-left: 6px; font-size: 13px">{{
+                                </el-form-item>
-                                                `库: [${item.db}]`
+                                <el-form-item label="库" label-width="20px">
-                                            }}</span>
+                                    <el-select v-model="scanParam.db" @change="changeDb" placeholder="库"  style="width: 70px">
-                                        </el-option>
+                                        <el-option v-for="db in dbList" :key="db" :label="db" :value="db"> </el-option>
                                     </el-select>
                                 </el-form-item>
                             </template>
@@ -23,7 +23,7 @@
                         <el-form class="search-form" label-position="right" :inline="true" label-width="60px">
                             <el-form-item label="key" label-width="40px">
                                 <el-input
-                                    placeholder="支持*模糊key"
+                                    placeholder="match 支持*模糊key"
                                     style="width: 240px"
                                     v-model="scanParam.match"
                                     @clear="clear()"
@@ -31,12 +31,20 @@
                                 ></el-input>
                             </el-form-item>
                             <el-form-item label="count" label-width="60px">
-                                <el-input placeholder="count" style="width: 62px" v-model="scanParam.count"></el-input>
+                                <el-input placeholder="count" style="width: 62px" v-model.number="scanParam.count"></el-input>
                             </el-form-item>
                             <el-form-item>
                                 <el-button @click="searchKey()" type="success" icon="search" plain></el-button>
                                 <el-button @click="scan()" icon="bottom" plain>scan</el-button>
-                                <el-button type="primary" icon="plus" @click="onAddData(false)" plain></el-button>
+                                <el-popover placement="right" :width="200" trigger="click">
+                                    <template #reference>
+                                        <el-button type="primary" icon="plus" plain></el-button>
+                                    </template>
+                                    <el-tag @click="onAddData('string')" :color="getTypeColor('string')" style="cursor: pointer">string</el-tag>
+                                    <el-tag @click="onAddData('hash')" :color="getTypeColor('hash')" class="ml5" style="cursor: pointer">hash</el-tag>
+                                    <el-tag @click="onAddData('set')" :color="getTypeColor('set')" class="ml5" style="cursor: pointer">set</el-tag>
+                                    <!-- <el-tag @click="onAddData('list')" :color="getTypeColor('list')" class="ml5" style="cursor: pointer">list</el-tag> -->
+                                </el-popover>
                             </el-form-item>
                             <div style="float: right">
                                 <span>keys: {{ dbsize }}</span>
@@ -53,7 +61,7 @@
                         <el-tag :color="getTypeColor(scope.row.type)" size="small">{{ scope.row.type }}</el-tag>
                     </template>
                 </el-table-column>
-                <el-table-column prop="ttl" label="ttl(过期时间)" width="130">
+                <el-table-column prop="ttl" label="ttl(过期时间)" width="140">
                     <template #default="scope">
                         {{ ttlConveter(scope.row.ttl) }}
                     </template>
@@ -69,17 +77,46 @@
 
         <div style="text-align: center; margin-top: 10px"></div>
 
-        <!-- <value-dialog v-model:visible="valueDialog.visible" :keyValue="valueDialog.value" /> -->
+        <hash-value
-
+            v-model:visible="hashValueDialog.visible"
-        <data-edit
+            :operationType="dataEdit.operationType"
-            v-model:visible="dataEdit.visible"
             :title="dataEdit.title"
             :keyInfo="dataEdit.keyInfo"
             :redisId="scanParam.id"
+            :db="scanParam.db"
+            @cancel="onCancelDataEdit"
+            @valChange="searchKey"
+        />
+
+        <string-value
+            v-model:visible="stringValueDialog.visible"
+            :operationType="dataEdit.operationType"
+            :title="dataEdit.title"
+            :keyInfo="dataEdit.keyInfo"
+            :redisId="scanParam.id"
+            :db="scanParam.db"
+            @cancel="onCancelDataEdit"
+            @valChange="searchKey"
+        />
+
+        <set-value
+            v-model:visible="setValueDialog.visible"
+            :title="dataEdit.title"
+            :keyInfo="dataEdit.keyInfo"
+            :redisId="scanParam.id"
+            :db="scanParam.db"
+            :operationType="dataEdit.operationType"
+            @valChange="searchKey"
+            @cancel="onCancelDataEdit"
+        />
+
+        <list-value
+            v-model:visible="listValueDialog.visible"
+            :title="dataEdit.title"
+            :keyInfo="dataEdit.keyInfo"
+            :redisId="scanParam.id"
+            :db="scanParam.db"
             :operationType="dataEdit.operationType"
-            :stringValue="dataEdit.stringValue"
-            :setValue="dataEdit.setValue"
-            :hashValue="dataEdit.hashValue"
             @valChange="searchKey"
             @cancel="onCancelDataEdit"
         />
@@ -91,34 +128,35 @@ import { redisApi } from './api';
 import { toRefs, reactive, defineComponent } from 'vue';
 import { ElMessage, ElMessageBox } from 'element-plus';
 import ProjectEnvSelect from '../component/ProjectEnvSelect.vue';
-import DataEdit from './DataEdit.vue';
+import HashValue from './HashValue.vue';
-import { isTrue, notNull } from '@/common/assert';
+import StringValue from './StringValue.vue';
+import SetValue from './SetValue.vue';
+import ListValue from './ListValue.vue';
+import { isTrue, notBlank, notNull } from '@/common/assert';
 
 export default defineComponent({
     name: 'DataOperation',
     components: {
-        DataEdit,
+        StringValue,
+        HashValue,
+        SetValue,
+        ListValue,
         ProjectEnvSelect,
     },
     setup() {
         const state = reactive({
             loading: false,
-            cluster: 0,
             redisList: [],
+            dbList: [],
             query: {
                 envId: 0,
             },
             scanParam: {
                 id: null,
-                cluster: 0,
+                db: null,
                 match: null,
                 count: 10,
-                cursor: 0,
+                cursor: {},
-                prevCursor: null,
-            },
-            valueDialog: {
-                visible: false,
-                value: {},
             },
             dataEdit: {
                 visible: false,
@@ -129,9 +167,18 @@ export default defineComponent({
                     timed: -1,
                     key: '',
                 },
-                stringValue: '',
+            },
-                hashValue: [{ key: '', value: '' }],
+            hashValueDialog: {
-                setValue: [{ value: '' }],
+                visible: false,
+            },
+            stringValueDialog: {
+                visible: false,
+            },
+            setValueDialog: {
+                visible: false,
+            },
+            listValueDialog: {
+                visible: false,
             },
             keys: [],
             dbsize: 0,
@@ -151,37 +198,53 @@ export default defineComponent({
             }
         };
 
-        const changeRedis = () => {
+        const changeRedis = (id: number) => {
-            resetScanParam();
+            resetScanParam(id);
+            state.scanParam.db = null;
+            state.dbList = (state.redisList.find((x: any) => x.id == id) as any).db.split(',');
+            state.keys = [];
+            state.dbsize = 0;
+        };
+
+        const changeDb = () => {
+            resetScanParam(state.scanParam.id as any);
             state.keys = [];
             state.dbsize = 0;
             searchKey();
         };
 
-        const scan = () => {
+        const scan = async () => {
             isTrue(state.scanParam.id != null, '请先选择redis');
-            isTrue(state.scanParam.count < 20001, 'count不能超过20000');
+            notBlank(state.scanParam.count, 'count不能为空');
+
+            const match = state.scanParam.match;
+            if (!match || (match as string).length < 4) {
+                isTrue(state.scanParam.count <= 200, 'key为空或小于4字符时, count不能超过200');
+            } else {
+                isTrue(state.scanParam.count <= 20000, 'count不能超过20000');
+            }
 
             state.loading = true;
-            state.scanParam.cluster = state.cluster == 0 ? 0 : 1;
+            try {
-
+                const res = await redisApi.scan.request(state.scanParam);
-            redisApi.scan.request(state.scanParam).then((res) => {
                 state.keys = res.keys;
                 state.dbsize = res.dbSize;
                 state.scanParam.cursor = res.cursor;
+            } finally {
                 state.loading = false;
-            });
+            }
         };
 
-        const searchKey = () => {
+        const searchKey = async () => {
-            state.scanParam.cursor = 0;
+            state.scanParam.cursor = {};
-            scan();
+            await scan();
         };
 
         const clearRedis = () => {
             state.redisList = [];
             state.scanParam.id = null;
             resetScanParam();
+            state.scanParam.db = null;
             state.keys = [];
             state.dbsize = 0;
         };
@@ -193,96 +256,87 @@ export default defineComponent({
             }
         };
 
-        const resetScanParam = () => {
+        const resetScanParam = (id: number = 0) => {
-            state.scanParam.match = null;
-            state.scanParam.cursor = 0;
             state.scanParam.count = 10;
+            if (id != 0) {
+                const redis: any = state.redisList.find((x: any) => x.id == id);
+                // 集群模式count设小点，因为后端会从所有master节点scan一遍然后合并结果
+                if (redis && redis.mode == 'cluster') {
+                    state.scanParam.count = 4;
+                }
+            }
+            state.scanParam.match = null;
+            state.scanParam.cursor = {};
         };
 
         const getValue = async (row: any) => {
             const type = row.type;
-            const key = row.key;
-
-            let res: any;
-            const id = state.cluster == 0 ? state.scanParam.id : state.cluster;
-            const reqParam = {
-                cluster: state.cluster,
-                key: row.key,
-                id,
-            };
-            switch (type) {
-                case 'string':
-                    res = await redisApi.getStringValue.request(reqParam);
-                    break;
-                case 'hash':
-                    res = await redisApi.getHashValue.request(reqParam);
-                    break;
-                case 'set':
-                    res = await redisApi.getSetValue.request(reqParam);
-                    break;
-                default:
-                    res = null;
-                    break;
-            }
-            notNull(res, '暂不支持该类型数据查看');
-
-            if (type == 'string') {
-                state.dataEdit.stringValue = res;
-            }
-            if (type == 'set') {
-                state.dataEdit.setValue = res.map((x: any) => {
-                    return {
-                        value: x,
-                    };
-                });
-            }
-            if (type == 'hash') {
-                const hash = [];
-                //遍历key和value
-                const keys = Object.keys(res);
-                for (let i = 0; i < keys.length; i++) {
-                    const key = keys[i];
-                    const value = res[key];
-                    hash.push({
-                        key,
-                        value,
-                    });
-                }
-                state.dataEdit.hashValue = hash;
-            }
 
             state.dataEdit.keyInfo.type = type;
             state.dataEdit.keyInfo.timed = row.ttl;
-            state.dataEdit.keyInfo.key = key;
+            state.dataEdit.keyInfo.key = row.key;
             state.dataEdit.operationType = 2;
-            state.dataEdit.title = '修改数据';
+            state.dataEdit.title = '查看数据';
-            state.dataEdit.visible = true;
+
+            if (type == 'hash') {
+                state.hashValueDialog.visible = true;
+            } else if (type == 'string') {
+                state.stringValueDialog.visible = true;
+            } else if (type == 'set') {
+                state.setValueDialog.visible = true;
+            } else if (type == 'list') {
+                state.listValueDialog.visible = true;
+            } else {
+                ElMessage.warning('暂不支持该类型');
+            }
+        };
+
+        const onAddData = (type: string) => {
+            notNull(state.scanParam.id, '请先选择redis');
+            state.dataEdit.operationType = 1;
+            state.dataEdit.title = '新增数据';
+            state.dataEdit.keyInfo.type = type;
+            state.dataEdit.keyInfo.timed = -1;
+            if (type == 'hash') {
+                state.hashValueDialog.visible = true;
+            } else if (type == 'string') {
+                state.stringValueDialog.visible = true;
+            } else if (type == 'set') {
+                state.setValueDialog.visible = true;
+            } else if (type == 'list') {
+                state.listValueDialog.visible = true;
+            } else {
+                ElMessage.warning('暂不支持该类型');
+            }
+        };
+
+        const onCancelDataEdit = () => {
+            state.dataEdit.keyInfo = {} as any;
         };
 
         const del = (key: string) => {
-            ElMessageBox.confirm(`此操作将删除对应的key , 是否继续?`, '提示', {
+            ElMessageBox.confirm(`确定删除[ ${key} ] 该key?`, '提示', {
                 confirmButtonText: '确定',
                 cancelButtonText: '取消',
                 type: 'warning',
             })
                 .then(() => {
-                    let id = state.cluster == 0 ? state.scanParam.id : state.cluster;
                     redisApi.delKey
                         .request({
-                            cluster: state.cluster,
                             key,
-                            id,
+                            id: state.scanParam.id,
+                            db: state.scanParam.db,
                         })
                         .then(() => {
                             ElMessage.success('删除成功！');
-                            scan();
+                            searchKey();
                         });
                 })
                 .catch(() => {});
         };
 
         const ttlConveter = (ttl: any) => {
-            if (ttl == -1) {
+            if (ttl == -1 || ttl == 0) {
                 return '永久';
             }
             if (!ttl) {
@@ -329,24 +383,11 @@ export default defineComponent({
             }
         };
 
-        const onAddData = () => {
-            notNull(state.scanParam.id, '请先选择redis');
-            state.dataEdit.operationType = 1;
-            state.dataEdit.title = '新增数据';
-            state.dataEdit.visible = true;
-        };
-
-        const onCancelDataEdit = () => {
-            state.dataEdit.keyInfo = {} as any;
-            state.dataEdit.stringValue = '';
-            state.dataEdit.setValue = [];
-            state.dataEdit.hashValue = [];
-        };
-
         return {
             ...toRefs(state),
             changeProjectEnv,
             changeRedis,
+            changeDb,
             clearRedis,
             searchKey,
             scan,

mayfly_go_web/src/views/ops/redis/HashValue.vue

@@ -0,0 +1,264 @@
+<template>
+    <el-dialog :title="title" v-model="dialogVisible" :before-close="cancel" width="800px" :destroy-on-close="true">
+        <el-form label-width="85px">
+            <el-form-item prop="key" label="key:">
+                <el-input :disabled="operationType == 2" v-model="key.key"></el-input>
+            </el-form-item>
+            <el-form-item prop="timed" label="过期时间:">
+                <el-input v-model.number="key.timed" type="number"></el-input>
+            </el-form-item>
+            <el-form-item prop="dataType" label="数据类型:">
+                <el-input v-model="key.type" disabled></el-input>
+            </el-form-item>
+
+            <el-row class="mt10">
+                <el-form label-position="right" :inline="true">
+                    <el-form-item label="field" label-width="40px" v-if="operationType == 2">
+                        <el-input placeholder="支持*模糊field" style="width: 140px" v-model="scanParam.match" clearable size="small"></el-input>
+                    </el-form-item>
+                    <el-form-item label="count" v-if="operationType == 2">
+                        <el-input placeholder="count" style="width: 62px" v-model.number="scanParam.count" size="small"></el-input>
+                    </el-form-item>
+                    <el-form-item>
+                        <el-button v-if="operationType == 2" @click="reHscan()" type="success" icon="search" plain size="small"></el-button>
+                        <el-button v-if="operationType == 2" @click="hscan()" icon="bottom" plain size="small">scan</el-button>
+                        <el-button @click="onAddHashValue" icon="plus" size="small" plain>添加</el-button>
+                    </el-form-item>
+                    <div v-if="operationType == 2" class="mt10" style="float: right">
+                        <span>fieldSize: {{ keySize }}</span>
+                    </div>
+                </el-form>
+            </el-row>
+            <el-table :data="hashValues" stripe style="width: 100%">
+                <el-table-column prop="field" label="field" width>
+                    <template #default="scope">
+                        <el-input v-model="scope.row.field" clearable size="small"></el-input>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="value" label="value" min-width="200">
+                    <template #default="scope">
+                        <el-input v-model="scope.row.value" clearable type="textarea" :autosize="{ minRows: 2, maxRows: 10 }" size="small"></el-input>
+                    </template>
+                </el-table-column>
+                <el-table-column label="操作" width="120">
+                    <template #default="scope">
+                        <el-button v-if="operationType == 2" type="success" @click="hset(scope.row)" icon="check" size="small" plain></el-button>
+                        <el-button type="danger" @click="hdel(scope.row.field, scope.$index)" icon="delete" size="small" plain></el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+        </el-form>
+        <template #footer v-if="operationType == 1">
+            <div class="dialog-footer">
+                <el-button @click="cancel()">取 消</el-button>
+                <el-button @click="saveValue" type="primary" v-auth="'redis:data:save'">确 定</el-button>
+            </div>
+        </template>
+    </el-dialog>
+</template>
+<script lang="ts">
+import { defineComponent, reactive, watch, toRefs } from 'vue';
+import { redisApi } from './api';
+import { ElMessage, ElMessageBox } from 'element-plus';
+import { isTrue, notEmpty } from '@/common/assert';
+
+export default defineComponent({
+    name: 'HashValue',
+    components: {},
+    props: {
+        visible: {
+            type: Boolean,
+        },
+        title: {
+            type: String,
+        },
+        // 操作类型，1：新增，2：修改
+        operationType: {
+            type: [Number],
+            require: true,
+        },
+        redisId: {
+            type: [Number],
+            require: true,
+        },
+        db: {
+            type: [Number],
+            require: true,
+        },
+        keyInfo: {
+            type: [Object],
+        },
+        hashValue: {
+            type: [Array, Object],
+        },
+    },
+    emits: ['valChange', 'cancel', 'update:visible'],
+    setup(props: any, { emit }) {
+        const state = reactive({
+            dialogVisible: false,
+            operationType: 1,
+            redisId: 0,
+            db: 0,
+            key: {
+                key: '',
+                type: 'hash',
+                timed: -1,
+            },
+            scanParam: {
+                key: '',
+                id: 0,
+                db: 0,
+                cursor: 0,
+                match: '',
+                count: 10,
+            },
+            keySize: 0,
+            hashValues: [
+                {
+                    field: '',
+                    value: '',
+                },
+            ],
+        });
+
+        const cancel = () => {
+            emit('update:visible', false);
+            emit('cancel');
+            setTimeout(() => {
+                state.hashValues = [];
+                state.key = {} as any;
+            }, 500);
+        };
+
+        watch(props, async (newValue) => {
+            const visible = newValue.visible;
+            state.redisId = newValue.redisId;
+            state.db = newValue.db;
+            state.key = newValue.keyInfo;
+            state.operationType = newValue.operationType;
+
+            if (visible && state.operationType == 2) {
+                state.scanParam.id = props.redisId;
+                state.scanParam.key = state.key.key;
+                await reHscan();
+            }
+
+            state.dialogVisible = visible;
+        });
+
+        const reHscan = async () => {
+            state.scanParam.id = state.redisId;
+            state.scanParam.db = state.db;
+            state.scanParam.cursor = 0;
+            hscan();
+        };
+
+        const hscan = async () => {
+            const match = state.scanParam.match;
+            if (!match || match == '' || match == '*') {
+                if (state.scanParam.count > 100) {
+                    ElMessage.error('match为空或者*时, count不能超过100');
+                    return;
+                }
+            } else {
+                if (state.scanParam.count > 1000) {
+                    ElMessage.error('count不能超过1000');
+                    return;
+                }
+            }
+
+            const scanRes = await redisApi.hscan.request(state.scanParam);
+            state.scanParam.cursor = scanRes.cursor;
+            state.keySize = scanRes.keySize;
+
+            const keys = scanRes.keys;
+            const hashValue = [];
+            const fieldCount = keys.length / 2;
+            let nextFieldIndex = 0;
+            for (let i = 0; i < fieldCount; i++) {
+                hashValue.push({ field: keys[nextFieldIndex++], value: keys[nextFieldIndex++] });
+            }
+            state.hashValues = hashValue;
+        };
+
+        const hdel = async (field: any, index: any) => {
+            // 如果是新增操作，则直接数组移除即可
+            if (state.operationType == 1) {
+                state.hashValues.splice(index, 1);
+                return;
+            }
+            await ElMessageBox.confirm(`确定删除[${field}]?`, '提示', {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                type: 'warning',
+            });
+            await redisApi.hdel.request({
+                id: state.redisId,
+                db: state.db,
+                key: state.key.key,
+                field,
+            });
+            ElMessage.success('删除成功');
+            reHscan();
+        };
+
+        const hset = async (row: any) => {
+            await redisApi.saveHashValue.request({
+                id: state.redisId,
+                db: state.db,
+                key: state.key.key,
+                timed: state.key.timed,
+                value: [
+                    {
+                        field: row.field,
+                        value: row.value,
+                    },
+                ],
+            });
+            ElMessage.success('保存成功');
+        };
+
+        const onAddHashValue = () => {
+            state.hashValues.unshift({ field: '', value: '' });
+        };
+
+        const saveValue = async () => {
+            notEmpty(state.key.key, 'key不能为空');
+            isTrue(state.hashValues.length > 0, 'hash内容不能为空');
+            const sv = { value: state.hashValues, id: state.redisId, db: state.db };
+            Object.assign(sv, state.key);
+            await redisApi.saveHashValue.request(sv);
+            ElMessage.success('保存成功');
+
+            cancel();
+            emit('valChange');
+        };
+
+        return {
+            ...toRefs(state),
+            reHscan,
+            hscan,
+            cancel,
+            hdel,
+            hset,
+            onAddHashValue,
+            saveValue,
+        };
+    },
+});
+</script>
+<style lang="scss">
+#string-value-text {
+    flex-grow: 1;
+    display: flex;
+    position: relative;
+
+    .text-type-select {
+        position: absolute;
+        z-index: 2;
+        right: 10px;
+        top: 10px;
+        max-width: 70px;
+    }
+}
+</style>

mayfly_go_web/src/views/ops/redis/ListValue.vue

@@ -0,0 +1,213 @@
+<template>
+    <el-dialog :title="title" v-model="dialogVisible" :before-close="cancel" width="800px" :destroy-on-close="true">
+        <el-form label-width="85px">
+            <el-form-item prop="key" label="key:">
+                <el-input :disabled="operationType == 2" v-model="key.key"></el-input>
+            </el-form-item>
+            <el-form-item prop="timed" label="过期时间:">
+                <el-input v-model.number="key.timed" type="number"></el-input>
+            </el-form-item>
+            <el-form-item prop="dataType" label="数据类型:">
+                <el-input v-model="key.type" disabled></el-input>
+            </el-form-item>
+
+            <!-- <el-button @click="onAddListValue" icon="plus" size="small" plain class="mt10">添加</el-button> -->
+            <div v-if="operationType == 2" class="mt10" style="float: left">
+                <span>len: {{ len }}</span>
+            </div>
+            <el-table :data="value" stripe style="width: 100%">
+                <el-table-column prop="value" label="value" min-width="200">
+                    <template #default="scope">
+                        <el-input v-model="scope.row.value" clearable type="textarea" :autosize="{ minRows: 2, maxRows: 10 }" size="small"></el-input>
+                    </template>
+                </el-table-column>
+                <el-table-column label="操作" width="140">
+                    <template #default="scope">
+                        <el-button
+                            v-if="operationType == 2"
+                            type="success"
+                            @click="lset(scope.row, scope.$index)"
+                            icon="check"
+                            size="small"
+                            plain
+                        ></el-button>
+                        <!-- <el-button type="danger" @click="set.value.splice(scope.$index, 1)" icon="delete" size="small" plain></el-button> -->
+                    </template>
+                </el-table-column>
+            </el-table>
+            <el-row style="margin-top: 20px" type="flex" justify="end">
+                <el-pagination
+                    style="text-align: right"
+                    :total="len"
+                    layout="prev, pager, next, total"
+                    @current-change="handlePageChange"
+                    v-model:current-page="pageNum"
+                    :page-size="pageSize"
+                ></el-pagination>
+            </el-row>
+        </el-form>
+        <!-- <template #footer>
+            <div class="dialog-footer">
+                <el-button @click="cancel()">取 消</el-button>
+                <el-button @click="saveValue" type="primary" v-auth="'redis:data:save'">确 定</el-button>
+            </div>
+        </template> -->
+    </el-dialog>
+</template>
+<script lang="ts">
+import { defineComponent, reactive, watch, toRefs } from 'vue';
+import { redisApi } from './api';
+import { ElMessage } from 'element-plus';
+import { isTrue, notEmpty } from '@/common/assert';
+
+export default defineComponent({
+    name: 'ListValue',
+    components: {},
+    props: {
+        visible: {
+            type: Boolean,
+        },
+        title: {
+            type: String,
+        },
+        redisId: {
+            type: [Number],
+            require: true,
+        },
+        db: {
+            type: [Number],
+            require: true,
+        },
+        keyInfo: {
+            type: [Object],
+        },
+        // 操作类型，1：新增，2：修改
+        operationType: {
+            type: [Number],
+        },
+        listValue: {
+            type: [Array, Object],
+        },
+    },
+    emits: ['valChange', 'cancel', 'update:visible'],
+    setup(props: any, { emit }) {
+        const state = reactive({
+            dialogVisible: false,
+            operationType: 1,
+            redisId: '',
+            db: 0,
+            key: {
+                key: '',
+                type: 'string',
+                timed: -1,
+            },
+            value: [{ value: '' }],
+            len: 0,
+            start: 0,
+            stop: 0,
+            pageNum: 1,
+            pageSize: 10,
+        });
+
+        const cancel = () => {
+            emit('update:visible', false);
+            emit('cancel');
+            setTimeout(() => {
+                state.key = {
+                    key: '',
+                    type: 'string',
+                    timed: -1,
+                };
+                state.value = [];
+            }, 500);
+        };
+
+        watch(props, async (newValue) => {
+            state.dialogVisible = newValue.visible;
+            state.key = newValue.key;
+            state.redisId = newValue.redisId;
+            state.db = newValue.db;
+            state.key = newValue.keyInfo;
+            state.operationType = newValue.operationType;
+            // 如果是查看编辑操作，则获取值
+            if (state.dialogVisible && state.operationType == 2) {
+                getListValue();
+            }
+        });
+
+        const getListValue = async () => {
+            const pageNum = state.pageNum;
+            const pageSize = state.pageSize;
+            const res = await redisApi.getListValue.request({
+                id: state.redisId,
+                db: state.db,
+                key: state.key.key,
+                start: (pageNum - 1) * pageSize,
+                stop: pageNum * pageSize - 1,
+            });
+            state.len = res.len;
+            state.value = res.list.map((x: any) => {
+                return {
+                    value: x,
+                };
+            });
+        };
+
+        const lset = async (row: any, rowIndex: number) => {
+            await redisApi.setListValue.request({
+                id: state.redisId,
+                db: state.db,
+                key: state.key.key,
+                index: (state.pageNum - 1) * state.pageSize + rowIndex,
+                value: row.value,
+            });
+            ElMessage.success('数据保存成功');
+        };
+
+        const saveValue = async () => {
+            notEmpty(state.key.key, 'key不能为空');
+            isTrue(state.value.length > 0, 'list内容不能为空');
+            // const sv = { value: state.value.map((x) => x.value), id: state.redisId };
+            // Object.assign(sv, state.key);
+            // await redisApi.saveSetValue.request(sv);
+
+            ElMessage.success('数据保存成功');
+            cancel();
+            emit('valChange');
+        };
+
+        const onAddListValue = () => {
+            state.value.unshift({ value: '' });
+        };
+
+        const handlePageChange = (curPage: number) => {
+            state.pageNum = curPage;
+            getListValue();
+        };
+
+        return {
+            ...toRefs(state),
+            saveValue,
+            handlePageChange,
+            cancel,
+            lset,
+            onAddListValue,
+        };
+    },
+});
+</script>
+<style lang="scss">
+#string-value-text {
+    flex-grow: 1;
+    display: flex;
+    position: relative;
+
+    .text-type-select {
+        position: absolute;
+        z-index: 2;
+        right: 10px;
+        top: 10px;
+        max-width: 70px;
+    }
+}
+</style>

mayfly_go_web/src/views/ops/redis/RedisEdit.vue

@@ -1,6 +1,6 @@
 <template>
     <div>
-        <el-dialog :title="title" v-model="dialogVisible" :before-close="cancel" :close-on-click-modal="false" :destroy-on-close="true" width="35%">
+        <el-dialog :title="title" v-model="dialogVisible" :before-close="cancel" :close-on-click-modal="false" :destroy-on-close="true" width="38%">
             <el-form :model="form" ref="redisForm" :rules="rules" label-width="85px">
                 <el-form-item prop="projectId" label="项目:" required>
                     <el-select style="width: 100%" v-model="form.projectId" placeholder="请选择项目" @change="changeProject" filterable>
@@ -13,27 +13,68 @@
                         <el-option v-for="item in envs" :key="item.id" :label="`${item.name} [${item.remark}]`" :value="item.id"> </el-option>
                     </el-select>
                 </el-form-item>
+                <el-form-item prop="mode" label="mode:" required>
+                    <el-select style="width: 100%" v-model="form.mode" placeholder="请选择模式">
+                        <el-option label="standalone" value="standalone"> </el-option>
+                        <el-option label="cluster" value="cluster"> </el-option>
+                        <el-option label="sentinel" value="sentinel"> </el-option>
+                    </el-select>
+                </el-form-item>
                 <el-form-item prop="host" label="host:" required>
-                    <el-input v-model.trim="form.host" placeholder="请输入host:port" auto-complete="off"></el-input>
+                    <el-input
+                        v-model.trim="form.host"
+                        placeholder="请输入host:port；sentinel模式为: mastername=sentinelhost:port，若集群或哨兵需设多个节点可使用','分割"
+                        auto-complete="off"
+                        type="textarea"
+                    ></el-input>
                 </el-form-item>
                 <el-form-item prop="password" label="密码:">
                     <el-input
                         type="password"
                         show-password
                         v-model.trim="form.password"
-                        placeholder="请输入密码"
+                        placeholder="请输入密码, 修改操作可不填"
                         autocomplete="new-password"
-                    ></el-input>
+                        ><template v-if="form.id && form.id != 0" #suffix>
+                            <el-popover @hide="pwd = ''" placement="right" title="原密码" :width="200" trigger="click" :content="pwd">
+                                <template #reference>
+                                    <el-link @click="getPwd" :underline="false" type="primary" class="mr5">原密码</el-link>
+                                </template>
+                            </el-popover>
+                        </template></el-input
+                    >
                 </el-form-item>
                 <el-form-item prop="db" label="库号:" required>
-                    <el-input v-model.number="form.db" placeholder="请输入库号"></el-input>
+                    <el-select @change="changeDb" v-model="dbList" multiple placeholder="请选择可操作库号" style="width: 100%">
+                        <el-option v-for="db in [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15]" :key="db" :label="db" :value="db" />
+                    </el-select>
+                </el-form-item>
+                <el-form-item prop="remark" label="备注:">
+                    <el-input v-model.trim="form.remark" auto-complete="off" type="textarea"></el-input>
+                </el-form-item>
+                <el-form-item prop="enableSshTunnel" label="SSH隧道:">
+                    <el-col :span="3">
+                        <el-checkbox @change="getSshTunnelMachines" v-model="form.enableSshTunnel" :true-label="1" :false-label="-1"></el-checkbox>
+                    </el-col>
+                    <el-col :span="2" v-if="form.enableSshTunnel == 1"> 机器: </el-col>
+                    <el-col :span="19" v-if="form.enableSshTunnel == 1">
+                        <el-select style="width: 100%" v-model="form.sshTunnelMachineId" placeholder="请选择SSH隧道机器">
+                            <el-option
+                                v-for="item in sshTunnelMachineList"
+                                :key="item.id"
+                                :label="`${item.ip}:${item.port} [${item.name}]`"
+                                :value="item.id"
+                            >
+                            </el-option>
+                        </el-select>
+                    </el-col>
                 </el-form-item>
             </el-form>
 
             <template #footer>
                 <div class="dialog-footer">
                     <el-button @click="cancel()">取 消</el-button>
-                     <el-button type="primary" :loading="btnLoading" @click="btnOk">确 定</el-button>
+                    <el-button type="primary" :loading="btnLoading" @click="btnOk">确 定</el-button>
                 </div>
             </template>
         </el-dialog>
@@ -44,7 +85,9 @@
 import { toRefs, reactive, watch, defineComponent, ref } from 'vue';
 import { redisApi } from './api';
 import { projectApi } from '../project/api.ts';
+import { machineApi } from '../machine/api.ts';
 import { ElMessage } from 'element-plus';
+import { RsaEncrypt } from '@/common/rsa';
 
 export default defineComponent({
     name: 'RedisEdit',
@@ -68,16 +111,24 @@ export default defineComponent({
             dialogVisible: false,
             projects: [],
             envs: [],
+            sshTunnelMachineList: [],
             form: {
                 id: null,
                 name: null,
-                host: null,
+                mode: 'standalone',
+                host: '',
                 password: null,
+                db: '',
                 project: null,
                 projectId: null,
                 envId: null,
                 env: null,
+                remark: '',
+                enableSshTunnel: null,
+                sshTunnelMachineId: null,
             },
+            dbList: [0],
+            pwd: '',
             btnLoading: false,
             rules: {
                 projectId: [
@@ -104,7 +155,14 @@ export default defineComponent({
                 db: [
                     {
                         required: true,
-                        message: '请输入库号',
+                        message: '请选择库号',
+                        trigger: ['change', 'blur'],
+                    },
+                ],
+                mode: [
+                    {
+                        required: true,
+                        message: '请选择模式',
                         trigger: ['change', 'blur'],
                     },
                 ],
@@ -113,20 +171,48 @@ export default defineComponent({
 
         watch(props, async (newValue) => {
             state.dialogVisible = newValue.visible;
+            if (!state.dialogVisible) {
+                return;
+            }
             state.projects = newValue.projects;
             if (newValue.redis) {
                 getEnvs(newValue.redis.projectId);
                 state.form = { ...newValue.redis };
+                convertDb(state.form.db);
             } else {
                 state.envs = [];
-                state.form = { db: 0 } as any;
+                state.form = { db: '0', enableSshTunnel: -1 } as any;
+                state.dbList = [];
             }
+            getSshTunnelMachines();
         });
 
+        const convertDb = (db: string) => {
+            state.dbList = db.split(',').map((x) => Number.parseInt(x));
+        };
+
+        /**
+         * 改变表单中的数据库字段，方便表单错误提示。如全部删光，可提示请添加库号
+         */
+        const changeDb = () => {
+            state.form.db = state.dbList.length == 0 ? '' : state.dbList.join(',');
+        };
+
+        const getSshTunnelMachines = async () => {
+            if (state.form.enableSshTunnel == 1 && state.sshTunnelMachineList.length == 0) {
+                const res = await machineApi.list.request({ pageNum: 1, pageSize: 100 });
+                state.sshTunnelMachineList = res.list;
+            }
+        };
+
         const getEnvs = async (projectId: any) => {
             state.envs = await projectApi.projectEnvs.request({ projectId });
         };
 
+        const getPwd = async () => {
+            state.pwd = await redisApi.getRedisPwd.request({ id: state.form.id });
+        };
+
         const changeProject = (projectId: number) => {
             for (let p of state.projects as any) {
                 if (p.id == projectId) {
@@ -148,9 +234,15 @@ export default defineComponent({
         };
 
         const btnOk = async () => {
-            redisForm.value.validate((valid: boolean) => {
+            redisForm.value.validate(async (valid: boolean) => {
                 if (valid) {
-                    redisApi.saveRedis.request(state.form).then(() => {
+                    const reqForm = { ...state.form };
+                    if (reqForm.mode == 'sentinel' && reqForm.host.split('=').length != 2) {
+                        ElMessage.error('sentinel模式host需为: mastername=sentinelhost:sentinelport模式');
+                        return;
+                    }
+                    reqForm.password = await RsaEncrypt(reqForm.password);
+                    redisApi.saveRedis.request(reqForm).then(() => {
                         ElMessage.success('保存成功');
                         emit('val-change', state.form);
                         state.btnLoading = true;
@@ -175,6 +267,9 @@ export default defineComponent({
         return {
             ...toRefs(state),
             redisForm,
+            changeDb,
+            getSshTunnelMachines,
+            getPwd,
             changeProject,
             changeEnv,
             btnOk,

mayfly_go_web/src/views/ops/redis/RedisList.vue

@@ -5,16 +5,12 @@
             <el-button type="primary" icon="edit" :disabled="currentId == null" @click="editRedis(false)" plain>编辑</el-button>
             <el-button type="danger" icon="delete" :disabled="currentId == null" @click="deleteRedis" plain>删除</el-button>
             <div style="float: right">
-                <!-- <el-input placeholder="host"  style="width: 140px" v-model="query.host" @clear="search" plain clearable></el-input>
+                <el-select @focus="getProjects" v-model="query.projectId" placeholder="请选择项目" filterable clearable>
-                <el-select v-model="params.clusterId"  clearable placeholder="集群选择">
-                    <el-option v-for="item in clusters" :key="item.id" :value="item.id" :label="item.name"></el-option>
-                </el-select> -->
-                <el-select v-model="query.projectId" placeholder="请选择项目" filterable clearable>
                     <el-option v-for="item in projects" :key="item.id" :label="`${item.name} [${item.remark}]`" :value="item.id"> </el-option>
                 </el-select>
                 <el-button class="ml5" @click="search" type="success" icon="search"></el-button>
             </div>
-            <el-table :data="redisTable" style="width: 100%" @current-change="choose" stripe>
+            <el-table :data="redisTable" @current-change="choose" stripe>
                 <el-table-column label="选择" width="60px">
                     <template #default="scope">
                         <el-radio v-model="currentId" :label="scope.row.id">
@@ -22,19 +18,29 @@
                         </el-radio>
                     </template>
                 </el-table-column>
-                <el-table-column prop="project" label="项目" width></el-table-column>
+                <el-table-column prop="project" label="项目" min-width="100"></el-table-column>
-                <el-table-column prop="env" label="环境" width></el-table-column>
+                <el-table-column prop="env" label="环境" min-width="100"></el-table-column>
-                <el-table-column prop="host" label="host:port" width></el-table-column>
+                <el-table-column prop="host" label="host:port" min-width="150" show-overflow-tooltip> </el-table-column>
-                <el-table-column prop="createTime" label="创建时间">
+                <el-table-column prop="mode" label="mode" min-width="100"></el-table-column>
+                <el-table-column prop="remark" label="备注" min-width="120" show-overflow-tooltip></el-table-column>
+                <el-table-column prop="createTime" label="创建时间" min-width="160">
                     <template #default="scope">
                         {{ $filters.dateFormat(scope.row.createTime) }}
                     </template>
                 </el-table-column>
-                <el-table-column prop="creator" label="创建人"></el-table-column>
+                <el-table-column prop="creator" label="创建人" min-width="100"></el-table-column>
-                <el-table-column label="操作" width>
+                <el-table-column label="更多" min-width="130" fixed="right">
                     <template #default="scope">
-                        <el-button type="primary" @click="info(scope.row)" icon="tickets" plain size="small">info</el-button>
+                        <el-link
-                        <!-- <el-button type="success" @click="manage(scope.row)" :ref="scope.row"  plain>数据管理</el-button> -->
+                            v-if="scope.row.mode == 'standalone' || scope.row.mode == 'sentinel'"
+                            type="primary"
+                            @click="info(scope.row)"
+                            :underline="false"
+                            >单机信息</el-link
+                        >
+                        <el-link @click="onShowClusterInfo(scope.row)" v-if="scope.row.mode == 'cluster'" type="success" :underline="false"
+                            >集群信息</el-link
+                        >
                     </template>
                 </el-table-column>
             </el-table>
@@ -52,6 +58,84 @@
 
         <info v-model:visible="infoDialog.visible" :title="infoDialog.title" :info="infoDialog.info"></info>
 
+        <el-dialog width="1000px" title="集群信息" v-model="clusterInfoDialog.visible">
+            <el-input type="textarea" :autosize="{ minRows: 12, maxRows: 12 }" v-model="clusterInfoDialog.info"> </el-input>
+
+            <el-divider content-position="left">节点信息</el-divider>
+            <el-table :data="clusterInfoDialog.nodes" stripe size="small" border>
+                <el-table-column prop="nodeId" label="nodeId" min-width="300">
+                    <template #header>
+                        nodeId
+                        <el-tooltip class="box-item" effect="dark" content="节点id" placement="top">
+                            <el-icon><question-filled /></el-icon>
+                        </el-tooltip>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="ip" label="ip" min-width="180">
+                    <template #header>
+                        ip
+                        <el-tooltip
+                            class="box-item"
+                            effect="dark"
+                            content="ip:port1@port2：port1指redis服务器与客户端通信的端口，port2则是集群内部节点间通信的端口"
+                            placement="top"
+                        >
+                            <el-icon><question-filled /></el-icon>
+                        </el-tooltip>
+                    </template>
+                    <template #default="scope">
+                        <el-tag
+                            @click="info({ id: clusterInfoDialog.redisId, ip: scope.row.ip })"
+                            effect="plain"
+                            type="success"
+                            size="small"
+                            style="cursor: pointer"
+                            >{{ scope.row.ip }}</el-tag
+                        >
+                    </template>
+                </el-table-column>
+                <el-table-column prop="flags" label="flags" min-width="110"></el-table-column>
+                <el-table-column prop="masterSlaveRelation" label="masterSlaveRelation" min-width="300">
+                    <template #header>
+                        masterSlaveRelation
+                        <el-tooltip
+                            class="box-item"
+                            effect="dark"
+                            content="如果节点是slave，并且已知master节点，则为master节点ID；否则为符号'-'"
+                            placement="top"
+                        >
+                            <el-icon><question-filled /></el-icon>
+                        </el-tooltip>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="pingSent" label="pingSent" min-width="130" show-overflow-tooltip>
+                    <template #default="scope">
+                        {{ scope.row.pingSent == 0 ? 0 : new Date(parseInt(scope.row.pingSent)).toLocaleString() }}
+                    </template>
+                </el-table-column>
+                <el-table-column prop="pongRecv" label="pongRecv" min-width="130" show-overflow-tooltip>
+                    <template #default="scope">
+                        {{ scope.row.pongRecv == 0 ? 0 : new Date(parseInt(scope.row.pongRecv)).toLocaleString() }}
+                    </template>
+                </el-table-column>
+                <el-table-column prop="configEpoch" label="configEpoch" min-width="130">
+                    <template #header>
+                        configEpoch
+                        <el-tooltip
+                            class="box-item"
+                            effect="dark"
+                            content="节点的epoch值（如果该节点是从节点，则为其主节点的epoch值）。每当节点发生失败切换时，都会创建一个新的，独特的，递增的epoch。"
+                            placement="top"
+                        >
+                            <el-icon><question-filled /></el-icon>
+                        </el-tooltip>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="linkState" label="linkState" min-width="100"></el-table-column>
+                <el-table-column prop="slot" label="slot" min-width="100"></el-table-column>
+            </el-table>
+        </el-dialog>
+
         <redis-edit
             @val-change="valChange"
             :projects="projects"
@@ -92,6 +176,12 @@ export default defineComponent({
             redisInfo: {
                 url: '',
             },
+            clusterInfoDialog: {
+                visible: false,
+                redisId: 0,
+                info: '',
+                nodes: [],
+            },
             clusters: [
                 {
                     id: 0,
@@ -118,7 +208,6 @@ export default defineComponent({
 
         onMounted(async () => {
             search();
-            state.projects = (await projectApi.projects.request({ pageNum: 1, pageSize: 100 })).list;
         });
 
         const handlePageChange = (curPage: number) => {
@@ -134,12 +223,6 @@ export default defineComponent({
             state.currentData = item;
         };
 
-        // connect() {
-        //   Req.post('/open/redis/connect', this.form, res => {
-        //     this.redisInfo = res
-        //   })
-        // }
-
         const deleteRedis = async () => {
             try {
                 await ElMessageBox.confirm(`确定删除该redis?`, '提示', {
@@ -155,12 +238,23 @@ export default defineComponent({
             } catch (err) {}
         };
 
-        const info = (redis: any) => {
+        const info = async (redis: any) => {
-            redisApi.redisInfo.request({ id: redis.id }).then((res: any) => {
+            var host = redis.host;
-                state.infoDialog.info = res;
+            if (redis.ip) {
-                state.infoDialog.title = `'${redis.host}' info`;
+                host = redis.ip.split('@')[0];
-                state.infoDialog.visible = true;
+            }
-            });
+            const res = await redisApi.redisInfo.request({ id: redis.id, host });
+            state.infoDialog.info = res;
+            state.infoDialog.title = `'${host}' info`;
+            state.infoDialog.visible = true;
+        };
+
+        const onShowClusterInfo = async (redis: any) => {
+            const ci = await redisApi.clusterInfo.request({ id: redis.id });
+            state.clusterInfoDialog.info = ci.clusterInfo;
+            state.clusterInfoDialog.nodes = ci.clusterNodes;
+            state.clusterInfoDialog.redisId = redis.id;
+            state.clusterInfoDialog.visible = true;
         };
 
         const search = async () => {
@@ -169,7 +263,12 @@ export default defineComponent({
             state.total = res.total;
         };
 
-        const editRedis = (isAdd = false) => {
+        const getProjects = async () => {
+            state.projects = await projectApi.accountProjects.request(null);
+        };
+
+        const editRedis = async (isAdd = false) => {
+            await getProjects();
             if (isAdd) {
                 state.redisEditDialog.data = null;
                 state.redisEditDialog.title = '新增redis';
@@ -188,10 +287,12 @@ export default defineComponent({
 
         return {
             ...toRefs(state),
+            getProjects,
             search,
             handlePageChange,
             choose,
             info,
+            onShowClusterInfo,
             deleteRedis,
             editRedis,
             valChange,

mayfly_go_web/src/views/ops/redis/SetValue.vue

@@ -0,0 +1,164 @@
+<template>
+    <el-dialog :title="title" v-model="dialogVisible" :before-close="cancel" width="800px" :destroy-on-close="true">
+        <el-form label-width="85px">
+            <el-form-item prop="key" label="key:">
+                <el-input :disabled="operationType == 2" v-model="key.key"></el-input>
+            </el-form-item>
+            <el-form-item prop="timed" label="过期时间:">
+                <el-input v-model.number="key.timed" type="number"></el-input>
+            </el-form-item>
+            <el-form-item prop="dataType" label="数据类型:">
+                <el-input v-model="key.type" disabled></el-input>
+            </el-form-item>
+
+            <el-button @click="onAddSetValue" icon="plus" size="small" plain class="mt10">添加</el-button>
+            <el-table :data="value" stripe style="width: 100%">
+                <el-table-column prop="value" label="value" min-width="200">
+                    <template #default="scope">
+                        <el-input v-model="scope.row.value" clearable type="textarea" :autosize="{ minRows: 2, maxRows: 10 }" size="small"></el-input>
+                    </template>
+                </el-table-column>
+                <el-table-column label="操作" width="90">
+                    <template #default="scope">
+                        <el-button type="danger" @click="value.splice(scope.$index, 1)" icon="delete" size="small" plain>删除</el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+        </el-form>
+        <template #footer>
+            <div class="dialog-footer">
+                <el-button @click="cancel()">取 消</el-button>
+                <el-button @click="saveValue" type="primary" v-auth="'redis:data:save'">确 定</el-button>
+            </div>
+        </template>
+    </el-dialog>
+</template>
+<script lang="ts">
+import { defineComponent, reactive, watch, toRefs } from 'vue';
+import { redisApi } from './api';
+import { ElMessage } from 'element-plus';
+import { isTrue, notEmpty } from '@/common/assert';
+
+export default defineComponent({
+    name: 'SetValue',
+    components: {},
+    props: {
+        visible: {
+            type: Boolean,
+        },
+        title: {
+            type: String,
+        },
+        redisId: {
+            type: [Number],
+            require: true,
+        },
+        db: {
+            type: [Number],
+            require: true,
+        },
+        keyInfo: {
+            type: [Object],
+        },
+        // 操作类型，1：新增，2：修改
+        operationType: {
+            type: [Number],
+        },
+        setValue: {
+            type: [Array, Object],
+        },
+    },
+    emits: ['valChange', 'cancel', 'update:visible'],
+    setup(props: any, { emit }) {
+        const state = reactive({
+            dialogVisible: false,
+            operationType: 1,
+            redisId: '',
+            db: 0,
+            key: {
+                key: '',
+                type: 'string',
+                timed: -1,
+            },
+            value: [{ value: '' }],
+        });
+
+        const cancel = () => {
+            emit('update:visible', false);
+            emit('cancel');
+            setTimeout(() => {
+                state.key = {
+                    key: '',
+                    type: 'string',
+                    timed: -1,
+                };
+                state.value = [];
+            }, 500);
+        };
+
+        watch(props, async (newValue) => {
+            state.dialogVisible = newValue.visible;
+            state.key = newValue.key;
+            state.redisId = newValue.redisId;
+            state.db = newValue.db;
+            state.key = newValue.keyInfo;
+            state.operationType = newValue.operationType;
+            // 如果是查看编辑操作，则获取值
+            if (state.dialogVisible && state.operationType == 2) {
+                getSetValue();
+            }
+        });
+
+        const getSetValue = async () => {
+            const res = await redisApi.getSetValue.request({
+                id: state.redisId,
+                db: state.db,
+                key: state.key.key,
+            });
+            state.value = res.map((x: any) => {
+                return {
+                    value: x,
+                };
+            });
+        };
+
+        const saveValue = async () => {
+            notEmpty(state.key.key, 'key不能为空');
+            isTrue(state.value.length > 0, 'set内容不能为空');
+            const sv = { value: state.value.map((x) => x.value), id: state.redisId, db: state.db };
+            Object.assign(sv, state.key);
+            await redisApi.saveSetValue.request(sv);
+
+            ElMessage.success('数据保存成功');
+            cancel();
+            emit('valChange');
+        };
+
+        const onAddSetValue = () => {
+            state.value.unshift({ value: '' });
+        };
+
+        return {
+            ...toRefs(state),
+            saveValue,
+            cancel,
+            onAddSetValue,
+        };
+    },
+});
+</script>
+<style lang="scss">
+#string-value-text {
+    flex-grow: 1;
+    display: flex;
+    position: relative;
+
+    .text-type-select {
+        position: absolute;
+        z-index: 2;
+        right: 10px;
+        top: 10px;
+        max-width: 70px;
+    }
+}
+</style>

mayfly_go_web/src/views/ops/redis/StringValue.vue

@@ -0,0 +1,183 @@
+<template>
+    <el-dialog :title="title" v-model="dialogVisible" :before-close="cancel" width="800px" :destroy-on-close="true">
+        <el-form label-width="85px">
+            <el-form-item prop="key" label="key:">
+                <el-input :disabled="operationType == 2" v-model="key.key"></el-input>
+            </el-form-item>
+            <el-form-item prop="timed" label="过期时间:">
+                <el-input v-model.number="key.timed" type="number"></el-input>
+            </el-form-item>
+            <el-form-item prop="dataType" label="数据类型:">
+                <el-input v-model="key.type" disabled></el-input>
+            </el-form-item>
+
+            <div id="string-value-text" style="width: 100%">
+                <el-input class="json-text" v-model="string.value" type="textarea" :autosize="{ minRows: 10, maxRows: 20 }"></el-input>
+                <el-select class="text-type-select" @change="onChangeTextType" v-model="string.type">
+                    <el-option key="text" label="text" value="text"> </el-option>
+                    <el-option key="json" label="json" value="json"> </el-option>
+                </el-select>
+            </div>
+        </el-form>
+        <template #footer>
+            <div class="dialog-footer">
+                <el-button @click="cancel()">取 消</el-button>
+                <el-button @click="saveValue" type="primary" v-auth="'redis:data:save'">确 定</el-button>
+            </div>
+        </template>
+    </el-dialog>
+</template>
+<script lang="ts">
+import { defineComponent, reactive, watch, toRefs } from 'vue';
+import { redisApi } from './api';
+import { ElMessage } from 'element-plus';
+import { notEmpty } from '@/common/assert';
+import { formatJsonString } from '@/common/utils/format';
+
+export default defineComponent({
+    name: 'StringValue',
+    components: {},
+    props: {
+        visible: {
+            type: Boolean,
+        },
+        title: {
+            type: String,
+        },
+        redisId: {
+            type: [Number],
+            require: true,
+        },
+        db: {
+            type: [Number],
+            require: true,
+        },
+        keyInfo: {
+            type: [Object],
+        },
+        // 操作类型，1：新增，2：修改
+        operationType: {
+            type: [Number],
+        },
+    },
+    emits: ['valChange', 'cancel', 'update:visible'],
+    setup(props: any, { emit }) {
+        const state = reactive({
+            dialogVisible: false,
+            operationType: 1,
+            redisId: '',
+            db: 0,
+            key: {
+                key: '',
+                type: 'string',
+                timed: -1,
+            },
+            string: {
+                type: 'text',
+                value: '',
+            },
+        });
+
+        const cancel = () => {
+            emit('update:visible', false);
+            emit('cancel');
+            setTimeout(() => {
+                state.key = {
+                    key: '',
+                    type: 'string',
+                    timed: -1,
+                };
+                state.string.value = '';
+                state.string.type = 'text';
+            }, 500);
+        };
+
+        watch(
+            () => props.visible,
+            (val) => {
+                state.dialogVisible = val;
+            }
+        );
+
+        watch(
+            () => props.redisId,
+            (val) => {
+                state.redisId = val;
+            }
+        );
+
+        watch(
+            () => props.db,
+            (val) => {
+                state.db = val;
+            }
+        );
+
+        watch(props, async (newValue) => {
+            state.dialogVisible = newValue.visible;
+            state.key = newValue.key;
+            state.redisId = newValue.redisId;
+            state.db = newValue.db;
+            state.key = newValue.keyInfo;
+            state.operationType = newValue.operationType;
+            // 如果是查看编辑操作，则获取值
+            if (state.dialogVisible && state.operationType == 2) {
+                getStringValue();
+            }
+        });
+
+        const getStringValue = async () => {
+            state.string.value = await redisApi.getStringValue.request({
+                id: state.redisId,
+                db: state.db,
+                key: state.key.key,
+            });
+        };
+
+        const saveValue = async () => {
+            notEmpty(state.key.key, 'key不能为空');
+
+            notEmpty(state.string.value, 'value不能为空');
+            const sv = { value: formatJsonString(state.string.value, true), id: state.redisId, db: state.db };
+            Object.assign(sv, state.key);
+            await redisApi.saveStringValue.request(sv);
+            ElMessage.success('数据保存成功');
+            cancel();
+            emit('valChange');
+        };
+
+        // 更改文本类型
+        const onChangeTextType = (val: string) => {
+            if (val == 'json') {
+                state.string.value = formatJsonString(state.string.value, false);
+                return;
+            }
+            if (val == 'text') {
+                state.string.value = formatJsonString(state.string.value, true);
+            }
+        };
+
+        return {
+            ...toRefs(state),
+            saveValue,
+            cancel,
+            onChangeTextType,
+        };
+    },
+});
+</script>
+<style lang="scss">
+#string-value-text {
+    flex-grow: 1;
+    display: flex;
+    position: relative;
+
+    .text-type-select {
+        position: absolute;
+        z-index: 2;
+        right: 10px;
+        top: 10px;
+        max-width: 70px;
+    }
+}
+</style>

mayfly_go_web/src/views/ops/redis/api.ts

@@ -2,17 +2,25 @@ import Api from '@/common/Api';
 
 export const redisApi = {
     redisList : Api.create("/redis", 'get'),
+    getRedisPwd: Api.create("/redis/{id}/pwd", 'get'),
     redisInfo: Api.create("/redis/{id}/info", 'get'),
+    clusterInfo: Api.create("/redis/{id}/cluster-info", 'get'),
     saveRedis: Api.create("/redis", 'post'),
     delRedis: Api.create("/redis/{id}", 'delete'),
     // 获取权限列表
-    scan: Api.create("/redis/{id}/scan/{cursor}/{count}", 'get'),
+    scan: Api.create("/redis/{id}/{db}/scan", 'post'),
-    getStringValue: Api.create("/redis/{id}/string-value", 'get'),
+    getStringValue: Api.create("/redis/{id}/{db}/string-value", 'get'),
-    saveStringValue: Api.create("/redis/{id}/string-value", 'post'),
+    saveStringValue: Api.create("/redis/{id}/{db}/string-value", 'post'),
-    getHashValue: Api.create("/redis/{id}/hash-value", 'get'),
+    getHashValue: Api.create("/redis/{id}/{db}/hash-value", 'get'),
-    saveHashValue: Api.create("/redis/{id}/hash-value", 'post'),
+    hscan: Api.create("/redis/{id}/{db}/hscan", 'get'),
-    getSetValue: Api.create("/redis/{id}/set-value", 'get'),
+    hget: Api.create("/redis/{id}/{db}/hget", 'get'),
-    saveSetValue: Api.create("/redis/{id}/set-value", 'post'),
+    hdel: Api.create("/redis/{id}/{db}/hdel", 'delete'),
-    del: Api.create("/redis/{id}/scan/{cursor}/{count}", 'delete'),
+    saveHashValue: Api.create("/redis/{id}/{db}/hash-value", 'post'),
-    delKey: Api.create("/redis/{id}/key", 'delete'),
+    getSetValue: Api.create("/redis/{id}/{db}/set-value", 'get'),
+    saveSetValue: Api.create("/redis/{id}/{db}/set-value", 'post'),
+    del: Api.create("/redis/{id}/{db}/scan/{cursor}/{count}", 'delete'),
+    delKey: Api.create("/redis/{id}/{db}/key", 'delete'),
+    getListValue: Api.create("/redis/{id}/{db}/list-value", 'get'),
+    saveListValue: Api.create("/redis/{id}/{db}/list-value", 'post'),
+    setListValue: Api.create("/redis/{id}/{db}/list-value/lset", 'post'),
 }

mayfly_go_web/src/views/system/account/AccountEdit.vue

@@ -3,14 +3,11 @@
         <el-dialog :title="title" v-model="dialogVisible" :before-close="cancel" :show-close="false" width="35%" :destroy-on-close="true">
             <el-form :model="form" ref="accountForm" :rules="rules" label-width="85px">
                 <el-form-item prop="username" label="用户名:" required>
-                    <el-input :disabled="edit" v-model.trim="form.username" placeholder="请输入账号用户名" auto-complete="off"></el-input>
+                    <el-input :disabled="edit" v-model.trim="form.username" placeholder="请输入账号用户名，密码默认与账号名一致" auto-complete="off"></el-input>
                 </el-form-item>
-                <!-- <el-form-item prop="password" label="密码:" required>
+                <el-form-item v-if="edit" prop="password" label="密码:" required>
                     <el-input type="password" v-model.trim="form.password" placeholder="请输入密码" autocomplete="new-password"></el-input>
                 </el-form-item>
-                <el-form-item v-if="!edit" label="确认密码:" required>
-                    <el-input type="password" v-model.trim="form.repassword" placeholder="请输入确认密码" autocomplete="new-password"></el-input>
-                </el-form-item> -->
             </el-form>
 
             <template #footer>
@@ -74,6 +71,7 @@ export default defineComponent({
         watch(props, (newValue) => {
             if (newValue.account) {
                 state.form = { ...newValue.account };
+                state.edit = true;
             } else {
                 state.form = {} as any;
             }
@@ -81,11 +79,9 @@ export default defineComponent({
         });
 
         const btnOk = async () => {
-            let p = state.form.id ? accountApi.update : accountApi.save;
-
             accountForm.value.validate((valid: boolean) => {
                 if (valid) {
-                    p.request(state.form).then(() => {
+                    accountApi.save.request(state.form).then(() => {
                         ElMessage.success('操作成功');
                         emit('val-change', state.form);
                         state.btnLoading = true;

mayfly_go_web/src/views/system/account/AccountList.vue

@@ -2,7 +2,7 @@
     <div class="role-list">
         <el-card>
             <el-button v-auth="'account:add'" type="primary" icon="plus" @click="editAccount(true)">添加</el-button>
-            <el-button v-auth="'account:update'" :disabled="chooseId == null" @click="editAccount(false)" type="primary" icon="edit">编辑</el-button>
+            <el-button v-auth="'account:add'" :disabled="chooseId == null" @click="editAccount(false)" type="primary" icon="edit">编辑</el-button>
             <el-button v-auth="'account:saveRoles'" :disabled="chooseId == null" @click="roleEdit()" type="success" icon="setting"
                 >角色分配</el-button
             >
@@ -20,7 +20,7 @@
                 <el-button @click="search()" type="success" icon="search" size="small"></el-button>
             </div>
             <el-table :data="datas" ref="table" @current-change="choose" show-overflow-tooltip>
-                <el-table-column label="选择" width="50px">
+                <el-table-column label="选择" width="55px">
                     <template #default="scope">
                         <el-radio v-model="chooseId" :label="scope.row.id">
                             <i></i>
@@ -29,20 +29,20 @@
                 </el-table-column>
                 <el-table-column prop="username" label="用户名" min-width="115"></el-table-column>
 
-                <el-table-column align="center" prop="status" label="状态" min-width="63">
+                <el-table-column align="center" prop="status" label="状态" min-width="65">
                     <template #default="scope">
                         <el-tag v-if="scope.row.status == 1" type="success">正常</el-tag>
                         <el-tag v-if="scope.row.status == -1" type="danger">禁用</el-tag>
                     </template>
                 </el-table-column>
-                <el-table-column min-width="160" prop="lastLoginTime" label="最后登录时间">
+                <el-table-column min-width="160" prop="lastLoginTime" label="最后登录时间" show-overflow-tooltip>
                     <template #default="scope">
                         {{ $filters.dateFormat(scope.row.lastLoginTime) }}
                     </template>
                 </el-table-column>
 
                 <el-table-column min-width="115" prop="creator" label="创建账号"></el-table-column>
-                <el-table-column min-width="160" prop="createTime" label="创建时间">
+                <el-table-column min-width="160" prop="createTime" label="创建时间" show-overflow-tooltip>
                     <template #default="scope">
                         {{ $filters.dateFormat(scope.row.createTime) }}
                     </template>

mayfly_go_web/src/views/system/api.ts

@@ -32,6 +32,12 @@ export const accountApi = {
     saveRoles: Api.create("/sys/accounts/roles", 'post')
 }
 
-export const logApi = {
+export const configApi = {
-    list: Api.create("/sys/logs", "get")
+    list: Api.create("/sys/configs", 'get'),
+    save: Api.create("/sys/configs", 'post'),
+    getValue: Api.create("/sys/configs/value", 'get'),
+}
+
+export const logApi = {
+    list: Api.create("/syslogs", "get")
 }

mayfly_go_web/src/views/system/config/ConfigEdit.vue

@@ -0,0 +1,99 @@
+<template>
+    <div>
+        <el-dialog :title="title" v-model="dvisible" :show-close="false" :before-close="cancel" width="500px" :destroy-on-close="true">
+            <el-form ref="configForm" :model="form" label-width="90px">
+                <el-form-item prop="name" label="配置项:" required>
+                    <el-input v-model="form.name"></el-input>
+                </el-form-item>
+                <el-form-item prop="key" label="配置key:" required>
+                    <el-input :disabled="form.id != null" v-model="form.key"></el-input>
+                </el-form-item>
+                <el-form-item prop="value" label="配置值:" required>
+                    <el-input v-model="form.value"></el-input>
+                </el-form-item>
+                <el-form-item label="备注:">
+                    <el-input v-model="form.remark" type="textarea" :rows="2"></el-input>
+                </el-form-item>
+            </el-form>
+            <template #footer>
+                <div class="dialog-footer">
+                    <el-button @click="cancel()">取 消</el-button>
+                    <el-button type="primary" :loading="btnLoading" @click="btnOk">确 定</el-button>
+                </div>
+            </template>
+        </el-dialog>
+    </div>
+</template>
+
+<script lang="ts">
+import { ref, toRefs, reactive, watch, defineComponent } from 'vue';
+import { configApi } from '../api';
+
+export default defineComponent({
+    name: 'ConfigEdit',
+    props: {
+        visible: {
+            type: Boolean,
+        },
+        data: {
+            type: [Boolean, Object],
+        },
+        title: {
+            type: String,
+        },
+    },
+    setup(props: any, { emit }) {
+        const configForm: any = ref(null);
+        const state = reactive({
+            dvisible: false,
+            form: {
+                id: null,
+                name: '',
+                key: '',
+                value: '',
+                remark: '',
+            },
+            btnLoading: false,
+        });
+
+        watch(props, (newValue) => {
+            state.dvisible = newValue.visible;
+            if (newValue.data) {
+                state.form = { ...newValue.data };
+            } else {
+                state.form = {} as any;
+            }
+        });
+
+        const cancel = () => {
+            // 更新父组件visible prop对应的值为false
+            emit('update:visible', false);
+            // 若父组件有取消事件，则调用
+            emit('cancel');
+        };
+
+        const btnOk = async () => {
+            configForm.value.validate(async (valid: boolean) => {
+                if (valid) {
+                    await configApi.save.request(state.form);
+                    emit('val-change', state.form);
+                    cancel();
+                    state.btnLoading = true;
+                    setTimeout(() => {
+                        state.btnLoading = false;
+                    }, 1000);
+                }
+            });
+        };
+
+        return {
+            ...toRefs(state),
+            configForm,
+            btnOk,
+            cancel,
+        };
+    },
+});
+</script>
+<style lang="scss">
+</style>

mayfly_go_web/src/views/system/config/ConfigList.vue

@@ -0,0 +1,124 @@
+<template>
+    <div class="role-list">
+        <el-card>
+            <el-button type="primary" icon="plus" @click="editConfig(false)">添加</el-button>
+            <el-button :disabled="chooseId == null" @click="editConfig(chooseData)" type="primary" icon="edit">编辑</el-button>
+
+            <el-table :data="configs" @current-change="choose" ref="table" style="width: 100%">
+                <el-table-column label="选择" width="55px">
+                    <template #default="scope">
+                        <el-radio v-model="chooseId" :label="scope.row.id">
+                            <i></i>
+                        </el-radio>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="name" label="配置项"></el-table-column>
+                <el-table-column prop="key" label="配置key"></el-table-column>
+                <el-table-column prop="value" label="配置值" min-width="100px" show-overflow-tooltip></el-table-column>
+                <el-table-column prop="remark" label="备注" min-width="100px" show-overflow-tooltip></el-table-column>
+                <el-table-column prop="updateTime" label="更新时间">
+                    <template #default="scope">
+                        {{ $filters.dateFormat(scope.row.createTime) }}
+                    </template>
+                </el-table-column>
+                <el-table-column prop="modifier" label="修改者" show-overflow-tooltip></el-table-column>
+            </el-table>
+            <el-row style="margin-top: 20px" type="flex" justify="end">
+                <el-pagination
+                    style="text-align: right"
+                    @current-change="handlePageChange"
+                    :total="total"
+                    layout="prev, pager, next, total, jumper"
+                    v-model:current-page="query.pageNum"
+                    :page-size="query.pageSize"
+                ></el-pagination>
+            </el-row>
+        </el-card>
+
+        <config-edit :title="configEdit.title" v-model:visible="configEdit.visible" :data="configEdit.config" @val-change="configEditChange" />
+    </div>
+</template>
+
+<script lang="ts">
+import { toRefs, reactive, onMounted, defineComponent } from 'vue';
+import ConfigEdit from './ConfigEdit.vue';
+import { configApi } from '../api';
+import { ElMessage, ElMessageBox } from 'element-plus';
+export default defineComponent({
+    name: 'ConfigList',
+    components: {
+        ConfigEdit,
+    },
+    setup() {
+        const state = reactive({
+            dialogFormVisible: false,
+            currentEditPermissions: false,
+            query: {
+                pageNum: 1,
+                pageSize: 10,
+                name: null,
+            },
+            total: 0,
+            configs: [],
+            chooseId: null,
+            chooseData: null,
+            configEdit: {
+                title: '配置修改',
+                visible: false,
+                config: {},
+            },
+        });
+
+        onMounted(() => {
+            search();
+        });
+
+        const search = async () => {
+            let res = await configApi.list.request(state.query);
+            state.configs = res.list;
+            state.total = res.total;
+        };
+
+        const handlePageChange = (curPage: number) => {
+            state.query.pageNum = curPage;
+            search();
+        };
+
+        const choose = (item: any) => {
+            if (!item) {
+                return;
+            }
+            state.chooseId = item.id;
+            state.chooseData = item;
+        };
+
+        const configEditChange = () => {
+            ElMessage.success('修改成功！');
+            state.chooseId = null;
+            state.chooseData = null;
+            search();
+        };
+
+        const editConfig = (data: any) => {
+            if (data) {
+                state.configEdit.config = data;
+            } else {
+                state.configEdit.config = false;
+            }
+
+            state.configEdit.visible = true;
+        };
+
+        return {
+            ...toRefs(state),
+            search,
+            handlePageChange,
+            choose,
+            configEditChange,
+            editConfig,
+        };
+    },
+});
+</script>
+<style lang="scss">
+</style>

mayfly_go_web/src/views/system/role/RoleEdit.vue

@@ -1,7 +1,7 @@
 <template>
     <div class="role-dialog">
         <el-dialog :title="title" v-model="dvisible" :show-close="false" :before-close="cancel" width="500px" :destroy-on-close="true">
-            <el-form :model="form" label-width="90px">
+            <el-form ref="roleForm" :model="form" label-width="90px">
                 <el-form-item prop="name" label="角色名称:" required>
                     <el-input v-model="form.name" auto-complete="off"></el-input>
                 </el-form-item>
@@ -28,7 +28,7 @@
 </template>
 
 <script lang="ts">
-import { toRefs, reactive, watch, defineComponent } from 'vue';
+import { ref, toRefs, reactive, watch, defineComponent } from 'vue';
 import { roleApi } from '../api';
 
 export default defineComponent({
@@ -45,6 +45,7 @@ export default defineComponent({
         },
     },
     setup(props: any, { emit }) {
+        const roleForm: any = ref(null);
         const state = reactive({
             dvisible: false,
             form: {
@@ -73,18 +74,22 @@ export default defineComponent({
         };
 
         const btnOk = async () => {
-            // let p = state.form.id ? roleApi.update : roleApi.save;
+            roleForm.value.validate(async (valid: boolean) => {
-            await roleApi.save.request(state.form);
+                if (valid) {
-            emit('val-change', state.form);
+                    await roleApi.save.request(state.form);
-            cancel();
+                    emit('val-change', state.form);
-            state.btnLoading = true;
+                    cancel();
-            setTimeout(() => {
+                    state.btnLoading = true;
-                state.btnLoading = false;
+                    setTimeout(() => {
-            }, 1000);
+                        state.btnLoading = false;
+                    }, 1000);
+                }
+            });
         };
 
         return {
             ...toRefs(state),
+            roleForm,
             btnOk,
             cancel,
         };

mayfly_go_web/src/views/system/role/RoleList.vue

@@ -10,18 +10,17 @@
 
             <div style="float: right">
                 <el-input
-                    placeholder="请输入角色名称！"
+                    placeholder="请输入角色名称"
                     class="mr2"
-                    size="small"
+                    style="width: 200px"
-                    style="width: 300px"
                     v-model="query.name"
                     @clear="search"
                     clearable
                 ></el-input>
-                <el-button @click="search" type="success" icon="search" size="small"></el-button>
+                <el-button @click="search" type="success" icon="search"></el-button>
             </div>
             <el-table :data="roles" @current-change="choose" ref="table" style="width: 100%">
-                <el-table-column label="选择" width="50px">
+                <el-table-column label="选择" width="55px">
                     <template #default="scope">
                         <el-radio v-model="chooseId" :label="scope.row.id">
                             <i></i>

mayfly_go_web/src/views/system/syslog/SyslogList.vue

@@ -0,0 +1,103 @@
+<template>
+    <div class="role-list">
+        <el-card>
+            <div style="float: right">
+                <el-select
+                    remote
+                    :remote-method="getAccount"
+                    v-model="query.creatorId"
+                    filterable
+                    placeholder="请输入并选择账号"
+                    clearable
+                    class="mr5"
+                >
+                    <el-option v-for="item in accounts" :key="item.id" :label="item.username" :value="item.id"> </el-option>
+                </el-select>
+                <el-select v-model="query.type" filterable placeholder="请选择操作结果" clearable class="mr5">
+                    <el-option label="成功" :value="1"> </el-option>
+                    <el-option label="失败" :value="2"> </el-option>
+                </el-select>
+                <el-button @click="search" type="success" icon="search"></el-button>
+            </div>
+            <el-table :data="logs" style="width: 100%">
+                <el-table-column prop="creator" label="操作人" min-width="100" show-overflow-tooltip></el-table-column>
+                <el-table-column prop="createTime" label="操作时间" min-width="160">
+                    <template #default="scope">
+                        {{ $filters.dateFormat(scope.row.createTime) }}
+                    </template>
+                </el-table-column>
+                <el-table-column prop="type" label="结果" min-width="65">
+                    <template #default="scope">
+                        <el-tag v-if="scope.row.type == 1" type="success" size="small">成功</el-tag>
+                        <el-tag v-if="scope.row.type == 2" type="danger" size="small">失败</el-tag>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="description" label="描述" min-width="160" show-overflow-tooltip></el-table-column>
+
+                <el-table-column prop="reqParam" label="请求信息" min-width="300" show-overflow-tooltip></el-table-column>
+                <el-table-column prop="resp" label="响应信息" min-width="200" show-overflow-tooltip></el-table-column>
+            </el-table>
+            <el-row style="margin-top: 20px" type="flex" justify="end">
+                <el-pagination
+                    style="text-align: right"
+                    @current-change="handlePageChange"
+                    :total="total"
+                    layout="prev, pager, next, total, jumper"
+                    v-model:current-page="query.pageNum"
+                    :page-size="query.pageSize"
+                ></el-pagination>
+            </el-row>
+        </el-card>
+    </div>
+</template>
+
+<script lang="ts">
+import { toRefs, reactive, onMounted, defineComponent } from 'vue';
+import { logApi, accountApi } from '../api';
+export default defineComponent({
+    name: 'SyslogList',
+    components: {},
+    setup() {
+        const state = reactive({
+            query: {
+                pageNum: 1,
+                pageSize: 10,
+                name: null,
+            },
+            total: 0,
+            logs: [],
+            accounts: [],
+        });
+
+        onMounted(() => {
+            search();
+        });
+
+        const search = async () => {
+            let res = await logApi.list.request(state.query);
+            state.logs = res.list;
+            state.total = res.total;
+        };
+
+        const handlePageChange = (curPage: number) => {
+            state.query.pageNum = curPage;
+            search();
+        };
+
+        const getAccount = (username: any) => {
+            accountApi.list.request({ username }).then((res) => {
+                state.accounts = res.list;
+            });
+        };
+
+        return {
+            ...toRefs(state),
+            search,
+            handlePageChange,
+            getAccount,
+        };
+    },
+});
+</script>
+<style lang="scss">
+</style>

mayfly_go_web/vite.config.ts

@@ -30,7 +30,6 @@ const viteConfig: UserConfig = {
 				target: 'http://localhost:8888',
 				ws: true,
 				changeOrigin: true,
-				rewrite: (path) => path.replace(/^\/api/, '/'),
 			},
 		},
 	},

server/config.yml

@@ -1,7 +1,3 @@
-app:
-  name: mayfly-go
-  version: 1.0.0
-  
 server:
   # debug release test
   model: release
@@ -11,28 +7,16 @@ server:
     enable: false
     key-file: ./default.key
     cert-file: ./default.pem
-  # 静态资源
+  # 机器终端操作回放文件存储路径
-  static:
+  machine-rec-path: ./rec
-    - relative-path: /assets
-      root: ./static/assets
-  # 静态文件
-  static-file:
-    - relative-path: /
-      filepath: ./static/index.html
-    - relative-path: /favicon.ico
-      filepath: ./static/favicon.ico
-    - relative-path: /config.js
-      filepath: ./static/config.js
-
 jwt:
-  key: mykey
+  # jwt key，不设置默认使用随机字符串
+  key: 
   # 过期时间单位分钟
   expire-time: 1440
-
+# 资源密码aes加密key
-redis:
+aes:
-  host: 127.0.0.1
+  key: 1111111111111111
-  port: 6379
-
 mysql:
   host: localhost:3306
   username: root
@@ -40,7 +24,6 @@ mysql:
   db-name: mayfly-go
   config: charset=utf8&loc=Local&parseTime=true
   max-idle-conns: 5
-
 log:
    # 日志等级, trace, debug, info, warn, error, fatal
   level: info

server/go.mod

@@ -1,37 +1,40 @@
 module mayfly-go
 
-go 1.18
+go 1.19
 
 require (
-	github.com/dgrijalva/jwt-go v3.2.0+incompatible // jwt
 	github.com/gin-gonic/gin v1.8.1
-	github.com/go-redis/redis v6.15.9+incompatible
+	github.com/go-redis/redis/v8 v8.11.5
+	github.com/go-sql-driver/mysql v1.6.0
+	github.com/golang-jwt/jwt/v4 v4.4.2
 	github.com/gorilla/websocket v1.5.0
+	github.com/lib/pq v1.10.6
 	github.com/mojocn/base64Captcha v1.3.5 // 验证码
-	github.com/pkg/sftp v1.13.4
+	github.com/pkg/sftp v1.13.5
 	github.com/robfig/cron/v3 v3.0.1 // 定时任务
-	github.com/sirupsen/logrus v1.8.1
+	github.com/sirupsen/logrus v1.9.0
 	github.com/xwb1989/sqlparser v0.0.0-20180606152119-120387863bf2
 	go.mongodb.org/mongo-driver v1.9.1 // mongo
-	golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e // ssh
+	golang.org/x/crypto v0.0.0-20220924013350-4ba4fb4dd9e7 // ssh
-	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b
+	gopkg.in/yaml.v3 v3.0.1
 	// gorm
-	gorm.io/driver/mysql v1.3.4
+	gorm.io/driver/mysql v1.3.6
-	gorm.io/gorm v1.23.5
+	gorm.io/gorm v1.23.10
 )
 
 require (
+	github.com/cespare/xxhash/v2 v2.1.2 // indirect
+	github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
 	github.com/gin-contrib/sse v0.1.0 // indirect
 	github.com/go-playground/locales v0.14.0 // indirect
 	github.com/go-playground/universal-translator v0.18.0 // indirect
 	github.com/go-playground/validator/v10 v10.10.1 // indirect
-	github.com/go-sql-driver/mysql v1.6.0 // indirect
 	github.com/go-stack/stack v1.8.0 // indirect
 	github.com/goccy/go-json v0.9.7 // indirect
 	github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 // indirect
 	github.com/golang/snappy v0.0.1 // indirect
 	github.com/jinzhu/inflection v1.0.0 // indirect
-	github.com/jinzhu/now v1.1.4 // indirect
+	github.com/jinzhu/now v1.1.5 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
 	github.com/klauspost/compress v1.13.6 // indirect
 	github.com/kr/fs v0.1.0 // indirect
@@ -39,8 +42,6 @@ require (
 	github.com/mattn/go-isatty v0.0.14 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
-	github.com/onsi/ginkgo v1.16.5 // indirect
-	github.com/onsi/gomega v1.18.1 // indirect
 	github.com/pelletier/go-toml/v2 v2.0.1 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/ugorji/go/codec v1.2.7 // indirect
@@ -49,10 +50,11 @@ require (
 	github.com/xdg-go/stringprep v1.0.2 // indirect
 	github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d // indirect
 	golang.org/x/image v0.0.0-20220302094943-723b81ca9867 // indirect
-	golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2 // indirect
+	golang.org/x/net v0.0.0-20220225172249-27dd8689420f // indirect
 	golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9 // indirect
-	golang.org/x/sys v0.0.0-20220310020820-b874c991c1a5 // indirect
+	golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8 // indirect
 	golang.org/x/text v0.3.7 // indirect
+	golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
 	google.golang.org/protobuf v1.28.0 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 )

server/initialize/router.go

@@ -2,16 +2,29 @@ package initialize
 
 import (
 	"fmt"
-	common_index_router "mayfly-go/internal/common/router"
+	"io/fs"
-	devops_router "mayfly-go/internal/devops/router"
+	common_router "mayfly-go/internal/common/router"
+	db_router "mayfly-go/internal/db/router"
+	machine_router "mayfly-go/internal/machine/router"
+	mongo_router "mayfly-go/internal/mongo/router"
+	project_router "mayfly-go/internal/project/router"
+	redis_router "mayfly-go/internal/redis/router"
 	sys_router "mayfly-go/internal/sys/router"
 	"mayfly-go/pkg/config"
 	"mayfly-go/pkg/middleware"
+	"mayfly-go/static"
 	"net/http"
 
 	"github.com/gin-gonic/gin"
 )
 
+func WrapStaticHandler(h http.Handler) gin.HandlerFunc {
+	return func(c *gin.Context) {
+		c.Writer.Header().Set("Cache-Control", `public, max-age=31536000`)
+		h.ServeHTTP(c.Writer, c.Request)
+	}
+}
+
 func InitRouter() *gin.Engine {
 	// server配置
 	serverConfig := config.Conf.Server
@@ -25,12 +38,21 @@ func InitRouter() *gin.Engine {
 		g.JSON(http.StatusNotFound, gin.H{"code": 404, "msg": fmt.Sprintf("not found '%s:%s'", g.Request.Method, g.Request.URL.Path)})
 	})
 
+	// 使用embed打包静态资源至二进制文件中
+	fsys, _ := fs.Sub(static.Static, "static")
+	fileServer := http.FileServer(http.FS(fsys))
+	handler := WrapStaticHandler(fileServer)
+	router.GET("/", handler)
+	router.GET("/favicon.ico", handler)
+	router.GET("/config.js", handler)
+	// 所有/assets/**开头的都是静态资源文件
+	router.GET("/assets/*file", handler)
+
 	// 设置静态资源
 	if staticConfs := serverConfig.Static; staticConfs != nil {
 		for _, scs := range *staticConfs {
-			router.Static(scs.RelativePath, scs.Root)
+			router.StaticFS(scs.RelativePath, http.Dir(scs.Root))
 		}
-
 	}
 	// 设置静态文件
 	if staticFileConfs := serverConfig.StaticFile; staticFileConfs != nil {
@@ -38,6 +60,7 @@ func InitRouter() *gin.Engine {
 			router.StaticFile(sfs.RelativePath, sfs.Filepath)
 		}
 	}
+
 	// 是否允许跨域
 	if serverConfig.Cors {
 		router.Use(middleware.Cors())
@@ -46,22 +69,16 @@ func InitRouter() *gin.Engine {
 	// 设置路由组
 	api := router.Group("/api")
 	{
-		common_index_router.InitIndexRouter(api)
+		common_router.InitIndexRouter(api)
+		common_router.InitCommonRouter(api)
 
-		sys_router.InitCaptchaRouter(api)
+		sys_router.Init(api)
-		sys_router.InitAccountRouter(api) // 注册account路由
-		sys_router.InitResourceRouter(api)
-		sys_router.InitRoleRouter(api)
-		sys_router.InitSystemRouter(api)
 
-		devops_router.InitProjectRouter(api)
+		project_router.Init(api)
-		devops_router.InitDbRouter(api)
+		machine_router.Init(api)
-		devops_router.InitDbSqlExecRouter(api)
+		db_router.Init(api)
-		devops_router.InitRedisRouter(api)
+		redis_router.Init(api)
-		devops_router.InitMachineRouter(api)
+		mongo_router.Init(api)
-		devops_router.InitMachineScriptRouter(api)
-		devops_router.InitMachineFileRouter(api)
-		devops_router.InitMongoRouter(api)
 	}
 
 	return router

server/initialize/savelog.go

@@ -0,0 +1,10 @@
+package initialize
+
+import (
+	sysapp "mayfly-go/internal/sys/application"
+	"mayfly-go/pkg/ctx"
+)
+
+func InitSaveLogFunc() ctx.SaveLogFunc {
+	return sysapp.GetSyslogApp().SaveFromReq
+}

server/internal/common/api/common.go

@@ -0,0 +1,16 @@
+package api
+
+import (
+	"mayfly-go/pkg/biz"
+	"mayfly-go/pkg/ctx"
+	"mayfly-go/pkg/utils"
+)
+
+type Common struct {
+}
+
+func (i *Common) RasPublicKey(rc *ctx.ReqCtx) {
+	publicKeyStr, err := utils.GetRsaPublicKey()
+	biz.ErrIsNilAppendErr(err, "rsa生成公私钥失败")
+	rc.ResData = publicKeyStr
+}

server/internal/common/api/index.go

@@ -1,23 +1,30 @@
 package api
 
 import (
-	"mayfly-go/internal/devops/application"
+	dbapp "mayfly-go/internal/db/application"
-	"mayfly-go/internal/devops/domain/entity"
+	dbentity "mayfly-go/internal/db/domain/entity"
+	machineentity "mayfly-go/internal/machine/domain/entity"
+	projectentity "mayfly-go/internal/project/domain/entity"
+	redisentity "mayfly-go/internal/redis/domain/entity"
+
+	machineapp "mayfly-go/internal/machine/application"
+	projectapp "mayfly-go/internal/project/application"
+	redisapp "mayfly-go/internal/redis/application"
 	"mayfly-go/pkg/ctx"
 )
 
 type Index struct {
-	ProjectApp application.Project
+	ProjectApp projectapp.Project
-	MachineApp application.Machine
+	MachineApp machineapp.Machine
-	DbApp      application.Db
+	DbApp      dbapp.Db
-	RedisApp   application.Redis
+	RedisApp   redisapp.Redis
 }
 
 func (i *Index) Count(rc *ctx.ReqCtx) {
 	rc.ResData = map[string]interface{}{
-		"projectNum": i.ProjectApp.Count(new(entity.Project)),
+		"projectNum": i.ProjectApp.Count(new(projectentity.Project)),
-		"machineNum": i.MachineApp.Count(new(entity.Machine)),
+		"machineNum": i.MachineApp.Count(new(machineentity.Machine)),
-		"dbNum":      i.DbApp.Count(new(entity.Db)),
+		"dbNum":      i.DbApp.Count(new(dbentity.Db)),
-		"redisNum":   i.RedisApp.Count(new(entity.Redis)),
+		"redisNum":   i.RedisApp.Count(new(redisentity.Redis)),
 	}
 }

server/internal/common/router/common.go

@@ -0,0 +1,21 @@
+package router
+
+import (
+	"mayfly-go/internal/common/api"
+	"mayfly-go/pkg/ctx"
+
+	"github.com/gin-gonic/gin"
+)
+
+func InitCommonRouter(router *gin.RouterGroup) {
+	common := router.Group("common")
+	c := &api.Common{}
+	{
+		// 获取公钥
+		common.GET("public-key", func(g *gin.Context) {
+			ctx.NewReqCtxWithGin(g).
+				WithNeedToken(false).
+				Handle(c.RasPublicKey)
+		})
+	}
+}

server/internal/common/router/index.go

@@ -2,7 +2,10 @@ package router
 
 import (
 	"mayfly-go/internal/common/api"
-	devops_app "mayfly-go/internal/devops/application"
+	dbapp "mayfly-go/internal/db/application"
+	machineapp "mayfly-go/internal/machine/application"
+	projectapp "mayfly-go/internal/project/application"
+	redisapp "mayfly-go/internal/redis/application"
 	"mayfly-go/pkg/ctx"
 
 	"github.com/gin-gonic/gin"
@@ -11,10 +14,10 @@ import (
 func InitIndexRouter(router *gin.RouterGroup) {
 	index := router.Group("common/index")
 	i := &api.Index{
-		ProjectApp: devops_app.ProjectApp,
+		ProjectApp: projectapp.GetProjectApp(),
-		MachineApp: devops_app.MachineApp,
+		MachineApp: machineapp.GetMachineApp(),
-		DbApp:      devops_app.DbApp,
+		DbApp:      dbapp.GetDbApp(),
-		RedisApp:   devops_app.RedisApp,
+		RedisApp:   redisapp.GetRedisApp(),
 	}
 	{
 		// 首页基本信息统计

server/internal/common/utils/pwd.go

@@ -0,0 +1,35 @@
+package utils
+
+import (
+	"mayfly-go/pkg/biz"
+	"mayfly-go/pkg/config"
+)
+
+// 使用config.yml的aes.key进行密码加密
+func PwdAesEncrypt(password string) string {
+	if password == "" {
+		return ""
+	}
+	aes := config.Conf.Aes
+	if aes == nil {
+		return password
+	}
+	encryptPwd, err := aes.EncryptBase64([]byte(password))
+	biz.ErrIsNilAppendErr(err, "密码加密失败: %s")
+	return encryptPwd
+}
+
+// 使用config.yml的aes.key进行密码解密
+func PwdAesDecrypt(encryptPwd string) string {
+	if encryptPwd == "" {
+		return ""
+	}
+	aes := config.Conf.Aes
+	if aes == nil {
+		return encryptPwd
+	}
+	decryptPwd, err := aes.DecryptBase64(encryptPwd)
+	biz.ErrIsNilAppendErr(err, "密码解密失败: %s")
+	// 解密后的密码
+	return string(decryptPwd)
+}

server/internal/constant/constant.go

@@ -0,0 +1,16 @@
+package constant
+
+import "time"
+
+const (
+	MachineConnExpireTime = 60 * time.Minute
+	DbConnExpireTime      = 45 * time.Minute
+	RedisConnExpireTime   = 30 * time.Minute
+	MongoConnExpireTime   = 30 * time.Minute
+
+/****  开发测试使用   ****/
+// MachineConnExpireTime = 4 * time.Minute
+// DbConnExpireTime      = 2 * time.Minute
+// RedisConnExpireTime   = 2 * time.Minute
+// MongoConnExpireTime   = 2 * time.Minute
+)

server/internal/db/api/db.go

@@ -3,11 +3,12 @@ package api
 import (
 	"fmt"
 	"io"
-	"mayfly-go/internal/devops/api/form"
+	"mayfly-go/internal/db/api/form"
-	"mayfly-go/internal/devops/api/vo"
+	"mayfly-go/internal/db/api/vo"
-	"mayfly-go/internal/devops/application"
+	"mayfly-go/internal/db/application"
-	"mayfly-go/internal/devops/domain/entity"
+	"mayfly-go/internal/db/domain/entity"
-	sysApplication "mayfly-go/internal/sys/application"
+	projectapp "mayfly-go/internal/project/application"
+	sysapp "mayfly-go/internal/sys/application"
 	"mayfly-go/pkg/biz"
 	"mayfly-go/pkg/ctx"
 	"mayfly-go/pkg/ginx"
@@ -25,8 +26,8 @@ import (
 type Db struct {
 	DbApp        application.Db
 	DbSqlExecApp application.DbSqlExec
-	MsgApp       sysApplication.Msg
+	MsgApp       sysapp.Msg
-	ProjectApp   application.Project
+	ProjectApp   projectapp.Project
 }
 
 const DEFAULT_COLUMN_SIZE = 500
@@ -45,12 +46,48 @@ func (d *Db) Save(rc *ctx.ReqCtx) {
 	form := &form.DbForm{}
 	ginx.BindJsonAndValid(rc.GinCtx, form)
 
+	db := new(entity.Db)
+	utils.Copy(db, form)
+
+	// 密码解密，并使用解密后的赋值
+	originPwd, err := utils.DefaultRsaDecrypt(form.Password, true)
+	biz.ErrIsNilAppendErr(err, "解密密码错误: %s")
+	db.Password = originPwd
+
+	// 密码脱敏记录日志
+	form.Password = "****"
 	rc.ReqParam = form
 
+	db.SetBaseInfo(rc.LoginAccount)
+	d.DbApp.Save(db)
+}
+
+// 获取数据库实例密码，由于数据库是加密存储，故提供该接口展示原文密码
+func (d *Db) GetDbPwd(rc *ctx.ReqCtx) {
+	dbId := GetDbId(rc.GinCtx)
+	dbEntity := d.DbApp.GetById(dbId, "Password")
+	dbEntity.PwdDecrypt()
+	rc.ResData = dbEntity.Password
+}
+
+// 获取数据库实例的所有数据库名
+func (d *Db) GetDatabaseNames(rc *ctx.ReqCtx) {
+	form := &form.DbForm{}
+	ginx.BindJsonAndValid(rc.GinCtx, form)
+
 	db := new(entity.Db)
 	utils.Copy(db, form)
-	db.SetBaseInfo(rc.LoginAccount)
+
-	d.DbApp.Save(db)
+	// 密码解密，并使用解密后的赋值
+	originPwd, err := utils.DefaultRsaDecrypt(form.Password, true)
+	biz.ErrIsNilAppendErr(err, "解密密码错误: %s")
+	db.Password = originPwd
+
+	// 如果id不为空，并且密码为空则从数据库查询
+	if form.Id != 0 && db.Password == "" {
+		db = d.DbApp.GetById(form.Id)
+	}
+	rc.ResData = d.DbApp.GetDatabases(db)
 }
 
 func (d *Db) DeleteDb(rc *ctx.ReqCtx) {
@@ -61,19 +98,19 @@ func (d *Db) DeleteDb(rc *ctx.ReqCtx) {
 }
 
 func (d *Db) TableInfos(rc *ctx.ReqCtx) {
-	rc.ResData = d.DbApp.GetDbInstance(GetIdAndDb(rc.GinCtx)).GetTableInfos()
+	rc.ResData = d.DbApp.GetDbInstance(GetIdAndDb(rc.GinCtx)).GetMeta().GetTableInfos()
 }
 
 func (d *Db) TableIndex(rc *ctx.ReqCtx) {
 	tn := rc.GinCtx.Query("tableName")
 	biz.NotEmpty(tn, "tableName不能为空")
-	rc.ResData = d.DbApp.GetDbInstance(GetIdAndDb(rc.GinCtx)).GetTableIndex(tn)
+	rc.ResData = d.DbApp.GetDbInstance(GetIdAndDb(rc.GinCtx)).GetMeta().GetTableIndex(tn)
 }
 
 func (d *Db) GetCreateTableDdl(rc *ctx.ReqCtx) {
 	tn := rc.GinCtx.Query("tableName")
 	biz.NotEmpty(tn, "tableName不能为空")
-	rc.ResData = d.DbApp.GetDbInstance(GetIdAndDb(rc.GinCtx)).GetCreateTableDdl(tn)
+	rc.ResData = d.DbApp.GetDbInstance(GetIdAndDb(rc.GinCtx)).GetMeta().GetCreateTableDdl(tn)
 }
 
 func (d *Db) ExecSql(rc *ctx.ReqCtx) {
@@ -93,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)
+	execRes, err := d.DbSqlExecApp.Exec(&application.DbSqlExecReq{
-		biz.ErrIsNilAppendErr(err, "执行失败: %s")
+		DbId:         id,
-		res := make([]map[string]string, 0)
+		Db:           db,
-		resData := make(map[string]string)
+		Sql:          sql,
-		resData["影响条数"] = fmt.Sprintf("%d", rowsAffected)
+		Remark:       form.Remark,
-		res = append(res, resData)
+		DbInstance:   dbInstance,
-
+		LoginAccount: rc.LoginAccount,
-		colAndRes := make(map[string]interface{})
+	})
-		colAndRes["colNames"] = []string{"影响条数"}
+	biz.ErrIsNilAppendErr(err, "执行失败: %s")
-		colAndRes["res"] = res
+	colAndRes := make(map[string]interface{})
-
+	colAndRes["colNames"] = execRes.ColNames
-		rc.ResData = colAndRes
+	colAndRes["res"] = execRes.Res
-		// 保存sql执行记录
+	rc.ResData = colAndRes
-		if res[0]["影响条数"] > "0" {
-			execRecord.Remark = form.Remark
-			d.DbSqlExecApp.Save(execRecord)
-		}
-	}
 }
 
 // 执行sql文件
@@ -136,6 +157,8 @@ func (d *Db) ExecSqlFile(rc *ctx.ReqCtx) {
 	filename := fileheader.Filename
 	dbId, db := GetIdAndDb(g)
 
+	rc.ReqParam = fmt.Sprintf("dbId: %d, db: %s, filename: %s", dbId, db, filename)
+
 	go func() {
 		db := d.DbApp.GetDbInstance(dbId, db)
 
@@ -184,13 +207,14 @@ func (d *Db) DumpSql(rc *ctx.ReqCtx) {
 	// 是否需要导出数据
 	needData := dumpType == "2" || dumpType == "3"
 
+	dbInstance := d.DbApp.GetDbInstance(dbId, db)
+	biz.ErrIsNilAppendErr(d.ProjectApp.CanAccess(rc.LoginAccount.Id, dbInstance.ProjectId), "%s")
+
 	now := time.Now()
 	filename := fmt.Sprintf("%s.%s.sql", db, now.Format("200601021504"))
 	g.Header("Content-Type", "application/octet-stream")
 	g.Header("Content-Disposition", "attachment; filename="+filename)
 
-	rc.ReqParam = fmt.Sprintf("数据库id: %d -- %s", dbId, db)
-	dbInstance := d.DbApp.GetDbInstance(dbId, db)
 	writer := g.Writer
 	writer.WriteString("-- ----------------------------")
 	writer.WriteString("\n-- 导出平台: mayfly-go")
@@ -198,11 +222,12 @@ func (d *Db) DumpSql(rc *ctx.ReqCtx) {
 	writer.WriteString(fmt.Sprintf("\n-- 导出数据库: %s ", db))
 	writer.WriteString("\n-- ----------------------------\n")
 
+	dbmeta := d.DbApp.GetDbInstance(GetIdAndDb(rc.GinCtx)).GetMeta()
 	for _, table := range tables {
 		if needStruct {
 			writer.WriteString(fmt.Sprintf("\n-- ----------------------------\n-- 表结构: %s \n-- ----------------------------\n", table))
 			writer.WriteString(fmt.Sprintf("DROP TABLE IF EXISTS `%s`;\n", table))
-			writer.WriteString(dbInstance.GetCreateTableDdl(table)[0]["Create Table"].(string) + ";\n")
+			writer.WriteString(dbmeta.GetCreateTableDdl(table)[0]["Create Table"].(string) + ";\n")
 		}
 
 		if !needData {
@@ -215,14 +240,26 @@ func (d *Db) DumpSql(rc *ctx.ReqCtx) {
 		countSql := fmt.Sprintf("SELECT COUNT(*) count FROM %s", table)
 		_, countRes, _ := dbInstance.SelectData(countSql)
 		// 查询出所有列信息总数，手动分页获取所有数据
-		maCount := int(countRes[0]["count"].(int64))
+		maCount := 0
+		// 查询出所有列信息总数，手动分页获取所有数据
+		if count64, is64 := countRes[0]["count"].(int64); is64 {
+			maCount = int(count64)
+		} else {
+			maCount = countRes[0]["count"].(int)
+		}
 		// 计算需要查询的页数
 		pageNum := maCount / DEFAULT_COLUMN_SIZE
 		if maCount%DEFAULT_COLUMN_SIZE > 0 {
 			pageNum++
 		}
 
-		sqlTmp := "SELECT * FROM %s LIMIT %d, %d"
+		var sqlTmp string
+		switch dbInstance.Type {
+		case entity.DbTypeMysql:
+			sqlTmp = "SELECT * FROM %s LIMIT %d, %d"
+		case entity.DbTypePostgres:
+			sqlTmp = "SELECT * FROM %s OFFSET %d LIMIT %d"
+		}
 		for index := 0; index < pageNum; index++ {
 			sql := fmt.Sprintf(sqlTmp, table, index*DEFAULT_COLUMN_SIZE, DEFAULT_COLUMN_SIZE)
 			columns, result, _ := dbInstance.SelectData(sql)
@@ -250,13 +287,15 @@ func (d *Db) DumpSql(rc *ctx.ReqCtx) {
 		writer.WriteString("COMMIT;\n")
 	}
 	rc.NoRes = true
+
+	rc.ReqParam = fmt.Sprintf("dbId: %d, db: %s, tables: %s, dumpType: %s", dbId, db, tablesStr, dumpType)
 }
 
 // @router /api/db/:dbId/t-metadata [get]
 func (d *Db) TableMA(rc *ctx.ReqCtx) {
 	dbi := d.DbApp.GetDbInstance(GetIdAndDb(rc.GinCtx))
 	biz.ErrIsNilAppendErr(d.ProjectApp.CanAccess(rc.LoginAccount.Id, dbi.ProjectId), "%s")
-	rc.ResData = dbi.GetTableMetedatas()
+	rc.ResData = dbi.GetMeta().GetTables()
 }
 
 // @router /api/db/:dbId/c-metadata [get]
@@ -267,16 +306,17 @@ func (d *Db) ColumnMA(rc *ctx.ReqCtx) {
 
 	dbi := d.DbApp.GetDbInstance(GetIdAndDb(rc.GinCtx))
 	biz.ErrIsNilAppendErr(d.ProjectApp.CanAccess(rc.LoginAccount.Id, dbi.ProjectId), "%s")
-	rc.ResData = dbi.GetColumnMetadatas(tn)
+	rc.ResData = dbi.GetMeta().GetColumns(tn)
 }
 
 // @router /api/db/:dbId/hint-tables [get]
 func (d *Db) HintTables(rc *ctx.ReqCtx) {
 	dbi := d.DbApp.GetDbInstance(GetIdAndDb(rc.GinCtx))
 	biz.ErrIsNilAppendErr(d.ProjectApp.CanAccess(rc.LoginAccount.Id, dbi.ProjectId), "%s")
-	// 获取所有表
-	tables := dbi.GetTableMetedatas()
 
+	dm := dbi.GetMeta()
+	// 获取所有表
+	tables := dm.GetTables()
 	tableNames := make([]string, 0)
 	for _, v := range tables {
 		tableNames = append(tableNames, v["tableName"].(string))
@@ -291,7 +331,7 @@ func (d *Db) HintTables(rc *ctx.ReqCtx) {
 	}
 
 	// 获取所有表下的所有列信息
-	columnMds := dbi.GetColumnMetadatas(tableNames...)
+	columnMds := dm.GetColumns(tableNames...)
 	for _, v := range columnMds {
 		tName := v["tableName"].(string)
 		if res[tName] == nil {
@@ -301,7 +341,7 @@ func (d *Db) HintTables(rc *ctx.ReqCtx) {
 		columnName := fmt.Sprintf("%s  [%s]", v["columnName"], v["columnType"])
 		comment := v["columnComment"]
 		// 如果字段备注不为空，则加上备注信息
-		if comment != "" {
+		if comment != nil && comment != "" {
 			columnName = fmt.Sprintf("%s[%s]", columnName, comment)
 		}
 

server/internal/db/api/db_sql_exec.go

@@ -1,8 +1,8 @@
 package api
 
 import (
-	"mayfly-go/internal/devops/application"
+	"mayfly-go/internal/db/application"
-	"mayfly-go/internal/devops/domain/entity"
+	"mayfly-go/internal/db/domain/entity"
 	"mayfly-go/pkg/ctx"
 	"mayfly-go/pkg/ginx"
 )

server/internal/db/api/form/db.go

@@ -8,11 +8,22 @@ type DbForm struct {
 	Port      int    `binding:"required" json:"port"`
 	Username  string `binding:"required" json:"username"`
 	Password  string `json:"password"`
-	Database  string `binding:"required" json:"database"`
+	Params    string `json:"params"`
+	Database  string `json:"database"`
 	ProjectId uint64 `binding:"required" json:"projectId"`
 	Project   string `json:"project"`
 	Env       string `json:"env"`
 	EnvId     uint64 `binding:"required" json:"envId"`
+
+	EnableSshTunnel    int8   `json:"enableSshTunnel"`
+	SshTunnelMachineId uint64 `json:"sshTunnelMachineId"`
+}
+
+type DbSqlSaveForm struct {
+	Name string
+	Sql  string `binding:"required"`
+	Type int    `binding:"required"`
+	Db   string `binding:"required"`
 }
 
 // 数据库SQL执行表单

server/internal/db/api/vo/db.go

@@ -9,6 +9,7 @@ type SelectDataDbVO struct {
 	Host       *string    `json:"host"`
 	Port       *int       `json:"port"`
 	Type       *string    `json:"type"`
+	Params     *string    `json:"params"`
 	Database   *string    `json:"database"`
 	Username   *string    `json:"username"`
 	ProjectId  *int64     `json:"projectId"`
@@ -18,4 +19,7 @@ type SelectDataDbVO struct {
 	CreateTime *time.Time `json:"createTime"`
 	Creator    *string    `json:"creator"`
 	CreatorId  *int64     `json:"creatorId"`
+
+	EnableSshTunnel    *int8   `json:"enableSshTunnel"`
+	SshTunnelMachineId *uint64 `json:"sshTunnelMachineId"`
 }

server/internal/db/application/application.go

@@ -0,0 +1,16 @@
+package application
+
+import "mayfly-go/internal/db/infrastructure/persistence"
+
+var (
+	dbApp        Db        = newDbApp(persistence.GetDbRepo(), persistence.GetDbSqlRepo())
+	dbSqlExecApp DbSqlExec = newDbSqlExecApp(persistence.GetDbSqlExecRepo())
+)
+
+func GetDbApp() Db {
+	return dbApp
+}
+
+func GetDbSqlExecApp() DbSqlExec {
+	return dbSqlExecApp
+}

server/internal/db/application/db.go

@@ -0,0 +1,732 @@
+package application
+
+import (
+	"context"
+	"database/sql"
+	"fmt"
+	"mayfly-go/internal/constant"
+	"mayfly-go/internal/db/domain/entity"
+	"mayfly-go/internal/db/domain/repository"
+	machineapp "mayfly-go/internal/machine/application"
+	"mayfly-go/internal/machine/infrastructure/machine"
+	"mayfly-go/pkg/biz"
+	"mayfly-go/pkg/cache"
+	"mayfly-go/pkg/global"
+	"mayfly-go/pkg/model"
+	"mayfly-go/pkg/utils"
+	"net"
+	"reflect"
+	"strconv"
+	"strings"
+	"sync"
+	"time"
+
+	"github.com/go-sql-driver/mysql"
+	"github.com/lib/pq"
+)
+
+type Db interface {
+	// 分页获取
+	GetPageList(condition *entity.Db, pageParam *model.PageParam, toEntity interface{}, orderBy ...string) *model.PageResult
+
+	Count(condition *entity.Db) int64
+
+	// 根据条件获取
+	GetDbBy(condition *entity.Db, cols ...string) error
+
+	// 根据id获取
+	GetById(id uint64, cols ...string) *entity.Db
+
+	Save(entity *entity.Db)
+
+	// 删除数据库信息
+	Delete(id uint64)
+
+	// 获取数据库连接实例
+	// @param id 数据库实例id
+	// @param db 数据库
+	GetDbInstance(id uint64, db string) *DbInstance
+
+	// 获取数据库实例的所有数据库列表
+	GetDatabases(entity *entity.Db) []string
+}
+
+func newDbApp(dbRepo repository.Db, dbSqlRepo repository.DbSql) Db {
+	return &dbAppImpl{
+		dbRepo:    dbRepo,
+		dbSqlRepo: dbSqlRepo,
+	}
+}
+
+type dbAppImpl struct {
+	dbRepo    repository.Db
+	dbSqlRepo repository.DbSql
+}
+
+// 分页获取数据库信息列表
+func (d *dbAppImpl) GetPageList(condition *entity.Db, pageParam *model.PageParam, toEntity interface{}, orderBy ...string) *model.PageResult {
+	return d.dbRepo.GetDbList(condition, pageParam, toEntity, orderBy...)
+}
+
+func (d *dbAppImpl) Count(condition *entity.Db) int64 {
+	return d.dbRepo.Count(condition)
+}
+
+// 根据条件获取
+func (d *dbAppImpl) GetDbBy(condition *entity.Db, cols ...string) error {
+	return d.dbRepo.GetDb(condition, cols...)
+}
+
+// 根据id获取
+func (d *dbAppImpl) GetById(id uint64, cols ...string) *entity.Db {
+	return d.dbRepo.GetById(id, cols...)
+}
+
+func (d *dbAppImpl) Save(dbEntity *entity.Db) {
+	// 默认tcp连接
+	dbEntity.Network = dbEntity.GetNetwork()
+
+	// 测试连接
+	if dbEntity.Password != "" {
+		TestConnection(dbEntity)
+	}
+
+	// 查找是否存在该库
+	oldDb := &entity.Db{Host: dbEntity.Host, Port: dbEntity.Port, EnvId: dbEntity.EnvId}
+	err := d.GetDbBy(oldDb)
+
+	if dbEntity.Id == 0 {
+		biz.NotEmpty(dbEntity.Password, "密码不能为空")
+		biz.IsTrue(err != nil, "该数据库实例已存在")
+		dbEntity.PwdEncrypt()
+		d.dbRepo.Insert(dbEntity)
+		return
+	}
+
+	// 如果存在该库，则校验修改的库是否为该库
+	if err == nil {
+		biz.IsTrue(oldDb.Id == dbEntity.Id, "该数据库实例已存在")
+	}
+
+	dbId := dbEntity.Id
+	old := d.GetById(dbId)
+
+	var oldDbs []interface{}
+	for _, v := range strings.Split(old.Database, " ") {
+		// 关闭数据库连接
+		CloseDb(dbEntity.Id, v)
+		oldDbs = append(oldDbs, v)
+	}
+
+	var newDbs []interface{}
+	for _, v := range strings.Split(dbEntity.Database, " ") {
+		newDbs = append(newDbs, v)
+	}
+	// 比较新旧数据库列表，需要将移除的数据库相关联的信息删除
+	_, delDb, _ := utils.ArrayCompare(newDbs, oldDbs, func(i1, i2 interface{}) bool {
+		return i1.(string) == i2.(string)
+	})
+	for _, v := range delDb {
+		// 删除该库关联的所有sql记录
+		d.dbSqlRepo.DeleteBy(&entity.DbSql{DbId: dbId, Db: v.(string)})
+	}
+
+	dbEntity.PwdEncrypt()
+	d.dbRepo.Update(dbEntity)
+}
+
+func (d *dbAppImpl) Delete(id uint64) {
+	db := d.GetById(id)
+	dbs := strings.Split(db.Database, " ")
+	for _, v := range dbs {
+		// 关闭连接
+		CloseDb(id, v)
+	}
+	d.dbRepo.Delete(id)
+	// 删除该库下用户保存的所有sql信息
+	d.dbSqlRepo.DeleteBy(&entity.DbSql{DbId: id})
+}
+
+func (d *dbAppImpl) GetDatabases(ed *entity.Db) []string {
+	ed.Network = ed.GetNetwork()
+	databases := make([]string, 0)
+	var dbConn *sql.DB
+	var metaDb string
+	var getDatabasesSql string
+	if ed.Type == entity.DbTypeMysql {
+		metaDb = "information_schema"
+		getDatabasesSql = "SELECT SCHEMA_NAME AS dbname FROM SCHEMATA"
+	} else {
+		metaDb = "postgres"
+		getDatabasesSql = "SELECT datname AS dbname FROM pg_database"
+	}
+
+	dbConn, err := GetDbConn(ed, metaDb)
+	biz.ErrIsNilAppendErr(err, "数据库连接失败: %s")
+	defer dbConn.Close()
+
+	_, res, err := SelectDataByDb(dbConn, getDatabasesSql)
+	biz.ErrIsNilAppendErr(err, "获取数据库列表失败")
+	for _, re := range res {
+		databases = append(databases, re["dbname"].(string))
+	}
+	return databases
+}
+
+var mutex sync.Mutex
+
+func (da *dbAppImpl) GetDbInstance(id uint64, db string) *DbInstance {
+	// Id不为0，则为需要缓存
+	needCache := id != 0
+	if needCache {
+		load, ok := dbCache.Get(GetDbCacheKey(id, db))
+		if ok {
+			return load.(*DbInstance)
+		}
+	}
+	mutex.Lock()
+	defer mutex.Unlock()
+
+	d := da.GetById(id)
+	// 密码解密
+	d.PwdDecrypt()
+	biz.NotNil(d, "数据库信息不存在")
+	biz.IsTrue(strings.Contains(d.Database, db), "未配置该库的操作权限")
+
+	cacheKey := GetDbCacheKey(id, db)
+	dbi := &DbInstance{Id: cacheKey, Type: d.Type, ProjectId: d.ProjectId, sshTunnelMachineId: d.SshTunnelMachineId}
+
+	DB, err := GetDbConn(d, db)
+	if err != nil {
+		dbi.Close()
+		global.Log.Errorf("连接db失败: %s:%d/%s", d.Host, d.Port, db)
+		panic(biz.NewBizErr(fmt.Sprintf("数据库连接失败: %s", err.Error())))
+	}
+
+	// 最大连接周期，超过时间的连接就close
+	// DB.SetConnMaxLifetime(100 * time.Second)
+	// 设置最大连接数
+	DB.SetMaxOpenConns(2)
+	// 设置闲置连接数
+	DB.SetMaxIdleConns(1)
+
+	dbi.db = DB
+	global.Log.Infof("连接db: %s:%d/%s", d.Host, d.Port, db)
+	if needCache {
+		dbCache.Put(cacheKey, dbi)
+	}
+	return dbi
+}
+
+//------------------------------------------------------------------------------
+
+// 单次最大查询数据集
+const Max_Rows = 2000
+
+// 客户端连接缓存，指定时间内没有访问则会被关闭, key为数据库实例id:数据库
+var dbCache = cache.NewTimedCache(constant.DbConnExpireTime, 5*time.Second).
+	WithUpdateAccessTime(true).
+	OnEvicted(func(key interface{}, value interface{}) {
+		global.Log.Info(fmt.Sprintf("删除db连接缓存 id = %s", key))
+		value.(*DbInstance).Close()
+	})
+
+func init() {
+	machine.AddCheckSshTunnelMachineUseFunc(func(machineId uint64) bool {
+		// 遍历所有db连接实例，若存在db实例使用该ssh隧道机器，则返回true，表示还在使用中...
+		items := dbCache.Items()
+		for _, v := range items {
+			if v.Value.(*DbInstance).sshTunnelMachineId == machineId {
+				return true
+			}
+		}
+		return false
+	})
+}
+
+func GetDbCacheKey(dbId uint64, db string) string {
+	return fmt.Sprintf("%d:%s", dbId, db)
+}
+
+func GetDbInstanceByCache(id string) *DbInstance {
+	if load, ok := dbCache.Get(id); ok {
+		return load.(*DbInstance)
+	}
+	return nil
+}
+
+func TestConnection(d *entity.Db) {
+	// 验证第一个库是否可以连接即可
+	DB, err := GetDbConn(d, strings.Split(d.Database, " ")[0])
+	biz.ErrIsNilAppendErr(err, "数据库连接失败: %s")
+	defer DB.Close()
+}
+
+// 获取数据库连接
+func GetDbConn(d *entity.Db, db string) (*sql.DB, error) {
+	// SSH Conect
+	if d.EnableSshTunnel == 1 && d.SshTunnelMachineId != 0 {
+		sshTunnelMachine := machineapp.GetMachineApp().GetSshTunnelMachine(d.SshTunnelMachineId)
+		if d.Type == entity.DbTypeMysql {
+			mysql.RegisterDialContext(d.Network, func(ctx context.Context, addr string) (net.Conn, error) {
+				return sshTunnelMachine.GetDialConn("tcp", addr)
+			})
+		} else if d.Type == entity.DbTypePostgres {
+			_, err := pq.DialOpen(&PqSqlDialer{sshTunnelMachine: sshTunnelMachine}, getDsn(d, db))
+			if err != nil {
+				panic(biz.NewBizErr(fmt.Sprintf("postgres隧道连接失败: %s", err.Error())))
+			}
+		}
+	}
+
+	DB, err := sql.Open(d.Type, getDsn(d, db))
+	if err != nil {
+		return nil, err
+	}
+	err = DB.Ping()
+	if err != nil {
+		DB.Close()
+		return nil, err
+	}
+
+	return DB, nil
+}
+
+func SelectDataByDb(db *sql.DB, selectSql string) ([]string, []map[string]interface{}, error) {
+	rows, err := db.Query(selectSql)
+	if err != nil {
+		return nil, nil, err
+	}
+	// rows对象一定要close掉，如果出错，不关掉则会很迅速的达到设置最大连接数，
+	// 后面的链接过来直接报错或拒绝，实际上也没有起效果
+	defer func() {
+		if rows != nil {
+			rows.Close()
+		}
+	}()
+	colTypes, _ := rows.ColumnTypes()
+	// 这里表示一行填充数据
+	scans := make([]interface{}, len(colTypes))
+	// 这里表示一行所有列的值，用[]byte表示
+	vals := make([][]byte, len(colTypes))
+	// 这里scans引用vals，把数据填充到[]byte里
+	for k := range vals {
+		scans[k] = &vals[k]
+	}
+
+	result := make([]map[string]interface{}, 0)
+	// 列名用于前端表头名称按照数据库与查询字段顺序显示
+	colNames := make([]string, 0)
+	// 是否第一次遍历，列名数组只需第一次遍历时加入
+	isFirst := true
+	rowNum := 0
+	for rows.Next() {
+		rowNum++
+		biz.IsTrue(rowNum <= Max_Rows, "结果集 > 2000, 请完善条件或分页信息")
+
+		// 不Scan也会导致等待，该链接实际处于未工作的状态，然后也会导致连接数迅速达到最大
+		err := rows.Scan(scans...)
+		if err != nil {
+			return nil, nil, err
+		}
+		// 每行数据
+		rowData := make(map[string]interface{})
+		// 把vals中的数据复制到row中
+		for i, v := range vals {
+			colType := colTypes[i]
+			colName := colType.Name()
+			// 如果是第一行，则将列名加入到列信息中，由于map是无序的，所有需要返回列名的有序数组
+			if isFirst {
+				colNames = append(colNames, colName)
+			}
+			rowData[colName] = valueConvert(v, colType)
+		}
+		// 放入结果集
+		result = append(result, rowData)
+		isFirst = false
+	}
+	return colNames, result, nil
+}
+
+// 将查询的值转为对应列类型的实际值，不全部转为字符串
+func valueConvert(data []byte, colType *sql.ColumnType) interface{} {
+	if data == nil {
+		return nil
+	}
+	// 列的数据库类型名
+	colDatabaseTypeName := strings.ToLower(colType.DatabaseTypeName())
+
+	// 如果类型是bit，则直接返回第一个字节即可
+	if strings.Contains(colDatabaseTypeName, "bit") {
+		return data[0]
+	}
+
+	// 这里把[]byte数据转成string
+	stringV := string(data)
+	if stringV == "" {
+		return ""
+	}
+	colScanType := strings.ToLower(colType.ScanType().Name())
+
+	if strings.Contains(colScanType, "int") {
+		// 如果长度超过16位，则返回字符串，因为前端js长度大于16会丢失精度
+		if len(stringV) > 16 {
+			return stringV
+		}
+		intV, _ := strconv.Atoi(stringV)
+		switch colType.ScanType().Kind() {
+		case reflect.Int8:
+			return int8(intV)
+		case reflect.Uint8:
+			return uint8(intV)
+		case reflect.Int64:
+			return int64(intV)
+		case reflect.Uint64:
+			return uint64(intV)
+		case reflect.Uint:
+			return uint(intV)
+		default:
+			return intV
+		}
+	}
+	if strings.Contains(colScanType, "float") {
+		floatV, _ := strconv.ParseFloat(stringV, 64)
+		return floatV
+	}
+
+	return stringV
+}
+
+type PqSqlDialer struct {
+	sshTunnelMachine *machine.SshTunnelMachine
+}
+
+func (pd *PqSqlDialer) Dial(network, address string) (net.Conn, error) {
+	if sshConn, err := pd.sshTunnelMachine.GetDialConn("tcp", address); err == nil {
+		// 将ssh conn包装，否则redis内部设置超时会报错,ssh conn不支持设置超时会返回错误: ssh: tcpChan: deadline not supported
+		return &utils.WrapSshConn{Conn: sshConn}, nil
+	} else {
+		return nil, err
+	}
+}
+func (pd *PqSqlDialer) DialTimeout(network, address string, timeout time.Duration) (net.Conn, error) {
+	return pd.Dial(network, address)
+}
+
+// db实例
+type DbInstance struct {
+	Id                 string
+	Type               string
+	ProjectId          uint64
+	db                 *sql.DB
+	sshTunnelMachineId uint64
+}
+
+// 执行查询语句
+// 依次返回 列名数组，结果map，错误
+func (d *DbInstance) SelectData(execSql string) ([]string, []map[string]interface{}, error) {
+	return SelectDataByDb(d.db, execSql)
+}
+
+// 执行 update, insert, delete，建表等sql
+// 返回影响条数和错误
+func (d *DbInstance) Exec(sql string) (int64, error) {
+	res, err := d.db.Exec(sql)
+	if err != nil {
+		return 0, err
+	}
+	return res.RowsAffected()
+}
+
+// 获取数据库元信息实现接口
+func (di *DbInstance) GetMeta() DbMetadata {
+	dbType := di.Type
+	if dbType == entity.DbTypeMysql {
+		return &MysqlMetadata{di: di}
+	}
+	if dbType == entity.DbTypePostgres {
+		return &PgsqlMetadata{di: di}
+	}
+	return nil
+}
+
+// 关闭连接
+func (d *DbInstance) Close() {
+	if d.db != nil {
+		if err := d.db.Close(); err != nil {
+			global.Log.Errorf("关闭数据库实例[%s]连接失败: %s", d.Id, err.Error())
+		}
+		d.db = nil
+	}
+}
+
+// 获取dataSourceName
+func getDsn(d *entity.Db, db string) string {
+	var dsn string
+	if d.Type == entity.DbTypeMysql {
+		dsn = fmt.Sprintf("%s:%s@%s(%s:%d)/%s?timeout=8s", d.Username, d.Password, d.Network, d.Host, d.Port, db)
+		if d.Params != "" {
+			dsn = fmt.Sprintf("%s&%s", dsn, d.Params)
+		}
+		return dsn
+	}
+
+	if d.Type == entity.DbTypePostgres {
+		dsn = fmt.Sprintf("host=%s port=%d user=%s password=%s dbname=%s sslmode=disable", d.Host, d.Port, d.Username, d.Password, db)
+		if d.Params != "" {
+			dsn = fmt.Sprintf("%s %s", dsn, strings.Join(strings.Split(d.Params, "&"), " "))
+		}
+		return dsn
+	}
+	return ""
+}
+
+// 删除db缓存并关闭该数据库所有连接
+func CloseDb(dbId uint64, db string) {
+	dbCache.Delete(GetDbCacheKey(dbId, db))
+}
+
+// -----------------------------------元数据-------------------------------------------
+// 数据库元信息接口（表、列等元信息）
+type DbMetadata interface {
+	// 获取表基础元信息, 如表名等
+	GetTables() []map[string]interface{}
+
+	// 获取列元信息, 如列名等
+	GetColumns(tableNames ...string) []map[string]interface{}
+
+	// 获取表主键字段名，默认第一个字段
+	GetPrimaryKey(tablename string) string
+
+	// 获取表信息，比GetTables获取更详细的表信息
+	GetTableInfos() []map[string]interface{}
+
+	// 获取表索引信息
+	GetTableIndex(tableName string) []map[string]interface{}
+
+	// 获取建表ddl
+	GetCreateTableDdl(tableName string) []map[string]interface{}
+}
+
+// 默认每次查询列元信息数量
+const DEFAULT_COLUMN_SIZE = 2000
+
+// ---------------------------------- mysql元数据 -----------------------------------
+const (
+	// mysql 表信息元数据
+	MYSQL_TABLE_MA = `SELECT table_name tableName, engine, table_comment tableComment, 
+	create_time createTime from information_schema.tables
+	WHERE table_schema = (SELECT database()) LIMIT 2000`
+
+	// mysql 表信息
+	MYSQL_TABLE_INFO = `SELECT table_name tableName, table_comment tableComment, table_rows tableRows,
+	data_length dataLength, index_length indexLength, create_time createTime 
+	FROM information_schema.tables 
+    WHERE table_schema = (SELECT database()) LIMIT 2000`
+
+	// mysql 索引信息
+	MYSQL_INDEX_INFO = `SELECT index_name indexName, column_name columnName, index_type indexType,
+	SEQ_IN_INDEX seqInIndex, INDEX_COMMENT indexComment
+	FROM information_schema.STATISTICS 
+    WHERE table_schema = (SELECT database()) AND table_name = '%s' LIMIT 500`
+
+	// mysql 列信息元数据
+	MYSQL_COLUMN_MA = `SELECT table_name tableName, column_name columnName, column_type columnType,
+	column_comment columnComment, column_key columnKey, extra, is_nullable nullable from information_schema.columns
+	WHERE table_name in (%s) AND table_schema = (SELECT database()) ORDER BY tableName, ordinal_position LIMIT %d, %d`
+
+	// mysql 列信息元数据总数
+	MYSQL_COLOUMN_MA_COUNT = `SELECT COUNT(*) maNum from information_schema.columns
+	WHERE table_name in (%s) AND table_schema = (SELECT database())`
+)
+
+type MysqlMetadata struct {
+	di *DbInstance
+}
+
+// 获取表基础元信息, 如表名等
+func (mm *MysqlMetadata) GetTables() []map[string]interface{} {
+	_, res, _ := mm.di.SelectData(MYSQL_TABLE_MA)
+	return res
+}
+
+// 获取列元信息, 如列名等
+func (mm *MysqlMetadata) GetColumns(tableNames ...string) []map[string]interface{} {
+	var sql, tableName string
+	for i := 0; i < len(tableNames); i++ {
+		if i != 0 {
+			tableName = tableName + ", "
+		}
+		tableName = tableName + "'" + tableNames[i] + "'"
+	}
+
+	pageNum := 1
+	// 如果大于一个表，则统计列数并分页获取
+	if len(tableNames) > 1 {
+		countSql := fmt.Sprintf(MYSQL_COLOUMN_MA_COUNT, tableName)
+		_, countRes, _ := mm.di.SelectData(countSql)
+		maCount := 0
+		// 查询出所有列信息总数，手动分页获取所有数据
+		if count64, is64 := countRes[0]["maNum"].(int64); is64 {
+			maCount = int(count64)
+		} else {
+			maCount = countRes[0]["maNum"].(int)
+		}
+
+		// 计算需要查询的页数
+		pageNum = maCount / DEFAULT_COLUMN_SIZE
+		if maCount%DEFAULT_COLUMN_SIZE > 0 {
+			pageNum++
+		}
+	}
+
+	res := make([]map[string]interface{}, 0)
+	for index := 0; index < pageNum; index++ {
+		sql = fmt.Sprintf(MYSQL_COLUMN_MA, tableName, index*DEFAULT_COLUMN_SIZE, DEFAULT_COLUMN_SIZE)
+		_, result, err := mm.di.SelectData(sql)
+		biz.ErrIsNilAppendErr(err, "获取数据库列信息失败: %s")
+		res = append(res, result...)
+	}
+	return res
+}
+
+// 获取表主键字段名，默认第一个字段
+func (mm *MysqlMetadata) GetPrimaryKey(tablename string) string {
+	return mm.GetColumns(tablename)[0]["columnName"].(string)
+}
+
+// 获取表信息，比GetTableMetedatas获取更详细的表信息
+func (mm *MysqlMetadata) GetTableInfos() []map[string]interface{} {
+	_, res, _ := mm.di.SelectData(MYSQL_TABLE_INFO)
+	return res
+}
+
+// 获取表索引信息
+func (mm *MysqlMetadata) GetTableIndex(tableName string) []map[string]interface{} {
+	_, res, _ := mm.di.SelectData(fmt.Sprintf(MYSQL_INDEX_INFO, tableName))
+	return res
+}
+
+// 获取建表ddl
+func (mm *MysqlMetadata) GetCreateTableDdl(tableName string) []map[string]interface{} {
+	_, res, _ := mm.di.SelectData(fmt.Sprintf("show create table %s ", tableName))
+	return res
+}
+
+// ---------------------------------- pgsql元数据 -----------------------------------
+const (
+	// postgres 表信息元数据
+	PGSQL_TABLE_MA = `SELECT obj_description(c.oid) AS "tableComment", c.relname AS "tableName" FROM pg_class c 
+	JOIN pg_namespace n ON c.relnamespace = n.oid WHERE n.nspname = (select current_schema()) AND c.reltype > 0`
+
+	PGSQL_TABLE_INFO = `SELECT obj_description(c.oid) AS "tableComment", c.relname AS "tableName" FROM pg_class c 
+	JOIN pg_namespace n ON c.relnamespace = n.oid WHERE n.nspname = (select current_schema()) AND c.reltype > 0`
+
+	PGSQL_INDEX_INFO = `SELECT indexname AS "indexName", indexdef AS "indexComment"
+	FROM pg_indexes WHERE schemaname =  (select current_schema()) AND tablename = '%s'`
+
+	PGSQL_COLUMN_MA = `SELECT
+		C.relname AS "tableName",
+		A.attname AS "columnName",
+		concat_ws ( '', t.typname, SUBSTRING ( format_type ( a.atttypid, a.atttypmod ) FROM '\(.*\)' ) ) AS "columnType",
+		d.description AS "columnComment" 
+	FROM
+		pg_attribute a LEFT JOIN pg_description d ON d.objoid = a.attrelid 
+		AND d.objsubid = A.attnum
+		LEFT JOIN pg_class c ON A.attrelid = c.oid
+		LEFT JOIN pg_namespace pn ON c.relnamespace = pn.oid
+		LEFT JOIN pg_type t ON a.atttypid = t.oid 
+	WHERE
+		A.attnum >= 0 
+		AND pn.nspname = (select current_schema())
+		AND C.relname in (%s)
+	ORDER BY
+		C.relname DESC,
+		A.attnum ASC
+	OFFSET %d LIMIT %d	
+	`
+
+	PGSQL_COLUMN_MA_COUNT = `SELECT COUNT(*) "maNum"
+	FROM
+		pg_attribute a LEFT JOIN pg_description d ON d.objoid = a.attrelid 
+		AND d.objsubid = A.attnum
+		LEFT JOIN pg_class c ON A.attrelid = c.oid
+		LEFT JOIN pg_namespace pn ON c.relnamespace = pn.oid
+		LEFT JOIN pg_type t ON a.atttypid = t.oid 
+	WHERE
+		A.attnum >= 0 
+		AND pn.nspname = (select current_schema())
+		AND C.relname in (%s)
+	`
+)
+
+type PgsqlMetadata struct {
+	di *DbInstance
+}
+
+// 获取表基础元信息, 如表名等
+func (pm *PgsqlMetadata) GetTables() []map[string]interface{} {
+	_, res, _ := pm.di.SelectData(PGSQL_TABLE_MA)
+	return res
+}
+
+// 获取列元信息, 如列名等
+func (pm *PgsqlMetadata) GetColumns(tableNames ...string) []map[string]interface{} {
+	var sql, tableName string
+	for i := 0; i < len(tableNames); i++ {
+		if i != 0 {
+			tableName = tableName + ", "
+		}
+		tableName = tableName + "'" + tableNames[i] + "'"
+	}
+
+	pageNum := 1
+	// 如果大于一个表，则统计列数并分页获取
+	if len(tableNames) > 1 {
+		countSql := fmt.Sprintf(PGSQL_COLUMN_MA_COUNT, tableName)
+		_, countRes, _ := pm.di.SelectData(countSql)
+		maCount := 0
+		// 查询出所有列信息总数，手动分页获取所有数据
+		if count64, is64 := countRes[0]["maNum"].(int64); is64 {
+			maCount = int(count64)
+		} else {
+			maCount = countRes[0]["maNum"].(int)
+		}
+		// 计算需要查询的页数
+		pageNum = maCount / DEFAULT_COLUMN_SIZE
+		if maCount%DEFAULT_COLUMN_SIZE > 0 {
+			pageNum++
+		}
+	}
+
+	res := make([]map[string]interface{}, 0)
+	for index := 0; index < pageNum; index++ {
+		sql = fmt.Sprintf(PGSQL_COLUMN_MA, tableName, index*DEFAULT_COLUMN_SIZE, DEFAULT_COLUMN_SIZE)
+		_, result, err := pm.di.SelectData(sql)
+		biz.ErrIsNilAppendErr(err, "获取数据库列信息失败: %s")
+		res = append(res, result...)
+	}
+	return res
+}
+
+// 获取表主键字段名，默认第一个字段
+func (pm *PgsqlMetadata) GetPrimaryKey(tablename string) string {
+	return pm.GetColumns(tablename)[0]["columnName"].(string)
+}
+
+// 获取表信息，比GetTables获取更详细的表信息
+func (pm *PgsqlMetadata) GetTableInfos() []map[string]interface{} {
+	_, res, _ := pm.di.SelectData(PGSQL_TABLE_INFO)
+	return res
+}
+
+// 获取表索引信息
+func (pm *PgsqlMetadata) GetTableIndex(tableName string) []map[string]interface{} {
+	_, res, _ := pm.di.SelectData(fmt.Sprintf(PGSQL_INDEX_INFO, tableName))
+	return res
+}
+
+// 获取建表ddl
+func (mm *PgsqlMetadata) GetCreateTableDdl(tableName string) []map[string]interface{} {
+	return nil
+}

server/internal/db/application/db_sql_exec.go

@@ -0,0 +1,200 @@
+package application
+
+import (
+	"encoding/json"
+	"fmt"
+
+	"mayfly-go/internal/db/domain/entity"
+	"mayfly-go/internal/db/domain/repository"
+	"mayfly-go/pkg/global"
+	"mayfly-go/pkg/model"
+	"strings"
+
+	"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
+	Exec(execSqlReq *DbSqlExecReq) (*DbSqlExecRes, error)
+
+	// 根据条件删除sql执行记录
+	DeleteBy(condition *entity.DbSqlExec)
+
+	// 分页获取
+	GetPageList(condition *entity.DbSqlExec, pageParam *model.PageParam, toEntity interface{}, orderBy ...string) *model.PageResult
+}
+
+func newDbSqlExecApp(dbExecSqlRepo repository.DbSqlExec) DbSqlExec {
+	return &dbSqlExecAppImpl{
+		dbSqlExecRepo: dbExecSqlRepo,
+	}
+}
+
+type dbSqlExecAppImpl struct {
+	dbSqlExecRepo repository.DbSqlExec
+}
+
+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)
+		return nil, err
+	}
+
+	dbSqlExecRecord := new(entity.DbSqlExec)
+	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:
+		execRes, err = doUpdate(stmt, execSqlReq, dbSqlExecRecord)
+	case *sqlparser.Delete:
+		execRes, err = doDelete(stmt, execSqlReq, dbSqlExecRecord)
+	case *sqlparser.Insert:
+		execRes, err = doInsert(stmt, execSqlReq, dbSqlExecRecord)
+	default:
+		execRes, err = doExec(execSqlReq.Sql, execSqlReq.DbInstance)
+	}
+	if err != nil {
+		return nil, err
+	}
+
+	if !isSelect {
+		// 保存执行记录
+		d.dbSqlExecRepo.Insert(dbSqlExecRecord)
+	}
+	return execRes, nil
+}
+
+func (d *dbSqlExecAppImpl) DeleteBy(condition *entity.DbSqlExec) {
+	d.dbSqlExecRepo.DeleteBy(condition)
+}
+
+func (d *dbSqlExecAppImpl) GetPageList(condition *entity.DbSqlExec, pageParam *model.PageParam, toEntity interface{}, orderBy ...string) *model.PageResult {
+	return d.dbSqlExecRepo.GetPageList(condition, pageParam, toEntity, orderBy...)
+}
+
+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]
+	where := sqlparser.String(update.Where)
+
+	updateExprs := update.Exprs
+	updateColumns := make([]string, 0)
+	for _, v := range updateExprs {
+		updateColumns = append(updateColumns, v.Name.Name.String())
+	}
+
+	// 获取表主键列名,排除使用别名
+	primaryKey := dbInstance.GetMeta().GetPrimaryKey(tableName)
+
+	updateColumnsAndPrimaryKey := strings.Join(updateColumns, ",") + "," + primaryKey
+	// 查询要更新字段数据的旧值，以及主键值
+	selectSql := fmt.Sprintf("SELECT %s FROM %s %s LIMIT 200", updateColumnsAndPrimaryKey, tableStr, where)
+	_, res, _ := dbInstance.SelectData(selectSql)
+
+	bytes, _ := json.Marshal(res)
+	dbSqlExec.OldValue = string(bytes)
+	dbSqlExec.Table = tableName
+	dbSqlExec.Type = entity.DbSqlExecTypeUpdate
+
+	return doExec(execSqlReq.Sql, dbInstance)
+}
+
+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]
+	where := sqlparser.String(delete.Where)
+
+	// 查询删除数据
+	selectSql := fmt.Sprintf("SELECT * FROM %s %s LIMIT 200", tableStr, where)
+	_, res, _ := dbInstance.SelectData(selectSql)
+
+	bytes, _ := json.Marshal(res)
+	dbSqlExec.OldValue = string(bytes)
+	dbSqlExec.Table = table
+	dbSqlExec.Type = entity.DbSqlExecTypeDelete
+
+	return doExec(execSqlReq.Sql, dbInstance)
+}
+
+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
+}

server/internal/db/domain/entity/db.go

@@ -0,0 +1,56 @@
+package entity
+
+import (
+	"fmt"
+	"mayfly-go/internal/common/utils"
+	"mayfly-go/pkg/model"
+)
+
+type Db struct {
+	model.Model
+
+	Name      string `orm:"column(name)" json:"name"`
+	Type      string `orm:"column(type)" json:"type"` // 类型，mysql oracle等
+	Host      string `orm:"column(host)" json:"host"`
+	Port      int    `orm:"column(port)" json:"port"`
+	Network   string `orm:"column(network)" json:"network"`
+	Username  string `orm:"column(username)" json:"username"`
+	Password  string `orm:"column(password)" json:"-"`
+	Database  string `orm:"column(database)" json:"database"`
+	Params    string `json:"params"`
+	ProjectId uint64
+	Project   string
+	EnvId     uint64
+	Env       string
+
+	EnableSshTunnel    int8   `orm:"column(enable_ssh_tunnel)" json:"enableSshTunnel"`        // 是否启用ssh隧道
+	SshTunnelMachineId uint64 `orm:"column(ssh_tunnel_machine_id)" json:"sshTunnelMachineId"` // ssh隧道机器id
+}
+
+// 获取数据库连接网络, 若没有使用ssh隧道，则直接返回。否则返回拼接的网络需要注册至指定dial
+func (d *Db) GetNetwork() string {
+	network := d.Network
+	if d.EnableSshTunnel == 0 || d.EnableSshTunnel == -1 {
+		if network == "" {
+			return "tcp"
+		} else {
+			return network
+		}
+	}
+	return fmt.Sprintf("%s+ssh:%d", d.Type, d.SshTunnelMachineId)
+}
+
+func (d *Db) PwdEncrypt() {
+	// 密码替换为加密后的密码
+	d.Password = utils.PwdAesEncrypt(d.Password)
+}
+
+func (d *Db) PwdDecrypt() {
+	// 密码替换为解密后的密码
+	d.Password = utils.PwdAesDecrypt(d.Password)
+}
+
+const (
+	DbTypeMysql    = "mysql"
+	DbTypePostgres = "postgres"
+)

server/internal/db/domain/repository/db.go

@@ -1,7 +1,7 @@
 package repository
 
 import (
-	"mayfly-go/internal/devops/domain/entity"
+	"mayfly-go/internal/db/domain/entity"
 	"mayfly-go/pkg/model"
 )
 

server/internal/db/domain/repository/db_sql.go

@@ -1,6 +1,6 @@
 package repository
 
-import "mayfly-go/internal/devops/domain/entity"
+import "mayfly-go/internal/db/domain/entity"
 
 type DbSql interface {
 	DeleteBy(condition *entity.DbSql)

server/internal/db/domain/repository/db_sql_exec.go

@@ -1,7 +1,7 @@
 package repository
 
 import (
-	"mayfly-go/internal/devops/domain/entity"
+	"mayfly-go/internal/db/domain/entity"
 	"mayfly-go/pkg/model"
 )
 

server/internal/db/infrastructure/persistence/db.go

@@ -2,18 +2,20 @@ package persistence
 
 import (
 	"fmt"
-	"mayfly-go/internal/devops/domain/entity"
+	"mayfly-go/internal/db/domain/entity"
-	"mayfly-go/internal/devops/domain/repository"
+	"mayfly-go/internal/db/domain/repository"
 	"mayfly-go/pkg/biz"
 	"mayfly-go/pkg/model"
 )
 
-type dbRepo struct{}
+type dbRepoImpl struct{}
 
-var DbDao repository.Db = &dbRepo{}
+func newDbRepo() repository.Db {
+	return new(dbRepoImpl)
+}
 
 // 分页获取数据库信息列表
-func (d *dbRepo) GetDbList(condition *entity.Db, pageParam *model.PageParam, toEntity interface{}, orderBy ...string) *model.PageResult {
+func (d *dbRepoImpl) GetDbList(condition *entity.Db, pageParam *model.PageParam, toEntity interface{}, orderBy ...string) *model.PageResult {
 	sql := "SELECT d.* FROM t_db d JOIN t_project_member pm ON d.project_id = pm.project_id WHERE 1 = 1 "
 	if condition.CreatorId != 0 {
 		// 使用创建者id模拟项目成员id
@@ -35,17 +37,17 @@ func (d *dbRepo) GetDbList(condition *entity.Db, pageParam *model.PageParam, toE
 	return model.GetPageBySql(sql, pageParam, toEntity)
 }
 
-func (d *dbRepo) Count(condition *entity.Db) int64 {
+func (d *dbRepoImpl) Count(condition *entity.Db) int64 {
 	return model.CountBy(condition)
 }
 
 // 根据条件获取账号信息
-func (d *dbRepo) GetDb(condition *entity.Db, cols ...string) error {
+func (d *dbRepoImpl) GetDb(condition *entity.Db, cols ...string) error {
 	return model.GetBy(condition, cols...)
 }
 
 // 根据id获取
-func (d *dbRepo) GetById(id uint64, cols ...string) *entity.Db {
+func (d *dbRepoImpl) GetById(id uint64, cols ...string) *entity.Db {
 	db := new(entity.Db)
 	if err := model.GetById(db, id, cols...); err != nil {
 		return nil
@@ -54,14 +56,14 @@ func (d *dbRepo) GetById(id uint64, cols ...string) *entity.Db {
 	return db
 }
 
-func (d *dbRepo) Insert(db *entity.Db) {
+func (d *dbRepoImpl) Insert(db *entity.Db) {
 	biz.ErrIsNil(model.Insert(db), "新增数据库信息失败")
 }
 
-func (d *dbRepo) Update(db *entity.Db) {
+func (d *dbRepoImpl) Update(db *entity.Db) {
 	biz.ErrIsNil(model.UpdateById(db), "更新数据库信息失败")
 }
 
-func (d *dbRepo) Delete(id uint64) {
+func (d *dbRepoImpl) Delete(id uint64) {
 	model.DeleteById(new(entity.Db), id)
 }

server/internal/db/infrastructure/persistence/db_sql.go

@@ -0,0 +1,19 @@
+package persistence
+
+import (
+	"mayfly-go/internal/db/domain/entity"
+	"mayfly-go/internal/db/domain/repository"
+	"mayfly-go/pkg/biz"
+	"mayfly-go/pkg/model"
+)
+
+type dbSqlRepoImpl struct{}
+
+func newDbSqlRepo() repository.DbSql {
+	return new(dbSqlRepoImpl)
+}
+
+// 分页获取数据库信息列表
+func (d *dbSqlRepoImpl) DeleteBy(condition *entity.DbSql) {
+	biz.ErrIsNil(model.DeleteByCondition(condition), "删除sql失败")
+}

server/internal/db/infrastructure/persistence/db_sql_exec.go

@@ -0,0 +1,27 @@
+package persistence
+
+import (
+	"mayfly-go/internal/db/domain/entity"
+	"mayfly-go/internal/db/domain/repository"
+	"mayfly-go/pkg/biz"
+	"mayfly-go/pkg/model"
+)
+
+type dbSqlExecRepoImpl struct{}
+
+func newDbSqlExecRepo() repository.DbSqlExec {
+	return new(dbSqlExecRepoImpl)
+}
+
+func (d *dbSqlExecRepoImpl) Insert(dse *entity.DbSqlExec) {
+	model.Insert(dse)
+}
+
+func (d *dbSqlExecRepoImpl) DeleteBy(condition *entity.DbSqlExec) {
+	biz.ErrIsNil(model.DeleteByCondition(condition), "删除sql执行记录失败")
+}
+
+// 分页获取
+func (d *dbSqlExecRepoImpl) GetPageList(condition *entity.DbSqlExec, pageParam *model.PageParam, toEntity interface{}, orderBy ...string) *model.PageResult {
+	return model.GetPage(pageParam, condition, toEntity, orderBy...)
+}

server/internal/db/infrastructure/persistence/persistence.go

@@ -0,0 +1,21 @@
+package persistence
+
+import "mayfly-go/internal/db/domain/repository"
+
+var (
+	dbRepo        repository.Db        = newDbRepo()
+	dbSqlRepo     repository.DbSql     = newDbSqlRepo()
+	dbSqlExecRepo repository.DbSqlExec = newDbSqlExecRepo()
+)
+
+func GetDbRepo() repository.Db {
+	return dbRepo
+}
+
+func GetDbSqlRepo() repository.DbSql {
+	return dbSqlRepo
+}
+
+func GetDbSqlExecRepo() repository.DbSqlExec {
+	return dbSqlExecRepo
+}

server/internal/db/router/db.go

@@ -1,9 +1,10 @@
 package router
 
 import (
-	"mayfly-go/internal/devops/api"
+	"mayfly-go/internal/db/api"
-	"mayfly-go/internal/devops/application"
+	"mayfly-go/internal/db/application"
-	sysApplication "mayfly-go/internal/sys/application"
+	projectapp "mayfly-go/internal/project/application"
+	sysapp "mayfly-go/internal/sys/application"
 	"mayfly-go/pkg/ctx"
 
 	"github.com/gin-gonic/gin"
@@ -13,25 +14,34 @@ func InitDbRouter(router *gin.RouterGroup) {
 	db := router.Group("dbs")
 	{
 		d := &api.Db{
-			DbApp:        application.DbApp,
+			DbApp:        application.GetDbApp(),
-			DbSqlExecApp: application.DbSqlExecApp,
+			DbSqlExecApp: application.GetDbSqlExecApp(),
-			MsgApp:       sysApplication.MsgApp,
+			MsgApp:       sysapp.GetMsgApp(),
-			ProjectApp:   application.ProjectApp,
+			ProjectApp:   projectapp.GetProjectApp(),
 		}
 		// 获取所有数据库列表
 		db.GET("", func(c *gin.Context) {
-			rc := ctx.NewReqCtxWithGin(c)
+			ctx.NewReqCtxWithGin(c).Handle(d.Dbs)
-			rc.Handle(d.Dbs)
 		})
 
-		saveDb := ctx.NewLogInfo("保存数据库信息")
+		saveDb := ctx.NewLogInfo("保存数据库信息").WithSave(true)
 		db.POST("", func(c *gin.Context) {
 			ctx.NewReqCtxWithGin(c).
 				WithLog(saveDb).
 				Handle(d.Save)
 		})
 
-		deleteDb := ctx.NewLogInfo("删除数据库信息")
+		// 获取数据库实例的所有数据库名
+		db.POST("databases", func(c *gin.Context) {
+			ctx.NewReqCtxWithGin(c).
+				Handle(d.GetDatabaseNames)
+		})
+
+		db.GET(":dbId/pwd", func(c *gin.Context) {
+			ctx.NewReqCtxWithGin(c).Handle(d.GetDbPwd)
+		})
+
+		deleteDb := ctx.NewLogInfo("删除数据库信息").WithSave(true)
 		db.DELETE(":dbId", func(c *gin.Context) {
 			ctx.NewReqCtxWithGin(c).
 				WithLog(deleteDb).
@@ -50,20 +60,23 @@ func InitDbRouter(router *gin.RouterGroup) {
 			ctx.NewReqCtxWithGin(c).Handle(d.GetCreateTableDdl)
 		})
 
-		// db.GET(":dbId/exec-sql", controllers.SelectData)
+		execSqlLog := ctx.NewLogInfo("执行Sql语句")
 		db.POST(":dbId/exec-sql", func(g *gin.Context) {
-			rc := ctx.NewReqCtxWithGin(g).WithLog(ctx.NewLogInfo("执行Sql语句"))
+			rc := ctx.NewReqCtxWithGin(g).WithLog(execSqlLog)
 			rc.Handle(d.ExecSql)
 		})
 
+		execSqlFileLog := ctx.NewLogInfo("执行Sql文件").WithSave(true)
 		db.POST(":dbId/exec-sql-file", func(g *gin.Context) {
-			rc := ctx.NewReqCtxWithGin(g).WithLog(ctx.NewLogInfo("执行Sql文件"))
+			ctx.NewReqCtxWithGin(g).
-			rc.Handle(d.ExecSqlFile)
+				WithLog(execSqlFileLog).
+				Handle(d.ExecSqlFile)
 		})
 
+		dumpLog := ctx.NewLogInfo("导出sql文件").WithSave(true)
 		db.GET(":dbId/dump", func(g *gin.Context) {
 			ctx.NewReqCtxWithGin(g).
-				WithLog(ctx.NewLogInfo("Sql文件dump")).
+				WithLog(dumpLog).
 				Handle(d.DumpSql)
 		})
 

server/internal/db/router/db_sql_exec.go

@@ -1,8 +1,8 @@
 package router
 
 import (
-	"mayfly-go/internal/devops/api"
+	"mayfly-go/internal/db/api"
-	"mayfly-go/internal/devops/application"
+	"mayfly-go/internal/db/application"
 	"mayfly-go/pkg/ctx"
 
 	"github.com/gin-gonic/gin"
@@ -12,7 +12,7 @@ func InitDbSqlExecRouter(router *gin.RouterGroup) {
 	db := router.Group("/dbs/:dbId/sql-execs")
 	{
 		d := &api.DbSqlExec{
-			DbSqlExecApp: application.DbSqlExecApp,
+			DbSqlExecApp: application.GetDbSqlExecApp(),
 		}
 		// 获取所有数据库sql执行记录列表
 		db.GET("", func(c *gin.Context) {

server/internal/db/router/router.go

@@ -0,0 +1,8 @@
+package router
+
+import "github.com/gin-gonic/gin"
+
+func Init(router *gin.RouterGroup) {
+	InitDbRouter(router)
+	InitDbSqlExecRouter(router)
+}

server/internal/devops/api/form/form.go

@@ -1,52 +0,0 @@
-package form
-
-type MachineForm struct {
-	Id          uint64 `json:"id"`
-	ProjectId   uint64 `json:"projectId"`
-	ProjectName string `json:"projectName"`
-	Name        string `json:"name" binding:"required"`
-	// IP地址
-	Ip string `json:"ip" binding:"required"`
-	// 用户名
-	Username string `json:"username" binding:"required"`
-	Password string `json:"password"`
-	// 端口号
-	Port   int    `json:"port" binding:"required"`
-	Remark string `json:"remark"`
-}
-
-type MachineRunForm struct {
-	MachineId int64  `binding:"required"`
-	Cmd       string `binding:"required"`
-}
-
-type MachineFileForm struct {
-	Id        uint64
-	Name      string `binding:"required"`
-	MachineId uint64 `binding:"required"`
-	Type      int    `binding:"required"`
-	Path      string `binding:"required"`
-}
-
-type MachineScriptForm struct {
-	Id          uint64
-	Name        string `binding:"required"`
-	MachineId   uint64 `binding:"required"`
-	Type        int    `binding:"required"`
-	Description string `binding:"required"`
-	Params      string
-	Script      string `binding:"required"`
-}
-
-type DbSqlSaveForm struct {
-	Name string
-	Sql  string `binding:"required"`
-	Type int    `binding:"required"`
-	Db   string `binding:"required"`
-}
-
-type MachineFileUpdateForm struct {
-	Content string `binding:"required"`
-	Id      uint64 `binding:"required"`
-	Path    string `binding:"required"`
-}

server/internal/devops/api/form/redis.go

@@ -1,32 +0,0 @@
-package form
-
-type Redis struct {
-	Id        uint64
-	Host      string `binding:"required" json:"host"`
-	Password  string `json:"password"`
-	Db        int    `json:"db"`
-	ProjectId uint64 `binding:"required" json:"projectId"`
-	Project   string `json:"project"`
-	Env       string `json:"env"`
-	EnvId     uint64 `binding:"required" json:"envId"`
-}
-
-type KeyInfo struct {
-	Key   string `binding:"required" json:"key"`
-	Timed int64
-}
-
-type StringValue struct {
-	KeyInfo
-	Value interface{} `binding:"required" json:"value"`
-}
-
-type HashValue struct {
-	KeyInfo
-	Value []map[string]interface{} `binding:"required" json:"value"`
-}
-
-type SetValue struct {
-	KeyInfo
-	Value []interface{} `binding:"required" json:"value"`
-}

server/internal/devops/api/redis.go

@@ -1,216 +0,0 @@
-package api
-
-import (
-	"mayfly-go/internal/devops/api/form"
-	"mayfly-go/internal/devops/api/vo"
-	"mayfly-go/internal/devops/application"
-	"mayfly-go/internal/devops/domain/entity"
-	"mayfly-go/pkg/biz"
-	"mayfly-go/pkg/ctx"
-	"mayfly-go/pkg/ginx"
-	"mayfly-go/pkg/utils"
-	"strconv"
-	"strings"
-	"time"
-)
-
-type Redis struct {
-	RedisApp   application.Redis
-	ProjectApp application.Project
-}
-
-func (r *Redis) RedisList(rc *ctx.ReqCtx) {
-	g := rc.GinCtx
-	m := &entity.Redis{EnvId: uint64(ginx.QueryInt(g, "envId", 0)),
-		ProjectId: uint64(ginx.QueryInt(g, "projectId", 0)),
-	}
-	m.CreatorId = rc.LoginAccount.Id
-	rc.ResData = r.RedisApp.GetPageList(m, ginx.GetPageParam(rc.GinCtx), new([]vo.Redis))
-}
-
-func (r *Redis) Save(rc *ctx.ReqCtx) {
-	form := &form.Redis{}
-	ginx.BindJsonAndValid(rc.GinCtx, form)
-
-	rc.ReqParam = form
-
-	redis := new(entity.Redis)
-	utils.Copy(redis, form)
-	redis.SetBaseInfo(rc.LoginAccount)
-	r.RedisApp.Save(redis)
-}
-
-func (r *Redis) DeleteRedis(rc *ctx.ReqCtx) {
-	r.RedisApp.Delete(uint64(ginx.PathParamInt(rc.GinCtx, "id")))
-}
-
-func (r *Redis) RedisInfo(rc *ctx.ReqCtx) {
-	res, _ := r.RedisApp.GetRedisInstance(uint64(ginx.PathParamInt(rc.GinCtx, "id"))).Cli.Info().Result()
-
-	datas := strings.Split(res, "\r\n")
-	i := 0
-	length := len(datas)
-
-	parseMap := make(map[string]map[string]string)
-	for {
-		if i >= length {
-			break
-		}
-		if strings.Contains(datas[i], "#") {
-			key := utils.SubString(datas[i], strings.Index(datas[i], "#")+1, utils.StrLen(datas[i]))
-			i++
-			key = strings.Trim(key, " ")
-
-			sectionMap := make(map[string]string)
-			for {
-				if i >= length || !strings.Contains(datas[i], ":") {
-					break
-				}
-				pair := strings.Split(datas[i], ":")
-				i++
-				if len(pair) != 2 {
-					continue
-				}
-				sectionMap[pair[0]] = pair[1]
-			}
-			parseMap[key] = sectionMap
-		} else {
-			i++
-		}
-	}
-	rc.ResData = parseMap
-}
-
-// scan获取redis的key列表信息
-func (r *Redis) Scan(rc *ctx.ReqCtx) {
-	g := rc.GinCtx
-
-	ri := r.RedisApp.GetRedisInstance(uint64(ginx.PathParamInt(g, "id")))
-	biz.ErrIsNilAppendErr(r.ProjectApp.CanAccess(rc.LoginAccount.Id, ri.ProjectId), "%s")
-
-	keys, cursor := ri.Scan(uint64(ginx.PathParamInt(g, "cursor")), g.Query("match"), int64(ginx.PathParamInt(g, "count")))
-
-	var keyInfoSplit []string
-	if len(keys) > 0 {
-		keyInfoLua := `
-			local result = {}
-			-- KEYS[1]为第1个参数，lua数组下标从1开始
-			local ttl = redis.call('ttl', KEYS[1]);
-			local keyType = redis.call('type', KEYS[1]);
-			for i = 1, #KEYS do
-				local ttl = redis.call('ttl', KEYS[i]);
-				local keyType = redis.call('type', KEYS[i]);
-				table.insert(result, string.format("%d,%s", ttl, keyType['ok']));
-			end;
-			return table.concat(result, ".");`
-		// 通过lua获取 ttl,type.ttl2,type2格式，以便下面切割获取ttl和type。避免多次调用ttl和type函数
-		keyInfos, _ := ri.Cli.Eval(keyInfoLua, keys).Result()
-		keyInfoSplit = strings.Split(keyInfos.(string), ".")
-	}
-
-	kis := make([]*vo.KeyInfo, 0)
-	for i, k := range keys {
-		ttlType := strings.Split(keyInfoSplit[i], ",")
-		ttl, _ := strconv.Atoi(ttlType[0])
-		ki := &vo.KeyInfo{Key: k, Type: ttlType[1], Ttl: int64(ttl)}
-		kis = append(kis, ki)
-	}
-
-	size, _ := ri.Cli.DBSize().Result()
-	rc.ResData = &vo.Keys{Cursor: cursor, Keys: kis, DbSize: size}
-}
-
-func (r *Redis) DeleteKey(rc *ctx.ReqCtx) {
-	g := rc.GinCtx
-	key := g.Query("key")
-	biz.NotEmpty(key, "key不能为空")
-
-	ri := r.RedisApp.GetRedisInstance(uint64(ginx.PathParamInt(g, "id")))
-	biz.ErrIsNilAppendErr(r.ProjectApp.CanAccess(rc.LoginAccount.Id, ri.ProjectId), "%s")
-
-	rc.ReqParam = key
-	ri.Cli.Del(key)
-}
-
-func (r *Redis) checkKey(rc *ctx.ReqCtx) (*application.RedisInstance, string) {
-	g := rc.GinCtx
-	key := g.Query("key")
-	biz.NotEmpty(key, "key不能为空")
-
-	ri := r.RedisApp.GetRedisInstance(uint64(ginx.PathParamInt(g, "id")))
-	biz.ErrIsNilAppendErr(r.ProjectApp.CanAccess(rc.LoginAccount.Id, ri.ProjectId), "%s")
-
-	return ri, key
-}
-
-func (r *Redis) GetStringValue(rc *ctx.ReqCtx) {
-	ri, key := r.checkKey(rc)
-	str, err := ri.Cli.Get(key).Result()
-	biz.ErrIsNilAppendErr(err, "获取字符串值失败: %s")
-	rc.ResData = str
-}
-
-func (r *Redis) GetHashValue(rc *ctx.ReqCtx) {
-	ri, key := r.checkKey(rc)
-	res, err := ri.Cli.HGetAll(key).Result()
-	biz.ErrIsNilAppendErr(err, "获取hash值失败: %s")
-	rc.ResData = res
-}
-
-func (r *Redis) SetStringValue(rc *ctx.ReqCtx) {
-	g := rc.GinCtx
-	keyValue := new(form.StringValue)
-	ginx.BindJsonAndValid(g, keyValue)
-
-	ri := r.RedisApp.GetRedisInstance(uint64(ginx.PathParamInt(g, "id")))
-	biz.ErrIsNilAppendErr(r.ProjectApp.CanAccess(rc.LoginAccount.Id, ri.ProjectId), "%s")
-
-	str, err := ri.Cli.Set(keyValue.Key, keyValue.Value, time.Second*time.Duration(keyValue.Timed)).Result()
-	biz.ErrIsNilAppendErr(err, "保存字符串值失败: %s")
-	rc.ResData = str
-}
-
-func (r *Redis) SetHashValue(rc *ctx.ReqCtx) {
-	g := rc.GinCtx
-	hashValue := new(form.HashValue)
-	ginx.BindJsonAndValid(g, hashValue)
-
-	ri := r.RedisApp.GetRedisInstance(uint64(ginx.PathParamInt(g, "id")))
-	biz.ErrIsNilAppendErr(r.ProjectApp.CanAccess(rc.LoginAccount.Id, ri.ProjectId), "%s")
-
-	key := hashValue.Key
-	// 简单处理->先删除，后新增
-	ri.Cli.Del(key)
-	for _, v := range hashValue.Value {
-		res := ri.Cli.HSet(key, v["key"].(string), v["value"])
-		biz.ErrIsNilAppendErr(res.Err(), "保存hash值失败: %s")
-	}
-	if hashValue.Timed != -1 {
-		ri.Cli.Expire(key, time.Second*time.Duration(hashValue.Timed))
-	}
-}
-
-func (r *Redis) GetSetValue(rc *ctx.ReqCtx) {
-	ri, key := r.checkKey(rc)
-	res, err := ri.Cli.SMembers(key).Result()
-	biz.ErrIsNilAppendErr(err, "获取set值失败: %s")
-	rc.ResData = res
-}
-
-func (r *Redis) SetSetValue(rc *ctx.ReqCtx) {
-	g := rc.GinCtx
-	keyvalue := new(form.SetValue)
-	ginx.BindJsonAndValid(g, keyvalue)
-
-	ri := r.RedisApp.GetRedisInstance(uint64(ginx.PathParamInt(g, "id")))
-	biz.ErrIsNilAppendErr(r.ProjectApp.CanAccess(rc.LoginAccount.Id, ri.ProjectId), "%s")
-
-	key := keyvalue.Key
-	// 简单处理->先删除，后新增
-	ri.Cli.Del(key)
-	ri.Cli.SAdd(key, keyvalue.Value...)
-
-	if keyvalue.Timed != -1 {
-		ri.Cli.Expire(key, time.Second*time.Duration(keyvalue.Timed))
-	}
-}

server/internal/devops/api/vo/redis.go

@@ -1,29 +0,0 @@
-package vo
-
-import "time"
-
-type Redis struct {
-	Id *int64 `json:"id"`
-	// Name       *string    `json:"name"`
-	Host       *string    `json:"host"`
-	Db         int        `json:"db"`
-	ProjectId  *int64     `json:"projectId"`
-	Project    *string    `json:"project"`
-	Env        *string    `json:"env"`
-	EnvId      *int64     `json:"envId"`
-	CreateTime *time.Time `json:"createTime"`
-	Creator    *string    `json:"creator"`
-	CreatorId  *int64     `json:"creatorId"`
-}
-
-type Keys struct {
-	Cursor uint64     `json:"cursor"`
-	Keys   []*KeyInfo `json:"keys"`
-	DbSize int64      `json:"dbSize"`
-}
-
-type KeyInfo struct {
-	Key  string `json:"key"`
-	Ttl  int64  `json:"ttl"`
-	Type string `json:"type"`
-}

server/internal/devops/api/vo/vo.go

@@ -1,64 +0,0 @@
-package vo
-
-import "time"
-
-type AccountVO struct {
-	//models.BaseModel
-	Id         *int64  `json:"id"`
-	Username   *string `json:"username"`
-	CreateTime *string `json:"createTime"`
-	Creator    *string `json:"creator"`
-	CreatorId  *int64  `json:"creatorId"`
-	// Role       *RoleVO `json:"roles"`
-	//Status   int8   `json:"status"`
-}
-
-type MachineVO struct {
-	//models.BaseModel
-	Id          *uint64    `json:"id"`
-	ProjectId   uint64     `json:"projectId"`
-	ProjectName string     `json:"projectName"`
-	Name        *string    `json:"name"`
-	Username    *string    `json:"username"`
-	Ip          *string    `json:"ip"`
-	Port        *int       `json:"port"`
-	Status      *int8      `json:"status"`
-	CreateTime  *time.Time `json:"createTime"`
-	Creator     *string    `json:"creator"`
-	CreatorId   *int64     `json:"creatorId"`
-	UpdateTime  *time.Time `json:"updateTime"`
-	Modifier    *string    `json:"modifier"`
-	ModifierId  *int64     `json:"modifierId"`
-	HasCli      bool       `json:"hasCli" gorm:"-"`
-	Remark      *string    `json:"remark"`
-}
-
-type MachineScriptVO struct {
-	Id          *int64  `json:"id"`
-	Name        *string `json:"name"`
-	Script      *string `json:"script"`
-	Type        *int    `json:"type"`
-	Description *string `json:"description"`
-	Params      *string `json:"params"`
-	MachineId   *uint64 `json:"machineId"`
-}
-
-type MachineFileVO struct {
-	Id        *int64  `json:"id"`
-	Name      *string `json:"name"`
-	Path      *string `json:"path"`
-	Type      *int    `json:"type"`
-	MachineId *uint64 `json:"machineId"`
-}
-
-type MachineFileInfo struct {
-	Name string `json:"name"`
-	Path string `json:"path"`
-	Size int64  `json:"size"`
-	Type string `json:"type"`
-}
-
-type RoleVO struct {
-	Id   *int64
-	Name *string
-}

server/internal/devops/application/db_app.go

@@ -1,457 +0,0 @@
-package application
-
-import (
-	"database/sql"
-	"errors"
-	"fmt"
-	"mayfly-go/internal/devops/domain/entity"
-	"mayfly-go/internal/devops/domain/repository"
-	"mayfly-go/internal/devops/infrastructure/persistence"
-	"mayfly-go/pkg/biz"
-	"mayfly-go/pkg/cache"
-	"mayfly-go/pkg/global"
-	"mayfly-go/pkg/model"
-	"mayfly-go/pkg/utils"
-	"reflect"
-	"strconv"
-	"strings"
-	"sync"
-	"time"
-)
-
-type Db interface {
-	// 分页获取
-	GetPageList(condition *entity.Db, pageParam *model.PageParam, toEntity interface{}, orderBy ...string) *model.PageResult
-
-	Count(condition *entity.Db) int64
-
-	// 根据条件获取
-	GetDbBy(condition *entity.Db, cols ...string) error
-
-	// 根据id获取
-	GetById(id uint64, cols ...string) *entity.Db
-
-	Save(entity *entity.Db)
-
-	// 删除数据库信息
-	Delete(id uint64)
-
-	// 获取数据库连接实例
-	// @param id 数据库实例id
-	// @param db 数据库
-	GetDbInstance(id uint64, db string) *DbInstance
-}
-
-type dbAppImpl struct {
-	dbRepo    repository.Db
-	dbSqlRepo repository.DbSql
-}
-
-var DbApp Db = &dbAppImpl{
-	dbRepo:    persistence.DbDao,
-	dbSqlRepo: persistence.DbSqlDao,
-}
-
-// 分页获取数据库信息列表
-func (d *dbAppImpl) GetPageList(condition *entity.Db, pageParam *model.PageParam, toEntity interface{}, orderBy ...string) *model.PageResult {
-	return d.dbRepo.GetDbList(condition, pageParam, toEntity, orderBy...)
-}
-
-func (d *dbAppImpl) Count(condition *entity.Db) int64 {
-	return d.dbRepo.Count(condition)
-}
-
-// 根据条件获取
-func (d *dbAppImpl) GetDbBy(condition *entity.Db, cols ...string) error {
-	return d.dbRepo.GetDb(condition, cols...)
-}
-
-// 根据id获取
-func (d *dbAppImpl) GetById(id uint64, cols ...string) *entity.Db {
-	return d.dbRepo.GetById(id, cols...)
-}
-
-func (d *dbAppImpl) Save(dbEntity *entity.Db) {
-	// 默认tcp连接
-	dbEntity.Network = "tcp"
-	// 测试连接
-	if dbEntity.Password != "" {
-		TestConnection(*dbEntity)
-	}
-
-	// 查找是否存在该库
-	oldDb := &entity.Db{Host: dbEntity.Host, Port: dbEntity.Port, EnvId: dbEntity.EnvId}
-	err := d.GetDbBy(oldDb)
-
-	if dbEntity.Id == 0 {
-		biz.NotEmpty(dbEntity.Password, "密码不能为空")
-		biz.IsTrue(err != nil, "该数据库实例已存在")
-		d.dbRepo.Insert(dbEntity)
-		return
-	}
-
-	// 如果存在该库，则校验修改的库是否为该库
-	if err == nil {
-		biz.IsTrue(oldDb.Id == dbEntity.Id, "该数据库实例已存在")
-	}
-
-	dbId := dbEntity.Id
-	old := d.GetById(dbId)
-
-	var oldDbs []interface{}
-	for _, v := range strings.Split(old.Database, " ") {
-		oldDbs = append(oldDbs, v)
-	}
-
-	var newDbs []interface{}
-	for _, v := range strings.Split(dbEntity.Database, " ") {
-		newDbs = append(newDbs, v)
-	}
-	// 比较新旧数据库列表，需要将移除的数据库相关联的信息删除
-	_, delDb, _ := utils.ArrayCompare(newDbs, oldDbs, func(i1, i2 interface{}) bool {
-		return i1.(string) == i2.(string)
-	})
-	for _, v := range delDb {
-		// 先关闭数据库连接
-		CloseDb(dbEntity.Id, v.(string))
-		// 删除该库关联的所有sql记录
-		d.dbSqlRepo.DeleteBy(&entity.DbSql{DbId: dbId, Db: v.(string)})
-	}
-
-	d.dbRepo.Update(dbEntity)
-
-}
-
-func (d *dbAppImpl) Delete(id uint64) {
-	db := d.GetById(id)
-	dbs := strings.Split(db.Database, " ")
-	for _, v := range dbs {
-		// 关闭连接
-		CloseDb(id, v)
-	}
-	d.dbRepo.Delete(id)
-	// 删除该库下用户保存的所有sql信息
-	d.dbSqlRepo.DeleteBy(&entity.DbSql{DbId: id})
-}
-
-var mutex sync.Mutex
-
-func (da *dbAppImpl) GetDbInstance(id uint64, db string) *DbInstance {
-	mutex.Lock()
-	defer mutex.Unlock()
-	// Id不为0，则为需要缓存
-	needCache := id != 0
-	if needCache {
-		load, ok := dbCache.Get(GetDbCacheKey(id, db))
-		if ok {
-			return load.(*DbInstance)
-		}
-	}
-
-	d := da.GetById(id)
-	biz.NotNil(d, "数据库信息不存在")
-	biz.IsTrue(strings.Contains(d.Database, db), "未配置该库的操作权限")
-	global.Log.Infof("连接db: %s:%d/%s", d.Host, d.Port, db)
-
-	// 将数据库替换为要访问的数据库，原本数据库为空格拼接的所有库
-	d.Database = db
-	DB, err := sql.Open(d.Type, getDsn(d))
-	biz.ErrIsNil(err, fmt.Sprintf("Open %s failed, err:%v\n", d.Type, err))
-	perr := DB.Ping()
-	if perr != nil {
-		global.Log.Errorf("连接db失败: %s:%d/%s", d.Host, d.Port, db)
-		panic(biz.NewBizErr(fmt.Sprintf("数据库连接失败: %s", perr.Error())))
-	}
-
-	// 最大连接周期，超过时间的连接就close
-	// DB.SetConnMaxLifetime(100 * time.Second)
-	// 设置最大连接数
-	DB.SetMaxOpenConns(2)
-	// 设置闲置连接数
-	DB.SetMaxIdleConns(1)
-
-	cacheKey := GetDbCacheKey(id, db)
-	dbi := &DbInstance{Id: cacheKey, Type: d.Type, ProjectId: d.ProjectId, db: DB}
-	if needCache {
-		dbCache.Put(cacheKey, dbi)
-	}
-	return dbi
-}
-
-//------------------------------------------------------------------------------
-
-// 客户端连接缓存，30分钟内没有访问则会被关闭, key为数据库实例id:数据库
-var dbCache = cache.NewTimedCache(30*time.Minute, 5*time.Second).
-	WithUpdateAccessTime(true).
-	OnEvicted(func(key interface{}, value interface{}) {
-		global.Log.Info(fmt.Sprintf("删除db连接缓存 id = %s", key))
-		value.(*DbInstance).Close()
-	})
-
-func GetDbCacheKey(dbId uint64, db string) string {
-	return fmt.Sprintf("%d:%s", dbId, db)
-}
-
-func GetDbInstanceByCache(id string) *DbInstance {
-	if load, ok := dbCache.Get(id); ok {
-		return load.(*DbInstance)
-	}
-	return nil
-}
-
-func TestConnection(d entity.Db) {
-	// 验证第一个库是否可以连接即可
-	d.Database = strings.Split(d.Database, " ")[0]
-	DB, err := sql.Open(d.Type, getDsn(&d))
-	biz.ErrIsNil(err, "Open %s failed, err:%v\n", d.Type, err)
-	defer DB.Close()
-	perr := DB.Ping()
-	biz.ErrIsNilAppendErr(perr, "数据库连接失败: %s")
-}
-
-// db实例
-type DbInstance struct {
-	Id        string
-	Type      string
-	ProjectId uint64
-	db        *sql.DB
-}
-
-// 执行查询语句
-// 依次返回 列名数组，结果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非查询语句")
-	}
-	// 没加limit，则默认限制50条
-	if isSelect && !strings.Contains(execSql, "limit") && !strings.Contains(execSql, "LIMIT") {
-		execSql = execSql + " LIMIT 50"
-	}
-
-	rows, err := d.db.Query(execSql)
-	if err != nil {
-		return nil, nil, err
-	}
-	// rows对象一定要close掉，如果出错，不关掉则会很迅速的达到设置最大连接数，
-	// 后面的链接过来直接报错或拒绝，实际上也没有起效果
-	defer func() {
-		if rows != nil {
-			rows.Close()
-		}
-	}()
-	colTypes, _ := rows.ColumnTypes()
-	// 这里表示一行填充数据
-	scans := make([]interface{}, len(colTypes))
-	// 这里表示一行所有列的值，用[]byte表示
-	vals := make([][]byte, len(colTypes))
-	// 这里scans引用vals，把数据填充到[]byte里
-	for k := range vals {
-		scans[k] = &vals[k]
-	}
-
-	result := make([]map[string]interface{}, 0)
-	// 列名用于前端表头名称按照数据库与查询字段顺序显示
-	colNames := make([]string, 0)
-	// 是否第一次遍历，列名数组只需第一次遍历时加入
-	isFirst := true
-	for rows.Next() {
-		// 不Scan也会导致等待，该链接实际处于未工作的状态，然后也会导致连接数迅速达到最大
-		err := rows.Scan(scans...)
-		if err != nil {
-			return nil, nil, err
-		}
-		// 每行数据
-		rowData := make(map[string]interface{})
-		// 把vals中的数据复制到row中
-		for i, v := range vals {
-			colType := colTypes[i]
-			colName := colType.Name()
-			// 字段类型名
-			colScanType := colType.ScanType().Name()
-			if isFirst {
-				colNames = append(colNames, colName)
-			}
-			if v == nil {
-				rowData[colName] = nil
-				continue
-			}
-			// 这里把[]byte数据转成string
-			stringV := string(v)
-			if stringV == "" {
-				rowData[colName] = stringV
-				continue
-			}
-			if strings.Contains(colScanType, "int") || strings.Contains(colScanType, "Int") {
-				intV, _ := strconv.Atoi(stringV)
-				switch colType.ScanType().Kind() {
-				case reflect.Int8:
-					rowData[colName] = int8(intV)
-				case reflect.Uint8:
-					rowData[colName] = uint8(intV)
-				case reflect.Int64:
-					rowData[colName] = int64(intV)
-				case reflect.Uint64:
-					rowData[colName] = uint64(intV)
-				case reflect.Uint:
-					rowData[colName] = uint(intV)
-				default:
-					rowData[colName] = intV
-				}
-				continue
-			}
-			if strings.Contains(colScanType, "float") || strings.Contains(colScanType, "Float") {
-				floatV, _ := strconv.ParseFloat(stringV, 64)
-				rowData[colName] = floatV
-			} else {
-				rowData[colName] = stringV
-			}
-		}
-		// 放入结果集
-		result = append(result, rowData)
-		isFirst = false
-	}
-	return colNames, result, nil
-}
-
-// 执行 update, insert, delete，建表等sql
-// 返回影响条数和错误
-func (d *DbInstance) Exec(sql string) (int64, error) {
-	res, err := d.db.Exec(sql)
-	if err != nil {
-		return 0, err
-	}
-	return res.RowsAffected()
-}
-
-// 关闭连接
-func (d *DbInstance) Close() {
-	d.db.Close()
-}
-
-// 获取dataSourceName
-func getDsn(d *entity.Db) string {
-	if d.Type == "mysql" {
-		return fmt.Sprintf("%s:%s@%s(%s:%d)/%s?timeout=8s", d.Username, d.Password, d.Network, d.Host, d.Port, d.Database)
-	}
-	return ""
-}
-
-// 删除db缓存并关闭该数据库所有连接
-func CloseDb(dbId uint64, db string) {
-	dbCache.Delete(GetDbCacheKey(dbId, db))
-}
-
-//-----------------------------------元数据-------------------------------------------
-
-const (
-	// mysql 表信息元数据
-	MYSQL_TABLE_MA = `SELECT table_name tableName, engine, table_comment tableComment, 
-	create_time createTime from information_schema.tables
-	WHERE table_schema = (SELECT database()) LIMIT 2000`
-
-	// mysql 表信息
-	MYSQL_TABLE_INFO = `SELECT table_name tableName, table_comment tableComment, table_rows tableRows,
-	data_length dataLength, index_length indexLength, create_time createTime 
-	FROM information_schema.tables 
-    WHERE table_schema = (SELECT database()) LIMIT 2000`
-
-	// mysql 索引信息
-	MYSQL_INDEX_INFO = `SELECT index_name indexName, column_name columnName, index_type indexType,
-	SEQ_IN_INDEX seqInIndex, INDEX_COMMENT indexComment
-	FROM information_schema.STATISTICS 
-    WHERE table_schema = (SELECT database()) AND table_name = '%s' LIMIT 500`
-
-	// 默认每次查询列元信息数量
-	DEFAULT_COLUMN_SIZE = 2000
-
-	// mysql 列信息元数据
-	MYSQL_COLOUMN_MA = `SELECT table_name tableName, column_name columnName, column_type columnType,
-	column_comment columnComment, column_key columnKey, extra, is_nullable nullable from information_schema.columns
-	WHERE table_name in (%s) AND table_schema = (SELECT database()) ORDER BY tableName, ordinal_position LIMIT %d, %d`
-
-	// mysql 列信息元数据总数
-	MYSQL_COLOUMN_MA_COUNT = `SELECT COUNT(*) maNum from information_schema.columns
-	WHERE table_name in (%s) AND table_schema = (SELECT database())`
-)
-
-func (d *DbInstance) GetTableMetedatas() []map[string]interface{} {
-	var sql string
-	if d.Type == "mysql" {
-		sql = MYSQL_TABLE_MA
-	}
-	_, res, _ := d.SelectData(sql)
-	return res
-}
-
-func (d *DbInstance) GetColumnMetadatas(tableNames ...string) []map[string]interface{} {
-	var sql, tableName string
-	for i := 0; i < len(tableNames); i++ {
-		if i != 0 {
-			tableName = tableName + ", "
-		}
-		tableName = tableName + "'" + tableNames[i] + "'"
-	}
-
-	var countSqlTmp string
-	var sqlTmp string
-	if d.Type == "mysql" {
-		countSqlTmp = MYSQL_COLOUMN_MA_COUNT
-		sqlTmp = MYSQL_COLOUMN_MA
-	}
-
-	countSql := fmt.Sprintf(countSqlTmp, tableName)
-	_, countRes, _ := d.SelectData(countSql)
-	// 查询出所有列信息总数，手动分页获取所有数据
-	maCount := int(countRes[0]["maNum"].(int64))
-	// 计算需要查询的页数
-	pageNum := maCount / DEFAULT_COLUMN_SIZE
-	if maCount%DEFAULT_COLUMN_SIZE > 0 {
-		pageNum++
-	}
-
-	res := make([]map[string]interface{}, 0)
-	for index := 0; index < pageNum; index++ {
-		sql = fmt.Sprintf(sqlTmp, tableName, index*DEFAULT_COLUMN_SIZE, DEFAULT_COLUMN_SIZE)
-		_, result, err := d.SelectData(sql)
-		biz.ErrIsNilAppendErr(err, "获取数据库列信息失败: %s")
-		res = append(res, result...)
-	}
-	return res
-}
-
-// 获取表的主键，目前默认第一列为主键
-func (d *DbInstance) GetPrimaryKey(tablename string) string {
-	return d.GetColumnMetadatas(tablename)[0]["columnName"].(string)
-}
-
-func (d *DbInstance) GetTableInfos() []map[string]interface{} {
-	var sql string
-	if d.Type == "mysql" {
-		sql = MYSQL_TABLE_INFO
-	}
-	_, res, _ := d.SelectData(sql)
-	return res
-}
-
-func (d *DbInstance) GetTableIndex(tableName string) []map[string]interface{} {
-	var sql string
-	if d.Type == "mysql" {
-		sql = fmt.Sprintf(MYSQL_INDEX_INFO, tableName)
-	}
-	_, res, _ := d.SelectData(sql)
-	return res
-}
-
-func (d *DbInstance) GetCreateTableDdl(tableName string) []map[string]interface{} {
-	var sql string
-	if d.Type == "mysql" {
-		sql = fmt.Sprintf("show create table %s ", tableName)
-	}
-	_, res, _ := d.SelectData(sql)
-	return res
-}