feat: 新增终端回放记录&其他小优化

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统一管理操作平台**
+基于DDD分层实现的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
-        echo_green '将打包后的静态文件拷贝至server/static'
-        rm -rf ${server_folder}/static && mkdir -p ${server_folder}/static && cp -r ${web_folder}/dist/* ${server_folder}/static
+    if [ "${copy2Server}" == "2" ] ; then
+        echo_green '将打包后的静态文件拷贝至server/static/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'"
-    mkdir -p ${toFolder}/static && cp -r ${web_folder}/dist/* ${toFolder}/static
+    if [ "${copy2Server}" == "1" ] ; then
+        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,15 @@ 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 runBuild() {
@@ -103,34 +106,30 @@ 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
     
-    if [ "${runBuildWeb}" == "1" ];then
-        buildWeb
-    fi
-    if [ "${runBuildWeb}" == "2" ];then
-        buildWeb 1
+    
+    if [ "${runBuildWeb}" == "1" ] || [ "${runBuildWeb}" == "2" ] ; then
+        buildWeb ${runBuildWeb}
     fi
 
-    if [ "${buildType}" == "1" ];then
-        buildLinuxAmd64 ${toPath}
-        exit;
-    fi
-
-    if [ "${buildType}" == "2" ];then
-        buildLinuxArm64 ${toPath}
-        exit;
-    fi
-
-    if [ "${buildType}" == "3" ];then
-        buildWindows ${toPath}
-        exit;
-    fi
-
-    buildLinuxAmd64 ${toPath}
-    buildLinuxArm64 ${toPath}
-    buildWindows ${toPath}
+    case ${buildType} in
+         "1")
+            buildLinuxAmd64 ${toPath} ${runBuildWeb}
+        ;;
+         "2")
+            buildLinuxArm64 ${toPath} ${runBuildWeb}
+        ;;
+        "3")
+            buildWindows ${toPath} ${runBuildWeb}
+        ;;
+        *)
+            buildLinuxAmd64 ${toPath} ${runBuildWeb}
+            buildLinuxArm64 ${toPath} ${runBuildWeb}
+            buildWindows ${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,25 +7,26 @@
     "lint-fix": "eslint --fix --ext .js --ext .jsx --ext .vue src/"
   },
   "dependencies": {
-    "@element-plus/icons-vue": "^2.0.4",
+    "@element-plus/icons-vue": "^2.0.9",
     "axios": "^0.27.2",
     "codemirror": "^5.65.5",
     "countup.js": "^2.0.7",
     "cropperjs": "^1.5.11",
-    "echarts": "^5.3.2",
-    "element-plus": "^2.2.4",
-    "jsoneditor": "^9.8.0",
+    "echarts": "^5.3.3",
+    "element-plus": "^2.2.15",
+    "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": "^6.1.2",
+    "sql-formatter": "^9.2.0",
     "vue": "^3.2.37",
     "vue-clipboard3": "^1.0.1",
-    "vue-router": "^4.0.15",
+    "vue-router": "^4.1.2",
     "vuex": "^4.0.2",
-    "xterm": "^4.18.0",
+    "xterm": "^4.19.0",
     "xterm-addon-fit": "^0.5.0"
   },
   "devDependencies": {
@@ -37,14 +38,15 @@
     "@typescript-eslint/parser": "^4.23.0",
     "@vitejs/plugin-vue": "^2.3.3",
     "@vue/compiler-sfc": "^3.0.11",
+    "asciinema-player": "^3.0.1",
     "dotenv": "^10.0.0",
     "eslint": "^8.5.0",
     "eslint-plugin-vue": "^8.2.0",
     "prettier": "^2.3.0",
     "sass": "^1.45.1",
     "sass-loader": "^12.4.0",
-    "typescript": "^4.2.4",
-    "vite": "^2.9.10",
+    "typescript": "^4.7.4",
+    "vite": "^2.9.13",
     "vue-eslint-parser": "^8.0.1"
   },
   "browserslist": [

mayfly_go_web/public/config.js

@@ -1,4 +1,5 @@
 window.globalConfig = {
-    "BaseApiUrl": "http://localhost:8888",
-    "BaseWsUrl": "ws://localhost:8888"
+    // 默认为空，以访问根目录为api请求地址。若前后端分离部署可单独配置该后端api请求地址
+    "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`,
-    baseWsUrl: `${(window as any).globalConfig.BaseWsUrl}/api`
+    baseApiUrl: `${(window as any).globalConfig.BaseApiUrl}/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),
-    captcha: () => request.request('GET', '/sys/captcha', null, null),
-    logout: (param: any) => request.request('POST', '/sys/accounts/logout/{token}', param, null),
-    getMenuRoute: (param: any) => request.request('Get', '/sys/resources/account', param, null)
+    login: (param: any) => request.request('POST', '/sys/accounts/login', param),
+    changePwd: (param: any) => request.request('POST', '/sys/accounts/change-pwd', param),
+    getPublicKey: () => request.request('GET', '/common/public-key'),
+    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.height = 180;
+    can.width = 400;
+    can.height = 250;
     const cans: any = can.getContext('2d');
     cans.rotate((-20 * Math.PI) / 180);
-    cans.font = '12px Vedana';
-    cans.fillStyle = 'rgba(200, 200, 200, 0.30)';
-    cans.textAlign = 'center';
+    cans.font = '14px Vedana';
+    cans.fillStyle = 'rgba(200, 200, 200, 0.35)';
+    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);
-        if (document.getElementById(id) === null) id = setWatermark(str);
+        set(str)
     },
     // 删除水印
     del: () => {
-        let id = '1.23452384164.123412416';
-        if (document.getElementById(id) !== null) document.body.removeChild(document.getElementById(id) as any);
+        del();
     },
 };
 

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/element.scss

@@ -239,16 +239,6 @@
 	color: set-color(primary);
 }
 
-/* Switch 开关
-------------------------------- */
-.el-switch.is-checked .el-switch__core {
-	border-color: set-color(primary);
-	background-color: set-color(primary);
-}
-.el-switch__label.is-active {
-	color: set-color(primary);
-}
-
 /* Slider 滑块
 ------------------------------- */
 .el-slider__bar {
@@ -957,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/views/layout/navBars/breadcrumb/search.vue

@@ -30,7 +30,7 @@ import { useStore } from '@/store/index.ts';
 export default defineComponent({
     name: 'layoutBreadcrumbSearch',
     setup() {
-        const layoutMenuAutocompleteRef = ref();
+        const layoutMenuAutocompleteRef: any = ref(null);
         const store = useStore();
         const router = useRouter();
         const state: any = reactive({
@@ -44,7 +44,9 @@ export default defineComponent({
             state.isShowSearch = true;
             initTageView();
             nextTick(() => {
-                layoutMenuAutocompleteRef.value.focus();
+                setTimeout(() => {
+                    layoutMenuAutocompleteRef.value.focus();
+                });
             });
         };
         // 搜索弹窗关闭
@@ -68,7 +70,6 @@ export default defineComponent({
         // 初始化菜单数据
         const initTageView = () => {
             if (state.tagsViewList.length > 0) return false;
-            console.log(getRoutes(store.state.routesList.routesList));
             getRoutes(store.state.routesList.routesList).map((v: any) => {
                 if (!v.meta.isHide) {
                     state.tagsViewList.push({ ...v });

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,54 +1,75 @@
 <template>
-    <el-form ref="loginFormRef" :model="loginForm" :rules="rules" class="login-content-form" size="large">
-        <el-form-item prop="username">
-            <el-input type="text" placeholder="请输入用户名" prefix-icon="user" v-model="loginForm.username" clearable autocomplete="off">
-            </el-input>
-        </el-form-item>
-        <el-form-item prop="password">
-            <el-input
-                type="password"
-                placeholder="请输入密码"
-                prefix-icon="lock"
-                v-model="loginForm.password"
-                autocomplete="off"
-                show-password
-            >
-            </el-input>
-        </el-form-item>
-        <el-form-item prop="captcha">
-            <el-row :gutter="15">
-                <el-col :span="16">
+    <div>
+        <el-form ref="loginFormRef" :model="loginForm" :rules="rules" class="login-content-form" size="large">
+            <el-form-item prop="username">
+                <el-input type="text" placeholder="请输入用户名" prefix-icon="user" v-model="loginForm.username" clearable autocomplete="off">
+                </el-input>
+            </el-form-item>
+            <el-form-item prop="password">
+                <el-input type="password" placeholder="请输入密码" prefix-icon="lock" v-model="loginForm.password" autocomplete="off" show-password>
+                </el-input>
+            </el-form-item>
+            <el-form-item v-if="useLoginCaptcha" prop="captcha">
+                <el-row :gutter="15">
+                    <el-col :span="16">
+                        <el-input
+                            type="text"
+                            maxlength="6"
+                            placeholder="请输入验证码"
+                            prefix-icon="position"
+                            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"
-                        maxlength="6"
-                        placeholder="请输入验证码"
-                        prefix-icon="position"
-                        v-model="loginForm.captcha"
-                        clearable
-                        autocomplete="off"
-                        @keyup.enter="login"
+                        v-model.trim="changePwdDialog.form.newPassword"
+                        placeholder="须为8位以上且包含字⺟⼤⼩写+数字+特殊符号"
+                        type="password"
+                        autocomplete="new-password"
                     ></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-form-item>
+            </el-form>
+
+            <template #footer>
+                <div class="dialog-footer">
+                    <el-button @click="cancelChangePwd">取 消</el-button>
+                    <el-button @click="changePwd" type="primary" :loading="loading.changePwd">确 定</el-button>
+                </div>
+            </template>
+        </el-dialog>
+    </div>
 </template>
 
 <script lang="ts">
@@ -57,10 +78,13 @@ 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: true,
             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,21 @@ export default defineComponent({
             },
             loading: {
                 signIn: false,
+                changePwd: false,
             },
         });
 
-        onMounted(() => {
+        onMounted(async () => {
+            // 移除公钥, 方便后续重新获取
+            sessionStorage.removeItem('RsaPublicKey');
+            state.useLoginCaptcha = await useLoginCaptcha();
             getCaptcha();
         });
 
         const getCaptcha = async () => {
+            if (!state.useLoginCaptcha) {
+                return;
+            }
             let res: any = await openApi.captcha();
             state.captchaImage = res.base64Captcha;
             state.loginForm.cid = res.cid;
@@ -116,15 +168,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);
-                // // 存储 token 到浏览器缓存
+                const loginReq = { ...state.loginForm };
+                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 +204,7 @@ export default defineComponent({
             };
 
             // 存储用户信息到浏览器缓存
-            setSession('userInfo', userInfos);
+            setUserInfo2Session(userInfos);
             // 1、请注意执行顺序(存储用户信息到vuex)
             store.dispatch('userInfos/setUserInfos', userInfos);
             if (!store.state.themeConfig.themeConfig.isRequestRoutes) {
@@ -167,18 +230,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-form :model="form" ref="dbForm" :rules="rules" label-width="85px">
+        <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="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-form-item>
-                <el-form-item prop="port" label="port:" required>
-                    <el-input type="number" v-model.trim="form.port" placeholder="请输入端口"></el-input>
+                    <el-col :span="18">
+                        <el-input :disabled="form.id" v-model.trim="form.host" placeholder="请输入主机ip" auto-complete="off"></el-input>
+                    </el-col>
+                    <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
-                        v-for="db in databaseList"
-                        :key="db"
-                        class="ml5 mt5"
-                        type="success"
-                        effect="plain"
-                        closable
-                        :disable-transitions="false"
-                        @close="handleClose(db)"
-                    >
-                        {{ db }}
-                    </el-tag>
-                    <el-input
-                        v-if="inputDbVisible"
-                        ref="InputDbRef"
-                        v-model="inputDbValue"
-                        style="width: 120px; margin-left: 5px; margin-top: 5px"
-                        size="small"
-                        @keyup.enter="handleInputDbConfirm"
-                        @blur="handleInputDbConfirm"
-                    />
-                    <el-button v-else class="ml5 mt5" size="small" @click="showInputDb"> + 添加数据库 </el-button>
+                    <el-col :span="19">
+                        <el-select
+                            @change="changeDatabase"
+                            v-model="databaseList"
+                            multiple
+                            collapse-tags
+                            collapse-tags-tooltip
+                            filterable
+                            allow-create
+                            placeholder="请确保数据库实例信息填写完整后获取库名"
+                            style="width: 100%"
+                        >
+                            <el-option v-for="db in allDatabases" :key="db" :label="db" :value="db" />
+                        </el-select>
+                    </el-col>
+                    <el-col style="text-align: center" :span="1"><el-divider direction="vertical" border-style="dashed" /></el-col>
+                    <el-col :span="4">
+                        <el-link @click="getAllDatabase" :underline="false" type="success">获取库名</el-link>
+                    </el-col>
+                </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>
 
@@ -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,
-            inputDbValue: '',
+            sshTunnelMachineList: [],
             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',
-                        trigger: ['change', 'blur'],
-                    },
-                ],
-                port: [
-                    {
-                        required: true,
-                        message: '请输入端口',
+                        message: '请输入主机ip和port',
                         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);
-                    dbApi.saveDb.request(state.form).then(() => {
+                    const reqForm = { ...state.form };
+                    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,
-            handleClose,
-            showInputDb,
-            handleInputDbConfirm,
+            getAllDatabase,
+            getDbPwd,
+            changeDatabase,
+            getSshTunnelMachines,
             changeProject,
             changeEnv,
             btnOk,

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

@@ -20,15 +20,15 @@
                         </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 min-width="160" label="host:port">
+                <el-table-column prop="name" label="名称" min-width="160" show-overflow-tooltip></el-table-column>
+                <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">
                     <template #default="scope">
                         <el-tag
@@ -46,7 +46,7 @@
                 <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>
@@ -72,11 +72,45 @@
 
         <el-dialog width="75%" :title="`${db} 表信息`" :before-close="closeTableInfo" v-model="tableInfoDialog.visible">
             <el-row class="mb10">
+                <el-popover v-model:visible="showDumpInfo" :width="470" placement="right">
+                    <template #reference>
+                        <el-button class="ml5" type="success" size="small" @click="showDumpInfo = !showDumpInfo">导出</el-button>
+                    </template>
+                    <el-form-item label="导出内容: ">
+                        <el-radio-group v-model="dumpInfo.type">
+                            <el-radio :label="1" size="small">结构</el-radio>
+                            <el-radio :label="2" size="small">数据</el-radio>
+                            <el-radio :label="3" size="small">结构＋数据</el-radio>
+                        </el-radio-group>
+                    </el-form-item>
+
+                    <el-form-item label="导出表: ">
+                        <el-table @selection-change="handleDumpTableSelectionChange" max-height="300" size="small" :data="tableInfoDialog.infos">
+                            <el-table-column type="selection" width="45" />
+                            <el-table-column property="tableName" label="表名" min-width="150" show-overflow-tooltip> </el-table-column>
+                            <el-table-column property="tableComment" label="备注" min-width="150" show-overflow-tooltip></el-table-column>
+                        </el-table>
+                    </el-form-item>
+
+                    <div style="text-align: right">
+                        <el-button @click="showDumpInfo = false" size="small">取消</el-button>
+                        <el-button @click="dump(db)" type="success" size="small">确定</el-button>
+                    </div>
+                </el-popover>
+
                 <el-button type="primary" size="small" @click="tableCreateDialog.visible = true">创建表</el-button>
             </el-row>
-            <el-table border stripe :data="tableInfoDialog.infos" size="small">
-                <el-table-column property="tableName" label="表名" min-width="150" show-overflow-tooltip></el-table-column>
-                <el-table-column property="tableComment" label="备注" min-width="150" show-overflow-tooltip></el-table-column>
+            <el-table v-loading="tableInfoDialog.loading" border stripe :data="filterTableInfos" size="small">
+                <el-table-column property="tableName" label="表名" min-width="150" show-overflow-tooltip>
+                    <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"
@@ -198,6 +232,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>
 
@@ -217,7 +252,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';
@@ -226,6 +261,10 @@ import { dbApi } from './api';
 import enums from './enums';
 import { projectApi } from '../project/api.ts';
 import SqlExecBox from './component/SqlExecBox.ts';
+import config from '@/common/config';
+import { getSession } from '@/common/utils/storage';
+import { isTrue } from '@/common/assert';
+
 export default defineComponent({
     name: 'DbList',
     components: {
@@ -255,6 +294,13 @@ export default defineComponent({
             },
             datas: [],
             total: 0,
+            showDumpInfo: false,
+            dumpInfo: {
+                id: 0,
+                db: '',
+                type: 3,
+                tables: [],
+            },
             // sql执行记录弹框
             sqlExecLogDialog: {
                 title: '',
@@ -276,8 +322,11 @@ export default defineComponent({
             },
             chooseTableName: '',
             tableInfoDialog: {
+                loading: false,
                 visible: false,
                 infos: [],
+                tableNameSearch: '',
+                tableCommentSearch: '',
             },
             columnDialog: {
                 visible: false,
@@ -303,7 +352,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) => {
@@ -330,7 +398,8 @@ export default defineComponent({
             search();
         };
 
-        const editDb = (isAdd = false) => {
+        const editDb = async (isAdd = false) => {
+            state.projects = await projectApi.accountProjects.request(null);
             if (isAdd) {
                 state.dbEditDialog.data = null;
                 state.dbEditDialog.title = '新增数据库资源';
@@ -391,6 +460,29 @@ export default defineComponent({
             searchSqlExecLog();
         };
 
+        /**
+         * 选择导出数据库表
+         */
+        const handleDumpTableSelectionChange = (vals: any) => {
+            state.dumpInfo.tables = vals.map((x: any) => x.tableName);
+        };
+
+        /**
+         * 数据库信息导出
+         */
+        const dump = (db: string) => {
+            isTrue(state.dumpInfo.tables.length > 0, '请选择要导出的表');
+            const a = document.createElement('a');
+            a.setAttribute(
+                'href',
+                `${config.baseApiUrl}/dbs/${state.dbId}/dump?db=${db}&type=${state.dumpInfo.type}&tables=${state.dumpInfo.tables.join(
+                    ','
+                )}&token=${getSession('token')}`
+            );
+            a.click();
+            state.showDumpInfo = false;
+        };
+
         const onShowRollbackSql = async (sqlExecLog: any) => {
             const columns = await dbApi.columnMetadata.request({ id: sqlExecLog.dbId, db: sqlExecLog.db, tableName: sqlExecLog.table });
             const primaryKey = columns[0].columnName;
@@ -434,13 +526,21 @@ export default defineComponent({
         };
 
         const showTableInfo = async (row: any, db: string) => {
-            state.tableInfoDialog.infos = await dbApi.tableInfos.request({ id: row.id, db });
-            state.dbId = row.id;
-            state.db = db;
+            state.tableInfoDialog.loading = true;
             state.tableInfoDialog.visible = true;
+            try {
+                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;
+            }
         };
 
         const closeTableInfo = () => {
+            state.showDumpInfo = false;
             state.tableInfoDialog.visible = false;
             state.tableInfoDialog.infos = [];
         };
@@ -502,6 +602,7 @@ export default defineComponent({
 
         return {
             ...toRefs(state),
+            filterTableInfos,
             enums,
             search,
             choose,
@@ -510,6 +611,8 @@ export default defineComponent({
             valChange,
             deleteDb,
             onShowSqlExec,
+            handleDumpTableSelectionChange,
+            dump,
             onBeforeCloseSqlExecDialog,
             handleSqlExecPageChange,
             searchSqlExecLog,

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,7 +109,7 @@
                             </div>
                         </div>
 
-                        <div @click="closeExecBtns" class="mt5 sqlEditor" @contextmenu="showExecBtns">
+                        <div class="mt5 sqlEditor">
                             <textarea ref="codeTextarea"></textarea>
                         </div>
 
@@ -145,52 +153,70 @@
 
                 <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-link @click="addRow" class="ml5" type="primary" icon="plus" :underline="false"></el-link>
-                        <el-link @click="onDeleteData" class="ml5" type="danger" icon="delete" :underline="false"></el-link>
+                        <el-col :span="8">
+                            <el-link @click="onRefresh(dt.name)" icon="refresh" :underline="false" class="ml5"></el-link>
+                            <el-divider direction="vertical" border-style="dashed" />
 
-                        <el-tooltip class="box-item" effect="dark" content="commit" placement="top">
-                            <el-link @click="onCommit" class="ml5" type="success" icon="check" :underline="false"></el-link>
-                        </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>
+                            <el-link @click="addRow" type="primary" icon="plus" :underline="false"></el-link>
+                            <el-divider direction="vertical" border-style="dashed" />
 
-                            <template #append>
-                                <el-button @click="selectByCondition(dt.name, dt.condition)" icon="search" size="small"></el-button>
-                            </template>
-                        </el-input>
+                            <el-link @click="onDeleteData" 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="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"
                         @sort-change="onTableSortChange"
                         @selection-change="onDataSelectionChange"
-                        :data="dt.execRes.data"
+                        :data="dt.datas"
                         size="small"
                         :max-height="dataTabsTableHeight"
                         v-loading="dt.loading"
@@ -200,12 +226,12 @@
                         border
                         class="mt5"
                     >
-                        <el-table-column v-if="dt.execRes.tableColumn.length > 0" type="selection" width="35" />
+                        <el-table-column v-if="dt.datas.length > 0" type="selection" width="35" />
                         <el-table-column
                             min-width="100"
-                            :width="flexColumnWidth(item, dt.execRes.data)"
+                            :width="flexColumnWidth(item, dt.datas)"
                             align="center"
-                            v-for="item in dt.execRes.tableColumn"
+                            v-for="item in dt.columnNames"
                             :key="item"
                             :prop="item"
                             :label="item"
@@ -215,15 +241,52 @@
                             <template #header>
                                 <el-tooltip raw-content placement="top" effect="customized">
                                     <template #content> {{ getColumnTip(dt.name, item) }} </template>
-                                    <!-- <el-icon><question-filled /></el-icon> -->
                                     {{ item }}
                                 </el-tooltip>
                             </template>
                         </el-table-column>
                     </el-table>
+                    <el-row type="flex" class="mt5" justify="center">
+                        <el-pagination
+                            small
+                            :total="dt.count"
+                            @current-change="handlePageChange(dt)"
+                            layout="prev, pager, next, total, jumper"
+                            v-model:current-page="dt.pageNum"
+                            :page-size="defalutLimit"
+                        ></el-pagination>
+                    </el-row>
                 </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>
 
@@ -263,15 +326,15 @@ export default defineComponent({
 
         const state = reactive({
             token: token,
-            defalutLimit: 25, // 默认查询数量
+            defalutLimit: 20, // 默认查询数量
             dbs: [], // 数据库实例列表
             databaseList: [], // 数据库实例拥有的数据库列表，1数据库实例  -> 多数据库
             db: '', // 当前操作的数据库
+            dbType: '',
             tables: [],
             dbId: null, // 当前选中操作的数据库实例
             tableName: '',
             tableMetadata: [],
-            columnMetadata: [],
             sqlName: '', // 当前sql模板名
             sqlNames: [], // 所有sql模板名
             activeName: 'Query',
@@ -297,12 +360,18 @@ export default defineComponent({
                 pageSize: 10,
                 envId: null,
             },
-            btnStyle: {
-                position: 'absolute',
-                zIndex: 1000,
-                display: 'none',
-                left: '',
-                top: '',
+            conditionDialog: {
+                title: '',
+                placeholder: '',
+                columnRow: null,
+                dataTab: null,
+                visible: false,
+                condition: '=',
+                value: null,
+            },
+            genSqlDialog: {
+                visible: false,
+                sql: '',
             },
             cmOptions: {
                 tabSize: 4,
@@ -356,7 +425,7 @@ export default defineComponent({
         const setHeight = () => {
             // 默认300px
             codemirror.setSize('auto', `${window.innerHeight - 538}px`);
-            state.dataTabsTableHeight = window.innerHeight - 258;
+            state.dataTabsTableHeight = window.innerHeight - 274;
         };
 
         /**
@@ -425,7 +494,6 @@ export default defineComponent({
             } catch (e: any) {
                 state.queryTab.loading = false;
             }
-            closeExecBtns();
 
             // 即只有以该字符串开头的sql才可修改表数据内容
             if (sql.startsWith('SELECT *') || sql.startsWith('select *') || sql.startsWith('SELECT\n  *')) {
@@ -457,33 +525,6 @@ export default defineComponent({
                 sql: sql.trim(),
                 remark,
             });
-            // const sqlTrim = sql.trim();
-            // let remark = '';
-            // let canRun = true;
-            // const needRemark = ['update', 'UPDATE', 'delete', 'DELETE', 'INSERT', 'insert'].indexOf(sqlTrim.split(' ')[0]);
-            // if (needRemark) {
-            //     const res: any = await ElMessageBox.prompt('请输入备注', 'Tip', {
-            //         confirmButtonText: '确定',
-            //         cancelButtonText: '取消',
-            //     });
-            //     remark = res.value;
-            //     if (!remark) {
-            //         canRun = false;
-            //     }
-            // }
-
-            // if (!canRun) {
-            //     return;
-            // }
-            // try {
-            //     state.queryTab.loading = true;
-            //     return await dbApi.sqlExec.request({
-            //         id: state.dbId,
-            //         db: state.db,
-            //         sql: sqlTrim,
-            //         remark,
-            //     });
-            // } catch (e: any) {}
         };
 
         const removeDataTab = (targetName: string) => {
@@ -533,7 +574,7 @@ export default defineComponent({
 
         // 获取sql文件上传执行url
         const getUploadSqlFileUrl = () => {
-            return `${config.baseApiUrl}/dbs/${state.dbId}/exec-sql-file`;
+            return `${config.baseApiUrl}/dbs/${state.dbId}/exec-sql-file?db=${state.db}`;
         };
 
         const flexColumnWidth = (str: any, tableData: any, flag = 'equal') => {
@@ -641,7 +682,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();
         };
 
@@ -673,8 +716,6 @@ export default defineComponent({
             if (tableName == '') {
                 return;
             }
-            state.columnMetadata = (await getColumns(tableName)) as any;
-
             if (!execSelectSql) {
                 return;
             }
@@ -691,40 +732,17 @@ export default defineComponent({
             tab = {
                 label: tableName,
                 name: tableName,
-                execRes: {
-                    tableColumn: [],
-                    data: [],
-                },
-                querySql: getDefaultSelectSql(tableName),
+                datas: [],
+                columnNames: [],
+                pageNum: 1,
+                count: 0,
             };
+            tab.columnNames = await getColumnNames(tableName);
             state.dataTabs[tableName] = tab;
 
-            state.dataTabs[tableName].execRes.tableColumn = [];
-            state.dataTabs[tableName].execRes.data = [];
-
             onRefresh(tableName);
         };
 
-        /**
-         * 获取默认查询语句
-         */
-        const getDefaultSelectSql = (tableName: string, where: string = '', orderBy: string = '') => {
-            return `SELECT * FROM \`${tableName}\` ${where ? 'WHERE ' + where : ''} ${orderBy ? orderBy : ''} LIMIT ${state.defalutLimit}`;
-        };
-
-        const selectByCondition = async (tableName: string, condition: string) => {
-            notEmpty(condition, '条件不能为空');
-            state.dataTabs[tableName].loading = true;
-            try {
-                const colAndData: any = await runSql(getDefaultSelectSql(tableName, condition));
-                state.dataTabs[tableName].execRes.tableColumn = colAndData.colNames;
-                state.dataTabs[tableName].execRes.data = colAndData.res;
-                state.dataTabs[tableName].loading = false;
-            } catch (err) {
-                state.dataTabs[tableName].loading = false;
-            }
-        };
-
         /**
          * 获取表的所有列信息
          */
@@ -748,38 +766,116 @@ export default defineComponent({
             return tableMap.get(tableName);
         };
 
+        const getColumnNames = async (tableName: string) => {
+            const columns = await getColumns(tableName);
+            return columns.map((t: any) => t.columnName);
+        };
+
         /**
          * 条件查询，点击列信息后显示输入对应的值
          */
         const onConditionRowClick = (event: any, dataTab: any) => {
             const row = event[0];
-            ElMessageBox.prompt(`请输入 [${row.columnName}] 的值`, '查询条件', {
-                confirmButtonText: '确定',
-                cancelButtonText: '取消',
-                inputPlaceholder: `${row.columnType}  ${row.columnComment}`,
-            })
-                .then(({ value }) => {
-                    if (!value) {
-                        value = '';
-                    }
-                    let condition = dataTab.condition;
-                    if (condition) {
-                        condition += ` AND `;
-                    }
-                    condition += `${row.columnName} = `;
-                    dataTab.condition = condition + wrapColumnValue(row, value);
-                })
-                .catch(() => {});
+            state.conditionDialog.title = `请输入 [${row.columnName}] 的值`;
+            state.conditionDialog.placeholder = `${row.columnType}  ${row.columnComment}`;
+            state.conditionDialog.columnRow = row;
+            state.conditionDialog.dataTab = dataTab;
+            state.conditionDialog.visible = true;
+        };
+
+        // 确认条件
+        const onConfirmCondition = () => {
+            const conditionDialog = state.conditionDialog;
+            const dataTab = state.conditionDialog.dataTab as any;
+            let condition = dataTab.condition;
+            if (condition) {
+                condition += ` AND `;
+            }
+            const row = conditionDialog.columnRow as any;
+            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) => {
+            const dataTab = state.dataTabs[tableName];
             // 查询条件置空
-            state.dataTabs[tableName].condition = '';
-            state.dataTabs[tableName].loading = true;
-            const colAndData: any = await runSql(state.dataTabs[tableName].querySql);
-            state.dataTabs[tableName].execRes.tableColumn = colAndData.colNames;
-            state.dataTabs[tableName].execRes.data = colAndData.res;
-            state.dataTabs[tableName].loading = false;
+            dataTab.condition = '';
+            dataTab.pageNum = 1;
+            setDataTabDatas(dataTab);
+        };
+
+        /**
+         * 数据tab修改页数
+         */
+        const handlePageChange = async (dataTab: any) => {
+            setDataTabDatas(dataTab);
+        };
+
+        /**
+         * 根据条件查询数据
+         */
+        const selectByCondition = async (tableName: string, condition: string) => {
+            notEmpty(condition, '条件不能为空');
+            const dataTab = state.dataTabs[tableName];
+            dataTab.pageNum = 1;
+            setDataTabDatas(dataTab);
+        };
+
+        /**
+         * 设置data tab的表数据
+         */
+        const setDataTabDatas = async (dataTab: any) => {
+            dataTab.loading = true;
+            try {
+                dataTab.count = await getTableCount(dataTab.name, dataTab.condition);
+                if (dataTab.count > 0) {
+                    const colAndData: any = await runSql(getDefaultSelectSql(dataTab.name, dataTab.condition, dataTab.orderBy, dataTab.pageNum));
+                    dataTab.datas = colAndData.res;
+                } else {
+                    dataTab.datas = [];
+                }
+            } finally {
+                dataTab.loading = false;
+            }
+        };
+
+        /**
+         * 获取表的统计数量
+         */
+        const getTableCount = async (tableName: string, condition: string = '') => {
+            const countRes = await runSql(getDefaultCountSql(tableName, condition));
+            return countRes.res[0].count;
+        };
+
+        /**
+         * 获取默认查询语句
+         */
+        const getDefaultSelectSql = (tableName: string, where: string = '', orderBy: string = '', pageNum: number = 1) => {
+            const baseSql = `SELECT * FROM ${tableName} ${where ? 'WHERE ' + where : ''} ${orderBy ? orderBy : ''}`;
+            if (state.dbType == 'mysql') {
+                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 : ''}`;
         };
 
         /**
@@ -801,7 +897,8 @@ export default defineComponent({
             const tableName = state.activeName;
             const sortType = sort.order == 'descending' ? 'DESC' : 'ASC';
 
-            state.dataTabs[state.activeName].querySql = getDefaultSelectSql(tableName, '', `ORDER BY \`${sort.prop}\` ${sortType}`);
+            const orderBy = `ORDER BY ${sort.prop} ${sortType}`;
+            state.dataTabs[state.activeName].orderBy = orderBy;
 
             onRefresh(tableName);
         };
@@ -892,7 +989,6 @@ export default defineComponent({
             state.tableName = '';
             state.nowTableName = '';
             state.tableMetadata = [];
-            state.columnMetadata = [];
             state.dataTabs = {};
             setCodermirrorValue('');
             state.sqlNames = [];
@@ -902,7 +998,6 @@ export default defineComponent({
             state.queryTab.execRes.tableColumn = [];
             state.cmOptions.hintOptions.tables = [];
             tableMap.clear();
-            closeExecBtns();
         };
 
         const onDataSelectionChange = (datas: []) => {
@@ -927,10 +1022,7 @@ export default defineComponent({
 
             promptExeSql(sql, null, () => {
                 if (!queryTab) {
-                    state.dataTabs[state.activeName].execRes.data = state.dataTabs[state.activeName].execRes.data.filter(
-                        (d: any) => !(deleteDatas.findIndex((x: any) => x[primaryKeyColumnName] == d[primaryKeyColumnName]) != -1)
-                    );
-                    state.dataTabs[state.activeName].selectionDatas = [];
+                    onRefresh(state.activeName);
                 } else {
                     state.queryTab.execRes.data = state.queryTab.execRes.data.filter(
                         (d: any) => !(deleteDatas.findIndex((x: any) => x[primaryKeyColumnName] == d[primaryKeyColumnName]) != -1)
@@ -940,6 +1032,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
          */
@@ -955,7 +1079,7 @@ export default defineComponent({
                 return;
             }
             // 转为字符串比较,可能存在数字等
-            let text = row[property] + '';
+            let text = (row[property] ? row[property] : '') + '';
             let div = cell.children[0];
             if (div) {
                 let input = document.createElement('input');
@@ -1049,7 +1173,6 @@ export default defineComponent({
             let selectSql = codemirror.getSelection();
             isTrue(selectSql, '请选中需要格式化的sql');
             codemirror.replaceSelection(sqlFormatter(selectSql));
-            closeExecBtns();
         };
 
         const search = async () => {
@@ -1057,31 +1180,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,
@@ -1098,6 +1196,8 @@ export default defineComponent({
             getColumnTip,
             getColumns4Map,
             onConditionRowClick,
+            onConfirmCondition,
+            onCancelCondition,
             changeSqlTemplate,
             deleteSql,
             saveSql,
@@ -1107,14 +1207,14 @@ export default defineComponent({
             formatSql,
             onBeforeChange,
             onRefresh,
+            handlePageChange,
             selectByCondition,
             onCommit,
             addRow,
             onDataSelectionChange,
             onDeleteData,
             onTableSortChange,
-            showExecBtns,
-            closeExecBtns,
+            onGenerateInsertSql,
         };
     },
 });

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

@@ -4,7 +4,10 @@ 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'),
     tableIndex: Api.create("/dbs/{id}/t-index", 'get'),
     tableDdl: Api.create("/dbs/{id}/t-create-ddl", 'get'),
@@ -21,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

@@ -2,7 +2,7 @@
     <div>
         <el-dialog title="待执行SQL" v-model="dialogVisible" :show-close="false" width="600px">
             <codemirror height="350px" class="codesql" ref="cmEditor" language="sql" v-model="sqlValue" :options="cmOptions" />
-            <el-input v-model="remark" placeholder="请输入执行备注" class="mt5" />
+            <el-input ref="remarkInputRef" v-model="remark" placeholder="请输入执行备注" class="mt5" />
             <template #footer>
                 <span class="dialog-footer">
                     <el-button @click="cancel">取 消</el-button>
@@ -14,9 +14,9 @@
 </template>
 
 <script lang="ts">
-import { toRefs, reactive, defineComponent } from 'vue';
+import { toRefs, ref, nextTick, reactive, defineComponent } from 'vue';
 import { dbApi } from '../api';
-import { ElDialog, ElButton, ElInput, ElMessage } from 'element-plus';
+import { ElDialog, ElButton, ElInput, ElMessage, InputInstance } from 'element-plus';
 // import base style
 import 'codemirror/lib/codemirror.css';
 // 引入主题后还需要在 options 中指定主题才会生效
@@ -50,6 +50,7 @@ export default defineComponent({
         },
     },
     setup(props: any) {
+        const remarkInputRef = ref<InputInstance>();
         const state = reactive({
             dialogVisible: false,
             sqlValue: '',
@@ -84,16 +85,22 @@ export default defineComponent({
                 ElMessage.error('请输入执行的备注信息');
                 return;
             }
-            
+
             try {
                 state.btnLoading = true;
-                await dbApi.sqlExec.request({
+                const res = await dbApi.sqlExec.request({
                     id: state.dbId,
                     db: state.db,
                     remark: state.remark,
                     sql: state.sqlValue.trim(),
                 });
-                runSuccess = true;
+                if (parseInt(res.res[0].影响条数) >= 1) {
+                    ElMessage.success('执行成功');
+                    runSuccess = true;
+                } else {
+                    ElMessage.error('执行失败');
+                    runSuccess = false;
+                }
             } catch (e) {
                 runSuccess = false;
             }
@@ -127,10 +134,16 @@ export default defineComponent({
             state.dbId = props.dbId;
             state.db = props.db;
             state.dialogVisible = true;
+            nextTick(() => {
+                setTimeout(() => {
+                    remarkInputRef.value?.focus();
+                });
+            });
         };
 
         return {
             ...toRefs(state),
+            remarkInputRef,
             open,
             runSql,
             cancel,

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="50%">
             <el-progress
                 v-if="uploadProgressShow"
                 style="width: 90%; margin-left: 20px"
@@ -66,7 +66,7 @@
                 :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">
@@ -89,17 +89,19 @@
 
                                 <template #dropdown>
                                     <el-dropdown-menu>
-                                        <el-dropdown-item v-if="data.type == '-' && data.size < 1 * 1024 * 1024">
-                                            <el-link
-                                                @click.prevent="getFileContent(tree.folder.id, data.path)"
-                                                type="info"
-                                                icon="view"
-                                                :underline="false"
-                                            >
-                                                查看
-                                            </el-link>
+                                        <el-dropdown-item
+                                            @click="getFileContent(tree.folder.id, data.path)"
+                                            v-if="data.type == '-' && data.size < 1 * 1024 * 1024"
+                                        >
+                                            <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
@@ -112,34 +114,20 @@
                                                     name="file"
                                                     style="display: inline-block; margin-left: 2px"
                                                 >
-                                                    <el-link icon="upload" :underline="false"> 上传 </el-link>
+                                                    <el-link icon="upload" :underline="false">上传</el-link>
                                                 </el-upload>
                                             </el-dropdown-item>
                                         </span>
 
                                         <span v-auth="'machine:file:write'">
-                                            <el-dropdown-item v-if="data.type == '-'">
-                                                <el-link
-                                                    @click.prevent="downloadFile(node, data)"
-                                                    type="primary"
-                                                    icon="download"
-                                                    :underline="false"
-                                                    style="margin-left: 2px"
-                                                    >下载</el-link
-                                                >
+                                            <el-dropdown-item @click="downloadFile(node, data)" v-if="data.type == '-'">
+                                                <el-link type="primary" icon="download" :underline="false" style="margin-left: 2px">下载</el-link>
                                             </el-dropdown-item>
                                         </span>
 
                                         <span v-auth="'machine:file:rm'">
-                                            <el-dropdown-item v-if="!dontOperate(data)">
-                                                <el-link
-                                                    @click.prevent="deleteFile(node, data)"
-                                                    type="danger"
-                                                    icon="delete"
-                                                    :underline="false"
-                                                    style="margin-left: 2px"
-                                                    >删除
-                                                </el-link>
+                                            <el-dropdown-item @click="deleteFile(node, data)" v-if="!dontOperate(data)">
+                                                <el-link type="danger" icon="delete" :underline="false" style="margin-left: 2px">删除</el-link>
                                             </el-dropdown-item>
                                         </span>
                                     </el-dropdown-menu>
@@ -151,6 +139,35 @@
             </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 class="dialog-footer">
+                    <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"
@@ -182,6 +199,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',
@@ -202,26 +220,8 @@ export default defineComponent({
         const fileTree: any = ref(null);
         const token = getSession('token');
 
-        const cmOptions = {
-            tabSize: 2,
-            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 folderType = 'd';
+        const fileType = '-';
 
         const state = reactive({
             dialogVisible: false,
@@ -268,6 +268,12 @@ export default defineComponent({
                 path: '',
                 type: '',
             },
+            createFileDialog: {
+                visible: false,
+                name: '',
+                type: folderType,
+                node: null as any,
+            },
             file: null as any,
         });
 
@@ -290,18 +296,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);
@@ -329,7 +323,6 @@ export default defineComponent({
                         })
                         .then(() => {
                             getFiles();
-                            // state.fileTable.splice(idx, 1);
                         });
                 });
             } else {
@@ -406,7 +399,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 };
         };
@@ -431,7 +423,7 @@ export default defineComponent({
                 return resolve([
                     {
                         name: path,
-                        type: 'd',
+                        type: folderType,
                         path: path,
                     },
                 ]);
@@ -453,13 +445,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}], 是否继续?`, '提示', {
@@ -486,7 +507,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}`
@@ -534,7 +554,6 @@ export default defineComponent({
 
         const beforeUpload = (file: File) => {
             state.file = file;
-            // ElMessage.success(`'${file.name}' 上传中,请关注结果通知`);
         };
         const getFilePath = (data: object, visible: boolean) => {
             if (visible) {
@@ -590,7 +609,6 @@ export default defineComponent({
             fileTree,
             enums,
             token,
-            cmOptions,
             add,
             getFiles,
             handlePageChange,
@@ -601,6 +619,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-form-item>
-                <el-form-item prop="port" label="port:" required>
-                    <el-input type="number" v-model.number="form.port" placeholder="请输入端口"></el-input>
+                    <el-col :span="18">
+                        <el-input :disabled="form.id" v-model.trim="form.ip" placeholder="主机ip" auto-complete="off"></el-input>
+                    </el-col>
+                    <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,
-                password: null,
+                username: '',
+                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',
-                        trigger: ['change', 'blur'],
-                    },
-                ],
-                port: [
-                    {
-                        required: true,
-                        message: '请输入端口',
+                        message: '请输入主机ip和端口',
                         trigger: ['change', 'blur'],
                     },
                 ],
@@ -124,19 +166,45 @@ 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) => {
+            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 +217,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 +255,8 @@ export default defineComponent({
         return {
             ...toRefs(state),
             machineForm,
+            getSshTunnelMachines,
+            getPwd,
             changeProject,
             btnOk,
             cancel,

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

@@ -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}`
@@ -57,11 +57,10 @@
                             v-model="scope.row.status"
                             :active-value="1"
                             :inactive-value="-1"
-                            active-color="#13ce66"
-                            inactive-color="#ff4949"
                             inline-prompt
                             active-text="启用"
                             inactive-text="停用"
+                            style="--el-switch-on-color: #13ce66; --el-switch-off-color: #ff4949"
                             @change="changeStatus(scope.row)"
                         ></el-switch>
                     </template>
@@ -69,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
-                            v-auth="'machine:terminal'"
-                            :disabled="scope.row.status == -1"
-                            type="primary"
-                            @click="showTerminal(scope.row)"
-                            plain
-                            size="small"
-                            :underline="false"
-                            >终端</el-link
-                        >
-                        <el-divider v-auth="'machine:terminal'" direction="vertical" border-style="dashed" />
-                        <el-link
-                            v-auth="'machine:file'"
-                            type="success"
-                            :disabled="scope.row.status == -1"
-                            @click="fileManage(scope.row)"
-                            plain
-                            size="small"
-                            :underline="false"
-                            >文件</el-link
-                        >
-                        <el-divider v-auth="'machine:file'" direction="vertical" border-style="dashed" />
+                        <span v-auth="'machine:terminal'">
+                            <el-link
+                                :disabled="scope.row.status == -1"
+                                type="primary"
+                                @click="showTerminal(scope.row)"
+                                plain
+                                size="small"
+                                :underline="false"
+                                >终端</el-link
+                            >
+                            <el-divider direction="vertical" border-style="dashed" />
+                        </span>
+
+                        <span v-auth="'machine:update'" v-if="scope.row.enableRecorder == 1">
+                            <el-link @click="showRec(scope.row)" plain :underline="false" size="small">终端回放</el-link>
+                            <el-divider direction="vertical" border-style="dashed" />
+                        </span>
+
+                        <span v-auth="'machine:file'">
+                            <el-link
+                                type="success"
+                                :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"
@@ -114,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"
@@ -161,6 +166,8 @@
             :machineId="machineStatsDialog.machineId"
             :title="machineStatsDialog.title"
         ></machine-stats>
+
+        <!-- <machine-rec v-model:visible="machineRecDialog.visible" :title="machineRecDialog.title" :machine-id="machineRecDialog.machineId" /> -->
     </div>
 </template>
 
@@ -175,6 +182,7 @@ import FileManage from './FileManage.vue';
 import MachineEdit from './MachineEdit.vue';
 import ProcessList from './ProcessList.vue';
 import MachineStats from './MachineStats.vue';
+// import MachineRec from './MachineRec.vue';
 
 export default defineComponent({
     name: 'MachineList',
@@ -184,6 +192,7 @@ export default defineComponent({
         FileManage,
         MachineEdit,
         MachineStats,
+        // MachineRec,
     },
     setup() {
         const router = useRouter();
@@ -229,11 +238,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) => {
@@ -256,18 +269,24 @@ 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 openFormDialog = async (machine: any) => {
+            state.projects = await projectApi.accountProjects.request(null);
             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 = '添加机器';
             }
 
@@ -339,6 +358,17 @@ 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,
@@ -353,6 +383,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-input v-model.trim="form.params" placeholder="参数数组json，若无可不填"></el-input>
+                <el-row style="margin-left: 30px; margin-bottom: 5px">
+                    <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
@@ -196,8 +212,10 @@ export default defineComponent({
             // 如果存在参数，则弹窗输入参数后执行
             if (script.params) {
                 state.scriptParamsDialog.paramsFormItem = JSON.parse(script.params);
-                state.scriptParamsDialog.visible = true;
-                return;
+                if (state.scriptParamsDialog.paramsFormItem && state.scriptParamsDialog.paramsFormItem.length > 0) {
+                    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,13 +54,17 @@ 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',
-                fontFamily: 'JetBrainsMono, Consolas, Menlo, Monaco',
+                fontWeight: getThemeConfig.value.terminalFontWeight || 'normal',
+                fontFamily: 'JetBrainsMono, monaco, Consolas, Lucida Console, monospace',
                 cursorBlink: true,
-                // cursorStyle: 'underline', //光标样式
                 disableStdin: false,
                 theme: {
                     foreground: getThemeConfig.value.terminalForeground || '#7e9192', //字体
@@ -82,6 +84,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 +114,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;
-            // 监听socket消息
-            state.socket.onmessage = getMessage;
+            state.socket.onerror = (e: any) => {
+                console.log('连接错误', e);
+            };
+
+            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() {
-            console.log('socket连接成功');
-            initXterm();
-            //开启心跳
-            //   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 getMessage(msg: any) {
+            // msg.data是真正后端返回的数据
+            state.term.write(msg.data);
         }
 
         function send(msg: any) {
@@ -175,11 +168,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-form :model="form" ref="mongoForm" :rules="rules" label-width="65px">
+        <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="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

@@ -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,14 @@ 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 editMongo = async (isAdd = false) => {
+            state.projects = await projectApi.accountProjects.request(null);
             if (isAdd) {
                 state.mongoEditDialog.data = null;
                 state.mongoEditDialog.title = '新增mongo';

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>
@@ -152,7 +152,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>

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

@@ -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,19 @@
                                 ></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-popover>
                             </el-form-item>
                             <div style="float: right">
                                 <span>keys: {{ dbsize }}</span>
@@ -69,17 +76,32 @@
 
         <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"
+            :operationType="dataEdit.operationType"
+            :title="dataEdit.title"
+            :keyInfo="dataEdit.keyInfo"
+            :redisId="scanParam.id"
+            @cancel="onCancelDataEdit"
+            @valChange="searchKey"
+        />
 
-        <data-edit
-            v-model:visible="dataEdit.visible"
+        <string-value
+            v-model:visible="stringValueDialog.visible"
+            :operationType="dataEdit.operationType"
+            :title="dataEdit.title"
+            :keyInfo="dataEdit.keyInfo"
+            :redisId="scanParam.id"
+            @cancel="onCancelDataEdit"
+            @valChange="searchKey"
+        />
+
+        <set-value
+            v-model:visible="setValueDialog.visible"
             :title="dataEdit.title"
             :keyInfo="dataEdit.keyInfo"
             :redisId="scanParam.id"
             :operationType="dataEdit.operationType"
-            :stringValue="dataEdit.stringValue"
-            :setValue="dataEdit.setValue"
-            :hashValue="dataEdit.hashValue"
             @valChange="searchKey"
             @cancel="onCancelDataEdit"
         />
@@ -91,34 +113,31 @@ 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 { isTrue, notNull } from '@/common/assert';
+import HashValue from './HashValue.vue';
+import StringValue from './StringValue.vue';
+import SetValue from './SetValue.vue';
+import { isTrue, notBlank, notNull } from '@/common/assert';
 
 export default defineComponent({
     name: 'DataOperation',
     components: {
-        DataEdit,
+        StringValue,
+        HashValue,
+        SetValue,
         ProjectEnvSelect,
     },
     setup() {
         const state = reactive({
             loading: false,
-            cluster: 0,
             redisList: [],
             query: {
                 envId: 0,
             },
             scanParam: {
                 id: null,
-                cluster: 0,
                 match: null,
                 count: 10,
-                cursor: 0,
-                prevCursor: null,
-            },
-            valueDialog: {
-                visible: false,
-                value: {},
+                cursor: {},
             },
             dataEdit: {
                 visible: false,
@@ -129,9 +148,15 @@ export default defineComponent({
                     timed: -1,
                     key: '',
                 },
-                stringValue: '',
-                hashValue: [{ key: '', value: '' }],
-                setValue: [{ value: '' }],
+            },
+            hashValueDialog: {
+                visible: false,
+            },
+            stringValueDialog: {
+                visible: false,
+            },
+            setValueDialog: {
+                visible: false,
             },
             keys: [],
             dbsize: 0,
@@ -151,31 +176,38 @@ export default defineComponent({
             }
         };
 
-        const changeRedis = () => {
-            resetScanParam();
+        const changeRedis = (id: number) => {
+            resetScanParam(id);
             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 == '*') {
+                isTrue(state.scanParam.count <= 200, 'match为空或者*时, count不能超过200');
+            } else {
+                isTrue(state.scanParam.count <= 20000, 'count不能超过20000');
+            }
 
             state.loading = true;
-            state.scanParam.cluster = state.cluster == 0 ? 0 : 1;
-
-            redisApi.scan.request(state.scanParam).then((res) => {
+            try {
+                const res = await redisApi.scan.request(state.scanParam);
                 state.keys = res.keys;
                 state.dbsize = res.dbSize;
                 state.scanParam.cursor = res.cursor;
+            } finally {
                 state.loading = false;
-            });
+            }
         };
 
-        const searchKey = () => {
-            state.scanParam.cursor = 0;
-            scan();
+        const searchKey = async () => {
+            state.scanParam.cursor = {};
+            await scan();
         };
 
         const clearRedis = () => {
@@ -193,96 +225,82 @@ export default defineComponent({
             }
         };
 
-        const resetScanParam = () => {
-            state.scanParam.match = null;
-            state.scanParam.cursor = 0;
+        const resetScanParam = (id: number = 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 = 5;
+                }
+            }
+            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.visible = true;
+            state.dataEdit.title = '查看数据';
+
+            if (type == 'hash') {
+                state.hashValueDialog.visible = true;
+            } else if (type == 'string') {
+                state.stringValueDialog.visible = true;
+            } else if (type == 'set') {
+                state.setValueDialog.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 {
+                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,
                         })
                         .then(() => {
                             ElMessage.success('删除成功！');
-                            scan();
+                            searchKey();
                         });
                 })
                 .catch(() => {});
         };
 
         const ttlConveter = (ttl: any) => {
-            if (ttl == -1) {
+            if (ttl == -1 || ttl == 0) {
                 return '永久';
             }
             if (!ttl) {
@@ -329,20 +347,6 @@ 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,

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

@@ -0,0 +1,254 @@
+<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,
+        },
+        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,
+            key: {
+                key: '',
+                type: 'hash',
+                timed: -1,
+            },
+            scanParam: {
+                key: '',
+                id: 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.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.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,
+                key: state.key.key,
+                field,
+            });
+            ElMessage.success('删除成功');
+            reHscan();
+        };
+
+        const hset = async (row: any) => {
+            await redisApi.saveHashValue.request({
+                id: state.redisId,
+                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 };
+            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/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,66 @@
                         <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-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 +83,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 +109,22 @@ export default defineComponent({
             dialogVisible: false,
             projects: [],
             envs: [],
+            sshTunnelMachineList: [],
             form: {
                 id: null,
                 name: null,
-                host: null,
+                mode: 'standalone',
+                host: '',
                 password: null,
                 project: null,
                 projectId: null,
                 envId: null,
                 env: null,
+                remark: '',
+                enableSshTunnel: null,
+                sshTunnelMachineId: null,
             },
+            pwd: '',
             btnLoading: false,
             rules: {
                 projectId: [
@@ -108,25 +155,47 @@ export default defineComponent({
                         trigger: ['change', 'blur'],
                     },
                 ],
+                mode: [
+                    {
+                        required: true,
+                        message: '请输入模式',
+                        trigger: ['change', 'blur'],
+                    },
+                ],
             },
         });
 
         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 };
             } else {
                 state.envs = [];
-                state.form = { db: 0 } as any;
+                state.form = { db: 0, enableSshTunnel: -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 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 +217,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 +250,8 @@ export default defineComponent({
         return {
             ...toRefs(state),
             redisForm,
+            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 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="env" label="环境" width></el-table-column>
-                <el-table-column prop="host" label="host:port" width></el-table-column>
-                <el-table-column prop="createTime" label="创建时间">
+                <el-table-column prop="project" label="项目" min-width="100"></el-table-column>
+                <el-table-column prop="env" label="环境" min-width="100"></el-table-column>
+                <el-table-column prop="host" label="host:port" min-width="150" show-overflow-tooltip> </el-table-column>
+                <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 label="操作" width>
+                <el-table-column prop="creator" label="创建人" min-width="100"></el-table-column>
+                <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-button type="success" @click="manage(scope.row)" :ref="scope.row"  plain>数据管理</el-button> -->
+                        <el-link
+                            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) => {
-            redisApi.redisInfo.request({ id: redis.id }).then((res: any) => {
-                state.infoDialog.info = res;
-                state.infoDialog.title = `'${redis.host}' info`;
-                state.infoDialog.visible = true;
-            });
+        const info = async (redis: any) => {
+            var host = redis.host;
+            if (redis.ip) {
+                host = redis.ip.split('@')[0];
+            }
+            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,8 @@ export default defineComponent({
             state.total = res.total;
         };
 
-        const editRedis = (isAdd = false) => {
+        const editRedis = async (isAdd = false) => {
+            state.projects = await projectApi.accountProjects.request(null);
             if (isAdd) {
                 state.redisEditDialog.data = null;
                 state.redisEditDialog.title = '新增redis';
@@ -192,6 +287,7 @@ export default defineComponent({
             handlePageChange,
             choose,
             info,
+            onShowClusterInfo,
             deleteRedis,
             editRedis,
             valChange,

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

@@ -0,0 +1,157 @@
+<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="set.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,
+        },
+        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: '',
+            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.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,
+                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 };
+            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,169 @@
+<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,
+        },
+        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: '',
+            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, async (newValue) => {
+            state.dialogVisible = newValue.visible;
+            state.key = newValue.key;
+            state.redisId = newValue.redisId;
+            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,
+                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 };
+            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,14 +2,19 @@ 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}/scan", 'post'),
     getStringValue: Api.create("/redis/{id}/string-value", 'get'),
     saveStringValue: Api.create("/redis/{id}/string-value", 'post'),
     getHashValue: Api.create("/redis/{id}/hash-value", 'get'),
+    hscan: Api.create("/redis/{id}/hscan", 'get'),
+    hget: Api.create("/redis/{id}/hget", 'get'),
+    hdel: Api.create("/redis/{id}/hdel", 'delete'),
     saveHashValue: Api.create("/redis/{id}/hash-value", 'post'),
     getSetValue: Api.create("/redis/{id}/set-value", 'get'),
     saveSetValue: Api.create("/redis/{id}/set-value", '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 = {
-    list: Api.create("/sys/logs", "get")
+export const configApi = {
+    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;
-            await roleApi.save.request(state.form);
-            emit('val-change', state.form);
-            cancel();
-            state.btnLoading = true;
-            setTimeout(() => {
-                state.btnLoading = false;
-            }, 1000);
+            roleForm.value.validate(async (valid: boolean) => {
+                if (valid) {
+                    await roleApi.save.request(state.form);
+                    emit('val-change', state.form);
+                    cancel();
+                    state.btnLoading = true;
+                    setTimeout(() => {
+                        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: 300px"
+                    style="width: 200px"
                     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:
-    - 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
-
+  # 机器终端操作回放文件存储路径
+  machine-rec-path: ./rec
 jwt:
-  key: mykey
+  # jwt key，不设置默认使用随机字符串
+  key: 
   # 过期时间单位分钟
   expire-time: 1440
-
-redis:
-  host: 127.0.0.1
-  port: 6379
-
+# 资源密码aes加密key
+aes:
+  key: 1111111111111111
 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.17
+go 1.18
 
 require (
-	github.com/dgrijalva/jwt-go v3.2.0+incompatible // jwt
-	github.com/gin-gonic/gin v1.7.7
-	github.com/go-redis/redis v6.15.9+incompatible
+	github.com/gin-gonic/gin v1.8.1
+	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
-	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b
+	golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa // ssh
+	gopkg.in/yaml.v3 v3.0.1
 	// gorm
-	gorm.io/driver/mysql v1.3.4
-	gorm.io/gorm v1.23.5
+	gorm.io/driver/mysql v1.3.5
+	gorm.io/gorm v1.23.8
 )
 
 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/protobuf v1.5.2 // 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,7 @@ 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
 	github.com/xdg-go/pbkdf2 v1.0.0 // indirect
@@ -48,9 +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-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
-	google.golang.org/protobuf v1.27.1 // 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,25 @@ package initialize
 
 import (
 	"fmt"
-	common_index_router "mayfly-go/internal/common/router"
+	"io/fs"
+	common_router "mayfly-go/internal/common/router"
 	devops_router "mayfly-go/internal/devops/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 +34,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 +56,7 @@ func InitRouter() *gin.Engine {
 			router.StaticFile(sfs.RelativePath, sfs.Filepath)
 		}
 	}
+
 	// 是否允许跨域
 	if serverConfig.Cors {
 		router.Use(middleware.Cors())
@@ -46,13 +65,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.InitAccountRouter(api) // 注册account路由
 		sys_router.InitResourceRouter(api)
 		sys_router.InitRoleRouter(api)
 		sys_router.InitSystemRouter(api)
+		sys_router.InitSyslogRouter(api)
+		sys_router.InitSysConfigRouter(api)
 
 		devops_router.InitProjectRouter(api)
 		devops_router.InitDbRouter(api)

server/initialize/savelog.go

@@ -0,0 +1,10 @@
+package initialize
+
+import (
+	sys_application "mayfly-go/internal/sys/application"
+	"mayfly-go/pkg/ctx"
+)
+
+func InitSaveLogFunc() ctx.SaveLogFunc {
+	return sys_application.SyslogApp.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/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/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/devops/api/db.go

@@ -2,7 +2,7 @@ package api
 
 import (
 	"fmt"
-	"io/ioutil"
+	"io"
 	"mayfly-go/internal/devops/api/form"
 	"mayfly-go/internal/devops/api/vo"
 	"mayfly-go/internal/devops/application"
@@ -16,8 +16,10 @@ import (
 	"mayfly-go/pkg/ws"
 	"strconv"
 	"strings"
+	"time"
 
 	"github.com/gin-gonic/gin"
+	"github.com/xwb1989/sqlparser"
 )
 
 type Db struct {
@@ -27,6 +29,8 @@ type Db struct {
 	ProjectApp   application.Project
 }
 
+const DEFAULT_COLUMN_SIZE = 500
+
 // @router /api/dbs [get]
 func (d *Db) Dbs(rc *ctx.ReqCtx) {
 	g := rc.GinCtx
@@ -41,12 +45,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) {
@@ -57,19 +97,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) {
@@ -91,7 +131,7 @@ 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") {
+	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{})
@@ -128,14 +168,12 @@ func (d *Db) ExecSqlFile(rc *ctx.ReqCtx) {
 	fileheader, err := g.FormFile("file")
 	biz.ErrIsNilAppendErr(err, "读取sql文件失败: %s")
 
-	// 读取sql文件并根据;切割sql语句
 	file, _ := fileheader.Open()
 	filename := fileheader.Filename
-	bytes, _ := ioutil.ReadAll(file)
-	sqlContent := string(bytes)
-	sqls := strings.Split(sqlContent, ";")
 	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)
 
@@ -153,12 +191,14 @@ func (d *Db) ExecSqlFile(rc *ctx.ReqCtx) {
 
 		biz.ErrIsNilAppendErr(d.ProjectApp.CanAccess(rc.LoginAccount.Id, db.ProjectId), "%s")
 
-		for _, sql := range sqls {
-			sql = strings.Trim(sql, " ")
-			if sql == "" || sql == "\n" {
-				continue
+		tokens := sqlparser.NewTokenizer(file)
+		for {
+			stmt, err := sqlparser.ParseNext(tokens)
+			if err == io.EOF {
+				break
 			}
-			_, err := db.Exec(sql)
+			sql := sqlparser.String(stmt)
+			_, err = db.Exec(sql)
 			if err != nil {
 				d.MsgApp.CreateAndSend(rc.LoginAccount, ws.ErrMsg("sql脚本执行失败", fmt.Sprintf("[%s]%s执行失败: [%s]", filename, dbInfo, err.Error())))
 				return
@@ -168,11 +208,103 @@ func (d *Db) ExecSqlFile(rc *ctx.ReqCtx) {
 	}()
 }
 
+// 数据库dump
+func (d *Db) DumpSql(rc *ctx.ReqCtx) {
+	g := rc.GinCtx
+	dbId, db := GetIdAndDb(g)
+	dumpType := g.Query("type")
+	tablesStr := g.Query("tables")
+	biz.NotEmpty(tablesStr, "请选择要导出的表")
+	tables := strings.Split(tablesStr, ",")
+
+	// 是否需要导出表结构
+	needStruct := dumpType == "1" || dumpType == "3"
+	// 是否需要导出数据
+	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)
+
+	writer := g.Writer
+	writer.WriteString("-- ----------------------------")
+	writer.WriteString("\n-- 导出平台: mayfly-go")
+	writer.WriteString(fmt.Sprintf("\n-- 导出时间: %s ", now.Format("2006-01-02 15:04:05")))
+	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(dbmeta.GetCreateTableDdl(table)[0]["Create Table"].(string) + ";\n")
+		}
+
+		if !needData {
+			continue
+		}
+
+		writer.WriteString(fmt.Sprintf("\n-- ----------------------------\n-- 表记录: %s \n-- ----------------------------\n", table))
+		writer.WriteString("BEGIN;\n")
+
+		countSql := fmt.Sprintf("SELECT COUNT(*) count FROM %s", table)
+		_, countRes, _ := dbInstance.SelectData(countSql)
+		// 查询出所有列信息总数，手动分页获取所有数据
+		maCount := int(countRes[0]["count"].(int64))
+		// 计算需要查询的页数
+		pageNum := maCount / DEFAULT_COLUMN_SIZE
+		if maCount%DEFAULT_COLUMN_SIZE > 0 {
+			pageNum++
+		}
+
+		var sqlTmp string
+		switch dbInstance.Type {
+		case "mysql":
+			sqlTmp = "SELECT * FROM %s LIMIT %d, %d"
+		case "postgres":
+			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)
+
+			insertSql := "INSERT INTO `%s` VALUES (%s);\n"
+			for _, res := range result {
+				var values []string
+				for _, column := range columns {
+					value := res[column]
+					if value == nil {
+						values = append(values, "NULL")
+						continue
+					}
+					strValue, ok := value.(string)
+					if ok {
+						values = append(values, fmt.Sprintf("%#v", strValue))
+					} else {
+						values = append(values, utils.ToString(value))
+					}
+				}
+				writer.WriteString(fmt.Sprintf(insertSql, table, strings.Join(values, ", ")))
+			}
+		}
+
+		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]
@@ -183,16 +315,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))
@@ -207,7 +340,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 {
@@ -217,7 +350,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/devops/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/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/machine.go

@@ -0,0 +1,51 @@
+package form
+
+type MachineForm struct {
+	Id                 uint64 `json:"id"`
+	ProjectId          uint64 `json:"projectId"`
+	ProjectName        string `json:"projectName"`
+	Name               string `json:"name" binding:"required"`
+	Ip                 string `json:"ip" binding:"required"`       // IP地址
+	Username           string `json:"username" binding:"required"` // 用户名
+	AuthMethod         int8   `json:"authMethod" binding:"required"`
+	Password           string `json:"password"`
+	Port               int    `json:"port" binding:"required"` // 端口号
+	Remark             string `json:"remark"`
+	EnableSshTunnel    int8   `json:"enableSshTunnel"`    // 是否启用ssh隧道
+	SshTunnelMachineId uint64 `json:"sshTunnelMachineId"` // ssh隧道机器id
+	EnableRecorder     int8   `json:"enableRecorder"`     // 是否启用终端回放记录
+}
+
+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 MachineCreateFileForm struct {
+	Path string `binding:"required"`
+	Type string `binding:"required"`
+}
+
+type MachineFileUpdateForm struct {
+	Content string `binding:"required"`
+	Id      uint64 `binding:"required"`
+	Path    string `binding:"required"`
+}

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

@@ -1,13 +1,15 @@
 package form
 
 type Mongo struct {
-	Id        uint64
-	Uri       string `binding:"required" json:"uri"`
-	Name      string `binding:"required" json:"name"`
-	ProjectId uint64 `binding:"required" json:"projectId"`
-	Project   string `json:"project"`
-	Env       string `json:"env"`
-	EnvId     uint64 `binding:"required" json:"envId"`
+	Id                 uint64
+	Uri                string `binding:"required" json:"uri"`
+	EnableSshTunnel    int8   `json:"enableSshTunnel"`    // 是否启用ssh隧道
+	SshTunnelMachineId uint64 `json:"sshTunnelMachineId"` // ssh隧道机器id
+	Name               string `binding:"required" json:"name"`
+	ProjectId          uint64 `binding:"required" json:"projectId"`
+	Project            string `json:"project"`
+	Env                string `json:"env"`
+	EnvId              uint64 `binding:"required" json:"envId"`
 }
 
 type MongoCommand struct {

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

@@ -1,14 +1,18 @@
 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"`
+	Id                 uint64
+	Host               string `binding:"required" json:"host"`
+	Password           string `json:"password"`
+	Mode               string `json:"mode"`
+	Db                 int    `json:"db"`
+	EnableSshTunnel    int8   `json:"enableSshTunnel"`    // 是否启用ssh隧道
+	SshTunnelMachineId uint64 `json:"sshTunnelMachineId"` // ssh隧道机器id
+	ProjectId          uint64 `binding:"required" json:"projectId"`
+	Project            string `json:"project"`
+	Env                string `json:"env"`
+	EnvId              uint64 `binding:"required" json:"envId"`
+	Remark             string `json:"remark"`
 }
 
 type KeyInfo struct {
@@ -30,3 +34,9 @@ type SetValue struct {
 	KeyInfo
 	Value []interface{} `binding:"required" json:"value"`
 }
+
+type RedisScanForm struct {
+	Cursor map[string]uint64 `json:"cursor"`
+	Match  string            `json:"match"`
+	Count  int64             `json:"count"`
+}

server/internal/devops/api/machine.go

@@ -1,6 +1,7 @@
 package api
 
 import (
+	"encoding/base64"
 	"fmt"
 	"mayfly-go/internal/devops/api/form"
 	"mayfly-go/internal/devops/api/vo"
@@ -8,11 +9,17 @@ import (
 	"mayfly-go/internal/devops/domain/entity"
 	"mayfly-go/internal/devops/infrastructure/machine"
 	"mayfly-go/pkg/biz"
+	"mayfly-go/pkg/config"
 	"mayfly-go/pkg/ctx"
 	"mayfly-go/pkg/ginx"
 	"mayfly-go/pkg/utils"
 	"mayfly-go/pkg/ws"
+	"os"
+	"path"
+	"sort"
 	"strconv"
+	"syscall"
+	"time"
 
 	"github.com/gin-gonic/gin"
 	"github.com/gorilla/websocket"
@@ -54,11 +61,30 @@ func (m *Machine) SaveMachine(rc *ctx.ReqCtx) {
 	machineForm := new(form.MachineForm)
 	ginx.BindJsonAndValid(g, machineForm)
 
-	entity := new(entity.Machine)
-	utils.Copy(entity, machineForm)
+	me := new(entity.Machine)
+	utils.Copy(me, machineForm)
 
-	entity.SetBaseInfo(rc.LoginAccount)
-	m.MachineApp.Save(entity)
+	if me.AuthMethod == entity.MachineAuthMethodPassword {
+		// 密码解密，并使用解密后的赋值
+		originPwd, err := utils.DefaultRsaDecrypt(machineForm.Password, true)
+		biz.ErrIsNilAppendErr(err, "解密密码错误: %s")
+		me.Password = originPwd
+	}
+
+	// 密码脱敏记录日志
+	machineForm.Password = "****"
+	rc.ReqParam = machineForm
+
+	me.SetBaseInfo(rc.LoginAccount)
+	m.MachineApp.Save(me)
+}
+
+// 获取机器实例密码，由于数据库是加密存储，故提供该接口展示原文密码
+func (m *Machine) GetMachinePwd(rc *ctx.ReqCtx) {
+	mid := GetMachineId(rc.GinCtx)
+	me := m.MachineApp.GetById(mid, "Password")
+	me.PwdDecrypt()
+	rc.ResData = me.Password
 }
 
 func (m *Machine) ChangeStatus(rc *ctx.ReqCtx) {
@@ -119,43 +145,78 @@ func (m *Machine) KillProcess(rc *ctx.ReqCtx) {
 	cli := m.MachineApp.GetCli(GetMachineId(rc.GinCtx))
 	biz.ErrIsNilAppendErr(m.ProjectApp.CanAccess(rc.LoginAccount.Id, cli.GetMachine().ProjectId), "%s")
 
-	_, err := cli.Run("kill -9 " + pid)
+	_, err := cli.Run("sudo kill -9 " + pid)
 	biz.ErrIsNilAppendErr(err, "终止进程失败: %s")
 }
 
 func (m *Machine) WsSSH(g *gin.Context) {
 	wsConn, err := ws.Upgrader.Upgrade(g.Writer, g.Request, nil)
 	defer func() {
-		if err := recover(); err != nil {
-			wsConn.WriteMessage(websocket.TextMessage, []byte(err.(error).Error()))
+		if wsConn != nil {
+			if err := recover(); err != nil {
+				wsConn.WriteMessage(websocket.TextMessage, []byte(err.(error).Error()))
+			}
 			wsConn.Close()
 		}
 	}()
 
-	if err != nil {
-		panic(biz.NewBizErr("升级websocket失败"))
-	}
+	biz.ErrIsNilAppendErr(err, "升级websocket失败: %s")
 	// 权限校验
 	rc := ctx.NewReqCtxWithGin(g).WithRequiredPermission(ctx.NewPermission("machine:terminal"))
 	if err = ctx.PermissionHandler(rc); err != nil {
 		panic(biz.NewBizErr("\033[1;31m您没有权限操作该机器终端,请重新登录后再试~\033[0m"))
 	}
 
-	cols := ginx.QueryInt(g, "cols", 80)
-	rows := ginx.QueryInt(g, "rows", 40)
-
 	cli := m.MachineApp.GetCli(GetMachineId(g))
 	biz.ErrIsNilAppendErr(m.ProjectApp.CanAccess(rc.LoginAccount.Id, cli.GetMachine().ProjectId), "%s")
 
-	sws, err := machine.NewLogicSshWsSession(cols, rows, cli, wsConn)
-	biz.ErrIsNilAppendErr(err, "\033[1;31m连接失败：%s\033[0m")
-	defer sws.Close()
+	cols := ginx.QueryInt(g, "cols", 80)
+	rows := ginx.QueryInt(g, "rows", 40)
 
-	quitChan := make(chan bool, 3)
-	sws.Start(quitChan)
-	go sws.Wait(quitChan)
+	var recorder *machine.Recorder
+	if cli.GetMachine().EnableRecorder == 1 {
+		mask := syscall.Umask(0)
+		defer syscall.Umask(mask)
+		now := time.Now()
+		// 回放文件路径为: 基础配置路径/机器id/操作日期/操作者账号/操作时间.cast
+		recPath := fmt.Sprintf("%s/%d/%s/%s", config.Conf.Server.GetMachineRecPath(), cli.GetMachine().Id, now.Format("20060102"), rc.LoginAccount.Username)
+		os.MkdirAll(recPath, 0766)
+		fileName := path.Join(recPath, fmt.Sprintf("%s.cast", now.Format("20060102_150405")))
+		f, err := os.OpenFile(fileName, os.O_CREATE|os.O_APPEND|os.O_WRONLY, 0766)
+		biz.ErrIsNilAppendErr(err, "创建终端回放记录文件失败: %s")
+		defer f.Close()
+		recorder = machine.NewRecorder(f)
+	}
 
-	<-quitChan
+	mts, err := machine.NewTerminalSession(utils.RandString(16), wsConn, cli, rows, cols, recorder)
+	biz.ErrIsNilAppendErr(err, "\033[1;31m连接失败: %s\033[0m")
+	mts.Start()
+	defer mts.Stop()
+}
+
+// 获取机器终端回放记录的相应文件夹名或文件内容
+func (m *Machine) MachineRecDirNames(rc *ctx.ReqCtx) {
+	readPath := rc.GinCtx.Query("path")
+	biz.NotEmpty(readPath, "path不能为空")
+	path_ := path.Join(config.Conf.Server.GetMachineRecPath(), readPath)
+
+	// 如果是读取文件内容，则读取对应回放记录文件内容，否则读取文件夹名列表。小小偷懒一会不想再加个接口
+	isFile := rc.GinCtx.Query("isFile")
+	if isFile == "1" {
+		bytes, err := os.ReadFile(path_)
+		biz.ErrIsNilAppendErr(err, "还未有相应终端操作记录: %s")
+		rc.ResData = base64.StdEncoding.EncodeToString(bytes)
+		return
+	}
+
+	files, err := os.ReadDir(path_)
+	biz.ErrIsNilAppendErr(err, "还未有相应终端操作记录: %s")
+	var names []string
+	for _, f := range files {
+		names = append(names, f.Name())
+	}
+	sort.Sort(sort.Reverse(sort.StringSlice(names)))
+	rc.ResData = names
 }
 
 func GetMachineId(g *gin.Context) uint64 {

server/internal/devops/api/machine_file.go

@@ -2,8 +2,8 @@ package api
 
 import (
 	"fmt"
+	"io"
 	"io/fs"
-	"io/ioutil"
 	"mayfly-go/internal/devops/api/form"
 	"mayfly-go/internal/devops/api/vo"
 	"mayfly-go/internal/devops/application"
@@ -60,6 +60,22 @@ func (m *MachineFile) DeleteFile(rc *ctx.ReqCtx) {
 
 /***      sftp相关操作      */
 
+func (m *MachineFile) CreateFile(rc *ctx.ReqCtx) {
+	g := rc.GinCtx
+	fid := GetMachineFileId(g)
+
+	form := new(form.MachineCreateFileForm)
+	ginx.BindJsonAndValid(g, form)
+	path := form.Path
+
+	if form.Type == dir {
+		m.MachineFileApp.MkDir(fid, form.Path)
+	} else {
+		m.MachineFileApp.CreateFile(fid, form.Path)
+	}
+	rc.ReqParam = fmt.Sprintf("path: %s, type: %s", path, form.Type)
+}
+
 func (m *MachineFile) ReadFileContent(rc *ctx.ReqCtx) {
 	g := rc.GinCtx
 	fid := GetMachineFileId(g)
@@ -82,7 +98,7 @@ func (m *MachineFile) ReadFileContent(rc *ctx.ReqCtx) {
 		path := strings.Split(readPath, "/")
 		rc.Download(sftpFile, path[len(path)-1])
 	} else {
-		datas, err := ioutil.ReadAll(sftpFile)
+		datas, err := io.ReadAll(sftpFile)
 		biz.ErrIsNilAppendErr(err, "读取文件内容失败: %s")
 		rc.ResData = string(datas)
 	}
@@ -104,6 +120,7 @@ func (m *MachineFile) GetDirEntry(rc *ctx.ReqCtx) {
 			Size: fi.Size(),
 			Path: readPath + fi.Name(),
 			Type: getFileType(fi.Mode()),
+			Mode: fi.Mode().String(),
 		})
 	}
 	rc.ResData = fisVO
@@ -155,7 +172,6 @@ func (m *MachineFile) UploadFile(rc *ctx.ReqCtx) {
 func (m *MachineFile) RemoveFile(rc *ctx.ReqCtx) {
 	g := rc.GinCtx
 	fid := GetMachineFileId(g)
-	// mid := GetMachineId(g)
 	path := g.Query("path")
 
 	m.MachineFileApp.RemoveFile(fid, path)
@@ -167,7 +183,10 @@ func getFileType(fm fs.FileMode) string {
 	if fm.IsDir() {
 		return dir
 	}
-	return file
+	if fm.IsRegular() {
+		return file
+	}
+	return dir
 }
 
 func GetMachineFileId(g *gin.Context) uint64 {

server/internal/devops/api/mongo.go

@@ -9,6 +9,7 @@ import (
 	"mayfly-go/pkg/ctx"
 	"mayfly-go/pkg/ginx"
 	"mayfly-go/pkg/utils"
+	"regexp"
 	"strconv"
 
 	"github.com/gin-gonic/gin"
@@ -34,10 +35,16 @@ func (m *Mongo) Save(rc *ctx.ReqCtx) {
 	form := &form.Mongo{}
 	ginx.BindJsonAndValid(rc.GinCtx, form)
 
-	rc.ReqParam = form
-
 	mongo := new(entity.Mongo)
 	utils.Copy(mongo, form)
+
+	// 密码脱敏记录日志
+	form.Uri = func(str string) string {
+		reg := regexp.MustCompile(`(^mongodb://.+?:)(.+)(@.+$)`)
+		return reg.ReplaceAllString(str, `${1}****${3}`)
+	}(form.Uri)
+	rc.ReqParam = form
+
 	mongo.SetBaseInfo(rc.LoginAccount)
 	m.MongoApp.Save(mongo)
 }

server/internal/devops/api/project.go

@@ -43,7 +43,8 @@ func (p *Project) GetProjects(rc *ctx.ReqCtx) {
 func (p *Project) SaveProject(rc *ctx.ReqCtx) {
 	project := &entity.Project{}
 	ginx.BindJsonAndValid(rc.GinCtx, project)
-	rc.ReqParam = project
+
+	rc.ReqParam = fmt.Sprintf("projectId: %d, projectName: %s, remark: %s", project.Id, project.Name, project.Remark)
 
 	project.SetBaseInfo(rc.LoginAccount)
 	p.ProjectApp.SaveProject(project)
@@ -81,7 +82,8 @@ func (p *Project) GetProjectMembers(rc *ctx.ReqCtx) {
 func (p *Project) SaveProjectMember(rc *ctx.ReqCtx) {
 	projectMem := &entity.ProjectMember{}
 	ginx.BindJsonAndValid(rc.GinCtx, projectMem)
-	rc.ReqParam = projectMem
+
+	rc.ReqParam = fmt.Sprintf("projectId: %d, username: %s", projectMem.ProjectId, projectMem.Username)
 
 	// 校验账号，并赋值username
 	account := &sys_entity.Account{}

server/internal/devops/api/redis.go

@@ -1,6 +1,7 @@
 package api
 
 import (
+	"context"
 	"mayfly-go/internal/devops/api/form"
 	"mayfly-go/internal/devops/api/vo"
 	"mayfly-go/internal/devops/application"
@@ -11,7 +12,10 @@ import (
 	"mayfly-go/pkg/utils"
 	"strconv"
 	"strings"
+	"sync"
 	"time"
+
+	"github.com/go-redis/redis/v8"
 )
 
 type Redis struct {
@@ -32,20 +36,69 @@ 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)
+
+	// 密码解密，并使用解密后的赋值
+	originPwd, err := utils.DefaultRsaDecrypt(redis.Password, true)
+	biz.ErrIsNilAppendErr(err, "解密密码错误: %s")
+	redis.Password = originPwd
+
+	// 密码脱敏记录日志
+	form.Password = "****"
+	rc.ReqParam = form
+
 	redis.SetBaseInfo(rc.LoginAccount)
 	r.RedisApp.Save(redis)
 }
 
+// 获取redis实例密码，由于数据库是加密存储，故提供该接口展示原文密码
+func (r *Redis) GetRedisPwd(rc *ctx.ReqCtx) {
+	rid := uint64(ginx.PathParamInt(rc.GinCtx, "id"))
+	re := r.RedisApp.GetById(rid, "Password")
+	re.PwdDecrypt()
+	rc.ResData = re.Password
+}
+
 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()
+	ri := r.RedisApp.GetRedisInstance(uint64(ginx.PathParamInt(rc.GinCtx, "id")))
+
+	var res string
+	var err error
+
+	ctx := context.Background()
+	if ri.Mode == "" || ri.Mode == entity.RedisModeStandalone {
+		res, err = ri.Cli.Info(ctx).Result()
+	} else if ri.Mode == entity.RedisModeCluster {
+		host := rc.GinCtx.Query("host")
+		biz.NotEmpty(host, "集群模式host信息不能为空")
+		clusterClient := ri.ClusterCli
+		var redisClient *redis.Client
+		// 遍历集群的master节点找到该redis client
+		clusterClient.ForEachMaster(ctx, func(ctx context.Context, client *redis.Client) error {
+			if host == client.Options().Addr {
+				redisClient = client
+			}
+			return nil
+		})
+		if redisClient == nil {
+			// 遍历集群的slave节点找到该redis client
+			clusterClient.ForEachSlave(ctx, func(ctx context.Context, client *redis.Client) error {
+				if host == client.Options().Addr {
+					redisClient = client
+				}
+				return nil
+			})
+		}
+		biz.NotNil(redisClient, "该实例不在该集群中")
+		res, err = redisClient.Info(ctx).Result()
+	}
+
+	biz.ErrIsNilAppendErr(err, "获取redis info失败: %s")
 
 	datas := strings.Split(res, "\r\n")
 	i := 0
@@ -81,43 +134,125 @@ func (r *Redis) RedisInfo(rc *ctx.ReqCtx) {
 	rc.ResData = parseMap
 }
 
+func (r *Redis) ClusterInfo(rc *ctx.ReqCtx) {
+	g := rc.GinCtx
+	ri := r.RedisApp.GetRedisInstance(uint64(ginx.PathParamInt(g, "id")))
+	biz.IsEquals(ri.Mode, entity.RedisModeCluster, "非集群模式")
+	info, _ := ri.ClusterCli.ClusterInfo(context.Background()).Result()
+	nodesStr, _ := ri.ClusterCli.ClusterNodes(context.Background()).Result()
+
+	nodesRes := make([]map[string]string, 0)
+	nodes := strings.Split(nodesStr, "\n")
+	for _, node := range nodes {
+		if node == "" {
+			continue
+		}
+		nodeInfos := strings.Split(node, " ")
+		node := make(map[string]string)
+		node["nodeId"] = nodeInfos[0]
+		// ip:port1@port2：port1指redis服务器与客户端通信的端口，port2则是集群内部节点间通信的端口
+		node["ip"] = nodeInfos[1]
+		node["flags"] = nodeInfos[2]
+		// 如果节点是slave，并且已知master节点，则为master节点ID；否则为符号"-"
+		node["masterSlaveRelation"] = nodeInfos[3]
+		// 最近一次发送ping的时间，这个时间是一个unix毫秒时间戳，0代表没有发送过
+		node["pingSent"] = nodeInfos[4]
+		// 最近一次收到pong的时间，使用unix时间戳表示
+		node["pongRecv"] = nodeInfos[5]
+		// 节点的epoch值（如果该节点是从节点，则为其主节点的epoch值）。每当节点发生失败切换时，都会创建一个新的，独特的，递增的epoch。
+		// 如果多个节点竞争同一个哈希槽时，epoch值更高的节点会抢夺到
+		node["configEpoch"] = nodeInfos[6]
+		// node-to-node集群总线使用的链接的状态，我们使用这个链接与集群中其他节点进行通信.值可以是 connected 和 disconnected
+		node["linkState"] = nodeInfos[7]
+		// slave节点没有插槽信息
+		if len(nodeInfos) > 8 {
+			// slot：master节点第9位为哈希槽值或者一个哈希槽范围，代表当前节点可以提供服务的所有哈希槽值。如果只是一个值,那就是只有一个槽会被使用。
+			// 如果是一个范围，这个值表示为起始槽-结束槽，节点将处理包括起始槽和结束槽在内的所有哈希槽。
+			node["slot"] = nodeInfos[8]
+		}
+		nodesRes = append(nodesRes, node)
+	}
+	rc.ResData = map[string]interface{}{
+		"clusterInfo":  info,
+		"clusterNodes": nodesRes,
+	}
+}
+
 // 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")))
+	form := &form.RedisScanForm{}
+	ginx.BindJsonAndValid(rc.GinCtx, form)
 
-	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), ".")
-	}
+	cmd := ri.GetCmdable()
+	ctx := context.Background()
 
 	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)
+	var cursorRes map[string]uint64 = make(map[string]uint64)
+
+	if ri.Mode == "" || ri.Mode == entity.RedisModeStandalone || ri.Mode == entity.RedisModeSentinel {
+		redisAddr := ri.Cli.Options().Addr
+		keys, cursor := ri.Scan(form.Cursor[redisAddr], form.Match, form.Count)
+		cursorRes[redisAddr] = cursor
+
+		var keyInfoSplit []string
+		if len(keys) > 0 {
+			keyInfosLua := `local result = {}
+							-- KEYS[1]为第1个参数,lua数组下标从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, err := cmd.Eval(ctx, keyInfosLua, keys).Result()
+			biz.ErrIsNilAppendErr(err, "执行lua脚本获取key信息失败: %s")
+			keyInfoSplit = strings.Split(keyInfos.(string), ".")
+		}
+
+		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)
+		}
+	} else if ri.Mode == entity.RedisModeCluster {
+		var keys []string
+
+		mu := &sync.Mutex{}
+		// 遍历所有master节点，并执行scan命令，合并keys
+		ri.ClusterCli.ForEachMaster(ctx, func(ctx context.Context, client *redis.Client) error {
+			redisAddr := client.Options().Addr
+			ks, cursor, _ := client.Scan(ctx, form.Cursor[redisAddr], form.Match, form.Count).Result()
+			// 遍历节点的内部回调函数使用异步调用，如不加锁会导致集合并发错误
+			mu.Lock()
+			cursorRes[redisAddr] = cursor
+			keys = append(keys, ks...)
+			mu.Unlock()
+			return nil
+		})
+
+		// 因为redis集群模式执行lua脚本key必须位于同一slot中，故单机获取的方式不适合
+		// 使用lua获取key的ttl以及类型，减少网络调用
+		keyInfoLua := `local ttl = redis.call('ttl', KEYS[1]);
+					   local keyType = redis.call('type', KEYS[1]);
+					   return string.format("%d,%s", ttl, keyType['ok'])`
+		for _, k := range keys {
+			keyInfo, err := cmd.Eval(ctx, keyInfoLua, []string{k}).Result()
+			biz.ErrIsNilAppendErr(err, "执行lua脚本获取key信息失败: %s")
+			ttlType := strings.Split(keyInfo.(string), ",")
+			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}
+	size, _ := cmd.DBSize(context.TODO()).Result()
+	rc.ResData = &vo.Keys{Cursor: cursorRes, Keys: kis, DbSize: size}
 }
 
 func (r *Redis) DeleteKey(rc *ctx.ReqCtx) {
@@ -129,7 +264,7 @@ func (r *Redis) DeleteKey(rc *ctx.ReqCtx) {
 	biz.ErrIsNilAppendErr(r.ProjectApp.CanAccess(rc.LoginAccount.Id, ri.ProjectId), "%s")
 
 	rc.ReqParam = key
-	ri.Cli.Del(key)
+	ri.GetCmdable().Del(context.Background(), key)
 }
 
 func (r *Redis) checkKey(rc *ctx.ReqCtx) (*application.RedisInstance, string) {
@@ -145,18 +280,11 @@ func (r *Redis) checkKey(rc *ctx.ReqCtx) (*application.RedisInstance, string) {
 
 func (r *Redis) GetStringValue(rc *ctx.ReqCtx) {
 	ri, key := r.checkKey(rc)
-	str, err := ri.Cli.Get(key).Result()
+	str, err := ri.GetCmdable().Get(context.TODO(), 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)
@@ -165,11 +293,50 @@ func (r *Redis) SetStringValue(rc *ctx.ReqCtx) {
 	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()
+	str, err := ri.GetCmdable().Set(context.TODO(), keyValue.Key, keyValue.Value, time.Second*time.Duration(keyValue.Timed)).Result()
 	biz.ErrIsNilAppendErr(err, "保存字符串值失败: %s")
 	rc.ResData = str
 }
 
+func (r *Redis) Hscan(rc *ctx.ReqCtx) {
+	ri, key := r.checkKey(rc)
+	g := rc.GinCtx
+	count := ginx.QueryInt(g, "count", 10)
+	match := g.Query("match")
+	cursor := ginx.QueryInt(g, "cursor", 0)
+	contextTodo := context.TODO()
+
+	cmdable := ri.GetCmdable()
+	keys, nextCursor, err := cmdable.HScan(contextTodo, key, uint64(cursor), match, int64(count)).Result()
+	biz.ErrIsNilAppendErr(err, "hcan err: %s")
+	keySize, err := cmdable.HLen(contextTodo, key).Result()
+	biz.ErrIsNilAppendErr(err, "hlen err: %s")
+
+	rc.ResData = map[string]interface{}{
+		"keys":    keys,
+		"cursor":  nextCursor,
+		"keySize": keySize,
+	}
+}
+
+func (r *Redis) Hdel(rc *ctx.ReqCtx) {
+	ri, key := r.checkKey(rc)
+	field := rc.GinCtx.Query("field")
+
+	delRes, err := ri.GetCmdable().HDel(context.TODO(), key, field).Result()
+	biz.ErrIsNilAppendErr(err, "hdel err: %s")
+	rc.ResData = delRes
+}
+
+func (r *Redis) Hget(rc *ctx.ReqCtx) {
+	ri, key := r.checkKey(rc)
+	field := rc.GinCtx.Query("field")
+
+	res, err := ri.GetCmdable().HGet(context.TODO(), key, field).Result()
+	biz.ErrIsNilAppendErr(err, "hget err: %s")
+	rc.ResData = res
+}
+
 func (r *Redis) SetHashValue(rc *ctx.ReqCtx) {
 	g := rc.GinCtx
 	hashValue := new(form.HashValue)
@@ -178,21 +345,21 @@ func (r *Redis) SetHashValue(rc *ctx.ReqCtx) {
 	ri := r.RedisApp.GetRedisInstance(uint64(ginx.PathParamInt(g, "id")))
 	biz.ErrIsNilAppendErr(r.ProjectApp.CanAccess(rc.LoginAccount.Id, ri.ProjectId), "%s")
 
+	cmd := ri.GetCmdable()
 	key := hashValue.Key
-	// 简单处理->先删除，后新增
-	ri.Cli.Del(key)
+	contextTodo := context.TODO()
 	for _, v := range hashValue.Value {
-		res := ri.Cli.HSet(key, v["key"].(string), v["value"])
+		res := cmd.HSet(contextTodo, key, v["field"].(string), v["value"])
 		biz.ErrIsNilAppendErr(res.Err(), "保存hash值失败: %s")
 	}
-	if hashValue.Timed != -1 {
-		ri.Cli.Expire(key, time.Second*time.Duration(hashValue.Timed))
+	if hashValue.Timed != 0 && hashValue.Timed != -1 {
+		cmd.Expire(context.TODO(), 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()
+	res, err := ri.GetCmdable().SMembers(context.TODO(), key).Result()
 	biz.ErrIsNilAppendErr(err, "获取set值失败: %s")
 	rc.ResData = res
 }
@@ -204,13 +371,14 @@ func (r *Redis) SetSetValue(rc *ctx.ReqCtx) {
 
 	ri := r.RedisApp.GetRedisInstance(uint64(ginx.PathParamInt(g, "id")))
 	biz.ErrIsNilAppendErr(r.ProjectApp.CanAccess(rc.LoginAccount.Id, ri.ProjectId), "%s")
+	cmd := ri.GetCmdable()
 
 	key := keyvalue.Key
 	// 简单处理->先删除，后新增
-	ri.Cli.Del(key)
-	ri.Cli.SAdd(key, keyvalue.Value...)
+	cmd.Del(context.TODO(), key)
+	cmd.SAdd(context.TODO(), key, keyvalue.Value...)
 
 	if keyvalue.Timed != -1 {
-		ri.Cli.Expire(key, time.Second*time.Duration(keyvalue.Timed))
+		cmd.Expire(context.TODO(), key, time.Second*time.Duration(keyvalue.Timed))
 	}
 }

server/internal/devops/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/devops/api/vo/redis.go

@@ -5,21 +5,25 @@ 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"`
+	Host               *string    `json:"host"`
+	Db                 int        `json:"db"`
+	ProjectId          *int64     `json:"projectId"`
+	Project            *string    `json:"project"`
+	Mode               *string    `json:"mode"`
+	EnableSshTunnel    *int8      `json:"enableSshTunnel"`    // 是否启用ssh隧道
+	SshTunnelMachineId *uint64    `json:"sshTunnelMachineId"` // ssh隧道机器id
+	Remark             *string    `json:"remark"`
+	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"`
+	Cursor map[string]uint64 `json:"cursor"`
+	Keys   []*KeyInfo        `json:"keys"`
+	DbSize int64             `json:"dbSize"`
 }
 
 type KeyInfo struct {

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

@@ -15,22 +15,26 @@ type AccountVO struct {
 
 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"`
+	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"`
+	AuthMethod         *int8      `json:"authMethod"`
+	Status             *int8      `json:"status"`
+	EnableSshTunnel    *int8      `json:"enableSshTunnel"`    // 是否启用ssh隧道
+	SshTunnelMachineId *uint64    `json:"sshTunnelMachineId"` // ssh隧道机器id
+	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"`
+	EnableRecorder     int8       `json:"enableRecorder"`
 }
 
 type MachineScriptVO struct {
@@ -56,6 +60,7 @@ type MachineFileInfo struct {
 	Path string `json:"path"`
 	Size int64  `json:"size"`
 	Type string `json:"type"`
+	Mode string `json:"mode"`
 }
 
 type RoleVO struct {

server/internal/devops/application/db_app.go

@@ -1,22 +1,29 @@
 package application
 
 import (
+	"context"
 	"database/sql"
 	"errors"
 	"fmt"
+	"mayfly-go/internal/constant"
 	"mayfly-go/internal/devops/domain/entity"
 	"mayfly-go/internal/devops/domain/repository"
+	"mayfly-go/internal/devops/infrastructure/machine"
 	"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"
+	"net"
 	"reflect"
 	"strconv"
 	"strings"
 	"sync"
 	"time"
+
+	"github.com/go-sql-driver/mysql"
+	"github.com/lib/pq"
 )
 
 type Db interface {
@@ -40,6 +47,9 @@ type Db interface {
 	// @param id 数据库实例id
 	// @param db 数据库
 	GetDbInstance(id uint64, db string) *DbInstance
+
+	// 获取数据库实例的所有数据库列表
+	GetDatabases(entity *entity.Db) []string
 }
 
 type dbAppImpl struct {
@@ -73,10 +83,11 @@ func (d *dbAppImpl) GetById(id uint64, cols ...string) *entity.Db {
 
 func (d *dbAppImpl) Save(dbEntity *entity.Db) {
 	// 默认tcp连接
-	dbEntity.Network = "tcp"
+	dbEntity.Network = dbEntity.GetNetwork()
+
 	// 测试连接
 	if dbEntity.Password != "" {
-		TestConnection(*dbEntity)
+		TestConnection(dbEntity)
 	}
 
 	// 查找是否存在该库
@@ -86,6 +97,7 @@ func (d *dbAppImpl) Save(dbEntity *entity.Db) {
 	if dbEntity.Id == 0 {
 		biz.NotEmpty(dbEntity.Password, "密码不能为空")
 		biz.IsTrue(err != nil, "该数据库实例已存在")
+		dbEntity.PwdEncrypt()
 		d.dbRepo.Insert(dbEntity)
 		return
 	}
@@ -100,6 +112,8 @@ func (d *dbAppImpl) Save(dbEntity *entity.Db) {
 
 	var oldDbs []interface{}
 	for _, v := range strings.Split(old.Database, " ") {
+		// 关闭数据库连接
+		CloseDb(dbEntity.Id, v)
 		oldDbs = append(oldDbs, v)
 	}
 
@@ -112,14 +126,12 @@ func (d *dbAppImpl) Save(dbEntity *entity.Db) {
 		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)})
 	}
 
+	dbEntity.PwdEncrypt()
 	d.dbRepo.Update(dbEntity)
-
 }
 
 func (d *dbAppImpl) Delete(id uint64) {
@@ -134,11 +146,35 @@ func (d *dbAppImpl) Delete(id uint64) {
 	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 {
-	mutex.Lock()
-	defer mutex.Unlock()
 	// Id不为0，则为需要缓存
 	needCache := id != 0
 	if needCache {
@@ -147,20 +183,23 @@ func (da *dbAppImpl) GetDbInstance(id uint64, db string) *DbInstance {
 			return load.(*DbInstance)
 		}
 	}
+	mutex.Lock()
+	defer mutex.Unlock()
 
 	d := da.GetById(id)
+	// 密码解密
+	d.PwdDecrypt()
 	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 {
+	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", perr.Error())))
+		panic(biz.NewBizErr(fmt.Sprintf("数据库连接失败: %s", err.Error())))
 	}
 
 	// 最大连接周期，超过时间的连接就close
@@ -170,8 +209,8 @@ func (da *dbAppImpl) GetDbInstance(id uint64, db string) *DbInstance {
 	// 设置闲置连接数
 	DB.SetMaxIdleConns(1)
 
-	cacheKey := GetDbCacheKey(id, db)
-	dbi := &DbInstance{Id: cacheKey, Type: d.Type, ProjectId: d.ProjectId, db: DB}
+	dbi.db = DB
+	global.Log.Infof("连接db: %s:%d/%s", d.Host, d.Port, db)
 	if needCache {
 		dbCache.Put(cacheKey, dbi)
 	}
@@ -180,14 +219,30 @@ func (da *dbAppImpl) GetDbInstance(id uint64, db string) *DbInstance {
 
 //------------------------------------------------------------------------------
 
-// 客户端连接缓存，30分钟内没有访问则会被关闭, key为数据库实例id:数据库
-var dbCache = cache.NewTimedCache(30*time.Minute, 5*time.Second).
+// 单次最大查询数据集
+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连接实例，若存在redis实例使用该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)
 }
@@ -199,40 +254,45 @@ func GetDbInstanceByCache(id string) *DbInstance {
 	return nil
 }
 
-func TestConnection(d entity.Db) {
+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)
+	DB, err := GetDbConn(d, strings.Split(d.Database, " ")[0])
+	biz.ErrIsNilAppendErr(err, "数据库连接失败: %s")
 	defer DB.Close()
-	perr := DB.Ping()
-	biz.ErrIsNilAppendErr(perr, "数据库连接失败: %s")
 }
 
-// db实例
-type DbInstance struct {
-	Id        string
-	Type      string
-	ProjectId uint64
-	db        *sql.DB
+// 获取数据库连接
+func GetDbConn(d *entity.Db, db string) (*sql.DB, error) {
+	// SSH Conect
+	if d.EnableSshTunnel == 1 && d.SshTunnelMachineId != 0 {
+		sshTunnelMachine := MachineApp.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
 }
 
-// 执行查询语句
-// 依次返回 列名数组，结果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")
-
-	if !isSelect && !isShow {
-		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)
+func SelectDataByDb(db *sql.DB, selectSql string) ([]string, []map[string]interface{}, error) {
+	rows, err := db.Query(selectSql)
 	if err != nil {
 		return nil, nil, err
 	}
@@ -258,7 +318,11 @@ func (d *DbInstance) SelectData(execSql string) ([]string, []map[string]interfac
 	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 {
@@ -272,14 +336,14 @@ func (d *DbInstance) SelectData(execSql string) ([]string, []map[string]interfac
 			colName := colType.Name()
 			// 字段类型名
 			colScanType := colType.ScanType().Name()
-
-			// 如果是密码字段，则脱敏显示
-			if colName == "password" {
-				v = []byte("******")
-			}
+			// 如果是第一行，则将列名加入到列信息中，由于map是无序的，所有需要返回列名的有序数组
 			if isFirst {
 				colNames = append(colNames, colName)
 			}
+			if v == nil {
+				rowData[colName] = nil
+				continue
+			}
 			// 这里把[]byte数据转成string
 			stringV := string(v)
 			if stringV == "" {
@@ -318,6 +382,45 @@ func (d *DbInstance) SelectData(execSql string) ([]string, []map[string]interfac
 	return colNames, result, nil
 }
 
+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) {
+	execSql = strings.Trim(execSql, " ")
+	isSelect := strings.HasPrefix(execSql, "SELECT") || strings.HasPrefix(execSql, "select")
+	isShow := strings.HasPrefix(execSql, "show")
+	isExplain := strings.HasPrefix(execSql, "explain")
+
+	if !isSelect && !isShow && !isExplain {
+		return nil, nil, errors.New("该sql非查询语句")
+	}
+	return SelectDataByDb(d.db, execSql)
+}
+
 // 执行 update, insert, delete，建表等sql
 // 返回影响条数和错误
 func (d *DbInstance) Exec(sql string) (int64, error) {
@@ -328,15 +431,45 @@ func (d *DbInstance) Exec(sql string) (int64, error) {
 	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() {
-	d.db.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) 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)
+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 ""
 }
@@ -346,49 +479,72 @@ 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())`
+	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())`
+    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'`
-
-	// 默认每次查询列元信息数量
-	DEFAULT_COLUMN_SIZE = 2000
+    WHERE table_schema = (SELECT database()) AND table_name = '%s' LIMIT 500`
 
 	// mysql 列信息元数据
-	MYSQL_COLOUMN_MA = `SELECT table_name tableName, column_name columnName, column_type columnType,
+	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`
+	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)
+type MysqlMetadata struct {
+	di *DbInstance
+}
+
+// 获取表基础元信息, 如表名等
+func (mm *MysqlMetadata) GetTables() []map[string]interface{} {
+	_, res, _ := mm.di.SelectData(MYSQL_TABLE_MA)
 	return res
 }
 
-func (d *DbInstance) GetColumnMetadatas(tableNames ...string) []map[string]interface{} {
+// 获取列元信息, 如列名等
+func (mm *MysqlMetadata) GetColumns(tableNames ...string) []map[string]interface{} {
 	var sql, tableName string
 	for i := 0; i < len(tableNames); i++ {
 		if i != 0 {
@@ -397,61 +553,162 @@ func (d *DbInstance) GetColumnMetadatas(tableNames ...string) []map[string]inter
 		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++
+	pageNum := 1
+	// 如果大于一个表，则统计列数并分页获取
+	if len(tableNames) > 1 {
+		countSql := fmt.Sprintf(MYSQL_COLOUMN_MA_COUNT, tableName)
+		_, countRes, _ := mm.di.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)
+		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 (d *DbInstance) GetPrimaryKey(tablename string) string {
-	return d.GetColumnMetadatas(tablename)[0]["columnName"].(string)
+// 获取表主键字段名，默认第一个字段
+func (mm *MysqlMetadata) GetPrimaryKey(tablename string) string {
+	return mm.GetColumns(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)
+// 获取表信息，比GetTableMetedatas获取更详细的表信息
+func (mm *MysqlMetadata) GetTableInfos() []map[string]interface{} {
+	_, res, _ := mm.di.SelectData(MYSQL_TABLE_INFO)
 	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)
+// 获取表索引信息
+func (mm *MysqlMetadata) GetTableIndex(tableName string) []map[string]interface{} {
+	_, res, _ := mm.di.SelectData(MYSQL_INDEX_INFO)
 	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)
+// 获取建表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 := 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(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(PGSQL_INDEX_INFO)
+	return res
+}
+
+// 获取建表ddl
+func (mm *PgsqlMetadata) GetCreateTableDdl(tableName string) []map[string]interface{} {
+	return nil
+}

server/internal/devops/application/db_sql_exec_app.go

@@ -3,6 +3,7 @@ package application
 import (
 	"encoding/json"
 	"fmt"
+
 	"mayfly-go/internal/devops/domain/entity"
 	"mayfly-go/internal/devops/domain/repository"
 	"mayfly-go/internal/devops/infrastructure/persistence"
@@ -89,7 +90,7 @@ func doUpdate(update *sqlparser.Update, dbInstance *DbInstance, dbSqlExec *entit
 	}
 
 	// 获取表主键列名,排除使用别名
-	primaryKey := dbInstance.GetPrimaryKey(tableName)
+	primaryKey := dbInstance.GetMeta().GetPrimaryKey(tableName)
 
 	updateColumnsAndPrimaryKey := strings.Join(updateColumns, ",") + "," + primaryKey
 	// 查询要更新字段数据的旧值，以及主键值

server/internal/devops/application/machine_app.go

@@ -32,6 +32,9 @@ type Machine interface {
 
 	// 获取机器连接
 	GetCli(id uint64) *machine.Cli
+
+	// 获取ssh隧道机器连接
+	GetSshTunnelMachine(id uint64) *machine.SshTunnelMachine
 }
 
 type machineAppImpl struct {
@@ -53,7 +56,7 @@ func (m *machineAppImpl) Count(condition *entity.Machine) int64 {
 func (m *machineAppImpl) Save(me *entity.Machine) {
 	// ’修改机器信息且密码不为空‘ or ‘新增’需要测试是否可连接
 	if (me.Id != 0 && me.Password != "") || me.Id == 0 {
-		biz.ErrIsNilAppendErr(machine.TestConn(me), "该机器无法连接: %s")
+		biz.ErrIsNilAppendErr(machine.TestConn(*me, func(u uint64) *entity.Machine { return m.GetById(u) }), "该机器无法连接: %s")
 	}
 
 	oldMachine := &entity.Machine{Ip: me.Ip, Port: me.Port, Username: me.Username}
@@ -66,11 +69,13 @@ func (m *machineAppImpl) Save(me *entity.Machine) {
 		}
 		// 关闭连接
 		machine.DeleteCli(me.Id)
+		me.PwdEncrypt()
 		m.machineRepo.UpdateById(me)
 	} else {
 		biz.IsTrue(err != nil, "该机器信息已存在")
 		// 新增机器，默认启用状态
 		me.Status = entity.MachineStatusEnable
+		me.PwdEncrypt()
 		m.machineRepo.Create(me)
 	}
 }
@@ -120,9 +125,21 @@ func (m *machineAppImpl) GetById(id uint64, cols ...string) *entity.Machine {
 func (m *machineAppImpl) GetCli(id uint64) *machine.Cli {
 	cli, err := machine.GetCli(id, func(machineId uint64) *entity.Machine {
 		machine := m.GetById(machineId)
+		machine.PwdDecrypt()
 		biz.IsTrue(machine.Status == entity.MachineStatusEnable, "该机器已被停用")
 		return machine
 	})
 	biz.ErrIsNilAppendErr(err, "获取客户端错误: %s")
 	return cli
 }
+
+func (m *machineAppImpl) GetSshTunnelMachine(id uint64) *machine.SshTunnelMachine {
+	sshTunnel, err := machine.GetSshTunnelMachine(id, func(machineId uint64) *entity.Machine {
+		machine := m.GetById(machineId)
+		machine.PwdDecrypt()
+		biz.IsTrue(machine.Status == entity.MachineStatusEnable, "该机器已被停用")
+		return machine
+	})
+	biz.ErrIsNilAppendErr(err, "获取ssh隧道连接失败: %s")
+	return sshTunnel
+}

server/internal/devops/application/machine_file_app.go

@@ -1,6 +1,7 @@
 package application
 
 import (
+	"fmt"
 	"io"
 	"io/fs"
 	"mayfly-go/internal/devops/domain/entity"
@@ -30,6 +31,12 @@ type MachineFile interface {
 
 	/**  sftp 相关操作 **/
 
+	// 创建目录
+	MkDir(fid uint64, path string)
+
+	// 创建文件
+	CreateFile(fid uint64, path string)
+
 	// 读取目录
 	ReadDir(fid uint64, path string) []fs.FileInfo
 
@@ -100,6 +107,25 @@ func (m *machineFileAppImpl) ReadDir(fid uint64, path string) []fs.FileInfo {
 	return fis
 }
 
+func (m *machineFileAppImpl) MkDir(fid uint64, path string) {
+	path, machineId := m.checkAndReturnPathMid(fid, path)
+	if !strings.HasSuffix(path, "/") {
+		path = path + "/"
+	}
+
+	sftpCli := m.getSftpCli(machineId)
+	err := sftpCli.Mkdir(path)
+	biz.ErrIsNilAppendErr(err, "创建目录失败: %s")
+}
+
+func (m *machineFileAppImpl) CreateFile(fid uint64, path string) {
+	path, machineId := m.checkAndReturnPathMid(fid, path)
+	sftpCli := m.getSftpCli(machineId)
+	file, err := sftpCli.Create(path)
+	biz.ErrIsNilAppendErr(err, "创建文件失败: %s")
+	defer file.Close()
+}
+
 func (m *machineFileAppImpl) ReadFile(fileId uint64, path string) *sftp.File {
 	path, machineId := m.checkAndReturnPathMid(fileId, path)
 	sftpCli := m.getSftpCli(machineId)
@@ -148,6 +174,11 @@ func (m *machineFileAppImpl) RemoveFile(fileId uint64, path string) {
 	fi, _ := file.Stat()
 	if fi.IsDir() {
 		err = sftpCli.RemoveDirectory(path)
+		// 如果文件夹有内容会删除失败，则使用rm -rf命令删除
+		if err != nil {
+			MachineApp.GetCli(machineId).Run(fmt.Sprintf("rm -rf %s", path))
+			err = nil
+		}
 	} else {
 		err = sftpCli.Remove(path)
 	}

server/internal/devops/application/mongo_app.go

@@ -2,13 +2,18 @@ package application
 
 import (
 	"context"
+	"mayfly-go/internal/constant"
 	"mayfly-go/internal/devops/domain/entity"
 	"mayfly-go/internal/devops/domain/repository"
+	"mayfly-go/internal/devops/infrastructure/machine"
 	"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"
+	"net"
+	"regexp"
 	"time"
 
 	"go.mongodb.org/mongo-driver/mongo"
@@ -80,36 +85,50 @@ func (d *mongoAppImpl) Save(m *entity.Mongo) {
 }
 
 func (d *mongoAppImpl) GetMongoCli(id uint64) *mongo.Client {
-	cli, err := GetMongoCli(id, func(u uint64) string {
-		mongo := d.GetById(id)
+	mongoInstance, err := GetMongoInstance(id, func(u uint64) *entity.Mongo {
+		mongo := d.GetById(u)
 		biz.NotNil(mongo, "mongo信息不存在")
-		return mongo.Uri
+		return mongo
 	})
 	biz.ErrIsNilAppendErr(err, "连接mongo失败: %s")
-	return cli
+	return mongoInstance.Cli
 }
 
 // -----------------------------------------------------------
 
-//mongo客户端连接缓存，30分钟内没有访问则会被关闭
-var mongoCliCache = cache.NewTimedCache(30*time.Minute, 5*time.Second).
+// mongo客户端连接缓存，指定时间内没有访问则会被关闭
+var mongoCliCache = cache.NewTimedCache(constant.MongoConnExpireTime, 5*time.Second).
 	WithUpdateAccessTime(true).
 	OnEvicted(func(key interface{}, value interface{}) {
-		global.Log.Info("关闭mongo连接: id = ", key)
-		value.(*mongo.Client).Disconnect(context.TODO())
+		global.Log.Info("删除mongo连接缓存: id = ", key)
+		value.(*MongoInstance).Close()
 	})
 
-func GetMongoCli(mongoId uint64, getMongoUri func(uint64) string) (*mongo.Client, error) {
-	cli, err := mongoCliCache.ComputeIfAbsent(mongoId, func(key interface{}) (interface{}, error) {
-		c, err := connect(getMongoUri(mongoId))
+func init() {
+	machine.AddCheckSshTunnelMachineUseFunc(func(machineId uint64) bool {
+		// 遍历所有mongo连接实例，若存在redis实例使用该ssh隧道机器，则返回true，表示还在使用中...
+		items := mongoCliCache.Items()
+		for _, v := range items {
+			if v.Value.(*MongoInstance).sshTunnelMachineId == machineId {
+				return true
+			}
+		}
+		return false
+	})
+}
+
+// 获取mongo的连接实例
+func GetMongoInstance(mongoId uint64, getMongoEntity func(uint64) *entity.Mongo) (*MongoInstance, error) {
+	mi, err := mongoCliCache.ComputeIfAbsent(mongoId, func(_ interface{}) (interface{}, error) {
+		c, err := connect(getMongoEntity(mongoId))
 		if err != nil {
 			return nil, err
 		}
 		return c, nil
 	})
 
-	if cli != nil {
-		return cli.(*mongo.Client), err
+	if mi != nil {
+		return mi.(*MongoInstance), err
 	}
 	return nil, err
 }
@@ -118,16 +137,64 @@ func DeleteMongoCache(mongoId uint64) {
 	mongoCliCache.Delete(mongoId)
 }
 
+type MongoInstance struct {
+	Id                 uint64
+	ProjectId          uint64
+	Cli                *mongo.Client
+	sshTunnelMachineId uint64
+}
+
+func (mi *MongoInstance) Close() {
+	if mi.Cli != nil {
+		if err := mi.Cli.Disconnect(context.Background()); err != nil {
+			global.Log.Errorf("关闭mongo实例[%d]连接失败: %s", mi.Id, err)
+		}
+		mi.Cli = nil
+	}
+}
+
 // 连接mongo，并返回client
-func connect(uri string) (*mongo.Client, error) {
-	ctx, cancel := context.WithTimeout(context.Background(), 20*time.Second)
+func connect(me *entity.Mongo) (*MongoInstance, error) {
+	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
 	defer cancel()
-	client, err := mongo.Connect(ctx, options.Client().ApplyURI(uri).SetMaxPoolSize(2))
+
+	mongoInstance := &MongoInstance{Id: me.Id, ProjectId: me.ProjectId}
+
+	mongoOptions := options.Client().ApplyURI(me.Uri).
+		SetMaxPoolSize(1)
+	// 启用ssh隧道则连接隧道机器
+	if me.EnableSshTunnel == 1 {
+		mongoInstance.sshTunnelMachineId = me.SshTunnelMachineId
+		mongoOptions.SetDialer(&MongoSshDialer{machineId: me.SshTunnelMachineId})
+	}
+
+	client, err := mongo.Connect(ctx, mongoOptions)
 	if err != nil {
+		mongoInstance.Close()
 		return nil, err
 	}
 	if err = client.Ping(context.TODO(), nil); err != nil {
+		mongoInstance.Close()
+		return nil, err
+	}
+
+	global.Log.Infof("连接mongo: %s", func(str string) string {
+		reg := regexp.MustCompile(`(^mongodb://.+?:)(.+)(@.+$)`)
+		return reg.ReplaceAllString(str, `${1}****${3}`)
+	}(me.Uri))
+	mongoInstance.Cli = client
+	return mongoInstance, err
+}
+
+type MongoSshDialer struct {
+	machineId uint64
+}
+
+func (sd *MongoSshDialer) DialContext(ctx context.Context, network, address string) (net.Conn, error) {
+	if sshConn, err := MachineApp.GetSshTunnelMachine(sd.machineId).GetDialConn(network, address); err == nil {
+		// 将ssh conn包装，否则内部部设置超时会报错,ssh conn不支持设置超时会返回错误: ssh: tcpChan: deadline not supported
+		return &utils.WrapSshConn{Conn: sshConn}, nil
+	} else {
 		return nil, err
 	}
-	return client, err
 }

server/internal/devops/application/redis_app.go

@@ -1,17 +1,23 @@
 package application
 
 import (
+	"context"
 	"fmt"
+	"mayfly-go/internal/constant"
 	"mayfly-go/internal/devops/domain/entity"
 	"mayfly-go/internal/devops/domain/repository"
+	"mayfly-go/internal/devops/infrastructure/machine"
 	"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"
+	"net"
+	"strings"
 	"time"
 
-	"github.com/go-redis/redis"
+	"github.com/go-redis/redis/v8"
 )
 
 type Redis interface {
@@ -63,7 +69,10 @@ func (r *redisAppImpl) GetRedisBy(condition *entity.Redis, cols ...string) error
 }
 
 func (r *redisAppImpl) Save(re *entity.Redis) {
-	TestRedisConnection(re)
+	// ’修改信息且密码不为空‘ or ‘新增’需要测试是否可连接
+	if (re.Id != 0 && re.Password != "") || re.Id == 0 {
+		TestRedisConnection(re)
+	}
 
 	// 查找是否存在该库
 	oldRedis := &entity.Redis{Host: re.Host, Db: re.Db}
@@ -71,6 +80,7 @@ func (r *redisAppImpl) Save(re *entity.Redis) {
 
 	if re.Id == 0 {
 		biz.IsTrue(err != nil, "该库已存在")
+		re.PwdEncrypt()
 		r.redisRepo.Insert(re)
 	} else {
 		// 如果存在该库，则校验修改的库是否为该库
@@ -79,6 +89,7 @@ func (r *redisAppImpl) Save(re *entity.Redis) {
 		}
 		// 先关闭数据库连接
 		CloseRedis(re.Id)
+		re.PwdEncrypt()
 		r.redisRepo.Update(re)
 	}
 }
@@ -101,61 +112,200 @@ func (r *redisAppImpl) GetRedisInstance(id uint64) *RedisInstance {
 	}
 	// 缓存不存在，则回调获取redis信息
 	re := r.GetById(id)
+	re.PwdDecrypt()
 	biz.NotNil(re, "redis信息不存在")
+
+	redisMode := re.Mode
+	var ri *RedisInstance
+	if redisMode == "" || redisMode == entity.RedisModeStandalone {
+		ri = getRedisCient(re)
+		// 测试连接
+		_, e := ri.Cli.Ping(context.Background()).Result()
+		if e != nil {
+			ri.Close()
+			panic(biz.NewBizErr(fmt.Sprintf("redis连接失败: %s", e.Error())))
+		}
+	} else if redisMode == entity.RedisModeCluster {
+		ri = getRedisClusterClient(re)
+		// 测试连接
+		_, e := ri.ClusterCli.Ping(context.Background()).Result()
+		if e != nil {
+			ri.Close()
+			panic(biz.NewBizErr(fmt.Sprintf("redis集群连接失败: %s", e.Error())))
+		}
+	} else if redisMode == entity.RedisModeSentinel {
+		ri = getRedisSentinelCient(re)
+		// 测试连接
+		_, e := ri.Cli.Ping(context.Background()).Result()
+		if e != nil {
+			ri.Close()
+			panic(biz.NewBizErr(fmt.Sprintf("redis sentinel连接失败: %s", e.Error())))
+		}
+	}
+
 	global.Log.Infof("连接redis: %s", re.Host)
-
-	rcli := redis.NewClient(&redis.Options{
-		Addr:     re.Host,
-		Password: re.Password, // no password set
-		DB:       re.Db,       // use default DB
-	})
-	// 测试连接
-	_, e := rcli.Ping().Result()
-	biz.ErrIsNilAppendErr(e, "redis连接失败: %s")
-
-	ri := &RedisInstance{Id: id, ProjectId: re.ProjectId, Cli: rcli}
 	if needCache {
 		redisCache.Put(re.Id, ri)
 	}
 	return ri
 }
 
+func getRedisCient(re *entity.Redis) *RedisInstance {
+	ri := &RedisInstance{Id: re.Id, ProjectId: re.ProjectId, Mode: re.Mode}
+
+	redisOptions := &redis.Options{
+		Addr:         re.Host,
+		Password:     re.Password, // no password set
+		DB:           re.Db,       // use default DB
+		DialTimeout:  8 * time.Second,
+		ReadTimeout:  -1, // Disable timeouts, because SSH does not support deadlines.
+		WriteTimeout: -1,
+	}
+	if re.EnableSshTunnel == 1 {
+		ri.sshTunnelMachineId = re.SshTunnelMachineId
+		redisOptions.Dialer = getRedisDialer(re.SshTunnelMachineId)
+	}
+	ri.Cli = redis.NewClient(redisOptions)
+	return ri
+}
+
+func getRedisClusterClient(re *entity.Redis) *RedisInstance {
+	ri := &RedisInstance{Id: re.Id, ProjectId: re.ProjectId, Mode: re.Mode}
+
+	redisClusterOptions := &redis.ClusterOptions{
+		Addrs:       strings.Split(re.Host, ","),
+		Password:    re.Password,
+		DialTimeout: 8 * time.Second,
+	}
+	if re.EnableSshTunnel == 1 {
+		ri.sshTunnelMachineId = re.SshTunnelMachineId
+		redisClusterOptions.Dialer = getRedisDialer(re.SshTunnelMachineId)
+	}
+	ri.ClusterCli = redis.NewClusterClient(redisClusterOptions)
+	return ri
+}
+
+func getRedisSentinelCient(re *entity.Redis) *RedisInstance {
+	ri := &RedisInstance{Id: re.Id, ProjectId: re.ProjectId, Mode: re.Mode}
+	// sentinel模式host为 masterName=host:port,host:port
+	masterNameAndHosts := strings.Split(re.Host, "=")
+	sentinelOptions := &redis.FailoverOptions{
+		MasterName:    masterNameAndHosts[0],
+		SentinelAddrs: strings.Split(masterNameAndHosts[1], ","),
+		Password:      re.Password, // no password set
+		DB:            re.Db,       // use default DB
+		DialTimeout:   8 * time.Second,
+		ReadTimeout:   -1, // Disable timeouts, because SSH does not support deadlines.
+		WriteTimeout:  -1,
+	}
+	if re.EnableSshTunnel == 1 {
+		ri.sshTunnelMachineId = re.SshTunnelMachineId
+		sentinelOptions.Dialer = getRedisDialer(re.SshTunnelMachineId)
+	}
+	ri.Cli = redis.NewFailoverClient(sentinelOptions)
+	return ri
+}
+
+func getRedisDialer(machineId uint64) func(ctx context.Context, network, addr string) (net.Conn, error) {
+	sshTunnel := MachineApp.GetSshTunnelMachine(machineId)
+	return func(_ context.Context, network, addr string) (net.Conn, error) {
+		if sshConn, err := sshTunnel.GetDialConn(network, addr); err == nil {
+			// 将ssh conn包装，否则redis内部设置超时会报错,ssh conn不支持设置超时会返回错误: ssh: tcpChan: deadline not supported
+			return &utils.WrapSshConn{Conn: sshConn}, nil
+		} else {
+			return nil, err
+		}
+	}
+}
+
 //------------------------------------------------------------------------------
 
-// redis客户端连接缓存，30分钟内没有访问则会被关闭
-var redisCache = cache.NewTimedCache(30*time.Minute, 5*time.Second).
+// redis客户端连接缓存，指定时间内没有访问则会被关闭
+var redisCache = cache.NewTimedCache(constant.RedisConnExpireTime, 5*time.Second).
 	WithUpdateAccessTime(true).
 	OnEvicted(func(key interface{}, value interface{}) {
 		global.Log.Info(fmt.Sprintf("删除redis连接缓存 id = %d", key))
-		value.(*RedisInstance).Cli.Close()
+		value.(*RedisInstance).Close()
 	})
 
-// redis实例
-type RedisInstance struct {
-	Id        uint64
-	ProjectId uint64
-	Cli       *redis.Client
-}
-
 // 移除redis连接缓存并关闭redis连接
 func CloseRedis(id uint64) {
 	redisCache.Delete(id)
 }
 
-func TestRedisConnection(re *entity.Redis) {
-	rcli := redis.NewClient(&redis.Options{
-		Addr:     re.Host,
-		Password: re.Password, // no password set
-		DB:       re.Db,       // use default DB
+func init() {
+	machine.AddCheckSshTunnelMachineUseFunc(func(machineId uint64) bool {
+		// 遍历所有redis连接实例，若存在redis实例使用该ssh隧道机器，则返回true，表示还在使用中...
+		items := redisCache.Items()
+		for _, v := range items {
+			if v.Value.(*RedisInstance).sshTunnelMachineId == machineId {
+				return true
+			}
+		}
+		return false
 	})
-	defer rcli.Close()
+}
+
+func TestRedisConnection(re *entity.Redis) {
+	var cmd redis.Cmdable
+	if re.Mode == "" || re.Mode == entity.RedisModeStandalone {
+		rcli := getRedisCient(re)
+		defer rcli.Close()
+		cmd = rcli.Cli
+	} else if re.Mode == entity.RedisModeCluster {
+		ccli := getRedisClusterClient(re)
+		defer ccli.Close()
+		cmd = ccli.ClusterCli
+	} else if re.Mode == entity.RedisModeSentinel {
+		rcli := getRedisSentinelCient(re)
+		defer rcli.Close()
+		cmd = rcli.Cli
+	}
+
 	// 测试连接
-	_, e := rcli.Ping().Result()
+	_, e := cmd.Ping(context.Background()).Result()
 	biz.ErrIsNilAppendErr(e, "Redis连接失败: %s")
 }
 
+// redis实例
+type RedisInstance struct {
+	Id                 uint64
+	ProjectId          uint64
+	Mode               string
+	Cli                *redis.Client
+	ClusterCli         *redis.ClusterClient
+	sshTunnelMachineId uint64
+}
+
+// 获取命令执行接口的具体实现
+func (r *RedisInstance) GetCmdable() redis.Cmdable {
+	redisMode := r.Mode
+	if redisMode == "" || redisMode == entity.RedisModeStandalone || r.Mode == entity.RedisModeSentinel {
+		return r.Cli
+	}
+	if redisMode == entity.RedisModeCluster {
+		return r.ClusterCli
+	}
+	return nil
+}
+
 func (r *RedisInstance) Scan(cursor uint64, match string, count int64) ([]string, uint64) {
-	keys, newcursor, err := r.Cli.Scan(cursor, match, count).Result()
+	keys, newcursor, err := r.GetCmdable().Scan(context.Background(), cursor, match, count).Result()
 	biz.ErrIsNilAppendErr(err, "scan失败: %s")
 	return keys, newcursor
 }
+
+func (r *RedisInstance) Close() {
+	if r.Mode == entity.RedisModeStandalone || r.Mode == entity.RedisModeSentinel {
+		if err := r.Cli.Close(); err != nil {
+			global.Log.Errorf("关闭redis单机实例[%d]连接失败: %s", r.Id, err.Error())
+		}
+		r.Cli = nil
+	}
+	if r.Mode == entity.RedisModeCluster {
+		if err := r.ClusterCli.Close(); err != nil {
+			global.Log.Errorf("关闭redis集群实例[%d]连接失败: %s", r.Id, err.Error())
+		}
+		r.ClusterCli = nil
+	}
+}

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

@@ -1,6 +1,8 @@
 package entity
 
 import (
+	"fmt"
+	"mayfly-go/internal/common/utils"
 	"mayfly-go/pkg/model"
 )
 
@@ -15,8 +17,40 @@ type Db struct {
 	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/devops/domain/entity/machine.go

@@ -1,23 +1,40 @@
 package entity
 
 import (
+	"mayfly-go/internal/common/utils"
 	"mayfly-go/pkg/model"
 )
 
 type Machine struct {
 	model.Model
-	ProjectId   uint64 `json:"projectId"`
-	ProjectName string `json:"projectName"`
-	Name        string `json:"name"`
-	Ip          string `json:"ip"`       // IP地址
-	Username    string `json:"username"` // 用户名
-	Password    string `json:"-"`
-	Port        int    `json:"port"`   // 端口号
-	Status      int8   `json:"status"` // 状态 1:启用；2:停用
-	Remark      string `json:"remark"` // 备注
+	ProjectId          uint64 `json:"projectId"`
+	ProjectName        string `json:"projectName"`
+	Name               string `json:"name"`
+	Ip                 string `json:"ip"`         // IP地址
+	Username           string `json:"username"`   // 用户名
+	AuthMethod         int8   `json:"authMethod"` // 授权认证方式
+	Password           string `json:"-"`
+	Port               int    `json:"port"`               // 端口号
+	Status             int8   `json:"status"`             // 状态 1:启用；2:停用
+	Remark             string `json:"remark"`             // 备注
+	EnableSshTunnel    int8   `json:"enableSshTunnel"`    // 是否启用ssh隧道
+	SshTunnelMachineId uint64 `json:"sshTunnelMachineId"` // ssh隧道机器id
+	EnableRecorder     int8   `json:"enableRecorder"`     // 是否启用终端回放记录
 }
 
 const (
-	MachineStatusEnable  int8 = 1  // 启用状态
-	MachineStatusDisable int8 = -1 // 禁用状态
+	MachineStatusEnable        int8 = 1  // 启用状态
+	MachineStatusDisable       int8 = -1 // 禁用状态
+	MachineAuthMethodPassword  int8 = 1  // 密码登录
+	MachineAuthMethodPublicKey int8 = 2  // 公钥免密登录
 )
+
+func (m *Machine) PwdEncrypt() {
+	// 密码替换为加密后的密码
+	m.Password = utils.PwdAesEncrypt(m.Password)
+}
+
+func (m *Machine) PwdDecrypt() {
+	// 密码替换为解密后的密码
+	m.Password = utils.PwdAesDecrypt(m.Password)
+}

server/internal/devops/domain/entity/mongo.go

@@ -5,10 +5,12 @@ import "mayfly-go/pkg/model"
 type Mongo struct {
 	model.Model
 
-	Name      string `orm:"column(name)" json:"name"`
-	Uri       string `orm:"column(uri)" json:"uri"`
-	ProjectId uint64 `json:"projectId"`
-	Project   string `json:"project"`
-	EnvId     uint64 `json:"envId"`
-	Env       string `json:"env"`
+	Name               string `orm:"column(name)" json:"name"`
+	Uri                string `orm:"column(uri)" json:"uri"`
+	EnableSshTunnel    int8   `orm:"column(enable_ssh_tunnel)" json:"enableSshTunnel"`        // 是否启用ssh隧道
+	SshTunnelMachineId uint64 `orm:"column(ssh_tunnel_machine_id)" json:"sshTunnelMachineId"` // ssh隧道机器id
+	ProjectId          uint64 `json:"projectId"`
+	Project            string `json:"project"`
+	EnvId              uint64 `json:"envId"`
+	Env                string `json:"env"`
 }

server/internal/devops/domain/entity/redis.go

@@ -1,17 +1,38 @@
 package entity
 
 import (
+	"mayfly-go/internal/common/utils"
 	"mayfly-go/pkg/model"
 )
 
 type Redis struct {
 	model.Model
 
-	Host      string `orm:"column(host)" json:"host"`
-	Password  string `orm:"column(password)" json:"-"`
-	Db        int    `orm:"column(database)" json:"db"`
-	ProjectId uint64
-	Project   string
-	EnvId     uint64
-	Env       string
+	Host               string `orm:"column(host)" json:"host"`
+	Mode               string `json:"mode"`
+	Password           string `orm:"column(password)" json:"-"`
+	Db                 int    `orm:"column(database)" json:"db"`
+	EnableSshTunnel    int8   `orm:"column(enable_ssh_tunnel)" json:"enableSshTunnel"`        // 是否启用ssh隧道
+	SshTunnelMachineId uint64 `orm:"column(ssh_tunnel_machine_id)" json:"sshTunnelMachineId"` // ssh隧道机器id
+	Remark             string
+	ProjectId          uint64
+	Project            string
+	EnvId              uint64
+	Env                string
+}
+
+const (
+	RedisModeStandalone = "standalone"
+	RedisModeCluster    = "cluster"
+	RedisModeSentinel   = "sentinel"
+)
+
+func (r *Redis) PwdEncrypt() {
+	// 密码替换为加密后的密码
+	r.Password = utils.PwdAesEncrypt(r.Password)
+}
+
+func (r *Redis) PwdDecrypt() {
+	// 密码替换为解密后的密码
+	r.Password = utils.PwdAesDecrypt(r.Password)
 }

server/internal/devops/infrastructure/machine/machine.go

@@ -3,6 +3,7 @@ package machine
 import (
 	"errors"
 	"fmt"
+	"mayfly-go/internal/constant"
 	"mayfly-go/internal/devops/domain/entity"
 	"mayfly-go/pkg/biz"
 	"mayfly-go/pkg/cache"
@@ -18,62 +19,12 @@ import (
 // 客户端信息
 type Cli struct {
 	machine *entity.Machine
-	// ssh客户端
-	client *ssh.Client
 
-	sftpClient *sftp.Client
-}
+	client     *ssh.Client  // ssh客户端
+	sftpClient *sftp.Client // sftp客户端
 
-// 机器客户端连接缓存，45分钟内没有访问则会被关闭
-var cliCache = cache.NewTimedCache(45*time.Minute, 5*time.Second).
-	WithUpdateAccessTime(true).
-	OnEvicted(func(key interface{}, value interface{}) {
-		value.(*Cli).Close()
-	})
-
-// 是否存在指定id的客户端连接
-func HasCli(machineId uint64) bool {
-	if _, ok := cliCache.Get(machineId); ok {
-		return true
-	}
-	return false
-}
-
-// 删除指定机器客户端，并关闭客户端连接
-func DeleteCli(id uint64) {
-	cliCache.Delete(id)
-}
-
-// 从缓存中获取客户端信息，不存在则回调获取机器信息函数，并新建
-func GetCli(machineId uint64, getMachine func(uint64) *entity.Machine) (*Cli, error) {
-	cli, err := cliCache.ComputeIfAbsent(machineId, func(key interface{}) (interface{}, error) {
-		c, err := newClient(getMachine(machineId))
-		if err != nil {
-			return nil, err
-		}
-		return c, nil
-	})
-
-	if cli != nil {
-		return cli.(*Cli), err
-	}
-	return nil, err
-}
-
-//根据机器信息创建客户端对象
-func newClient(machine *entity.Machine) (*Cli, error) {
-	if machine == nil {
-		return nil, errors.New("机器不存在")
-	}
-
-	global.Log.Infof("[%s]机器连接：%s:%d", machine.Name, machine.Ip, machine.Port)
-	cli := new(Cli)
-	cli.machine = machine
-	err := cli.connect()
-	if err != nil {
-		return nil, err
-	}
-	return cli, nil
+	enableSshTunnel    int8
+	sshTunnelMachineId uint64
 }
 
 //连接
@@ -83,16 +34,7 @@ func (c *Cli) connect() error {
 		return nil
 	}
 	m := c.machine
-	config := ssh.ClientConfig{
-		User: m.Username,
-		Auth: []ssh.AuthMethod{ssh.Password(m.Password)},
-		HostKeyCallback: func(hostname string, remote net.Addr, key ssh.PublicKey) error {
-			return nil
-		},
-		Timeout: 5 * time.Second,
-	}
-	addr := fmt.Sprintf("%s:%d", m.Ip, m.Port)
-	sshClient, err := ssh.Dial("tcp", addr, &config)
+	sshClient, err := GetSshClient(m)
 	if err != nil {
 		return err
 	}
@@ -100,26 +42,7 @@ func (c *Cli) connect() error {
 	return nil
 }
 
-// 测试连接
-func TestConn(m *entity.Machine) error {
-	config := ssh.ClientConfig{
-		User: m.Username,
-		Auth: []ssh.AuthMethod{ssh.Password(m.Password)},
-		HostKeyCallback: func(hostname string, remote net.Addr, key ssh.PublicKey) error {
-			return nil
-		},
-		Timeout: 5 * time.Second,
-	}
-	addr := fmt.Sprintf("%s:%d", m.Ip, m.Port)
-	sshClient, err := ssh.Dial("tcp", addr, &config)
-	if err != nil {
-		return err
-	}
-	defer sshClient.Close()
-	return nil
-}
-
-// 关闭client和并从缓存中移除
+// 关闭client并从缓存中移除，如果使用隧道则也关闭
 func (c *Cli) Close() {
 	m := c.machine
 	global.Log.Info(fmt.Sprintf("关闭机器客户端连接-> id: %d, name: %s, ip: %s", m.Id, m.Name, m.Ip))
@@ -131,6 +54,9 @@ func (c *Cli) Close() {
 		c.sftpClient.Close()
 		c.sftpClient = nil
 	}
+	if c.enableSshTunnel == 1 {
+		CloseSshTunnelMachine(c.sshTunnelMachineId, c.machine.Id)
+	}
 }
 
 // 获取sftp client
@@ -184,3 +110,144 @@ func (c *Cli) Run(shell string) (*string, error) {
 func (c *Cli) GetMachine() *entity.Machine {
 	return c.machine
 }
+
+// 机器客户端连接缓存，指定时间内没有访问则会被关闭
+var cliCache = cache.NewTimedCache(constant.MachineConnExpireTime, 5*time.Second).
+	WithUpdateAccessTime(true).
+	OnEvicted(func(_, value interface{}) {
+		value.(*Cli).Close()
+	})
+
+func init() {
+	AddCheckSshTunnelMachineUseFunc(func(machineId uint64) bool {
+		// 遍历所有机器连接实例，若存在机器连接实例使用该ssh隧道机器，则返回true，表示还在使用中...
+		items := cliCache.Items()
+		for _, v := range items {
+			if v.Value.(*Cli).sshTunnelMachineId == machineId {
+				return true
+			}
+		}
+		return false
+	})
+}
+
+// 是否存在指定id的客户端连接
+func HasCli(machineId uint64) bool {
+	if _, ok := cliCache.Get(machineId); ok {
+		return true
+	}
+	return false
+}
+
+// 删除指定机器客户端，并关闭客户端连接
+func DeleteCli(id uint64) {
+	cliCache.Delete(id)
+}
+
+// 从缓存中获取客户端信息，不存在则回调获取机器信息函数，并新建
+func GetCli(machineId uint64, getMachine func(uint64) *entity.Machine) (*Cli, error) {
+	cli, err := cliCache.ComputeIfAbsent(machineId, func(_ interface{}) (interface{}, error) {
+		me := getMachine(machineId)
+		err := IfUseSshTunnelChangeIpPort(me, getMachine)
+		if err != nil {
+			return nil, fmt.Errorf("ssh隧道连接失败: %s", err.Error())
+		}
+		c, err := newClient(me)
+		if err != nil {
+			CloseSshTunnelMachine(me.SshTunnelMachineId, me.Id)
+			return nil, err
+		}
+		c.enableSshTunnel = me.EnableSshTunnel
+		c.sshTunnelMachineId = me.SshTunnelMachineId
+		return c, nil
+	})
+
+	if cli != nil {
+		return cli.(*Cli), err
+	}
+	return nil, err
+}
+
+// 测试连接，使用传值的方式，而非引用。因为如果使用了ssh隧道，则ip和端口会变为本地映射地址与端口
+func TestConn(me entity.Machine, getSshTunnelMachine func(uint64) *entity.Machine) error {
+	originId := me.Id
+	if originId == 0 {
+		// 随机设置一个ip，如果使用了隧道则用于临时保存隧道
+		me.Id = uint64(time.Now().Nanosecond())
+	}
+
+	err := IfUseSshTunnelChangeIpPort(&me, getSshTunnelMachine)
+	biz.ErrIsNilAppendErr(err, "ssh隧道连接失败: %s")
+	if me.EnableSshTunnel == 1 {
+		defer CloseSshTunnelMachine(me.SshTunnelMachineId, me.Id)
+	}
+	sshClient, err := GetSshClient(&me)
+	if err != nil {
+		return err
+	}
+	defer sshClient.Close()
+	return nil
+}
+
+// 如果使用了ssh隧道，则修改机器ip port为暴露的ip port
+func IfUseSshTunnelChangeIpPort(me *entity.Machine, getMachine func(uint64) *entity.Machine) error {
+	if me.EnableSshTunnel != 1 {
+		return nil
+	}
+	sshTunnelMachine, err := GetSshTunnelMachine(me.SshTunnelMachineId, func(u uint64) *entity.Machine {
+		return getMachine(u)
+	})
+	if err != nil {
+		return err
+	}
+	exposeIp, exposePort, err := sshTunnelMachine.OpenSshTunnel(me.Id, me.Ip, me.Port)
+	if err != nil {
+		return err
+	}
+	// 修改机器ip地址
+	me.Ip = exposeIp
+	me.Port = exposePort
+	return nil
+}
+
+func GetSshClient(m *entity.Machine) (*ssh.Client, error) {
+	config := ssh.ClientConfig{
+		User: m.Username,
+		HostKeyCallback: func(hostname string, remote net.Addr, key ssh.PublicKey) error {
+			return nil
+		},
+		Timeout: 5 * time.Second,
+	}
+	if m.AuthMethod == entity.MachineAuthMethodPassword {
+		config.Auth = []ssh.AuthMethod{ssh.Password(m.Password)}
+	} else if m.AuthMethod == entity.MachineAuthMethodPublicKey {
+		if signer, err := ssh.ParsePrivateKey([]byte(m.Password)); err != nil {
+			return nil, err
+		} else {
+			config.Auth = []ssh.AuthMethod{ssh.PublicKeys(signer)}
+		}
+	}
+
+	addr := fmt.Sprintf("%s:%d", m.Ip, m.Port)
+	sshClient, err := ssh.Dial("tcp", addr, &config)
+	if err != nil {
+		return nil, err
+	}
+	return sshClient, nil
+}
+
+//根据机器信息创建客户端对象
+func newClient(machine *entity.Machine) (*Cli, error) {
+	if machine == nil {
+		return nil, errors.New("机器不存在")
+	}
+
+	global.Log.Infof("[%s]机器连接：%s:%d", machine.Name, machine.Ip, machine.Port)
+	cli := new(Cli)
+	cli.machine = machine
+	err := cli.connect()
+	if err != nil {
+		return nil, err
+	}
+	return cli, nil
+}

server/internal/devops/infrastructure/machine/recorder.go

@@ -0,0 +1,67 @@
+package machine
+
+import (
+	"encoding/json"
+	"io"
+	"sync"
+	"time"
+)
+
+type RecType string
+
+const (
+	InputType  RecType = "i"
+	OutPutType RecType = "o"
+)
+
+type RecHeader struct {
+	Version   int   `json:"version"`
+	Width     int   `json:"width"`
+	Height    int   `json:"height"`
+	Timestamp int64 `json:"timestamp"`
+	Env       struct {
+		Shell string `json:"SHELL"`
+		Term  string `json:"TERM"`
+	} `json:"env"`
+}
+
+func defaultRecHeader() *RecHeader {
+	recHeader := new(RecHeader)
+	recHeader.Version = 2
+	recHeader.Env.Shell = "/bin/bash"
+	recHeader.Env.Term = "xterm-256color"
+	return recHeader
+}
+
+type Recorder struct {
+	StartTime time.Time
+	Writer    io.Writer
+	sync.Mutex
+}
+
+func NewRecorder(writer io.Writer) *Recorder {
+	return &Recorder{
+		StartTime: time.Now(),
+		Writer:    writer,
+	}
+}
+
+func (rec *Recorder) WriteHeader(height, width int) {
+	header := defaultRecHeader()
+	header.Timestamp = rec.StartTime.Unix()
+	header.Height = height
+	header.Width = width
+	b, _ := json.Marshal(header)
+	rec.Writer.Write(b)
+	rec.Writer.Write([]byte("\r\n"))
+}
+
+func (rec *Recorder) WriteData(rectype RecType, data string) {
+	recData := make([]interface{}, 3)
+	recData[0] = float64(time.Since(rec.StartTime).Microseconds()) / float64(1000000)
+	recData[1] = rectype
+	recData[2] = data
+	b, _ := json.Marshal(recData)
+	rec.Writer.Write(b)
+	rec.Writer.Write([]byte("\r\n"))
+}

server/internal/devops/infrastructure/machine/shell.go

@@ -1,19 +0,0 @@
-package machine
-
-const StatsShell = `
-cat /proc/uptime
-echo '-----'
-/bin/hostname -f
-echo '-----'
-cat /proc/loadavg
-echo '-----'
-cat /proc/meminfo
-echo '-----'
-df -B1
-echo '-----'
-/sbin/ip -o addr
-echo '-----'
-/bin/cat /proc/net/dev
-echo '-----'
-top -b -n 1 | grep Cpu
-`

server/internal/devops/infrastructure/machine/sshtunnel.go

@@ -0,0 +1,242 @@
+package machine
+
+import (
+	"fmt"
+	"io"
+	"mayfly-go/internal/devops/domain/entity"
+	"mayfly-go/pkg/global"
+	"mayfly-go/pkg/scheduler"
+	"mayfly-go/pkg/utils"
+	"net"
+	"os"
+	"sync"
+
+	"golang.org/x/crypto/ssh"
+)
+
+var (
+	sshTunnelMachines map[uint64]*SshTunnelMachine = make(map[uint64]*SshTunnelMachine)
+
+	mutex sync.Mutex
+
+	// 所有检测ssh隧道机器是否被使用的函数
+	checkSshTunnelMachineHasUseFuncs []CheckSshTunnelMachineHasUseFunc
+
+	// 是否开启检查ssh隧道机器是否被使用，只有使用到了隧道机器才启用
+	startCheckSshTunnelHasUse bool = false
+)
+
+// 检查ssh隧道机器是否有被使用
+type CheckSshTunnelMachineHasUseFunc func(uint64) bool
+
+func startCheckUse() {
+	global.Log.Info("开启定时检测ssh隧道机器是否还有被使用")
+	// 每十分钟检查一次隧道机器是否还有被使用
+	scheduler.AddFun("@every 10m", func() {
+		if !mutex.TryLock() {
+			return
+		}
+		defer mutex.Unlock()
+		// 遍历隧道机器，都未被使用将会被关闭
+		for mid, sshTunnelMachine := range sshTunnelMachines {
+			global.Log.Debugf("开始定时检查ssh隧道机器[%d]是否还有被使用...", mid)
+			hasUse := false
+			for _, checkUseFunc := range checkSshTunnelMachineHasUseFuncs {
+				// 如果一个在使用则返回不关闭，不继续后续检查
+				if checkUseFunc(mid) {
+					hasUse = true
+					break
+				}
+			}
+			if !hasUse {
+				// 都未被使用，则关闭
+				sshTunnelMachine.Close()
+			}
+		}
+	})
+}
+
+// 添加ssh隧道机器检测是否使用函数
+func AddCheckSshTunnelMachineUseFunc(checkFunc CheckSshTunnelMachineHasUseFunc) {
+	if checkSshTunnelMachineHasUseFuncs == nil {
+		checkSshTunnelMachineHasUseFuncs = make([]CheckSshTunnelMachineHasUseFunc, 0)
+	}
+	checkSshTunnelMachineHasUseFuncs = append(checkSshTunnelMachineHasUseFuncs, checkFunc)
+}
+
+// ssh隧道机器
+type SshTunnelMachine struct {
+	machineId uint64 // 隧道机器id
+	SshClient *ssh.Client
+	mutex     sync.Mutex
+	tunnels   map[uint64]*Tunnel // 机器id -> 隧道
+}
+
+func (stm *SshTunnelMachine) OpenSshTunnel(id uint64, ip string, port int) (exposedIp string, exposedPort int, err error) {
+	stm.mutex.Lock()
+	defer stm.mutex.Unlock()
+
+	localPort, err := utils.GetAvailablePort()
+	if err != nil {
+		return "", 0, err
+	}
+
+	hostname, err := os.Hostname()
+	if err != nil {
+		return "", 0, err
+	}
+	// debug
+	//hostname = "0.0.0.0"
+
+	localAddr := fmt.Sprintf("%s:%d", hostname, localPort)
+	listener, err := net.Listen("tcp", localAddr)
+	if err != nil {
+		return "", 0, err
+	}
+
+	tunnel := &Tunnel{
+		id:         id,
+		machineId:  stm.machineId,
+		localHost:  hostname,
+		localPort:  localPort,
+		remoteHost: ip,
+		remotePort: port,
+		listener:   listener,
+	}
+	go tunnel.Open(stm.SshClient)
+	stm.tunnels[tunnel.id] = tunnel
+
+	return tunnel.localHost, tunnel.localPort, nil
+}
+
+func (st *SshTunnelMachine) GetDialConn(network string, addr string) (net.Conn, error) {
+	st.mutex.Lock()
+	defer st.mutex.Unlock()
+	return st.SshClient.Dial(network, addr)
+}
+
+func (stm *SshTunnelMachine) Close() {
+	stm.mutex.Lock()
+	defer stm.mutex.Unlock()
+
+	for id, tunnel := range stm.tunnels {
+		if tunnel != nil {
+			tunnel.Close()
+			delete(stm.tunnels, id)
+		}
+	}
+
+	if stm.SshClient != nil {
+		global.Log.Infof("ssh隧道机器[%d]未被使用, 关闭隧道...", stm.machineId)
+		err := stm.SshClient.Close()
+		if err != nil {
+			global.Log.Errorf("关闭ssh隧道机器[%d]发生错误: %s", stm.machineId, err.Error())
+		}
+	}
+	delete(sshTunnelMachines, stm.machineId)
+}
+
+// 获取ssh隧道机器，方便统一管理充当ssh隧道的机器，避免创建多个ssh client
+func GetSshTunnelMachine(machineId uint64, getMachine func(uint64) *entity.Machine) (*SshTunnelMachine, error) {
+	sshTunnelMachine := sshTunnelMachines[machineId]
+	if sshTunnelMachine != nil {
+		return sshTunnelMachine, nil
+	}
+
+	mutex.Lock()
+	defer mutex.Unlock()
+
+	me := getMachine(machineId)
+	sshClient, err := GetSshClient(me)
+	if err != nil {
+		return nil, err
+	}
+	sshTunnelMachine = &SshTunnelMachine{SshClient: sshClient, machineId: machineId, tunnels: map[uint64]*Tunnel{}}
+
+	global.Log.Infof("初次连接ssh隧道机器[%d][%s:%d]", machineId, me.Ip, me.Port)
+	sshTunnelMachines[machineId] = sshTunnelMachine
+
+	// 如果实用了隧道机器且还没开始定时检查是否还被实用，则执行定时任务检测隧道是否还被使用
+	if !startCheckSshTunnelHasUse {
+		startCheckUse()
+		startCheckSshTunnelHasUse = true
+	}
+	return sshTunnelMachine, nil
+}
+
+// 关闭ssh隧道机器的指定隧道
+func CloseSshTunnelMachine(machineId uint64, tunnelId uint64) {
+	sshTunnelMachine := sshTunnelMachines[machineId]
+	if sshTunnelMachine == nil {
+		return
+	}
+
+	sshTunnelMachine.mutex.Lock()
+	defer sshTunnelMachine.mutex.Unlock()
+	t := sshTunnelMachine.tunnels[tunnelId]
+	if t != nil {
+		t.Close()
+		delete(sshTunnelMachine.tunnels, tunnelId)
+	}
+}
+
+type Tunnel struct {
+	id                uint64 // 唯一标识
+	machineId         uint64 // 隧道机器id
+	localHost         string // 本地监听地址
+	localPort         int    // 本地端口
+	remoteHost        string // 远程连接地址
+	remotePort        int    // 远程端口
+	listener          net.Listener
+	localConnections  []net.Conn
+	remoteConnections []net.Conn
+}
+
+func (r *Tunnel) Open(sshClient *ssh.Client) {
+	localAddr := fmt.Sprintf("%s:%d", r.localHost, r.localPort)
+
+	for {
+		global.Log.Debugf("隧道 %v 等待客户端访问 %v", r.id, localAddr)
+		localConn, err := r.listener.Accept()
+		if err != nil {
+			global.Log.Debugf("隧道 %v 接受连接失败 %v, 退出循环", r.id, err.Error())
+			global.Log.Debug("-------------------------------------------------")
+			return
+		}
+		r.localConnections = append(r.localConnections, localConn)
+
+		global.Log.Debugf("隧道 %v 新增本地连接 %v", r.id, localConn.RemoteAddr().String())
+		remoteAddr := fmt.Sprintf("%s:%d", r.remoteHost, r.remotePort)
+		global.Log.Debugf("隧道 %v 连接远程地址 %v ...", r.id, remoteAddr)
+		remoteConn, err := sshClient.Dial("tcp", remoteAddr)
+		if err != nil {
+			global.Log.Debugf("隧道 %v 连接远程地址 %v, 退出循环", r.id, err.Error())
+			global.Log.Debug("-------------------------------------------------")
+			return
+		}
+		r.remoteConnections = append(r.remoteConnections, remoteConn)
+
+		global.Log.Debugf("隧道 %v 连接远程主机成功", r.id)
+		go copyConn(localConn, remoteConn)
+		go copyConn(remoteConn, localConn)
+		global.Log.Debugf("隧道 %v 开始转发数据 [%v]->[%v]", r.id, localAddr, remoteAddr)
+		global.Log.Debug("~~~~~~~~~~~~~~~~~~~~分割线~~~~~~~~~~~~~~~~~~~~~~~~")
+	}
+}
+
+func (r *Tunnel) Close() {
+	for i := range r.localConnections {
+		_ = r.localConnections[i].Close()
+	}
+	r.localConnections = nil
+	for i := range r.remoteConnections {
+		_ = r.remoteConnections[i].Close()
+	}
+	r.remoteConnections = nil
+	_ = r.listener.Close()
+	global.Log.Debugf("隧道 %d 监听器关闭", r.id)
+}
+
+func copyConn(writer, reader net.Conn) {
+	_, _ = io.Copy(writer, reader)
+}

server/internal/devops/infrastructure/machine/stats.go

@@ -53,6 +53,24 @@ type Stats struct {
 	CPU          CPUInfo // or []CPUInfo to get all the cpu-core's stats?
 }
 
+const StatsShell = `
+cat /proc/uptime
+echo '-----'
+/bin/hostname -f
+echo '-----'
+cat /proc/loadavg
+echo '-----'
+cat /proc/meminfo
+echo '-----'
+df -B1
+echo '-----'
+/sbin/ip -o addr
+echo '-----'
+/bin/cat /proc/net/dev
+echo '-----'
+top -b -n 1 | grep Cpu
+`
+
 func (c *Cli) GetAllStats() *Stats {
 	res, _ := c.Run(StatsShell)
 	infos := strings.Split(*res, "-----")

server/internal/devops/infrastructure/machine/terminal.go

@@ -0,0 +1,74 @@
+package machine
+
+import (
+	"bufio"
+	"io"
+
+	"golang.org/x/crypto/ssh"
+)
+
+type Terminal struct {
+	SshSession   *ssh.Session
+	StdinPipe    io.WriteCloser
+	StdoutReader *bufio.Reader
+}
+
+// 新建机器ssh终端
+func NewTerminal(cli *Cli) (*Terminal, error) {
+	sshSession, err := cli.GetSession()
+	if err != nil {
+		return nil, err
+	}
+
+	stdoutPipe, err := sshSession.StdoutPipe()
+	if err != nil {
+		return nil, err
+	}
+	stdoutReader := bufio.NewReader(stdoutPipe)
+
+	stdinPipe, err := sshSession.StdinPipe()
+	if err != nil {
+		return nil, err
+	}
+
+	terminal := Terminal{
+		SshSession:   sshSession,
+		StdinPipe:    stdinPipe,
+		StdoutReader: stdoutReader,
+	}
+
+	return &terminal, nil
+}
+
+func (t *Terminal) Write(p []byte) (int, error) {
+	return t.StdinPipe.Write(p)
+}
+
+func (t *Terminal) ReadRune() (r rune, size int, err error) {
+	return t.StdoutReader.ReadRune()
+}
+
+func (t *Terminal) Close() error {
+	if t.SshSession != nil {
+		return t.SshSession.Close()
+	}
+	return nil
+}
+
+func (t *Terminal) WindowChange(h int, w int) error {
+	return t.SshSession.WindowChange(h, w)
+}
+
+func (t *Terminal) RequestPty(term string, h, w int) error {
+	modes := ssh.TerminalModes{
+		ssh.ECHO:          1,
+		ssh.TTY_OP_ISPEED: 14400,
+		ssh.TTY_OP_OSPEED: 14400,
+	}
+
+	return t.SshSession.RequestPty(term, h, w, modes)
+}
+
+func (t *Terminal) Shell() error {
+	return t.SshSession.Shell()
+}

server/internal/devops/infrastructure/machine/terminal_session.go

@@ -0,0 +1,184 @@
+package machine
+
+import (
+	"context"
+	"encoding/json"
+	"io"
+	"mayfly-go/pkg/global"
+	"time"
+	"unicode/utf8"
+
+	"github.com/gorilla/websocket"
+)
+
+const (
+	Resize = 1
+	Data   = 2
+	Ping   = 3
+)
+
+type TerminalSession struct {
+	ID       string
+	wsConn   *websocket.Conn
+	terminal *Terminal
+	recorder *Recorder
+	ctx      context.Context
+	cancel   context.CancelFunc
+	dataChan chan rune
+	tick     *time.Ticker
+}
+
+func NewTerminalSession(sessionId string, ws *websocket.Conn, cli *Cli, rows, cols int, recorder *Recorder) (*TerminalSession, error) {
+	terminal, err := NewTerminal(cli)
+	if err != nil {
+		return nil, err
+	}
+	err = terminal.RequestPty("xterm-256color", rows, cols)
+	if err != nil {
+		return nil, err
+	}
+	err = terminal.Shell()
+	if err != nil {
+		return nil, err
+	}
+
+	if recorder != nil {
+		recorder.WriteHeader(rows-5, cols)
+	}
+
+	ctx, cancel := context.WithCancel(context.Background())
+	tick := time.NewTicker(time.Millisecond * time.Duration(60))
+	ts := &TerminalSession{
+		ID:       sessionId,
+		wsConn:   ws,
+		terminal: terminal,
+		recorder: recorder,
+		ctx:      ctx,
+		cancel:   cancel,
+		dataChan: make(chan rune),
+		tick:     tick,
+	}
+	return ts, nil
+}
+
+func (r TerminalSession) Start() {
+	go r.readFormTerminal()
+	go r.writeToWebsocket()
+	r.receiveWsMsg()
+}
+
+func (r TerminalSession) Stop() {
+	global.Log.Debug("close machine ssh terminal session")
+	r.tick.Stop()
+	r.cancel()
+	if r.terminal != nil {
+		if err := r.terminal.Close(); err != nil {
+			global.Log.Errorf("关闭机器ssh终端失败: %s", err.Error())
+		}
+	}
+}
+
+func (ts TerminalSession) readFormTerminal() {
+	for {
+		select {
+		case <-ts.ctx.Done():
+			return
+		default:
+			rn, size, err := ts.terminal.ReadRune()
+			if err != nil {
+				if err != io.EOF {
+					global.Log.Error("机器ssh终端读取消息失败: ", err)
+				}
+				return
+			}
+			if size > 0 {
+				ts.dataChan <- rn
+			}
+		}
+	}
+}
+
+func (ts TerminalSession) writeToWebsocket() {
+	var buf []byte
+	for {
+		select {
+		case <-ts.ctx.Done():
+			return
+		case <-ts.tick.C:
+			if len(buf) > 0 {
+				s := string(buf)
+				if err := WriteMessage(ts.wsConn, s); err != nil {
+					global.Log.Error("机器ssh终端发送消息至websocket失败: ", err)
+					return
+				}
+				// 如果记录器存在，则记录操作回放信息
+				if ts.recorder != nil {
+					ts.recorder.Lock()
+					ts.recorder.WriteData(OutPutType, s)
+					ts.recorder.Unlock()
+				}
+				buf = []byte{}
+			}
+		case data := <-ts.dataChan:
+			if data != utf8.RuneError {
+				p := make([]byte, utf8.RuneLen(data))
+				utf8.EncodeRune(p, data)
+				buf = append(buf, p...)
+			} else {
+				buf = append(buf, []byte("@")...)
+			}
+		}
+	}
+}
+
+type WsMsg struct {
+	Type int    `json:"type"`
+	Msg  string `json:"msg"`
+	Cols int    `json:"cols"`
+	Rows int    `json:"rows"`
+}
+
+func (ts *TerminalSession) receiveWsMsg() {
+	wsConn := ts.wsConn
+	for {
+		select {
+		case <-ts.ctx.Done():
+			return
+		default:
+			// read websocket msg
+			_, wsData, err := wsConn.ReadMessage()
+			if err != nil {
+				global.Log.Debug("机器ssh终端读取websocket消息失败: ", err)
+				return
+			}
+			// 解析消息
+			msgObj := WsMsg{}
+			if err := json.Unmarshal(wsData, &msgObj); err != nil {
+				global.Log.Error("机器ssh终端消息解析失败: ", err)
+			}
+			switch msgObj.Type {
+			case Resize:
+				if msgObj.Cols > 0 && msgObj.Rows > 0 {
+					if err := ts.terminal.WindowChange(msgObj.Rows, msgObj.Cols); err != nil {
+						global.Log.Error("ssh pty change windows size failed")
+					}
+				}
+			case Data:
+				_, err := ts.terminal.Write([]byte(msgObj.Msg))
+				if err != nil {
+					global.Log.Debug("机器ssh终端写入消息失败: %s", err)
+				}
+			case Ping:
+				_, err := ts.terminal.SshSession.SendRequest("ping", true, nil)
+				if err != nil {
+					WriteMessage(wsConn, "\r\n\033[1;31m提示: 终端连接已断开...\033[0m")
+					return
+				}
+			}
+		}
+	}
+}
+
+func WriteMessage(ws *websocket.Conn, msg string) error {
+	return ws.WriteMessage(websocket.TextMessage, []byte(msg))
+}

server/internal/devops/infrastructure/machine/ws_shell_session.go

@@ -1,195 +0,0 @@
-package machine
-
-import (
-	"bytes"
-	"encoding/json"
-	"io"
-	"mayfly-go/pkg/global"
-	"sync"
-	"time"
-
-	"github.com/gorilla/websocket"
-	"golang.org/x/crypto/ssh"
-)
-
-type safeBuffer struct {
-	buffer bytes.Buffer
-	mu     sync.Mutex
-}
-
-func (w *safeBuffer) Write(p []byte) (int, error) {
-	w.mu.Lock()
-	defer w.mu.Unlock()
-	return w.buffer.Write(p)
-}
-func (w *safeBuffer) Bytes() []byte {
-	w.mu.Lock()
-	defer w.mu.Unlock()
-	return w.buffer.Bytes()
-}
-func (w *safeBuffer) Reset() {
-	w.mu.Lock()
-	defer w.mu.Unlock()
-	w.buffer.Reset()
-}
-
-const (
-	wsMsgCmd    = "cmd"
-	wsMsgResize = "resize"
-)
-
-type WsMsg struct {
-	Type string `json:"type"`
-	Msg  string `json:"msg"`
-	Cols int    `json:"cols"`
-	Rows int    `json:"rows"`
-}
-
-type LogicSshWsSession struct {
-	stdinPipe       io.WriteCloser
-	comboOutput     *safeBuffer //ssh 终端混合输出
-	inputFilterBuff *safeBuffer //用来过滤输入的命令和ssh_filter配置对比的
-	session         *ssh.Session
-	wsConn          *websocket.Conn
-}
-
-func NewLogicSshWsSession(cols, rows int, cli *Cli, wsConn *websocket.Conn) (*LogicSshWsSession, error) {
-	sshSession, err := cli.GetSession()
-	if err != nil {
-		return nil, err
-	}
-
-	stdinP, err := sshSession.StdinPipe()
-	if err != nil {
-		return nil, err
-	}
-
-	comboWriter := new(safeBuffer)
-	inputBuf := new(safeBuffer)
-	//ssh.stdout and stderr will write output into comboWriter
-	sshSession.Stdout = comboWriter
-	sshSession.Stderr = comboWriter
-
-	modes := ssh.TerminalModes{
-		ssh.ECHO:          1,     // disable echo
-		ssh.TTY_OP_ISPEED: 14400, // input speed = 14.4kbaud
-		ssh.TTY_OP_OSPEED: 14400, // output speed = 14.4kbaud
-	}
-	// Request pseudo terminal
-	if err := sshSession.RequestPty("xterm", rows, cols, modes); err != nil {
-		return nil, err
-	}
-	// Start remote shell
-	if err := sshSession.Shell(); err != nil {
-		return nil, err
-	}
-	return &LogicSshWsSession{
-		stdinPipe:       stdinP,
-		comboOutput:     comboWriter,
-		inputFilterBuff: inputBuf,
-		session:         sshSession,
-		wsConn:          wsConn,
-	}, nil
-}
-
-//Close 关闭
-func (sws *LogicSshWsSession) Close() {
-	if sws.session != nil {
-		sws.session.Close()
-	}
-	if sws.comboOutput != nil {
-		sws.comboOutput = nil
-	}
-}
-
-func (sws *LogicSshWsSession) Start(quitChan chan bool) {
-	go sws.receiveWsMsg(quitChan)
-	go sws.sendComboOutput(quitChan)
-}
-
-//receiveWsMsg  receive websocket msg do some handling then write into ssh.session.stdin
-func (sws *LogicSshWsSession) receiveWsMsg(exitCh chan bool) {
-	wsConn := sws.wsConn
-	//tells other go routine quit
-	defer setQuit(exitCh)
-	for {
-		select {
-		case <-exitCh:
-			return
-		default:
-			//read websocket msg
-			_, wsData, err := wsConn.ReadMessage()
-			if err != nil {
-				if websocket.IsCloseError(err, websocket.CloseGoingAway, websocket.CloseNoStatusReceived) {
-					return
-				}
-				global.Log.Error("reading webSocket message failed: ", err)
-				return
-			}
-			//unmashal bytes into struct
-			msgObj := WsMsg{}
-			if err := json.Unmarshal(wsData, &msgObj); err != nil {
-				global.Log.Error("unmarshal websocket message failed：", err)
-			}
-			switch msgObj.Type {
-			case wsMsgResize:
-				//handle xterm.js size change
-				if msgObj.Cols > 0 && msgObj.Rows > 0 {
-					if err := sws.session.WindowChange(msgObj.Rows, msgObj.Cols); err != nil {
-						global.Log.Error("ssh pty change windows size failed")
-					}
-				}
-			case wsMsgCmd:
-				sws.sendWebsocketInputCommandToSshSessionStdinPipe([]byte(msgObj.Msg))
-			}
-		}
-	}
-}
-
-//sendWebsocketInputCommandToSshSessionStdinPipe
-func (sws *LogicSshWsSession) sendWebsocketInputCommandToSshSessionStdinPipe(cmdBytes []byte) {
-	if _, err := sws.stdinPipe.Write(cmdBytes); err != nil {
-		global.Log.Error("ws cmd bytes write to ssh.stdin pipe failed")
-	}
-}
-
-func (sws *LogicSshWsSession) sendComboOutput(exitCh chan bool) {
-	wsConn := sws.wsConn
-	//todo 优化成一个方法
-	//tells other go routine quit
-	defer setQuit(exitCh)
-
-	//every 120ms write combine output bytes into websocket response
-	tick := time.NewTicker(time.Millisecond * time.Duration(60))
-	//for range time.Tick(120 * time.Millisecond){}
-	defer tick.Stop()
-	for {
-		select {
-		case <-tick.C:
-			if sws.comboOutput == nil {
-				return
-			}
-			bs := sws.comboOutput.Bytes()
-			if len(bs) > 0 {
-				err := wsConn.WriteMessage(websocket.TextMessage, bs)
-				if err != nil {
-					global.Log.Error("ssh sending combo output to webSocket failed")
-				}
-				sws.comboOutput.buffer.Reset()
-			}
-
-		case <-exitCh:
-			return
-		}
-	}
-}
-
-func (sws *LogicSshWsSession) Wait(quitChan chan bool) {
-	if err := sws.session.Wait(); err != nil {
-		setQuit(quitChan)
-	}
-}
-
-func setQuit(ch chan bool) {
-	ch <- true
-}