feat: redis支持设置多库操作

fix: store mongodb password incorrectly

.vscode/launch.json

@@ -1,18 +0,0 @@
-{
-    // 使用 IntelliSense 了解相关属性。 
-    // 悬停以查看现有属性的描述。
-    // 欲了解更多信息，请访问: https://go.microsoft.com/fwlink/?linkid=830387
-    "version": "0.2.0",
-    "configurations": [
-
-        {
-            "name": "mayfly-go",
-            "type": "go",
-            "request": "launch",
-            "mode": "auto",
-            "program": "${fileDirname}/main.go",
-            "env": {},
-            "args": []
-        },
-    ]
-}

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,26 @@
-# mayfly-go
+# 🌈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>
+
+
+### 介绍
+web版 **linux(终端[终端回放] 文件 脚本 进程)、数据库（mysql postgres）、redis(单机 哨兵 集群)、mongo统一管理操作平台**
 
-#### 介绍
-简单基于DDD(领域驱动设计)分层架构实现web版mysql,redis,linux统一操作管理平台
 
 ### 开发语言与主要框架
 - 前端：typescript、vue3、element-plus
@@ -9,25 +28,57 @@
 
 
 ### 交流及问题反馈加 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>
+
 
 ### 系统相关资料
 - 项目文档: https://objs.gitee.io/mayfly-go-docs
 - 系统操作视频: https://space.bilibili.com/484091081/channel/collectiondetail?sid=392854
+- 安装包下载：https://gitee.com/objs/mayfly-go/releases
 
-### 系统功能
 
-记录操作记录
+### 系统核心功能截图
+
+##### 记录操作记录
 ![记录操作记录](https://images.gitee.com/uploads/images/2021/0508/204608_83ef7c33_1240250.png "屏幕截图.png")
 
-#### 系统管理
+#### 机器操作
-账号管理
+##### 状态查看
+![状态查看](https://objs.gitee.io/mayfly-go-docs/home/machine-status.jpg "屏幕截图.png")
+
+##### ssh终端
+![ssh终端](https://objs.gitee.io/mayfly-go-docs/home/machine-ssh.jpg "屏幕截图.png")
+
+##### 文件操作
+![文件操作](https://objs.gitee.io/mayfly-go-docs/home/file-dir.jpg "屏幕截图.png")
+![文件操作](https://objs.gitee.io/mayfly-go-docs/home/file-content-update.jpg "屏幕截图.png")
+
+
+#### 数据库操作
+##### sql编辑器
+![sql编辑器](https://objs.gitee.io/mayfly-go-docs/home/dbms-sql-editor.jpg "屏幕截图.png")
+
+##### 在线增删改查数据
+![选表查数据](https://objs.gitee.io/mayfly-go-docs/home/dbms-show-table-data.jpg "屏幕截图.png")
+
+
+#### Redis操作
+![数据](https://objs.gitee.io/mayfly-go-docs/home/redis-data-list.jpg "屏幕截图.png")
+
+
+#### Mongo操作
+![数据](https://objs.gitee.io/mayfly-go-docs/home/mongo-op.jpg "屏幕截图.png")
+
+
+##### 系统管理
+##### 账号管理
 ![账号管理](https://images.gitee.com/uploads/images/2021/0607/173919_a8d7dc18_1240250.png "屏幕截图.png")
 
-角色管理
+##### 角色管理
 ![角色管理](https://images.gitee.com/uploads/images/2021/0607/174028_3654fb28_1240250.png "屏幕截图.png")
 
-资源管理
+##### 资源管理
 ![资源管理](https://images.gitee.com/uploads/images/2021/0607/174436_e9e1535c_1240250.png "屏幕截图.png")
 
+
 **其他更多功能&操作指南可查看在线文档**:  https://objs.gitee.io/mayfly-go-docs

base/biz/bizerror.go

@@ -1,34 +0,0 @@
-package biz
-
-// 业务错误
-type BizError struct {
-	code int16
-	err  string
-}
-
-var (
-	Success       *BizError = NewBizErrCode(200, "success")
-	BizErr        *BizError = NewBizErrCode(400, "biz error")
-	ServerError   *BizError = NewBizErrCode(500, "server error")
-	PermissionErr *BizError = NewBizErrCode(501, "token error")
-)
-
-// 错误消息
-func (e *BizError) Error() string {
-	return e.err
-}
-
-// 错误码
-func (e *BizError) Code() int16 {
-	return e.code
-}
-
-// 创建业务逻辑错误结构体，默认为业务逻辑错误
-func NewBizErr(msg string) *BizError {
-	return &BizError{code: BizErr.code, err: msg}
-}
-
-// 创建业务逻辑错误结构体，可设置指定错误code
-func NewBizErrCode(code int16, msg string) *BizError {
-	return &BizError{code: code, err: msg}
-}

base/config/app.go

@@ -1,12 +0,0 @@
-package config
-
-import "fmt"
-
-type App struct {
-	Name    string `yaml:"name"`
-	Version string `yaml:"version"`
-}
-
-func (a *App) GetAppInfo() string {
-	return fmt.Sprintf("[%s:%s]", a.Name, a.Version)
-}

base/config/server.go

@@ -1,32 +0,0 @@
-package config
-
-import "fmt"
-
-type Server struct {
-	Port       int            `yaml:"port"`
-	Model      string         `yaml:"model"`
-	Cors       bool           `yaml:"cors"`
-	Tls        *Tls           `yaml:"tls"`
-	Static     *[]*Static     `yaml:"static"`
-	StaticFile *[]*StaticFile `yaml:"static-file"`
-}
-
-func (s *Server) GetPort() string {
-	return fmt.Sprintf(":%d", s.Port)
-}
-
-type Static struct {
-	RelativePath string `yaml:"relative-path"`
-	Root         string `yaml:"root"`
-}
-
-type StaticFile struct {
-	RelativePath string `yaml:"relative-path"`
-	Filepath     string `yaml:"filepath"`
-}
-
-type Tls struct {
-	Enable   bool   `yaml:"enable"`    // 是否启用tls
-	KeyFile  string `yaml:"key-file"`  // 私钥文件路径
-	CertFile string `yaml:"cert-file"` // 证书文件路径
-}

base/starter/banner.go

@@ -1,16 +0,0 @@
-package starter
-
-import (
-	"mayfly-go/base/global"
-)
-
-func PrintBanner() {
-	global.Log.Print(`
-                         __ _                         
-  _ __ ___   __ _ _   _ / _| |_   _        __ _  ___  
- | '_ ' _ \ / _' | | | | |_| | | | |_____ / _' |/ _ \ 
- | | | | | | (_| | |_| |  _| | |_| |_____| (_| | (_) |
- |_| |_| |_|\__,_|\__, |_| |_|\__, |      \__, |\___/ 
-                  |___/       |___/       |___/      
-	`)
-}

base/utils/crypto_utils.go

@@ -1,13 +0,0 @@
-package utils
-
-import (
-	"crypto/md5"
-	"encoding/hex"
-)
-
-// md5
-func Md5(str string) string {
-	h := md5.New()
-	h.Write([]byte(str))
-	return hex.EncodeToString(h.Sum(nil))
-}

build_release.sh

@@ -0,0 +1,143 @@
+#bin/bash
+
+#----------------------------------------------
+# 前后端打包编译至指定目录,即快速制作发行版
+#----------------------------------------------
+
+project_path=`pwd`
+# 构建后的二进制执行文件名
+exec_file_name="mayfly-go"
+# web项目目录
+web_folder="${project_path}/mayfly_go_web"
+# server目录
+server_folder="${project_path}/server"
+
+function echo_red() {
+    echo -e "\033[1;31m$1\033[0m"
+}
+
+function echo_green() {
+    echo -e "\033[1;32m$1\033[0m"
+}
+
+function echo_yellow() {
+    echo -e "\033[1;33m$1\033[0m"
+}
+
+function buildWeb() {
+    cd ${web_folder}
+    copy2Server=$1
+
+    echo_yellow "-------------------打包前端开始-------------------"
+    yarn run build
+    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"
+}
+
+function build() {
+    cd ${project_path}
+
+    # 打包产物的输出目录
+    toFolder=$1
+    os=$2
+    arch=$3
+    copyStatic=$4
+
+    echo_yellow "-------------------${os}-${arch}打包构建开始-------------------"
+
+    cd ${server_folder}
+    echo_green "打包构建可执行文件..."
+
+    execFileName=${exec_file_name}
+    # 如果是windows系统,可执行文件需要添加.exe结尾
+    if [ "${os}" == "windows" ];then
+        execFileName="${execFileName}.exe"
+    fi
+    CGO_ENABLE=0 GOOS=${os} GOARCH=${arch} go build -o ${execFileName} main.go
+
+    if [ -d ${toFolder} ] ; then
+        echo_green "目标文件夹已存在,清空文件夹"
+        sudo rm -rf ${toFolder}
+    fi
+    echo_green "创建'${toFolder}'目录"
+    mkdir ${toFolder}
+
+    echo_green "移动二进制文件至'${toFolder}'"
+    mv ${server_folder}/${execFileName} ${toFolder}
+
+    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}
+    cp ${server_folder}/mayfly-go.sql ${toFolder}
+    cp ${server_folder}/readme.txt ${toFolder}
+    cp ${server_folder}/startup.sh ${toFolder}
+    cp ${server_folder}/shutdown.sh ${toFolder}
+
+    echo_yellow ">>>>>>>>>>>>>>>>>>>${os}-${arch}打包构建完成<<<<<<<<<<<<<<<<<<<<\n"
+}
+
+function buildLinuxAmd64() {
+    build "$1/mayfly-go-linux-amd64" "linux" "amd64" $2
+}
+
+function buildLinuxArm64() {
+    build "$1/mayfly-go-linux-arm64" "linux" "arm64" $2
+}
+
+function buildWindows() {
+    build "$1/mayfly-go-windows" "windows" "amd64" $2
+}
+
+function buildMac() {
+    build "$1/mayfly-go-mac" "darwin" "amd64" $2
+}
+
+function runBuild() {
+    # 构建结果的目的路径
+    read -p "请输入构建产物输出目录: " toPath
+    if [ ! -d ${toPath} ] ; then
+        echo_red "构建产物输出目录不存在!"
+        exit;
+    fi
+    # 进入目标路径,并赋值全路径
+    cd ${toPath}
+    toPath=`pwd`
+
+    read -p "是否构建前端[0|其他->否 1->是 2->构建并拷贝至server/static/static]: " runBuildWeb
+    read -p "请选择构建版本[0|其他->全部 1->linux-amd64 2->linux-arm64 3->windows 4->mac]: " buildType
+    
+    
+    if [ "${runBuildWeb}" == "1" ] || [ "${runBuildWeb}" == "2" ] ; then
+        buildWeb ${runBuildWeb}
+    fi
+
+    case ${buildType} in
+         "1")
+            buildLinuxAmd64 ${toPath} ${runBuildWeb}
+        ;;
+         "2")
+            buildLinuxArm64 ${toPath} ${runBuildWeb}
+        ;;
+        "3")
+            buildWindows ${toPath} ${runBuildWeb}
+        ;;
+        "4")
+            buildMac ${toPath} ${runBuildWeb}
+        ;;
+        *)
+            buildLinuxAmd64 ${toPath} ${runBuildWeb}
+            buildLinuxArm64 ${toPath} ${runBuildWeb}
+            buildWindows ${toPath} ${runBuildWeb}
+            buildMac ${toPath} ${runBuildWeb}
+        ;;
+    esac
+}
+
+runBuild

go.mod

@@ -1,49 +0,0 @@
-module mayfly-go
-
-go 1.17
-
-require (
-	// jwt
-	github.com/dgrijalva/jwt-go v3.2.0+incompatible
-	github.com/gin-gonic/gin v1.7.7
-	github.com/go-redis/redis v6.15.9+incompatible
-	github.com/gorilla/websocket v1.5.0
-	// 验证码
-	github.com/mojocn/base64Captcha v1.3.5
-	github.com/pkg/sftp v1.13.4
-	// 定时任务
-	github.com/robfig/cron/v3 v3.0.1
-	github.com/sirupsen/logrus v1.8.1
-	// ssh
-	golang.org/x/crypto v0.0.0-20220314234724-5d542ad81a58
-	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b
-	// gorm
-	gorm.io/driver/mysql v1.3.2
-	gorm.io/gorm v1.23.2
-)
-
-require (
-	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/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 // indirect
-	github.com/golang/protobuf v1.5.2 // indirect
-	github.com/jinzhu/inflection v1.0.0 // indirect
-	github.com/jinzhu/now v1.1.4 // indirect
-	github.com/json-iterator/go v1.1.12 // indirect
-	github.com/kr/fs v0.1.0 // indirect
-	github.com/leodido/go-urn v1.2.1 // indirect
-	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/ugorji/go/codec v1.2.7 // indirect
-	golang.org/x/image v0.0.0-20220302094943-723b81ca9867 // indirect
-	golang.org/x/sys v0.0.0-20220310020820-b874c991c1a5 // indirect
-	golang.org/x/text v0.3.7 // indirect
-	google.golang.org/protobuf v1.27.1 // indirect
-	gopkg.in/yaml.v2 v2.4.0 // indirect
-)

go.sum

@@ -1,220 +0,0 @@
-github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
-github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
-github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
-github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
-github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
-github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumCAMpl/TFQ4/5kLM=
-github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
-github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
-github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4=
-github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
-github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE=
-github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI=
-github.com/gin-gonic/gin v1.7.7 h1:3DoBmSbJbZAWqXJC3SLjAPfutPJJRN1U5pALB7EeTTs=
-github.com/gin-gonic/gin v1.7.7/go.mod h1:axIBovoeJpVj8S3BwE0uPMTeReE4+AfFtqpqaZ1qq1U=
-github.com/go-playground/assert/v2 v2.0.1 h1:MsBgLAaY856+nPRTKrp3/OZK38U/wa0CcBYNjji3q3A=
-github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=
-github.com/go-playground/locales v0.13.0/go.mod h1:taPMhCMXrRLJO55olJkUXHZBHCxTMfnGwq/HNwmWNS8=
-github.com/go-playground/locales v0.14.0 h1:u50s323jtVGugKlcYeyzC0etD1HifMjqmJqb8WugfUU=
-github.com/go-playground/locales v0.14.0/go.mod h1:sawfccIbzZTqEDETgFXqTho0QybSa7l++s0DH+LDiLs=
-github.com/go-playground/universal-translator v0.17.0/go.mod h1:UkSxE5sNxxRwHyU+Scu5vgOQjsIJAF8j9muTVoKLVtA=
-github.com/go-playground/universal-translator v0.18.0 h1:82dyy6p4OuJq4/CByFNOn/jYrnRPArHwAcmLoJZxyho=
-github.com/go-playground/universal-translator v0.18.0/go.mod h1:UvRDBj+xPUEGrFYl+lu/H90nyDXpg0fqeB/AQUGNTVA=
-github.com/go-playground/validator/v10 v10.4.1/go.mod h1:nlOn6nFhuKACm19sB/8EGNn9GlaMV7XkbRSipzJ0Ii4=
-github.com/go-playground/validator/v10 v10.10.1 h1:uA0+amWMiglNZKZ9FJRKUAe9U3RX91eVn1JYXMWt7ig=
-github.com/go-playground/validator/v10 v10.10.1/go.mod h1:i+3WkQ1FvaUjjxh1kSvIA4dMGDBiPU55YFDl0WbKdWU=
-github.com/go-redis/redis v6.15.9+incompatible h1:K0pv1D7EQUjfyoMql+r/jZqCLizCGKFlFgcHWWmHQjg=
-github.com/go-redis/redis v6.15.9+incompatible/go.mod h1:NAIEuMOZ/fxfXJIrKDQDz8wamY7mA7PouImQ2Jvg6kA=
-github.com/go-sql-driver/mysql v1.6.0 h1:BCTh4TKNUYmOmMUcQ3IipzF5prigylS7XXjEkfCHuOE=
-github.com/go-sql-driver/mysql v1.6.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
-github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE=
-github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 h1:DACJavvAHhabrF08vX0COfcOBJRhZ8lUbR+ZWIs0Y5g=
-github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k=
-github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
-github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=
-github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA=
-github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs=
-github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
-github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
-github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
-github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
-github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw=
-github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
-github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
-github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
-github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU=
-github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
-github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
-github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc=
-github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
-github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
-github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
-github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E=
-github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc=
-github.com/jinzhu/now v1.1.4 h1:tHnRBy1i5F2Dh8BAFxqFzxKqqvezXrL2OW1TnX+Mlas=
-github.com/jinzhu/now v1.1.4/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8=
-github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
-github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
-github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
-github.com/kr/fs v0.1.0 h1:Jskdu9ieNAYnjxsi0LbQp1ulIKZV1LAFgK1tWhpZgl8=
-github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg=
-github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
-github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
-github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0=
-github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk=
-github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
-github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
-github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
-github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
-github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII=
-github.com/leodido/go-urn v1.2.1 h1:BqpAaACuzVSgi/VLzGZIobT2z4v53pjosyNd9Yv6n/w=
-github.com/leodido/go-urn v1.2.1/go.mod h1:zt4jvISO2HfUBqxjfIshjdMTYS56ZS/qv49ictyFfxY=
-github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
-github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9Y=
-github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
-github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
-github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
-github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
-github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
-github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=
-github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
-github.com/mojocn/base64Captcha v1.3.5 h1:Qeilr7Ta6eDtG4S+tQuZ5+hO+QHbiGAJdi4PfoagaA0=
-github.com/mojocn/base64Captcha v1.3.5/go.mod h1:/tTTXn4WTpX9CfrmipqRytCpJ27Uw3G6I7NcP2WwcmY=
-github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
-github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE=
-github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU=
-github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
-github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk=
-github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0=
-github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE=
-github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU=
-github.com/onsi/ginkgo/v2 v2.0.0/go.mod h1:vw5CSIxN1JObi/U8gcbwft7ZxR2dgaR70JSE3/PpL4c=
-github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
-github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
-github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY=
-github.com/onsi/gomega v1.18.1 h1:M1GfJqGRrBrrGGsbxzV5dqM2U2ApXefZCQpkukxYRLE=
-github.com/onsi/gomega v1.18.1/go.mod h1:0q+aL8jAiMXy9hbwj2mr5GziHiwhAIQpFmmtT5hitRs=
-github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
-github.com/pkg/sftp v1.13.4 h1:Lb0RYJCmgUcBgZosfoi9Y9sbl6+LJgOIgk/2Y4YjMFg=
-github.com/pkg/sftp v1.13.4/go.mod h1:LzqnAvaD5TWeNBsZpfKxSYn1MbjWwOsCIAFFJbpIsK8=
-github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
-github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/robfig/cron/v3 v3.0.1 h1:WdRxkvbJztn8LMz/QEvLN5sBU+xKpSqwwUO1Pjr4qDs=
-github.com/robfig/cron/v3 v3.0.1/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzGIFLtro=
-github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
-github.com/rogpeppe/go-internal v1.8.0 h1:FCbCCtXNOY3UtUuHUYaghJg4y7Fd14rXifAYUAtL9R8=
-github.com/rogpeppe/go-internal v1.8.0/go.mod h1:WmiCO8CzOY8rg0OYDC4/i/2WRWAB6poM+XZ2dLUbcbE=
-github.com/sirupsen/logrus v1.8.1 h1:dJKuHgqk1NNQlqoA6BTlM1Wf9DOH3NBjQyu0h9+AZZE=
-github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
-github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
-github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
-github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
-github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
-github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
-github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw=
-github.com/ugorji/go v1.2.7 h1:qYhyWUUd6WbiM+C6JZAUkIJt/1WrjzNHY9+KCIjVqTo=
-github.com/ugorji/go v1.2.7/go.mod h1:nF9osbDWLy6bDVv/Rtoh6QgnvNDpmCalQV5urGCCS6M=
-github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY=
-github.com/ugorji/go/codec v1.2.7 h1:YPXUKf7fYbp/y8xloBqZOw2qaVggbfwMlI8WM3wZUJ0=
-github.com/ugorji/go/codec v1.2.7/go.mod h1:WGN1fab3R1fzQlVQTkfxVtIBhWDRqOviHU95kRgeqEY=
-github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
-golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
-golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
-golang.org/x/crypto v0.0.0-20220314234724-5d542ad81a58 h1:L8CkJyVoa0/NslN3RUMLgasK5+KatNvyRGQ9QyCYAfc=
-golang.org/x/crypto v0.0.0-20220314234724-5d542ad81a58/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
-golang.org/x/image v0.0.0-20190501045829-6d32002ffd75/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
-golang.org/x/image v0.0.0-20220302094943-723b81ca9867 h1:TcHcE0vrmgzNH1v3ppjcMGbhG5+9fMuvOmUYwNEF4q4=
-golang.org/x/image v0.0.0-20220302094943-723b81ca9867/go.mod h1:023OzeP/+EPmXeapQh35lcL3II3LrY8Ic+EFFKVhULM=
-golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
-golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
-golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk=
-golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2 h1:CIJ76btIcR3eFI5EgSo6k1qKw9KJexJuRLI9G7Hp5wE=
-golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220310020820-b874c991c1a5 h1:y/woIyUBFbpQGKS0u1aHF/40WUDnek3fPOyD08H5Vng=
-golang.org/x/sys v0.0.0-20220310020820-b874c991c1a5/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1 h1:v+OssWQX+hTHEmOBgwxdZxK4zHq3yOs8F9J7mk0PY8E=
-golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
-golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
-golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
-golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
-golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
-golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
-golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
-google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
-google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
-google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE=
-google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
-google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
-google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
-google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
-google.golang.org/protobuf v1.27.1 h1:SnqbnDw1V7RiZcXPx5MEeqPv2s79L9i7BJUlG/+RurQ=
-google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
-gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
-gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
-gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
-gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
-gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
-gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
-gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
-gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo=
-gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gorm.io/driver/mysql v1.3.2 h1:QJryWiqQ91EvZ0jZL48NOpdlPdMjdip1hQ8bTgo4H7I=
-gorm.io/driver/mysql v1.3.2/go.mod h1:ChK6AHbHgDCFZyJp0F+BmVGb06PSIoh9uVYKAlRbb2U=
-gorm.io/gorm v1.23.1/go.mod h1:l2lP/RyAtc1ynaTjFksBde/O8v9oOGIApu2/xRitmZk=
-gorm.io/gorm v1.23.2 h1:xmq9QRMWL8HTJyhAUBXy8FqIIQCYESeKfJL4DoGKiWQ=
-gorm.io/gorm v1.23.2/go.mod h1:l2lP/RyAtc1ynaTjFksBde/O8v9oOGIApu2/xRitmZk=

mayfly_go_web/index.html

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

mayfly_go_web/package.json

@@ -7,26 +7,28 @@
     "lint-fix": "eslint --fix --ext .js --ext .jsx --ext .vue src/"
   },
   "dependencies": {
-    "axios": "^0.26.1",
+    "@element-plus/icons-vue": "^2.0.9",
-    "codemirror": "^5.65.2",
+    "asciinema-player": "^3.0.1",
+    "axios": "^0.27.2",
+    "codemirror": "^5.65.5",
     "countup.js": "^2.0.7",
     "cropperjs": "^1.5.11",
-    "echarts": "^5.3.2",
+    "echarts": "^5.3.3",
-    "element-plus": "^2.1.11",
+    "element-plus": "^2.2.17",
-    "@element-plus/icons-vue": "^1.1.3",
+    "jsencrypt": "^3.2.1",
-    "jsonlint": "^1.6.3",
+    "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": "^9.2.0",
+    "vue": "^3.2.39",
     "vue-clipboard3": "^1.0.1",
-    "sql-formatter": "^4.0.2",
+    "vue-router": "^4.1.5",
-    "vue": "^3.2.30",
-    "vue-router": "^4.0.12",
     "vuex": "^4.0.2",
-    "xterm": "^4.18.0",
+    "xterm": "^5.0.0",
-    "xterm-addon-fit": "^0.5.0"
+    "xterm-addon-fit": "^0.6.0"
   },
   "devDependencies": {
     "@types/lodash": "^4.14.178",
@@ -35,7 +37,7 @@
     "@types/sortablejs": "^1.10.6",
     "@typescript-eslint/eslint-plugin": "^4.23.0",
     "@typescript-eslint/parser": "^4.23.0",
-    "@vitejs/plugin-vue": "^1.2.2",
+    "@vitejs/plugin-vue": "^2.3.3",
     "@vue/compiler-sfc": "^3.0.11",
     "dotenv": "^10.0.0",
     "eslint": "^8.5.0",
@@ -43,8 +45,8 @@
     "prettier": "^2.3.0",
     "sass": "^1.45.1",
     "sass-loader": "^12.4.0",
-    "typescript": "^4.2.4",
+    "typescript": "^4.7.4",
-    "vite": "^2.8.6",
+    "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",
+    // 默认为空，以访问根目录为api请求地址。若前后端分离部署可单独配置该后端api请求地址
-    "BaseWsUrl": "ws://localhost:8888"
+    "BaseApiUrl": "",
+    "BaseWsUrl": ""
 }

mayfly_go_web/shim.d.ts

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

mayfly_go_web/src/App.vue

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

mayfly_go_web/src/common/config.ts

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

mayfly_go_web/src/common/openApi.ts

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

mayfly_go_web/src/common/rsa.ts

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

mayfly_go_web/src/common/sysconfig.ts

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

mayfly_go_web/src/common/utils/storage.ts

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

mayfly_go_web/src/common/utils/wartermark.ts

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

mayfly_go_web/src/components/jsonedit/index.vue

@@ -0,0 +1,133 @@
+<template>
+    <div>
+        <div ref="jsoneditorVue" :style="{ height: height, width: width }"></div>
+    </div>
+</template>
+
+<script lang="ts">
+import { ref, toRefs, reactive, nextTick, watch, onMounted, onUnmounted, defineComponent } from 'vue';
+import JSONEditor from 'jsoneditor';
+import 'jsoneditor/dist/jsoneditor.min.css';
+
+export default defineComponent({
+    name: 'JsonEdit',
+    components: {},
+    props: {
+        modelValue: {
+            type: [String, Object],
+        },
+        height: {
+            type: String,
+            default: '500px',
+        },
+        width: {
+            type: String,
+            default: 'auto',
+        },
+        options: {
+            type: Object,
+            default: null,
+        },
+        currentMode: {
+            type: String,
+            default: 'tree',
+        },
+        modeList: {
+            type: Array,
+            default() {
+                return ['tree', 'code', 'form', 'text', 'view'];
+            },
+        },
+    },
+    setup(props: any, { emit }) {
+        let { modelValue, options, modeList, currentMode } = toRefs(props);
+
+        const jsoneditorVue = ref(null)
+        // 编辑器实例
+        let editor = null as any;
+        // 值类型
+        let valueType = 'string';
+        // 是否内部改变(即onChange事件双向绑定)，内部改变则不需要重新赋值给editor
+        let internalChange = false;
+
+        const state = reactive({
+            height: '500px',
+            width: 'auto',
+        });
+
+        onMounted(() => {
+            state.width = props.width;
+            state.height = props.height;
+
+            init();
+            setJson(modelValue.value);
+        });
+
+        onUnmounted(() => {
+            editor?.destroy();
+            editor = null;
+        });
+
+        watch(
+            () => props.modelValue,
+            (newValue) => {
+                if (!editor) {
+                    init();
+                }
+                setJson(newValue);
+            }
+        );
+
+        const setJson = (value: any) => {
+            if (internalChange) {
+                return;
+            }
+            if (typeof value == 'string') {
+                valueType = 'string';
+                editor.set(JSON.parse(value));
+            } else {
+                valueType = 'object';
+                editor.set(value);
+            }
+        };
+
+        const onChange = () => {
+            try {
+                const json = editor.get();
+                if (valueType == 'string') {
+                    emit('update:modelValue', JSON.stringify(json));
+                } else {
+                    emit('update:modelValue', json);
+                }
+                emit('onChange', json);
+                internalChange = true;
+                nextTick(() => {
+                    internalChange = false;
+                });
+            } catch (error) {}
+        };
+
+        const init = () => {
+            console.log('init json editor');
+            const finalOptions = {
+                ...options.value,
+                mode: currentMode.value,
+                modes: modeList.value,
+                onChange,
+            };
+            editor = new JSONEditor(jsoneditorVue.value, finalOptions);
+        };
+
+        return {
+            ...toRefs(state),
+            jsoneditorVue,
+        };
+    },
+});
+</script>
+
+<style lang="scss">
+div.jsoneditor-menu a.jsoneditor-poweredBy {
+    display: none;
+}
+</style>

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
@@ -18,4 +22,8 @@ export const imports = {
     // redis
     "RedisList": () => import('@/views/ops/redis'),
     "DataOperation": () => import('@/views/ops/redis/DataOperation.vue'),
+    // mongo
+    "MongoDataOp": () => import('@/views/ops/mongo/MongoDataOp.vue'),
+    // redis
+    "MongoList": () => import('@/views/ops/mongo/MongoList.vue'),
 }

mayfly_go_web/src/router/index.ts

@@ -221,26 +221,32 @@ router.beforeEach((to, from, next) => {
     if (to.path === '/login' && !token) {
         next();
         NProgress.done();
-    } else {
+        return;
-        if (!token) {
+    }
-            next(`/login?redirect=${to.path}`);
+    if (!token) {
-            clearSession();
+        next(`/login?redirect=${to.path}`);
-            resetRoute();
+        clearSession();
-            NProgress.done();
+        resetRoute();
+        NProgress.done();
 
-            if (SysWs) {
+        if (SysWs) {
-                SysWs.close();
+            SysWs.close();
-                SysWs = null;
+            SysWs = null;
-            }
-        } else if (token && to.path === '/login') {
-            next('/');
-            NProgress.done();
-        } else {
-            if (!SysWs) {
-                SysWs = sockets.sysMsgSocket();
-            }
-            if (store.state.routesList.routesList.length > 0) next();
         }
+        return;
+    }
+    if (token && to.path === '/login') {
+        next('/');
+        NProgress.done();
+        return;
+    }
+
+    // 终端不需要连接系统websocket消息
+    if (!SysWs && to.path != '/machine/terminal') {
+        SysWs = sockets.sysMsgSocket();
+    }
+    if (store.state.routesList.routesList.length > 0) {
+        next();
     }
 });
 

mayfly_go_web/src/router/route.ts

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

mayfly_go_web/src/store/interface/index.ts

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

mayfly_go_web/src/store/modules/themeConfig.ts

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

mayfly_go_web/src/theme/app.scss

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

mayfly_go_web/src/theme/element.scss

@@ -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 抽屉
 ------------------------------- */
@@ -993,4 +977,15 @@
 }
 .el-drawer-fade-leave-active .el-drawer.ltr {
 	animation: ltr-drawer-animation 0.3s ease !important;
-}
+}
+
+// el-tooltip使用自定义主题时的样式
+.el-popper.is-customized {
+    /* Set padding to ensure the height is 32px */
+  //   padding: 6px 12px;
+    background: linear-gradient(90deg, rgb(159, 229, 151), rgb(204, 229, 129));
+  }
+  .el-popper.is-customized .el-popper__arrow::before {
+    background: linear-gradient(45deg, #b2e68d, #bce689);
+    right: 0;
+  }

mayfly_go_web/src/theme/iconSelector.scss

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

mayfly_go_web/src/theme/index.scss

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

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

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

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

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

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

@@ -7,17 +7,10 @@
                 >删除</el-button
             >
             <div style="float: right">
-                <el-form class="search-form" label-position="right" :inline="true" label-width="60px">
+                <el-select @focus="getProjects" v-model="query.projectId" placeholder="请选择项目" filterable clearable>
-                    <el-form-item prop="project">
+                    <el-option v-for="item in projects" :key="item.id" :label="`${item.name} [${item.remark}]`" :value="item.id"> </el-option>
-                        <el-select v-model="query.projectId" placeholder="请选择项目" filterable clearable>
+                </el-select>
-                            <el-option v-for="item in projects" :key="item.id" :label="`${item.name} [${item.remark}]`" :value="item.id"> </el-option>
+                <el-button v-waves type="primary" icon="search" @click="search()" class="ml5">查询</el-button>
-                        </el-select>
-                    </el-form-item>
-
-                    <el-form-item>
-                        <el-button v-waves type="primary" icon="search" @click="search()">查询</el-button>
-                    </el-form-item>
-                </el-form>
             </div>
             <el-table :data="datas" ref="table" @current-change="choose" show-overflow-tooltip stripe>
                 <el-table-column label="选择" width="60px">
@@ -27,40 +20,48 @@
                         </el-radio>
                     </template>
                 </el-table-column>
-                <el-table-column prop="project" label="项目" min-width="100"></el-table-column>
+                <el-table-column prop="project" label="项目" min-width="100" show-overflow-tooltip></el-table-column>
                 <el-table-column prop="env" label="环境" min-width="100"></el-table-column>
-                <el-table-column prop="name" label="名称" min-width="200"></el-table-column>
+                <el-table-column prop="name" label="名称" min-width="160" show-overflow-tooltip></el-table-column>
-                <el-table-column min-width="160" label="host:port">
+                <el-table-column min-width="170" label="host:port" show-overflow-tooltip>
                     <template #default="scope">
                         {{ `${scope.row.host}:${scope.row.port}` }}
                     </template>
                 </el-table-column>
-                <el-table-column prop="type" label="类型" min-width="80"></el-table-column>
+                <el-table-column prop="type" label="类型" min-width="90"></el-table-column>
-                <el-table-column prop="database" label="数据库" min-width="160">
+                <el-table-column prop="database" label="数据库" min-width="80">
                     <template #default="scope">
-                        <el-tag
+                        <el-popover :width="250" placement="right" trigger="click">
-                            @click="showTableInfo(scope.row, db)"
+                            <template #reference>
-                            effect="plain"
+                                <el-link type="primary" :underline="false" plain>查看</el-link>
-                            type="success"
+                            </template>
-                            size="small"
+                            <el-tag
-                            v-for="db in scope.row.dbs"
+                                @click="showTableInfo(scope.row, db)"
-                            :key="db"
+                                effect="plain"
-                            style="cursor: pointer; margin-left: 3px"
+                                type="success"
-                            >{{ db }}</el-tag
+                                size="small"
-                        >
+                                v-for="db in scope.row.dbs"
+                                :key="db"
+                                style="cursor: pointer; margin-left: 3px; margin-bottom: 3px;"
+                                >{{ db }}</el-tag
+                            >
+                        </el-popover>
                     </template>
                 </el-table-column>
                 <el-table-column prop="username" label="用户名" min-width="100"></el-table-column>
 
                 <el-table-column min-width="115" prop="creator" label="创建账号"></el-table-column>
-                <el-table-column min-width="160" prop="createTime" label="创建时间">
+                <el-table-column min-width="160" prop="createTime" label="创建时间" show-overflow-tooltip>
                     <template #default="scope">
                         {{ $filters.dateFormat(scope.row.createTime) }}
                     </template>
                 </el-table-column>
 
-                <!-- <el-table-column fixed="right" label="更多信息" min-width="100">
+                <el-table-column label="操作" min-width="120" fixed="right">
-                </el-table-column> -->
+                    <template #default="scope">
+                        <el-link type="primary" plain size="small" :underline="false" @click="onShowSqlExec(scope.row)">SQL执行记录</el-link>
+                    </template>
+                </el-table-column>
             </el-table>
             <el-row style="margin-top: 20px" type="flex" justify="end">
                 <el-pagination
@@ -76,11 +77,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 v-loading="tableInfoDialog.loading" border stripe :data="filterTableInfos" size="small">
-                <el-table-column property="tableName" label="表名" min-width="150" show-overflow-tooltip></el-table-column>
+                <el-table-column property="tableName" label="表名" min-width="150" show-overflow-tooltip>
-                <el-table-column property="tableComment" label="备注" min-width="150" show-overflow-tooltip></el-table-column>
+                    <template #header>
+                        <el-input v-model="tableInfoDialog.tableNameSearch" size="small" placeholder="表名: 输入可过滤" clearable />
+                    </template>
+                </el-table-column>
+                <el-table-column property="tableComment" label="备注" min-width="150" show-overflow-tooltip>
+                    <template #header>
+                        <el-input v-model="tableInfoDialog.tableCommentSearch" size="small" placeholder="备注: 输入可过滤" clearable />
+                    </template>
+                </el-table-column>
                 <el-table-column
                     prop="tableRows"
                     label="Rows"
@@ -124,6 +159,71 @@
             </el-table>
         </el-dialog>
 
+        <el-dialog
+            width="90%"
+            :title="`${sqlExecLogDialog.title} - SQL执行记录`"
+            :before-close="onBeforeCloseSqlExecDialog"
+            v-model="sqlExecLogDialog.visible"
+        >
+            <div class="toolbar">
+                <el-select v-model="sqlExecLogDialog.query.db" placeholder="请选择数据库" filterable clearable>
+                    <el-option v-for="item in sqlExecLogDialog.dbs" :key="item" :label="`${item}`" :value="item"> </el-option>
+                </el-select>
+                <el-input v-model="sqlExecLogDialog.query.table" placeholder="请输入表名" clearable class="ml5" style="width: 180px" />
+                <el-select v-model="sqlExecLogDialog.query.type" placeholder="请选择操作类型" clearable class="ml5">
+                    <el-option v-for="item in enums.DbSqlExecTypeEnum" :key="item.value" :label="item.label" :value="item.value"> </el-option>
+                </el-select>
+                <el-button class="ml5" @click="searchSqlExecLog" type="success" icon="search"></el-button>
+            </div>
+            <el-table border stripe :data="sqlExecLogDialog.data" size="small">
+                <el-table-column prop="db" label="数据库" min-width="60" show-overflow-tooltip> </el-table-column>
+                <el-table-column prop="table" label="表" min-width="60" show-overflow-tooltip> </el-table-column>
+                <el-table-column prop="type" label="类型" width="85" show-overflow-tooltip>
+                    <template #default="scope">
+                        <el-tag v-if="scope.row.type == enums.DbSqlExecTypeEnum.UPDATE.value" color="#E4F5EB" size="small">UPDATE</el-tag>
+                        <el-tag v-if="scope.row.type == enums.DbSqlExecTypeEnum.DELETE.value" color="#F9E2AE" size="small">DELETE</el-tag>
+                        <el-tag v-if="scope.row.type == enums.DbSqlExecTypeEnum.INSERT.value" color="#A8DEE0" size="small">INSERT</el-tag>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="sql" label="SQL" min-width="230" show-overflow-tooltip> </el-table-column>
+                <el-table-column prop="oldValue" label="原值" min-width="150" show-overflow-tooltip> </el-table-column>
+                <el-table-column prop="creator" label="执行人" min-width="60" show-overflow-tooltip> </el-table-column>
+                <el-table-column prop="createTime" label="执行时间" show-overflow-tooltip>
+                    <template #default="scope">
+                        {{ $filters.dateFormat(scope.row.createTime) }}
+                    </template>
+                </el-table-column>
+                <el-table-column prop="remark" label="备注" min-width="60" show-overflow-tooltip> </el-table-column>
+                <el-table-column label="操作" min-width="50" fixed="right">
+                    <template #default="scope">
+                        <el-link
+                            v-if="scope.row.type == enums.DbSqlExecTypeEnum.UPDATE.value || scope.row.type == enums.DbSqlExecTypeEnum.DELETE.value"
+                            type="primary"
+                            plain
+                            size="small"
+                            :underline="false"
+                            @click="onShowRollbackSql(scope.row)"
+                            >还原SQL</el-link
+                        >
+                    </template>
+                </el-table-column>
+            </el-table>
+            <el-row style="margin-top: 20px" type="flex" justify="end">
+                <el-pagination
+                    style="text-align: right"
+                    @current-change="handleSqlExecPageChange"
+                    :total="sqlExecLogDialog.total"
+                    layout="prev, pager, next, total, jumper"
+                    v-model:current-page="sqlExecLogDialog.query.pageNum"
+                    :page-size="sqlExecLogDialog.query.pageSize"
+                ></el-pagination>
+            </el-row>
+        </el-dialog>
+
+        <el-dialog width="55%" :title="`还原SQL`" v-model="rollbackSqlDialog.visible">
+            <el-input type="textarea" :autosize="{ minRows: 15, maxRows: 30 }" v-model="rollbackSqlDialog.sql" size="small"> </el-input>
+        </el-dialog>
+
         <el-dialog width="40%" :title="`${chooseTableName} 字段信息`" v-model="columnDialog.visible">
             <el-table border stripe :data="columnDialog.columns" size="small">
                 <el-table-column prop="columnName" label="名称" show-overflow-tooltip> </el-table-column>
@@ -139,6 +239,7 @@
                 <el-table-column prop="columnName" label="列名" show-overflow-tooltip> </el-table-column>
                 <el-table-column prop="seqInIndex" label="列序列号" show-overflow-tooltip> </el-table-column>
                 <el-table-column prop="indexType" label="类型"> </el-table-column>
+                <el-table-column prop="indexComment" label="备注" min-width="230" show-overflow-tooltip> </el-table-column>
             </el-table>
         </el-dialog>
 
@@ -158,14 +259,19 @@
 </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';
 import CreateTable from './CreateTable.vue';
 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: {
@@ -195,11 +301,40 @@ export default defineComponent({
             },
             datas: [],
             total: 0,
-
+            showDumpInfo: false,
+            dumpInfo: {
+                id: 0,
+                db: '',
+                type: 3,
+                tables: [],
+            },
+            // sql执行记录弹框
+            sqlExecLogDialog: {
+                title: '',
+                visible: false,
+                data: [],
+                total: 0,
+                dbs: [],
+                query: {
+                    dbId: 0,
+                    db: '',
+                    table: '',
+                    type: null,
+                    pageNum: 1,
+                    pageSize: 12,
+                },
+            },
+            rollbackSqlDialog: {
+                visible: false,
+                sql: '',
+            },
             chooseTableName: '',
             tableInfoDialog: {
+                loading: false,
                 visible: false,
                 infos: [],
+                tableNameSearch: '',
+                tableCommentSearch: '',
             },
             columnDialog: {
                 visible: false,
@@ -225,7 +360,26 @@ export default defineComponent({
 
         onMounted(async () => {
             search();
-            state.projects = (await projectApi.projects.request({ pageNum: 1, pageSize: 100 })).list;
+        });
+
+        const filterTableInfos = computed(() => {
+            const infos = state.tableInfoDialog.infos;
+            const tableNameSearch = state.tableInfoDialog.tableNameSearch;
+            const tableCommentSearch = state.tableInfoDialog.tableCommentSearch;
+            if (!tableNameSearch && !tableCommentSearch) {
+                return infos;
+            }
+            return infos.filter((data: any) => {
+                let tnMatch = true;
+                let tcMatch = true;
+                if (tableNameSearch) {
+                    tnMatch = data.tableName.toLowerCase().includes(tableNameSearch.toLowerCase());
+                }
+                if (tableCommentSearch) {
+                    tcMatch = data.tableComment.includes(tableCommentSearch);
+                }
+                return tnMatch && tcMatch;
+            });
         });
 
         const choose = (item: any) => {
@@ -252,7 +406,12 @@ export default defineComponent({
             search();
         };
 
-        const editDb = (isAdd = false) => {
+        const getProjects = async () => {
+            state.projects = await projectApi.accountProjects.request(null);
+        };
+
+        const editDb = async (isAdd = false) => {
+            await getProjects();
             if (isAdd) {
                 state.dbEditDialog.data = null;
                 state.dbEditDialog.title = '新增数据库资源';
@@ -284,14 +443,118 @@ export default defineComponent({
             } catch (err) {}
         };
 
+        const onShowSqlExec = async (row: any) => {
+            state.sqlExecLogDialog.title = `${row.name}[${row.host}:${row.port}]`;
+            state.sqlExecLogDialog.query.dbId = row.id;
+            state.sqlExecLogDialog.dbs = row.database.split(' ');
+            searchSqlExecLog();
+            state.sqlExecLogDialog.visible = true;
+        };
+
+        const onBeforeCloseSqlExecDialog = () => {
+            state.sqlExecLogDialog.visible = false;
+            state.sqlExecLogDialog.data = [];
+            state.sqlExecLogDialog.dbs = [];
+            state.sqlExecLogDialog.total = 0;
+            state.sqlExecLogDialog.query.dbId = 0;
+            state.sqlExecLogDialog.query.pageNum = 1;
+            state.sqlExecLogDialog.query.table = '';
+            state.sqlExecLogDialog.query.db = '';
+            state.sqlExecLogDialog.query.type = null;
+        };
+
+        const searchSqlExecLog = async () => {
+            const res = await dbApi.getSqlExecs.request(state.sqlExecLogDialog.query);
+            state.sqlExecLogDialog.data = res.list;
+            state.sqlExecLogDialog.total = res.total;
+        };
+
+        const handleSqlExecPageChange = (curPage: number) => {
+            state.sqlExecLogDialog.query.pageNum = curPage;
+            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;
+            const oldValue = JSON.parse(sqlExecLog.oldValue);
+
+            const rollbackSqls = [];
+            if (sqlExecLog.type == enums.DbSqlExecTypeEnum['UPDATE'].value) {
+                for (let ov of oldValue) {
+                    const setItems = [];
+                    for (let key in ov) {
+                        if (key == primaryKey) {
+                            continue;
+                        }
+                        setItems.push(`${key} = ${wrapValue(ov[key])}`);
+                    }
+                    rollbackSqls.push(`UPDATE ${sqlExecLog.table} SET ${setItems.join(', ')} WHERE ${primaryKey} = ${wrapValue(ov[primaryKey])};`);
+                }
+            } else if (sqlExecLog.type == enums.DbSqlExecTypeEnum['DELETE'].value) {
+                const columnNames = columns.map((c: any) => c.columnName);
+                for (let ov of oldValue) {
+                    const values = [];
+                    for (let column of columnNames) {
+                        values.push(wrapValue(ov[column]));
+                    }
+                    rollbackSqls.push(`INSERT INTO ${sqlExecLog.table} (${columnNames.join(', ')}) VALUES (${values.join(', ')});`);
+                }
+            }
+
+            state.rollbackSqlDialog.sql = rollbackSqls.join('\n');
+            state.rollbackSqlDialog.visible = true;
+        };
+
+        /**
+         * 包装值，如果值类型为number则直接返回，其他则需要使用''包装
+         */
+        const wrapValue = (val: any) => {
+            if (typeof val == 'number') {
+                return val;
+            }
+            return `'${val}'`;
+        };
+
         const showTableInfo = async (row: any, db: string) => {
-            state.tableInfoDialog.infos = await dbApi.tableInfos.request({ id: row.id, db });
+            state.tableInfoDialog.loading = true;
-            state.dbId = row.id;
-            state.db = db;
             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 = [];
         };
@@ -353,13 +616,22 @@ export default defineComponent({
 
         return {
             ...toRefs(state),
-            // enums,
+            getProjects,
+            filterTableInfos,
+            enums,
             search,
             choose,
             handlePageChange,
             editDb,
             valChange,
             deleteDb,
+            onShowSqlExec,
+            handleDumpTableSelectionChange,
+            dump,
+            onBeforeCloseSqlExecDialog,
+            handleSqlExecPageChange,
+            searchSqlExecLog,
+            onShowRollbackSql,
             showTableInfo,
             closeTableInfo,
             showColumns,

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

@@ -1,22 +1,12 @@
 <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">
                     <project-env-select @changeProjectEnv="changeProjectEnv">
                         <template #default>
                             <el-form-item label="资源">
-                                <el-select
+                                <el-select v-model="dbId" placeholder="请选择资源实例" @change="changeDbInstance" filterable style="width: 150px">
-                                    v-model="dbId"
-                                    placeholder="请选择资源实例"
-                                    @change="changeDbInstance"
-                                    filterable
-                                    style="width: 150px"
-                                >
                                     <el-option v-for="item in dbs" :key="item.id" :label="item.name" :value="item.id">
                                         <span style="float: left">{{ item.name }}</span>
                                         <span style="float: right; color: #8492a6; margin-left: 6px; font-size: 13px">{{
@@ -27,7 +17,15 @@
                             </el-form-item>
 
                             <el-form-item label="数据库">
-                                <el-select v-model="db" placeholder="请选择数据库" @change="changeDb" @clear="clearDb" clearable filterable style="width: 150px">
+                                <el-select
+                                    v-model="db"
+                                    placeholder="请选择数据库"
+                                    @change="changeDb"
+                                    @clear="clearDb"
+                                    clearable
+                                    filterable
+                                    style="width: 150px"
+                                >
                                     <el-option v-for="item in databaseList" :key="item" :label="item" :value="item"> </el-option>
                                 </el-select>
                             </el-form-item>
@@ -56,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"
@@ -70,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">
@@ -99,13 +109,25 @@
                             </div>
                         </div>
 
-                        <div @click="closeExecBtns" class="mt5 sqlEditor" @contextmenu="showExecBtns">
+                        <div class="mt5 sqlEditor">
                             <textarea ref="codeTextarea"></textarea>
                         </div>
 
                         <div class="mt5">
-                            <el-row v-if="queryTab.nowTableName">
+                            <el-row>
-                                <el-link @click="onDeleteData" class="ml5" type="danger" icon="delete" :underline="false"></el-link>
+                                <el-link
+                                    v-if="queryTab.nowTableName"
+                                    @click="onDeleteData"
+                                    class="ml5"
+                                    type="danger"
+                                    icon="delete"
+                                    :underline="false"
+                                ></el-link>
+
+                                <span v-if="queryTab.execRes.data.length > 0">
+                                    <el-divider direction="vertical" border-style="dashed" />
+                                    <el-link type="success" :underline="false" @click="exportData"><span style="font-size: 12px">导出</span></el-link>
+                                </span>
                             </el-row>
                             <el-table
                                 @cell-dblclick="cellClick"
@@ -143,52 +165,66 @@
 
                 <el-tab-pane closable v-for="dt in dataTabs" :key="dt.name" :label="dt.label" :name="dt.name">
                     <el-row v-if="dbId">
-                        <el-link @click="onRefresh(dt.name)" icon="refresh" :underline="false" class="ml5"></el-link>
+                        <el-col :span="8">
-                        <el-link @click="addRow" class="ml5" type="primary" icon="plus" :underline="false"></el-link>
+                            <el-link @click="onRefresh(dt.name)" icon="refresh" :underline="false" class="ml5"></el-link>
-                        <el-link @click="onDeleteData" class="ml5" type="danger" icon="delete" :underline="false"></el-link>
+                            <el-divider direction="vertical" border-style="dashed" />
 
-                        <el-tooltip class="box-item" effect="dark" content="commit" placement="top">
+                            <el-link @click="addRow" type="primary" icon="plus" :underline="false"></el-link>
-                            <el-link @click="onCommit" class="ml5" type="success" icon="check" :underline="false"></el-link>
+                            <el-divider direction="vertical" border-style="dashed" />
-                        </el-tooltip>
-                    </el-row>
-                    <el-row class="mt5">
-                        <el-input
-                            v-model="dt.condition"
-                            placeholder="若需条件过滤，可选择列并点击对应的字段并输入需要过滤的内容点击查询按钮即可"
-                            clearable
-                            size="small"
-                        >
-                            <template #prepend>
-                                <el-popover trigger="click" :width="270" placement="right">
-                                    <template #reference>
-                                        <el-link type="success" :underline="false">选择列</el-link>
-                                    </template>
-                                    <el-table
-                                        :data="getColumns4Map(dt.name)"
-                                        max-height="500"
-                                        size="small"
-                                        @row-click="
-                                            (...event) => {
-                                                onConditionRowClick(event, dt);
-                                            }
-                                        "
-                                    >
-                                        <el-table-column property="columnName" label="列名" show-overflow-tooltip> </el-table-column>
-                                        <el-table-column property="columnComment" label="备注" show-overflow-tooltip> </el-table-column>
-                                    </el-table>
-                                </el-popover>
-                            </template>
 
-                            <template #append>
+                            <el-link @click="onDeleteData" type="danger" icon="delete" :underline="false"></el-link>
-                                <el-button @click="selectByCondition(dt.name, dt.condition)" icon="search" size="small"></el-button>
+                            <el-divider direction="vertical" border-style="dashed" />
-                            </template>
+
-                        </el-input>
+                            <el-tooltip class="box-item" effect="dark" content="commit" placement="top">
+                                <el-link @click="onCommit" type="success" icon="CircleCheck" :underline="false"></el-link>
+                            </el-tooltip>
+                            <el-divider direction="vertical" border-style="dashed" />
+
+                            <el-tooltip class="box-item" effect="dark" content="生成insert sql" placement="top">
+                                <el-link @click="onGenerateInsertSql" type="success" :underline="false">gi</el-link>
+                            </el-tooltip>
+                        </el-col>
+                        <el-col :span="16">
+                            <el-input
+                                v-model="dt.condition"
+                                placeholder="若需条件过滤，可选择列并点击对应的字段并输入需要过滤的内容点击查询按钮即可"
+                                clearable
+                                size="small"
+                                style="width: 100%"
+                            >
+                                <template #prepend>
+                                    <el-popover trigger="click" :width="320" placement="right">
+                                        <template #reference>
+                                            <el-link type="success" :underline="false">选择列</el-link>
+                                        </template>
+                                        <el-table
+                                            :data="getColumns4Map(dt.name)"
+                                            max-height="500"
+                                            size="small"
+                                            @row-click="
+                                                (...event) => {
+                                                    onConditionRowClick(event, dt);
+                                                }
+                                            "
+                                            style="cursor: pointer"
+                                        >
+                                            <el-table-column property="columnName" label="列名" show-overflow-tooltip> </el-table-column>
+                                            <el-table-column property="columnComment" label="备注" show-overflow-tooltip> </el-table-column>
+                                        </el-table>
+                                    </el-popover>
+                                </template>
+
+                                <template #append>
+                                    <el-button @click="selectByCondition(dt.name, dt.condition)" icon="search" size="small"></el-button>
+                                </template>
+                            </el-input>
+                        </el-col>
                     </el-row>
                     <el-table
                         @cell-dblclick="cellClick"
                         @sort-change="onTableSortChange"
                         @selection-change="onDataSelectionChange"
-                        :data="dt.execRes.data"
+                        :data="dt.datas"
                         size="small"
                         :max-height="dataTabsTableHeight"
                         v-loading="dt.loading"
@@ -198,12 +234,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"
@@ -211,17 +247,54 @@
                             :sortable="nowTableName != '' ? 'custom' : false"
                         >
                             <template #header>
-                                <el-tooltip raw-content effect="dark" placement="top">
+                                <el-tooltip raw-content placement="top" effect="customized">
                                     <template #content> {{ getColumnTip(dt.name, item) }} </template>
-                                    <el-icon><question-filled /></el-icon>
+                                    {{ item }}
                                 </el-tooltip>
-                                {{ item }}
                             </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>
 
@@ -237,7 +310,6 @@ import 'codemirror/theme/base16-light.css';
 
 import 'codemirror/addon/selection/active-line';
 import _CodeMirror from 'codemirror';
-// import 'codemirror/mode/sql/sql.js';
 import 'codemirror/addon/hint/show-hint.js';
 import 'codemirror/addon/hint/sql-hint.js';
 
@@ -248,6 +320,7 @@ import ProjectEnvSelect from '../component/ProjectEnvSelect.vue';
 import config from '@/common/config';
 import { getSession } from '@/common/utils/storage';
 import SqlExecBox from './component/SqlExecBox';
+import { dateStrFormat } from '@/common/utils/date.ts';
 
 export default defineComponent({
     name: 'SqlExec',
@@ -262,15 +335,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',
@@ -296,12 +369,18 @@ export default defineComponent({
                 pageSize: 10,
                 envId: null,
             },
-            btnStyle: {
+            conditionDialog: {
-                position: 'absolute',
+                title: '',
-                zIndex: 1000,
+                placeholder: '',
-                display: 'none',
+                columnRow: null,
-                left: '',
+                dataTab: null,
-                top: '',
+                visible: false,
+                condition: '=',
+                value: null,
+            },
+            genSqlDialog: {
+                visible: false,
+                sql: '',
             },
             cmOptions: {
                 tabSize: 4,
@@ -355,7 +434,7 @@ export default defineComponent({
         const setHeight = () => {
             // 默认300px
             codemirror.setSize('auto', `${window.innerHeight - 538}px`);
-            state.dataTabsTableHeight = window.innerHeight - 258;
+            state.dataTabsTableHeight = window.innerHeight - 274;
         };
 
         /**
@@ -388,7 +467,43 @@ export default defineComponent({
             let sql = getSql();
             isTrue(sql && sql.trim(), '请选中需要执行的sql');
 
-            state.queryTab.loading = true;
+            // 去除字符串前的空格、换行等
+            sql = sql.replace(/(^\s*)/g, '');
+            let execRemark = '';
+            let canRun = true;
+            if (
+                sql.startsWith('update') ||
+                sql.startsWith('UPDATE') ||
+                sql.startsWith('INSERT') ||
+                sql.startsWith('insert') ||
+                sql.startsWith('DELETE') ||
+                sql.startsWith('delete')
+            ) {
+                const res: any = await ElMessageBox.prompt('请输入备注', 'Tip', {
+                    confirmButtonText: '确定',
+                    cancelButtonText: '取消',
+                    inputPattern: /^[\s\S]*.*[^\s][\s\S]*$/,
+                    inputErrorMessage: '请输入执行该sql的备注信息',
+                });
+                execRemark = res.value;
+                if (!execRemark) {
+                    canRun = false;
+                }
+            }
+            if (!canRun) {
+                return;
+            }
+
+            try {
+                state.queryTab.loading = true;
+                const colAndData: any = await runSql(sql, execRemark);
+                state.queryTab.execRes.data = colAndData.res;
+                state.queryTab.execRes.tableColumn = colAndData.colNames;
+                state.queryTab.loading = false;
+            } catch (e: any) {
+                state.queryTab.loading = false;
+            }
+
             // 即只有以该字符串开头的sql才可修改表数据内容
             if (sql.startsWith('SELECT *') || sql.startsWith('select *') || sql.startsWith('SELECT\n  *')) {
                 state.queryTab.selectionDatas = [];
@@ -405,16 +520,36 @@ export default defineComponent({
                 state.queryTab.nowTableName = '';
                 state.nowTableName = '';
             }
+        };
 
-            try {
+        const exportData = () => {
-                const colAndData: any = await runSql(sql);
+            const dataList = state.queryTab.execRes.data;
-                state.queryTab.execRes.data = colAndData.res;
+            isTrue(dataList.length > 0, '没有数据可导出');
-                state.queryTab.execRes.tableColumn = colAndData.colNames;
+
-                state.queryTab.loading = false;
+            const tableColumn = state.queryTab.execRes.tableColumn;
-            } catch (e: any) {
+            // 二维数组
-                state.queryTab.loading = false;
+            const cvsData = [tableColumn];
+            for (let data of dataList) {
+                // 数据值组成的一维数组
+                let dataValueArr: any = [];
+                for (let column of tableColumn) {
+                    dataValueArr.push(data[column]);
+                }
+                cvsData.push(dataValueArr);
             }
-            closeExecBtns();
+            const csvString = cvsData.map((e) => e.join(',')).join('\n');
+
+            // 导出
+            let link = document.createElement('a');
+            let exportContent = '\uFEFF';
+            let blob = new Blob([exportContent + csvString], {
+                type: 'text/plain;charset=utrf-8',
+            });
+            link.id = 'download-csv';
+            link.setAttribute('href', URL.createObjectURL(blob));
+            link.setAttribute('download', `查询数据导出-${dateStrFormat('yyyyMMddHHmmss', new Date())}.csv`);
+            document.body.appendChild(link);
+            link.click();
         };
 
         /**
@@ -422,11 +557,12 @@ export default defineComponent({
          *
          * @param sql 执行的sql
          */
-        const runSql = (sql: string) => {
+        const runSql = async (sql: string, remark: string = '') => {
-            return dbApi.sqlExec.request({
+            return await dbApi.sqlExec.request({
                 id: state.dbId,
                 db: state.db,
                 sql: sql.trim(),
+                remark,
             });
         };
 
@@ -477,7 +613,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') => {
@@ -495,8 +631,9 @@ export default defineComponent({
             if (flag === 'equal') {
                 // 获取该列中第一个不为空的数据(内容)
                 for (let i = 0; i < tableData.length; i++) {
-                    if (tableData[i][str].length > 0) {
+                    // 转为字符串后比较
-                        columnContent = tableData[i][str];
+                    if ((tableData[i][str] + '').length > 0) {
+                        columnContent = tableData[i][str] + '';
                         break;
                     }
                 }
@@ -513,31 +650,47 @@ export default defineComponent({
                         index = i;
                     }
                 }
-                columnContent = tableData[index][str];
+                columnContent = tableData[index][str] + '';
             }
+            const contentWidth: number = getContentWidth(columnContent);
+            // 获取列名称的长度 加上排序图标长度
+            const columnWidth: number = getContentWidth(str) + 43;
+            const flexWidth: number = contentWidth > columnWidth ? contentWidth : columnWidth;
+            return flexWidth + 'px';
+        };
+
+        /**
+         * 获取内容所需要占用的宽度
+         */
+        const getContentWidth = (content: any): number => {
             // 以下分配的单位长度可根据实际需求进行调整
             let flexWidth = 0;
-            for (const char of columnContent) {
+            for (const char of content) {
-                if ((char >= 'A' && char <= 'Z') || (char >= 'a' && char <= 'z')) {
+                if (flexWidth > 500) {
-                    // 如果是英文字符，为字符分配8个单位宽度
+                    break;
-                    flexWidth += 8;
+                }
-                } else if (char >= '\u4e00' && char <= '\u9fa5') {
+                if ((char >= '0' && char <= '9') || (char >= 'a' && char <= 'z')) {
-                    // 如果是中文字符，为字符分配15个单位宽度
+                    // 如果是小写字母、数字字符，分配8个单位宽度
+                    flexWidth += 8.5;
+                    continue;
+                }
+                if (char >= 'A' && char <= 'Z') {
+                    flexWidth += 9;
+                    continue;
+                }
+                if (char >= '\u4e00' && char <= '\u9fa5') {
+                    // 如果是中文字符，为字符分配16个单位宽度
                     flexWidth += 16;
                 } else {
-                    // 其他种类字符，为字符分配10个单位宽度
+                    // 其他种类字符，为字符分配9个单位宽度
-                    flexWidth += 10;
+                    flexWidth += 8;
                 }
             }
-            if (flexWidth < 80) {
-                // 设置最小宽度
-                flexWidth = 80;
-            }
             if (flexWidth > 500) {
                 // 设置最大宽度
                 flexWidth = 500;
             }
-            return flexWidth + 'px';
+            return flexWidth;
         };
 
         const getColumnTip = (tableName: string, columnName: string) => {
@@ -568,7 +721,9 @@ export default defineComponent({
          */
         const changeDbInstance = (dbId: any) => {
             state.db = '';
-            state.databaseList = (state.dbs.find((e: any) => e.id == dbId) as any).database.split(' ');
+            const dbInfo = state.dbs.find((e: any) => e.id == dbId) as any;
+            state.dbType = dbInfo.type;
+            state.databaseList = dbInfo.database.split(' ');
             clearDb();
         };
 
@@ -600,8 +755,6 @@ export default defineComponent({
             if (tableName == '') {
                 return;
             }
-            state.columnMetadata = (await getColumns(tableName)) as any;
-
             if (!execSelectSql) {
                 return;
             }
@@ -618,40 +771,17 @@ export default defineComponent({
             tab = {
                 label: tableName,
                 name: tableName,
-                execRes: {
+                datas: [],
-                    tableColumn: [],
+                columnNames: [],
-                    data: [],
+                pageNum: 1,
-                },
+                count: 0,
-                querySql: getDefaultSelectSql(tableName),
             };
+            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;
-            }
-        };
-
         /**
          * 获取表的所有列信息
          */
@@ -675,38 +805,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}] 的值`, '查询条件', {
+            state.conditionDialog.title = `请输入 [${row.columnName}] 的值`;
-                confirmButtonText: '确定',
+            state.conditionDialog.placeholder = `${row.columnType}  ${row.columnComment}`;
-                cancelButtonText: '取消',
+            state.conditionDialog.columnRow = row;
-                inputPlaceholder: `${row.columnType}  ${row.columnComment}`,
+            state.conditionDialog.dataTab = dataTab;
-            })
+            state.conditionDialog.visible = true;
-                .then(({ value }) => {
+        };
-                    if (!value) {
+
-                        value = '';
+        // 确认条件
-                    }
+        const onConfirmCondition = () => {
-                    let condition = dataTab.condition;
+            const conditionDialog = state.conditionDialog;
-                    if (condition) {
+            const dataTab = state.conditionDialog.dataTab as any;
-                        condition += ` AND `;
+            let condition = dataTab.condition;
-                    }
+            if (condition) {
-                    condition += `${row.columnName} = `;
+                condition += ` AND `;
-                    dataTab.condition = condition + wrapColumnValue(row, value);
+            }
-                })
+            const row = conditionDialog.columnRow as any;
-                .catch(() => {});
+            condition += `${row.columnName} ${conditionDialog.condition} `;
+            dataTab.condition = condition + wrapColumnValue(row, conditionDialog.value);
+            onCancelCondition();
+        };
+
+        const onCancelCondition = () => {
+            state.conditionDialog.visible = false;
+            state.conditionDialog.title = ``;
+            state.conditionDialog.placeholder = ``;
+            state.conditionDialog.value = null;
+            state.conditionDialog.columnRow = null;
+            state.conditionDialog.dataTab = null;
         };
 
         const onRefresh = async (tableName: string) => {
+            const dataTab = state.dataTabs[tableName];
             // 查询条件置空
-            state.dataTabs[tableName].condition = '';
+            dataTab.condition = '';
-            state.dataTabs[tableName].loading = true;
+            dataTab.pageNum = 1;
-            const colAndData: any = await runSql(state.dataTabs[tableName].querySql);
+            setDataTabDatas(dataTab);
-            state.dataTabs[tableName].execRes.tableColumn = colAndData.colNames;
+        };
-            state.dataTabs[tableName].execRes.data = colAndData.res;
+
-            state.dataTabs[tableName].loading = false;
+        /**
+         * 数据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 : ''}`;
         };
 
         /**
@@ -728,7 +936,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);
         };
@@ -819,7 +1028,6 @@ export default defineComponent({
             state.tableName = '';
             state.nowTableName = '';
             state.tableMetadata = [];
-            state.columnMetadata = [];
             state.dataTabs = {};
             setCodermirrorValue('');
             state.sqlNames = [];
@@ -829,7 +1037,6 @@ export default defineComponent({
             state.queryTab.execRes.tableColumn = [];
             state.cmOptions.hintOptions.tables = [];
             tableMap.clear();
-            closeExecBtns();
         };
 
         const onDataSelectionChange = (datas: []) => {
@@ -854,10 +1061,7 @@ export default defineComponent({
 
             promptExeSql(sql, null, () => {
                 if (!queryTab) {
-                    state.dataTabs[state.activeName].execRes.data = state.dataTabs[state.activeName].execRes.data.filter(
+                    onRefresh(state.activeName);
-                        (d: any) => !(deleteDatas.findIndex((x: any) => x[primaryKeyColumnName] == d[primaryKeyColumnName]) != -1)
-                    );
-                    state.dataTabs[state.activeName].selectionDatas = [];
                 } else {
                     state.queryTab.execRes.data = state.queryTab.execRes.data.filter(
                         (d: any) => !(deleteDatas.findIndex((x: any) => x[primaryKeyColumnName] == d[primaryKeyColumnName]) != -1)
@@ -867,6 +1071,38 @@ export default defineComponent({
             });
         };
 
+        const onGenerateInsertSql = async () => {
+            const queryTab = isQueryTab();
+            const datas = queryTab ? state.queryTab.selectionDatas : state.dataTabs[state.activeName].selectionDatas;
+            isTrue(datas && datas.length > 0, '请先选择要生成insert语句的数据');
+            const tableName = state.nowTableName;
+            const columns: any = await getColumns(tableName);
+
+            const sqls = [];
+            for (let data of datas) {
+                let colNames = [];
+                let values = [];
+                for (let column of columns) {
+                    const colName = column.columnName;
+                    colNames.push(colName);
+                    values.push(wrapValueByType(data[colName]));
+                }
+                sqls.push(`INSERT INTO ${tableName} (${colNames.join(', ')}) VALUES(${values.join(', ')})`);
+            }
+            state.genSqlDialog.sql = sqls.join(';\n') + ';';
+            state.genSqlDialog.visible = true;
+        };
+
+        const wrapValueByType = (val: any) => {
+            if (val == null) {
+                return 'NULL';
+            }
+            if (typeof val == 'number') {
+                return val;
+            }
+            return `'${val}'`;
+        };
+
         /**
          * 是否为查询tab
          */
@@ -881,7 +1117,8 @@ export default defineComponent({
             if (!state.nowTableName || !property) {
                 return;
             }
-            let text = row[property];
+            // 转为字符串比较,可能存在数字等
+            let text = (row[property] ? row[property] : '') + '';
             let div = cell.children[0];
             if (div) {
                 let input = document.createElement('input');
@@ -975,7 +1212,6 @@ export default defineComponent({
             let selectSql = codemirror.getSelection();
             isTrue(selectSql, '请选中需要格式化的sql');
             codemirror.replaceSelection(sqlFormatter(selectSql));
-            closeExecBtns();
         };
 
         const search = async () => {
@@ -983,31 +1219,6 @@ export default defineComponent({
             state.dbs = res.list;
         };
 
-        /**
-         * 显示执行sql和格式化按钮
-         */
-        const showExecBtns = (event: any) => {
-            if (event.preventDefault) {
-                event.preventDefault();
-            } else {
-                event.returnValue = false;
-            }
-            state.btnStyle.display = 'inline';
-            state.btnStyle.left = event.offsetX + 15 + 'px';
-            state.btnStyle.top = event.clientY - 80 + 'px';
-        };
-
-        /**
-         * 关闭执行sql和格式化按钮
-         */
-        const closeExecBtns = () => {
-            if (state.btnStyle.left) {
-                state.btnStyle.display = 'none';
-                state.btnStyle.left = '';
-                state.btnStyle.top = '';
-            }
-        };
-
         return {
             ...toRefs(state),
             codeTextarea,
@@ -1015,6 +1226,7 @@ export default defineComponent({
             changeTable,
             cellClick,
             onRunSql,
+            exportData,
             removeDataTab,
             onDataTabClick,
             beforeUpload,
@@ -1024,6 +1236,8 @@ export default defineComponent({
             getColumnTip,
             getColumns4Map,
             onConditionRowClick,
+            onConfirmCondition,
+            onCancelCondition,
             changeSqlTemplate,
             deleteSql,
             saveSql,
@@ -1033,14 +1247,14 @@ export default defineComponent({
             formatSql,
             onBeforeChange,
             onRefresh,
+            handlePageChange,
             selectByCondition,
             onCommit,
             addRow,
             onDataSelectionChange,
             onDeleteData,
             onTableSortChange,
-            showExecBtns,
+            onGenerateInsertSql,
-            closeExecBtns,
         };
     },
 });

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'),
@@ -12,7 +15,7 @@ export const dbApi = {
     columnMetadata: Api.create("/dbs/{id}/c-metadata", 'get'),
     // 获取表即列提示
     hintTables: Api.create("/dbs/{id}/hint-tables", 'get'),
-    sqlExec: Api.create("/dbs/{id}/exec-sql", 'get'),
+    sqlExec: Api.create("/dbs/{id}/exec-sql", 'post'),
     // 保存sql
     saveSql: Api.create("/dbs/{id}/sql", 'post'),
     // 获取保存的sql
@@ -20,4 +23,6 @@ export const dbApi = {
     // 获取保存的sql names
     getSqlNames: Api.create("/dbs/{id}/sql-names", 'get'),
     deleteDbSql: Api.create("/dbs/{id}/sql", 'delete'),
+    // 获取数据库sql执行记录
+    getSqlExecs: Api.create("/dbs/{dbId}/sql-execs", 'get'),
 }

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

@@ -2,6 +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 ref="remarkInputRef" v-model="remark" placeholder="请输入执行备注" class="mt5" />
             <template #footer>
                 <span class="dialog-footer">
                     <el-button @click="cancel">取 消</el-button>
@@ -13,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 } from 'element-plus';
+import { ElDialog, ElButton, ElInput, ElMessage, InputInstance } from 'element-plus';
 // import base style
 import 'codemirror/lib/codemirror.css';
 // 引入主题后还需要在 options 中指定主题才会生效
@@ -32,6 +33,7 @@ export default defineComponent({
         codemirror,
         ElButton,
         ElDialog,
+        ElInput,
     },
     props: {
         visible: {
@@ -48,11 +50,13 @@ export default defineComponent({
         },
     },
     setup(props: any) {
+        const remarkInputRef = ref<InputInstance>();
         const state = reactive({
             dialogVisible: false,
             sqlValue: '',
             dbId: 0,
             db: '',
+            remark: '',
             btnLoading: false,
             cmOptions: {
                 tabSize: 4,
@@ -77,14 +81,26 @@ export default defineComponent({
          * 执行sql
          */
         const runSql = async () => {
+            if (!state.remark) {
+                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;
             }
@@ -104,6 +120,7 @@ export default defineComponent({
             setTimeout(() => {
                 state.dbId = 0;
                 state.sqlValue = '';
+                state.remark = '';
                 runSuccessCallback = null;
                 cancelCallback = null;
                 runSuccess = false;
@@ -117,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,
@@ -133,7 +156,4 @@ export default defineComponent({
     font-size: 9pt;
     font-weight: 600;
 }
-.footer {
-    float: right;
-}
 </style>

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

@@ -0,0 +1,11 @@
+import { Enum } from '@/common/Enum'
+
+/**
+ * 枚举类
+ */
+export default {
+    // 数据库sql执行类型
+    DbSqlExecTypeEnum: new Enum().add('UPDATE', 'UPDATE', 1)
+        .add('DELETE', 'DELETE', 2)
+        .add('INSERT', 'INSERT', 3),
+}

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

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

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

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

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

@@ -16,7 +16,7 @@
                     >删除</el-button
                 >
                 <div style="float: right">
-                    <el-select v-model="params.projectId" placeholder="请选择项目" @clear="search" filterable clearable>
+                    <el-select @focus="getProjects" v-model="params.projectId" placeholder="请选择项目" @clear="search" filterable clearable>
                         <el-option v-for="item in projects" :key="item.id" :label="`${item.name} [${item.remark}]`" :value="item.id"> </el-option>
                     </el-select>
                     <el-input
@@ -42,7 +42,7 @@
                     </template>
                 </el-table-column>
                 <el-table-column prop="name" label="名称" min-width="140" show-overflow-tooltip></el-table-column>
-                <el-table-column prop="ip" label="ip:port" min-width="140">
+                <el-table-column prop="ip" label="ip:port" min-width="150">
                     <template #default="scope">
                         <el-link :disabled="scope.row.status == -1" @click="showMachineStats(scope.row)" type="primary" :underline="false">{{
                             `${scope.row.ip}:${scope.row.port}`
@@ -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
+                        <span v-auth="'machine:terminal'">
-                            v-auth="'machine:terminal'"
+                            <el-link
-                            :disabled="scope.row.status == -1"
+                                :disabled="scope.row.status == -1"
-                            type="primary"
+                                type="primary"
-                            @click="showTerminal(scope.row)"
+                                @click="showTerminal(scope.row)"
-                            plain
+                                plain
-                            size="small"
+                                size="small"
-                            :underline="false"
+                                :underline="false"
-                            >终端</el-link
+                                >终端</el-link
-                        >
+                            >
-                        <el-divider v-auth="'machine:terminal'" direction="vertical" border-style="dashed" />
+                            <el-divider direction="vertical" border-style="dashed" />
-                        <el-link
+                        </span>
-                            v-auth="'machine:file'"
+
-                            type="success"
+                        <span v-auth="'machine:update'" v-if="scope.row.enableRecorder == 1">
-                            :disabled="scope.row.status == -1"
+                            <el-link @click="showRec(scope.row)" plain :underline="false" size="small">终端回放</el-link>
-                            @click="fileManage(scope.row)"
+                            <el-divider direction="vertical" border-style="dashed" />
-                            plain
+                        </span>
-                            size="small"
+
-                            :underline="false"
+                        <span v-auth="'machine:file'">
-                            >文件</el-link
+                            <el-link
-                        >
+                                type="success"
-                        <el-divider v-auth="'machine:file'" direction="vertical" border-style="dashed" />
+                                :disabled="scope.row.status == -1"
+                                @click="fileManage(scope.row)"
+                                plain
+                                size="small"
+                                :underline="false"
+                                >文件</el-link
+                            >
+                            <el-divider direction="vertical" border-style="dashed" />
+                        </span>
+
                         <el-link
                             :disabled="scope.row.status == -1"
                             type="warning"
@@ -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"
@@ -229,11 +234,15 @@ export default defineComponent({
                 data: null,
                 title: '新增机器',
             },
+            machineRecDialog: {
+                visible: false,
+                machineId: 0,
+                title: '',
+            },
         });
 
         onMounted(async () => {
             search();
-            state.projects = await projectApi.accountProjects.request(null);
         });
 
         const choose = (item: any) => {
@@ -256,18 +265,28 @@ export default defineComponent({
         };
 
         const closeCli = async (row: any) => {
+            await ElMessageBox.confirm(`确定关闭该机器客户端连接?`, '提示', {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                type: 'warning',
+            });
             await machineApi.closeCli.request({ id: row.id });
             ElMessage.success('关闭成功');
             search();
         };
 
-        const openFormDialog = (redis: any) => {
+        const getProjects = async () => {
+            state.projects = await projectApi.accountProjects.request(null);
+        };
+
+        const openFormDialog = async (machine: any) => {
+            await getProjects();
             let dialogTitle;
-            if (redis) {
+            if (machine) {
                 state.machineEditDialog.data = state.currentData as any;
                 dialogTitle = '编辑机器';
             } else {
-                state.machineEditDialog.data = { port: 22 } as any;
+                state.machineEditDialog.data = null;
                 dialogTitle = '添加机器';
             }
 
@@ -339,9 +358,21 @@ export default defineComponent({
             state.processDialog.visible = true;
         };
 
+        const showRec = (row: any) => {
+            const { href } = router.resolve({
+                path: `/machine/terminal-rec`,
+                query: {
+                    id: row.id,
+                    name: `${row.name}[${row.ip}]-终端回放记录`,
+                },
+            });
+            window.open(href, '_blank');
+        };
+
         return {
             ...toRefs(state),
             choose,
+            getProjects,
             showTerminal,
             openFormDialog,
             deleteMachine,
@@ -353,6 +384,7 @@ export default defineComponent({
             submitSuccess,
             fileManage,
             search,
+            showRec,
             handlePageChange,
         };
     },

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

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

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,451 @@
+<template>
+    <div>
+        <div class="toolbar">
+            <el-row type="flex" justify="space-between">
+                <el-col :span="24">
+                    <project-env-select @changeProjectEnv="changeProjectEnv">
+                        <template #default>
+                            <el-form-item label="实例" label-width="40px">
+                                <el-select v-model="mongoId" placeholder="请选择mongo" @change="changeMongo">
+                                    <el-option v-for="item in mongoList" :key="item.id" :label="item.name" :value="item.id">
+                                        <span style="float: left">{{ item.name }}</span>
+                                        <span style="float: right; color: #8492a6; margin-left: 6px; font-size: 13px">{{ ` [${item.uri}]` }}</span>
+                                    </el-option>
+                                </el-select>
+                            </el-form-item>
+
+                            <el-form-item label="库" label-width="20px">
+                                <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">{{
+                                            ` [${formatByteSize(item.SizeOnDisk)}]`
+                                        }}</span>
+                                    </el-option>
+                                </el-select>
+                            </el-form-item>
+
+                            <el-form-item label="集合" label-width="40px">
+                                <el-select v-model="collection" placeholder="请选择集合" @change="changeCollection" filterable>
+                                    <el-option v-for="item in collections" :key="item" :label="item" :value="item">
+                                    </el-option>
+                                </el-select>
+                            </el-form-item>
+                        </template>
+                    </project-env-select>
+                </el-col>
+            </el-row>
+        </div>
+
+        <el-container id="data-exec" style="border: 1px solid #eee; margin-top: 1px">
+            <el-tabs @tab-remove="removeDataTab" @tab-click="onDataTabClick" style="width: 100%; margin-left: 5px" v-model="activeName">
+                <el-tab-pane closable v-for="dt in dataTabs" :key="dt.name" :label="dt.name" :name="dt.name">
+                    <el-row v-if="mongoId">
+                        <el-link @click="findCommand(activeName)" icon="refresh" :underline="false" class="ml5"></el-link>
+                        <el-link @click="showInsertDocDialog" class="ml5" type="primary" icon="plus" :underline="false"></el-link>
+                    </el-row>
+                    <el-row class="mt5 mb5">
+                        <el-input
+                            ref="findParamInputRef"
+                            v-model="dt.findParamStr"
+                            placeholder="点击输入相应查询条件"
+                            @focus="showFindDialog(dt.name)"
+                        >
+                            <template #prepend>查询参数</template>
+                        </el-input>
+                    </el-row>
+                    <el-row>
+                        <el-col :span="6" v-for="item in dt.datas" :key="item">
+                            <el-card :body-style="{ padding: '0px', position: 'relative' }">
+                                <el-input type="textarea" v-model="item.value" :rows="12" />
+                                <div style="padding: 3px; float: right" class="mr5 mongo-doc-btns">
+                                    <div>
+                                        <el-link @click="onJsonEditor(item)" :underline="false" type="success" icon="MagicStick"></el-link>
+
+                                        <el-divider direction="vertical" border-style="dashed" />
+
+                                        <el-link
+                                            @click="onSaveDoc(item.value)"
+                                            :underline="false"
+                                            type="warning"
+                                            icon="DocumentChecked"
+                                        ></el-link>
+
+                                        <el-divider direction="vertical" border-style="dashed" />
+
+                                        <el-popconfirm @confirm="onDeleteDoc(item.value)" title="确定删除该文档?">
+                                            <template #reference>
+                                                <el-link :underline="false" type="danger" icon="DocumentDelete"></el-link>
+                                            </template>
+                                        </el-popconfirm>
+                                    </div>
+                                </div>
+                            </el-card>
+                        </el-col>
+                    </el-row>
+                </el-tab-pane>
+            </el-tabs>
+        </el-container>
+
+        <el-dialog width="600px" title="find参数" v-model="findDialog.visible">
+            <el-form label-width="70px">
+                <el-form-item label="filter">
+                    <el-input v-model="findDialog.findParam.filter" type="textarea" :rows="6" clearable auto-complete="off"></el-input>
+                </el-form-item>
+                <el-form-item label="sort">
+                    <el-input v-model="findDialog.findParam.sort" type="textarea" :rows="3" clearable auto-complete="off"></el-input>
+                </el-form-item>
+                <el-form-item label="limit">
+                    <el-input v-model.number="findDialog.findParam.limit" type="number" auto-complete="off"></el-input>
+                </el-form-item>
+                <el-form-item label="skip">
+                    <el-input v-model.number="findDialog.findParam.skip" type="number" auto-complete="off"></el-input>
+                </el-form-item>
+            </el-form>
+            <template #footer>
+                <div>
+                    <el-button @click="findDialog.visible = false">取 消</el-button>
+                    <el-button @click="confirmFindDialog" type="primary">确 定</el-button>
+                </div>
+            </template>
+        </el-dialog>
+
+        <el-dialog width="800px" :title="`新增'${activeName}'集合文档`" v-model="insertDocDialog.visible" :close-on-click-modal="false">
+            <json-edit currentMode="code" v-model="insertDocDialog.doc" />
+            <template #footer>
+                <div>
+                    <el-button @click="insertDocDialog.visible = false">取 消</el-button>
+                    <el-button @click="onInsertDoc" type="primary">确 定</el-button>
+                </div>
+            </template>
+        </el-dialog>
+
+        <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>
+
+        <div style="text-align: center; margin-top: 10px"></div>
+    </div>
+</template>
+
+<script lang="ts">
+import { mongoApi } from './api';
+import { toRefs, ref, reactive, defineComponent } from 'vue';
+import { ElMessage } from 'element-plus';
+import ProjectEnvSelect from '../component/ProjectEnvSelect.vue';
+
+import { isTrue, notBlank, notNull } from '@/common/assert';
+import { formatByteSize } from '@/common/utils/format';
+import JsonEdit from '@/components/jsonedit/index.vue';
+
+export default defineComponent({
+    name: 'MongoDataOp',
+    components: {
+        ProjectEnvSelect,
+        JsonEdit,
+    },
+    setup() {
+        const findParamInputRef: any = ref(null);
+        const state = reactive({
+            loading: false,
+            mongoList: [],
+            query: {
+                envId: 0,
+            },
+            mongoId: null, // 当前选择操作的mongo
+            database: '', // 当前选择操作的库
+            collection: '', //当前选中的collection
+            activeName: '', // 当前操作的tab
+            databases: [],
+            collections: [],
+            dataTabs: {}, // 数据tabs
+            findDialog: {
+                visible: false,
+                findParam: {
+                    filter: '',
+                    sort: '',
+                },
+            },
+            insertDocDialog: {
+                visible: false,
+                doc: '',
+            },
+            jsoneditorDialog: {
+                visible: false,
+                doc: '',
+                item: {} as any,
+            },
+        });
+
+        const searchMongo = async () => {
+            notNull(state.query.envId, '请先选择项目环境');
+            const res = await mongoApi.mongoList.request(state.query);
+            state.mongoList = res.list;
+        };
+
+        const changeProjectEnv = (projectId: any, envId: any) => {
+            state.databases = [];
+            state.collections = [];
+            state.mongoId = null;
+            state.collection = '';
+            state.database = '';
+            state.dataTabs = {};
+            if (envId != null) {
+                state.query.envId = envId;
+                searchMongo();
+            }
+        };
+
+        const changeMongo = () => {
+            state.databases = [];
+            state.collections = [];
+            state.dataTabs = {};
+            getDatabases();
+        };
+
+        const getDatabases = async () => {
+            const res = await mongoApi.databases.request({ id: state.mongoId });
+            state.databases = res.Databases;
+        };
+
+        const changeDatabase = () => {
+            state.collections = [];
+            state.collection = '';
+            state.dataTabs = {};
+            getCollections();
+        };
+
+        const getCollections = async () => {
+            state.collections = await mongoApi.collections.request({ id: state.mongoId, database: state.database });
+        };
+
+        const changeCollection = () => {
+            const collection = state.collection;
+            let dataTab = state.dataTabs[collection];
+            if (!dataTab) {
+                // 默认查询参数
+                const findParam = {
+                        filter: '{}',
+                        sort: '{"_id": -1}',
+                        skip: 0,
+                        limit: 12,
+                    },
+                    dataTab = {
+                        name: collection,
+                        datas: [],
+                        findParamStr: JSON.stringify(findParam),
+                        findParam,
+                    };
+                state.dataTabs[collection] = dataTab;
+            }
+            state.activeName = collection;
+            findCommand(collection);
+        };
+
+        const showFindDialog = (collection: string) => {
+            // 获取当前tab的索引位置，将其输入框失去焦点，防止输入以及重复获取焦点
+            const dataTabNames = Object.keys(state.dataTabs);
+            for (let i = 0; i < dataTabNames.length; i++) {
+                if (collection == dataTabNames[i]) {
+                    findParamInputRef.value[i].blur();
+                }
+            }
+
+            state.findDialog.findParam = state.dataTabs[collection].findParam;
+            state.findDialog.visible = true;
+        };
+
+        const confirmFindDialog = () => {
+            state.dataTabs[state.activeName].findParam = state.findDialog.findParam;
+            state.dataTabs[state.activeName].findParamStr = JSON.stringify(state.findDialog.findParam);
+            state.findDialog.visible = false;
+            findCommand(state.activeName);
+        };
+
+        const findCommand = async (collection: string) => {
+            const dataTab = state.dataTabs[collection];
+            const findParma = dataTab.findParam;
+            let filter, sort;
+            try {
+                filter = findParma.filter ? JSON.parse(findParma.filter) : {};
+                sort = findParma.sort ? JSON.parse(findParma.sort) : {};
+            } catch (e) {
+                ElMessage.error('filter或sort字段json字符串值错误。注意: json key需双引号');
+                return;
+            }
+            const datas = await mongoApi.findCommand.request({
+                id: state.mongoId,
+                database: state.database,
+                collection,
+                filter,
+                sort,
+                limit: findParma.limit || 12,
+                skip: findParma.skip || 0,
+            });
+            state.dataTabs[collection].datas = wrapDatas(datas);
+        };
+
+        /**
+         * 包装mongo查询回来的对象，即将其都转为json字符串并用value属性值描述，方便显示
+         */
+        const wrapDatas = (datas: any) => {
+            const wrapDatas = [] as any;
+            if (!datas) {
+                return wrapDatas;
+            }
+            for (let data of datas) {
+                wrapDatas.push({ value: JSON.stringify(data, null, 4) });
+            }
+            return wrapDatas;
+        };
+
+        const showInsertDocDialog = () => {
+            // tab数据中的第一个文档，因为该集合的文档都类似，故使用第一个文档赋值至需要新增的文档输入框，方便直接修改新增
+            const datasFirstDoc = state.dataTabs[state.activeName].datas[0];
+            let doc = '';
+            if (datasFirstDoc) {
+                // 移除_id字段，因为新增无需该字段
+                const docObj = JSON.parse(datasFirstDoc.value);
+                delete docObj['_id'];
+                doc = JSON.stringify(docObj, null, 4);
+            }
+            state.insertDocDialog.doc = doc;
+            state.insertDocDialog.visible = true;
+        };
+
+        const onInsertDoc = async () => {
+            let docObj;
+            try {
+                docObj = JSON.parse(state.insertDocDialog.doc);
+            } catch (e) {
+                ElMessage.error('文档内容错误,无法解析为json对象');
+            }
+            const res = await mongoApi.insertCommand.request({
+                id: state.mongoId,
+                database: state.database,
+                collection: state.activeName,
+                doc: docObj,
+            });
+            isTrue(res.InsertedID, '新增失败');
+            ElMessage.success('新增成功');
+            findCommand(state.activeName);
+            state.insertDocDialog.visible = false;
+        };
+
+        const onJsonEditor = (item: any) => {
+            state.jsoneditorDialog.item = item;
+            state.jsoneditorDialog.doc = item.value;
+            state.jsoneditorDialog.visible = true;
+        };
+
+        const onCloseJsonEditDialog = () => {
+            state.jsoneditorDialog.item.value = JSON.stringify(JSON.parse(state.jsoneditorDialog.doc), null, 4);
+        };
+
+        const onSaveDoc = async (doc: string) => {
+            const docObj = parseDocJsonString(doc);
+            const id = docObj._id;
+            notBlank(id, '文档的_id属性不存在');
+            delete docObj['_id'];
+            const res = await mongoApi.updateByIdCommand.request({
+                id: state.mongoId,
+                database: state.database,
+                collection: state.collection,
+                docId: id,
+                update: { $set: docObj },
+            });
+            isTrue(res.ModifiedCount == 1, '修改失败');
+            ElMessage.success('保存成功');
+        };
+
+        const onDeleteDoc = async (doc: string) => {
+            const docObj = parseDocJsonString(doc);
+            const id = docObj._id;
+            notBlank(id, '文档的_id属性不存在');
+            const res = await mongoApi.deleteByIdCommand.request({
+                id: state.mongoId,
+                database: state.database,
+                collection: state.collection,
+                docId: id,
+            });
+            isTrue(res.DeletedCount == 1, '删除失败');
+            ElMessage.success('删除成功');
+            findCommand(state.activeName);
+        };
+
+        /**
+         * 将json字符串解析为json对象
+         */
+        const parseDocJsonString = (doc: string) => {
+            try {
+                return JSON.parse(doc);
+            } catch (e) {
+                ElMessage.error('文档内容解析为json对象失败');
+                throw e;
+            }
+        };
+
+        /**
+         * 数据tab点击
+         */
+        const onDataTabClick = (tab: any) => {
+            const name = tab.props.name;
+            // 修改选择框绑定的表信息
+            state.collection = name;
+        };
+
+        const removeDataTab = (targetName: string) => {
+            const tabNames = Object.keys(state.dataTabs);
+            let activeName = state.activeName;
+            tabNames.forEach((name, index) => {
+                if (name === targetName) {
+                    const nextTab = tabNames[index + 1] || tabNames[index - 1];
+                    if (nextTab) {
+                        activeName = nextTab;
+                    }
+                }
+            });
+            state.activeName = activeName;
+            // 如果移除最后一个数据tab，则将选择框绑定的collection置空
+            if (activeName == targetName) {
+                state.collection = '';
+            } else {
+                state.collection = activeName;
+            }
+
+            delete state.dataTabs[targetName];
+        };
+
+        return {
+            ...toRefs(state),
+            findParamInputRef,
+            changeProjectEnv,
+            changeMongo,
+            changeDatabase,
+            changeCollection,
+            onDataTabClick,
+            removeDataTab,
+            showFindDialog,
+            confirmFindDialog,
+            findCommand,
+            showInsertDocDialog,
+            onInsertDoc,
+            onSaveDoc,
+            onDeleteDoc,
+            onJsonEditor,
+            onCloseJsonEditDialog,
+            formatByteSize,
+        };
+    },
+});
+</script>
+
+<style>
+.mongo-doc-btns {
+    position: absolute;
+    z-index: 2;
+    right: 3px;
+    top: 2px;
+    max-width: 120px;
+}
+</style>

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

@@ -0,0 +1,219 @@
+<template>
+    <div>
+        <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>
+                    </el-select>
+                </el-form-item>
+
+                <el-form-item prop="envId" label="环境" required>
+                    <el-select @change="changeEnv" style="width: 100%" v-model="form.envId" placeholder="请选择环境">
+                        <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="name" label="名称" required>
+                    <el-input v-model.trim="form.name" placeholder="请输入名称" auto-complete="off"></el-input>
+                </el-form-item>
+                <el-form-item prop="uri" label="uri" required>
+                    <el-input
+                        type="textarea"
+                        :rows="2"
+                        v-model.trim="form.uri"
+                        placeholder="形如 mongodb://username:password@host1:port1"
+                        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>
+                <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 { 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({
+    name: 'MongoEdit',
+    props: {
+        visible: {
+            type: Boolean,
+        },
+        projects: {
+            type: Array,
+        },
+        mongo: {
+            type: [Boolean, Object],
+        },
+        title: {
+            type: String,
+        },
+    },
+    setup(props: any, { emit }) {
+        const mongoForm: any = ref(null);
+        const state = reactive({
+            dialogVisible: false,
+            projects: [],
+            envs: [],
+            sshTunnelMachineList: [],
+            form: {
+                id: null,
+                name: null,
+                uri: null,
+                enableSshTunnel: -1,
+                sshTunnelMachineId: null,
+                project: null,
+                projectId: null,
+                envId: null,
+                env: null,
+            },
+            btnLoading: false,
+            rules: {
+                projectId: [
+                    {
+                        required: true,
+                        message: '请选择项目',
+                        trigger: ['change', 'blur'],
+                    },
+                ],
+                envId: [
+                    {
+                        required: true,
+                        message: '请选择环境',
+                        trigger: ['change', 'blur'],
+                    },
+                ],
+                name: [
+                    {
+                        required: true,
+                        message: '请输入名称',
+                        trigger: ['change', 'blur'],
+                    },
+                ],
+                uri: [
+                    {
+                        required: true,
+                        message: '请输入mongo uri',
+                        trigger: ['change', 'blur'],
+                    },
+                ],
+            },
+        });
+
+        watch(props, async (newValue) => {
+            state.dialogVisible = newValue.visible;
+            if (!state.dialogVisible) {
+                return;
+            }
+            state.projects = newValue.projects;
+            if (newValue.mongo) {
+                getEnvs(newValue.mongo.projectId);
+                state.form = { ...newValue.mongo };
+            } else {
+                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 });
+        };
+
+        const changeProject = (projectId: number) => {
+            for (let p of state.projects as any) {
+                if (p.id == projectId) {
+                    state.form.project = p.name;
+                }
+            }
+            state.form.envId = null;
+            state.form.env = null;
+            state.envs = [];
+            getEnvs(projectId);
+        };
+
+        const changeEnv = (envId: number) => {
+            for (let p of state.envs as any) {
+                if (p.id == envId) {
+                    state.form.env = p.name;
+                }
+            }
+        };
+
+        const btnOk = async () => {
+            mongoForm.value.validate(async (valid: boolean) => {
+                if (valid) {
+                    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;
+                        setTimeout(() => {
+                            state.btnLoading = false;
+                        }, 1000);
+
+                        cancel();
+                    });
+                } else {
+                    ElMessage.error('请正确填写信息');
+                    return false;
+                }
+            });
+        };
+
+        const cancel = () => {
+            emit('update:visible', false);
+            emit('cancel');
+        };
+
+        return {
+            ...toRefs(state),
+            mongoForm,
+            changeProject,
+            getSshTunnelMachines,
+            changeEnv,
+            btnOk,
+            cancel,
+        };
+    },
+});
+</script>
+<style lang="scss">
+</style>

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

@@ -0,0 +1,418 @@
+<template>
+    <div>
+        <el-card>
+            <el-button type="primary" icon="plus" @click="editMongo(true)" plain>添加</el-button>
+            <el-button type="primary" icon="edit" :disabled="currentId == null" @click="editMongo(false)" plain>编辑</el-button>
+            <el-button type="danger" icon="delete" :disabled="currentId == null" @click="deleteMongo" plain>删除</el-button>
+            <div style="float: right">
+                <el-select @focus="getProjects" v-model="query.projectId" placeholder="请选择项目" filterable clearable>
+                    <el-option v-for="item in projects" :key="item.id" :label="`${item.name} [${item.remark}]`" :value="item.id"> </el-option>
+                </el-select>
+                <el-button class="ml5" @click="search" type="success" icon="search"></el-button>
+            </div>
+            <el-table :data="list" style="width: 100%" @current-change="choose" stripe>
+                <el-table-column label="选择" width="60px">
+                    <template #default="scope">
+                        <el-radio v-model="currentId" :label="scope.row.id">
+                            <i></i>
+                        </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="name" label="名称" width></el-table-column>
+                <el-table-column prop="uri" label="连接uri" min-width="150" show-overflow-tooltip>
+                    <template #default="scope">
+                        {{ scope.row.uri.split('@')[1] }}
+                    </template>
+                </el-table-column>
+                <el-table-column prop="createTime" label="创建时间" min-width="150">
+                    <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>
+                    <template #default="scope">
+                        <el-link type="primary" @click="showDatabases(scope.row.id)" plain size="small" :underline="false">数据库</el-link>
+                    </template>
+                </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>
+
+        <el-dialog width="800px" :title="databaseDialog.title" v-model="databaseDialog.visible">
+            <el-table :data="databaseDialog.data" size="small">
+                <el-table-column min-width="130" property="Name" label="库名" />
+                <el-table-column min-width="90" property="SizeOnDisk" label="size">
+                    <template #default="scope">
+                        {{ formatByteSize(scope.row.SizeOnDisk) }}
+                    </template>
+                </el-table-column>
+                <el-table-column min-width="80" property="Empty" label="是否为空" />
+
+                <el-table-column min-width="80" label="操作">
+                    <template #default="scope">
+                        <el-link type="success" @click="showDatabaseStats(scope.row.Name)" plain size="small" :underline="false">stats</el-link>
+                        <el-divider direction="vertical" border-style="dashed" />
+                        <el-link type="primary" @click="showCollections(scope.row.Name)" plain size="small" :underline="false">集合</el-link>
+                    </template>
+                </el-table-column>
+            </el-table>
+
+            <el-dialog width="700px" :title="databaseDialog.statsDialog.title" v-model="databaseDialog.statsDialog.visible">
+                <el-descriptions title="库状态信息" :column="3" border size="small">
+                    <el-descriptions-item label="db" label-align="right" align="center">
+                        {{ databaseDialog.statsDialog.data.db }}
+                    </el-descriptions-item>
+                    <el-descriptions-item label="collections" label-align="right" align="center">
+                        {{ databaseDialog.statsDialog.data.collections }}
+                    </el-descriptions-item>
+                    <el-descriptions-item label="objects" label-align="right" align="center">
+                        {{ databaseDialog.statsDialog.data.objects }}
+                    </el-descriptions-item>
+                    <el-descriptions-item label="indexes" label-align="right" align="center">
+                        {{ databaseDialog.statsDialog.data.indexes }}
+                    </el-descriptions-item>
+
+                    <el-descriptions-item label="avgObjSize" label-align="right" align="center">
+                        {{ formatByteSize(databaseDialog.statsDialog.data.avgObjSize) }}
+                    </el-descriptions-item>
+                    <el-descriptions-item label="dataSize" label-align="right" align="center">
+                        {{ formatByteSize(databaseDialog.statsDialog.data.dataSize) }}
+                    </el-descriptions-item>
+                    <el-descriptions-item label="totalSize" label-align="right" align="center">
+                        {{ formatByteSize(databaseDialog.statsDialog.data.totalSize) }}
+                    </el-descriptions-item>
+                    <el-descriptions-item label="storageSize" label-align="right" align="center">
+                        {{ formatByteSize(databaseDialog.statsDialog.data.storageSize) }}
+                    </el-descriptions-item>
+
+                    <el-descriptions-item label="fsTotalSize" label-align="right" align="center">
+                        {{ formatByteSize(databaseDialog.statsDialog.data.fsTotalSize) }}
+                    </el-descriptions-item>
+                    <el-descriptions-item label="fsUsedSize" label-align="right" align="center">
+                        {{ formatByteSize(databaseDialog.statsDialog.data.fsUsedSize) }}
+                    </el-descriptions-item>
+                    <el-descriptions-item label="indexSize" label-align="right" align="center">
+                        {{ formatByteSize(databaseDialog.statsDialog.data.indexSize) }}
+                    </el-descriptions-item>
+                </el-descriptions>
+            </el-dialog>
+        </el-dialog>
+
+        <el-dialog width="600px" :title="collectionsDialog.title" v-model="collectionsDialog.visible">
+            <div>
+                <el-button @click="showCreateCollectionDialog" type="primary" icon="plus" size="small">新建</el-button>
+            </div>
+            <el-table border stripe :data="collectionsDialog.data" size="small">
+                <el-table-column prop="name" label="名称" show-overflow-tooltip> </el-table-column>
+                <el-table-column min-width="80" label="操作">
+                    <template #default="scope">
+                        <el-link type="success" @click="showCollectionStats(scope.row.name)" plain size="small" :underline="false">stats</el-link>
+                        <el-divider direction="vertical" border-style="dashed" />
+                        <el-popconfirm @confirm="onDeleteCollection(scope.row.name)" title="确定删除该集合?">
+                            <template #reference>
+                                <el-link type="danger" plain size="small" :underline="false">删除</el-link>
+                            </template>
+                        </el-popconfirm>
+                    </template>
+                </el-table-column>
+            </el-table>
+
+            <el-dialog width="700px" :title="collectionsDialog.statsDialog.title" v-model="collectionsDialog.statsDialog.visible">
+                <el-descriptions title="集合状态信息" :column="3" border size="small">
+                    <el-descriptions-item label="ns" label-align="right" :span="2" align="center">
+                        {{ collectionsDialog.statsDialog.data.ns }}
+                    </el-descriptions-item>
+                    <el-descriptions-item label="count" label-align="right" align="center">
+                        {{ collectionsDialog.statsDialog.data.count }}
+                    </el-descriptions-item>
+                    <el-descriptions-item label="avgObjSize" label-align="right" align="center">
+                        {{ formatByteSize(collectionsDialog.statsDialog.data.avgObjSize) }}
+                    </el-descriptions-item>
+                    <el-descriptions-item label="nindexes" label-align="right" align="center">
+                        {{ collectionsDialog.statsDialog.data.nindexes }}
+                    </el-descriptions-item>
+
+                    <el-descriptions-item label="size" label-align="right" align="center">
+                        {{ formatByteSize(collectionsDialog.statsDialog.data.size) }}
+                    </el-descriptions-item>
+                    <el-descriptions-item label="totalSize" label-align="right" align="center">
+                        {{ formatByteSize(collectionsDialog.statsDialog.data.totalSize) }}
+                    </el-descriptions-item>
+                    <el-descriptions-item label="storageSize" label-align="right" align="center">
+                        {{ formatByteSize(collectionsDialog.statsDialog.data.storageSize) }}
+                    </el-descriptions-item>
+                    <el-descriptions-item label="freeStorageSize" label-align="right" align="center">
+                        {{ formatByteSize(collectionsDialog.statsDialog.data.freeStorageSize) }}
+                    </el-descriptions-item>
+                </el-descriptions>
+            </el-dialog>
+        </el-dialog>
+
+        <el-dialog width="400px" title="新建集合" v-model="createCollectionDialog.visible" :destroy-on-close="true">
+            <el-form :model="createCollectionDialog.form" label-width="70px">
+                <el-form-item prop="name" label="集合名" required>
+                    <el-input v-model="createCollectionDialog.form.name" clearable></el-input>
+                </el-form-item>
+                <!-- <el-form-item label="描述:">
+                    <el-input v-model="showEnvDialog.envForm.remark" auto-complete="off"></el-input>
+                </el-form-item> -->
+            </el-form>
+            <template #footer>
+                <div>
+                    <el-button @click="createCollectionDialog.visible = false">取 消</el-button>
+                    <el-button @click="onCreateCollection" type="primary">确 定</el-button>
+                </div>
+            </template>
+        </el-dialog>
+
+        <mongo-edit
+            @val-change="valChange"
+            :projects="projects"
+            :title="mongoEditDialog.title"
+            v-model:visible="mongoEditDialog.visible"
+            v-model:mongo="mongoEditDialog.data"
+        ></mongo-edit>
+    </div>
+</template>
+
+<script lang="ts">
+import { mongoApi } from './api';
+import { toRefs, reactive, defineComponent, onMounted } from 'vue';
+import { ElMessage, ElMessageBox } from 'element-plus';
+import { projectApi } from '../project/api.ts';
+import MongoEdit from './MongoEdit.vue';
+import { formatByteSize } from '@/common/utils/format';
+
+export default defineComponent({
+    name: 'MongoList',
+    components: {
+        MongoEdit,
+    },
+    setup() {
+        const state = reactive({
+            projects: [],
+            list: [],
+            total: 0,
+            currentId: null,
+            currentData: null,
+            query: {
+                pageNum: 1,
+                pageSize: 10,
+                prjectId: null,
+                clusterId: null,
+            },
+            mongoEditDialog: {
+                visible: false,
+                data: null,
+                title: '新增mongo',
+            },
+            databaseDialog: {
+                visible: false,
+                data: [],
+                title: '',
+                statsDialog: {
+                    visible: false,
+                    data: {},
+                    title: '',
+                },
+            },
+            collectionsDialog: {
+                database: '',
+                visible: false,
+                data: [],
+                title: '',
+                statsDialog: {
+                    visible: false,
+                    data: {},
+                    title: '',
+                },
+            },
+            createCollectionDialog: {
+                visible: false,
+                form: {
+                    name: '',
+                },
+            },
+        });
+
+        onMounted(async () => {
+            search();
+        });
+
+        const handlePageChange = (curPage: number) => {
+            state.query.pageNum = curPage;
+            search();
+        };
+
+        const choose = (item: any) => {
+            if (!item) {
+                return;
+            }
+            state.currentId = item.id;
+            state.currentData = item;
+        };
+
+        const showDatabases = async (id: number) => {
+            state.databaseDialog.data = (await mongoApi.databases.request({ id })).Databases;
+            state.databaseDialog.title = `数据库列表`;
+            state.databaseDialog.visible = true;
+        };
+
+        const showDatabaseStats = async (dbName: string) => {
+            state.databaseDialog.statsDialog.data = await mongoApi.runCommand.request({
+                id: state.currentId,
+                database: dbName,
+                command: {
+                    dbStats: 1,
+                },
+            });
+            state.databaseDialog.statsDialog.title = `'${dbName}' stats`;
+            state.databaseDialog.statsDialog.visible = true;
+        };
+
+        const showCollections = async (database: string) => {
+            state.collectionsDialog.database = database;
+            state.collectionsDialog.data = [];
+            setCollections(database);
+            state.collectionsDialog.title = `'${database}' 集合`;
+            state.collectionsDialog.visible = true;
+        };
+
+        const setCollections = async (database: string) => {
+            const res = await mongoApi.collections.request({ id: state.currentId, database });
+            const collections = [] as any;
+            for (let r of res) {
+                collections.push({ name: r });
+            }
+            state.collectionsDialog.data = collections;
+        };
+
+        /**
+         * 显示集合状态
+         */
+        const showCollectionStats = async (collection: string) => {
+            state.collectionsDialog.statsDialog.data = await mongoApi.runCommand.request({
+                id: state.currentId,
+                database: state.collectionsDialog.database,
+                command: {
+                    collStats: collection,
+                },
+            });
+            state.collectionsDialog.statsDialog.title = `'${collection}' stats`;
+            state.collectionsDialog.statsDialog.visible = true;
+        };
+
+        /**
+         * 删除集合
+         */
+        const onDeleteCollection = async (collection: string) => {
+            await mongoApi.runCommand.request({
+                id: state.currentId,
+                database: state.collectionsDialog.database,
+                command: {
+                    drop: collection,
+                },
+            });
+            ElMessage.success('集合删除成功');
+            setCollections(state.collectionsDialog.database);
+        };
+
+        const showCreateCollectionDialog = () => {
+            state.createCollectionDialog.visible = true;
+        };
+
+        const onCreateCollection = async () => {
+            const form = state.createCollectionDialog.form;
+            await mongoApi.runCommand.request({
+                id: state.currentId,
+                database: state.collectionsDialog.database,
+                command: {
+                    create: form.name,
+                },
+            });
+            ElMessage.success('集合创建成功');
+            state.createCollectionDialog.visible = false;
+            state.createCollectionDialog.form = {} as any;
+            setCollections(state.collectionsDialog.database);
+        };
+
+        const deleteMongo = async () => {
+            try {
+                await ElMessageBox.confirm(`确定删除该mongo?`, '提示', {
+                    confirmButtonText: '确定',
+                    cancelButtonText: '取消',
+                    type: 'warning',
+                });
+                await mongoApi.deleteMongo.request({ id: state.currentId });
+                ElMessage.success('删除成功');
+                state.currentData = null;
+                state.currentId = null;
+                search();
+            } catch (err) {}
+        };
+
+        const search = async () => {
+            const res = await mongoApi.mongoList.request(state.query);
+            state.list = res.list;
+            state.total = res.total;
+        };
+
+        const getProjects = async () => {
+            state.projects = await projectApi.accountProjects.request(null);
+        };
+
+        const editMongo = async (isAdd = false) => {
+            await getProjects();
+            if (isAdd) {
+                state.mongoEditDialog.data = null;
+                state.mongoEditDialog.title = '新增mongo';
+            } else {
+                state.mongoEditDialog.data = state.currentData;
+                state.mongoEditDialog.title = '修改mongo';
+            }
+            state.mongoEditDialog.visible = true;
+        };
+
+        const valChange = () => {
+            state.currentId = null;
+            state.currentData = null;
+            search();
+        };
+
+        return {
+            ...toRefs(state),
+            getProjects,
+            search,
+            handlePageChange,
+            choose,
+            showDatabases,
+            showDatabaseStats,
+            showCollections,
+            showCollectionStats,
+            onDeleteCollection,
+            showCreateCollectionDialog,
+            onCreateCollection,
+            formatByteSize,
+            deleteMongo,
+            editMongo,
+            valChange,
+        };
+    },
+});
+</script>
+
+<style>
+</style>

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

@@ -0,0 +1,14 @@
+import Api from '@/common/Api';
+
+export const mongoApi = {
+    mongoList : Api.create("/mongos", 'get'),
+    saveMongo : Api.create("/mongos", 'post'),
+    deleteMongo : Api.create("/mongos/{id}", 'delete'),
+    databases: Api.create("/mongos/{id}/databases", 'get'),
+    collections: Api.create("/mongos/{id}/collections", 'get'),
+    runCommand: Api.create("/mongos/{id}/run-command", 'post'),
+    findCommand: Api.create("/mongos/{id}/command/find", 'post'),
+    updateByIdCommand: Api.create("/mongos/{id}/command/update-by-id", 'post'),
+    deleteByIdCommand: Api.create("/mongos/{id}/command/delete-by-id", 'post'),
+    insertCommand: Api.create("/mongos/{id}/command/insert", 'post'),
+}

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,16 +1,13 @@
 <template>
     <div class="account-dialog">
-        <el-dialog :title="title" v-model="dialogVisible" :before-close="cancel" :show-close="false" width="35%">
+        <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;
@@ -105,15 +101,7 @@ export default defineComponent({
 
         const cancel = () => {
             emit('update:visible', false);
-            setTimeout(() => {
-                emit('update:account', null);
-            }, 800);
             emit('cancel');
-            setTimeout(() => {
-                accountForm.value.resetFields();
-                //  重置对象属性为null
-                state.form = {} as any;
-            }, 200);
         };
 
         return {

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/account/RoleEdit.vue

@@ -2,7 +2,7 @@
     <div class="account-dialog">
         <el-dialog
             :title="account == null ? '' : '分配“' + account.username + '”的角色'"
-            v-model="visible"
+            v-model="dialogVisible"
             :before-close="cancel"
             :show-close="false"
         >
@@ -15,7 +15,7 @@
             <el-table :data="allRole" border ref="roleTable" @select="select" style="width: 100%">
                 <el-table-column :selectable="selectable" type="selection" width="40"></el-table-column>
                 <el-table-column prop="name" label="角色名称"></el-table-column>
-                 <el-table-column prop="code" label="角色code"></el-table-column>
+                <el-table-column prop="code" label="角色code"></el-table-column>
                 <el-table-column prop="remark" label="角色描述">
                     <template #default="scope">
                         {{ scope.row.remark ? scope.row.remark : '暂无描述' }}
@@ -59,7 +59,7 @@ export default defineComponent({
     setup(props: any, { emit }) {
         const roleTable: any = ref(null);
         const state = reactive({
-            visible: false,
+            dialogVisible: false,
             btnLoading: false,
             // 所有角色
             allRole: [] as any,
@@ -73,8 +73,8 @@ export default defineComponent({
             total: 0,
         });
 
-        watch(props, (newValue, oldValue) => {
+        watch(props, (newValue) => {
-            state.visible = newValue.visible;
+            state.dialogVisible = newValue.visible;
             if (newValue.account && newValue.account.id != 0) {
                 accountApi.roleIds
                     .request({

mayfly_go_web/src/views/system/api.ts

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

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

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

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

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

mayfly_go_web/src/views/system/resource/ResourceEdit.vue

@@ -5,7 +5,7 @@
                 <el-row :gutter="10">
                     <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb10">
                         <el-form-item prop="type" label="类型" required>
-                            <el-select v-model="form.type" :disabled="typeDisabled" placeholder="请选择" width="w100">
+                            <el-select v-model="form.type" :disabled="typeDisabled" placeholder="请选择" >
                                 <el-option v-for="item in enums.ResourceTypeEnum" :key="item.value" :label="item.label" :value="item.value">
                                 </el-option>
                             </el-select>
@@ -83,7 +83,7 @@
             </el-form>
 
             <template #footer>
-                <div class="dialog-footer mt10">
+                <div>
                     <el-button @click="cancel()">取 消</el-button>
                     <el-button type="primary" :loading="btnLoading" @click="btnOk">确 定</el-button>
                 </div>
@@ -284,11 +284,6 @@ export default defineComponent({
         const cancel = () => {
             emit('update:visible', false);
             emit('cancel');
-            setTimeout(() => {
-                menuForm.value.resetFields();
-                //  重置对象属性为null
-                state.form = {} as any;
-            }, 200);
         };
 
         return {

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

@@ -109,9 +109,7 @@ export default defineComponent({
         const cancel = () => {
             // 更新父组件visible prop对应的值为false
             emit('update:visible', false);
-            setTimeout(() => {
+            emit('cancel');
-                emit('cancel');
-            }, 700);
         };
 
         return {

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

@@ -1,12 +1,17 @@
 <template>
     <div class="role-dialog">
-        <el-dialog :title="title" v-model="dvisible" :show-close="false" :before-close="cancel" width="500px">
+        <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>
                 <el-form-item prop="code" label="角色code:" required>
-                    <el-input :disabled="form.id != null" v-model="form.code" placeholder="COMMON开头则为所有账号共有角色" auto-complete="off"></el-input>
+                    <el-input
+                        :disabled="form.id != null"
+                        v-model="form.code"
+                        placeholder="COMMON开头则为所有账号共有角色"
+                        auto-complete="off"
+                    ></el-input>
                 </el-form-item>
                 <el-form-item label="角色描述:">
                     <el-input v-model="form.remark" type="textarea" :rows="3" placeholder="请输入角色描述"></el-input>
@@ -23,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({
@@ -40,6 +45,7 @@ export default defineComponent({
         },
     },
     setup(props: any, { emit }) {
+        const roleForm: any = ref(null);
         const state = reactive({
             dvisible: false,
             form: {
@@ -68,18 +74,22 @@ export default defineComponent({
         };
 
         const btnOk = async () => {
-            // let p = state.form.id ? roleApi.update : roleApi.save;
+            roleForm.value.validate(async (valid: boolean) => {
-            await roleApi.save.request(state.form);
+                if (valid) {
-            emit('val-change', state.form);
+                    await roleApi.save.request(state.form);
-            cancel();
+                    emit('val-change', state.form);
-            state.btnLoading = true;
+                    cancel();
-            setTimeout(() => {
+                    state.btnLoading = true;
-                state.btnLoading = false;
+                    setTimeout(() => {
-            }, 1000);
+                        state.btnLoading = false;
+                    }, 1000);
+                }
+            });
         };
 
         return {
             ...toRefs(state),
+            roleForm,
             btnOk,
             cancel,
         };

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

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

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

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

mayfly_go_web/vite.config.ts

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

server/common/api/index.go

@@ -1,23 +0,0 @@
-package api
-
-import (
-	"mayfly-go/base/ctx"
-	"mayfly-go/server/devops/application"
-	"mayfly-go/server/devops/domain/entity"
-)
-
-type Index struct {
-	ProjectApp application.Project
-	MachineApp application.Machine
-	DbApp      application.Db
-	RedisApp   application.Redis
-}
-
-func (i *Index) Count(rc *ctx.ReqCtx) {
-	rc.ResData = map[string]interface{}{
-		"projectNum": i.ProjectApp.Count(new(entity.Project)),
-		"machineNum": i.MachineApp.Count(new(entity.Machine)),
-		"dbNum":      i.DbApp.Count(new(entity.Db)),
-		"redisNum":   i.RedisApp.Count(new(entity.Redis)),
-	}
-}

server/common/router/index.go

@@ -1,26 +0,0 @@
-package router
-
-import (
-	"mayfly-go/base/ctx"
-	"mayfly-go/server/common/api"
-	devops_app "mayfly-go/server/devops/application"
-
-	"github.com/gin-gonic/gin"
-)
-
-func InitIndexRouter(router *gin.RouterGroup) {
-	index := router.Group("common/index")
-	i := &api.Index{
-		ProjectApp: devops_app.ProjectApp,
-		MachineApp: devops_app.MachineApp,
-		DbApp:      devops_app.DbApp,
-		RedisApp:   devops_app.RedisApp,
-	}
-	{
-		// 首页基本信息统计
-		index.GET("count", func(g *gin.Context) {
-			ctx.NewReqCtxWithGin(g).
-				Handle(i.Count)
-		})
-	}
-}

server/config.yml

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

server/default.key

@@ -1,27 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIIEpgIBAAKCAQEA0CsawvEZl42Vf+0BlTuZ3Dp10yW8Oty1tjimxUj3s0WPeKil
-6+TehnQELS8vGJfek+yT99nyrt+bkRmg1kxZ57FtQFEuthG4OQZoaMDUz6Ab+8P1
-PQ9VH0XimnnYabxztJiQjl8HdJt6N4WP35kGlcul7qQ+Qc7iwjhSadfAhXVycqVI
-cGQyHiPPfbmYRjueAIC4czmMUxwFKCwjepGYkwzWuGkpMD0hg/SIXpFJE2dcqYPR
-2nCah1gxZZG00lHU1X2pehNmmgeHRkB5S7mrsCdyyV/33SAYk6T6PT7dOqY54bfn
-h3C0k+T7IzvKTXKG76eG63STmxVa6luVoKMvxwIDAQABAoIBAQCI2Y2CUpYMd9us
-edbskH4ZtaT35nrUB3y+Cog4cjvE8xnarKRHa/KOWX7VZYuEk3KTtJeh/Pn51K6k
-uUBvIUqJcq7r9XLL5uJBOuEw3HQK+qrq3GxAc+/12y+Zdji7alR2iUWfEwIHup6i
-GX/38tXNbE/tjrQO9z9Dh1tGkbvS/66tPn/T/oMxsRvZB6mCjB7yuOlEIwYTomYB
-pUFemELt8T5RtfxRa8T1VoITbfuj7zvecqlThW0H8UizsFxvrOCUaga7jtsJOCHo
-bcW5WvWwazoOfQ2BGpksKkBDf1N6pj85e4kOoYcVG9UN03ZwDvAGfQPWUlHB4YzW
-PybMwIQBAoGBAPfuOQ+ukVmkiEKj6wCBe3Z0pYeNqBGec9aj62bKFh79BCE3ZopS
-7JtGs8VfBKkBAaOy+MDuvJ2fvRNRtHT4BYe1U6ZRsmVFqHScACOaO/7TR0tz0ihL
-0QLCkbSwsXExG6bYbwP4jMHkhHArT7Hy8WXvup8PffjSiEs1A1uGvYSBAoGBANbx
-lHo+39nsc1OO8TUAWZChIQUib2hFIwzQYngSzINdfXQaGFT/omOsudAtfdjvp+qO
-Tr7WpwgFEFveDFsdJfZ2Kc2x9a3ty7IYIWaAjK2ghkAKz3Tt4gClreB6qG2SBycP
-4C2ImbY6hMaFHz3ENtTEzzTMdD1ByxQVMvoem3BHAoGBAJdaTmtMXl8jGivUdXnx
-kbVWsFZ4G8nluUGm/+XYKHjybLr6XxbCWL7SApzSzL1/Z8jPURw2od53za0li8x8
-PKQEBfTamtVIGPZW5Z7WYRnHURa2tezzm7zbmqd71lcLa54HMn5yFTuojVEMn7I6
-ZTOdjYfcpUJpA9slmc8eCkQBAoGBAJEIbxRRaoBEQMkH8Y++zbB+WKZ7RssHo4/Y
-6Ch3HtIg+i6mEPcBitRQzww+NeV0SExHe7Dfa9NIf3JNkO7F60CzGJ/3zXtvsftY
-tujQIpxhbVS3NqaCgPXI1VtbyFwupW7hEnYG7xj7wW2mk578z7afmeTZdDGFPH8v
-krccgeuvAoGBAPAwiqbZlXNx+ueI1B3T8VpXnG0ozKxG+l5B71kssZWa7xcv9yRd
-c15l2PSXNtnoT/mBID7+dqQOmfYxsDHAkUdd/BrxhXtdi9FR3AfHSEQz+VKsogAD
-uLyRd7jWTYqqGa2UToF/CBV+c6QyMB+6pzFNk5DmUEm4Gd6jcHDITYeI
------END RSA PRIVATE KEY-----

server/default.pem

@@ -1,21 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDejCCAmICCQDQU4ZRt2G46TANBgkqhkiG9w0BAQsFADB/MQswCQYDVQQGEwJ6
-aDEPMA0GA1UECAwGbWF5Zmx5MQswCQYDVQQHDAJ4bTEPMA0GA1UECgwGbWF5Zmx5
-MQ8wDQYDVQQLDAZtYXlmbHkxDzANBgNVBAMMBm1heWZseTEfMB0GCSqGSIb3DQEJ
-ARYQOTU0NTM3NDczQHFxLmNvbTAeFw0yMTA2MjQwMzI2MzBaFw0zMTA2MjIwMzI2
-MzBaMH8xCzAJBgNVBAYTAnpoMQ8wDQYDVQQIDAZtYXlmbHkxCzAJBgNVBAcMAnht
-MQ8wDQYDVQQKDAZtYXlmbHkxDzANBgNVBAsMBm1heWZseTEPMA0GA1UEAwwGbWF5
-Zmx5MR8wHQYJKoZIhvcNAQkBFhA5NTQ1Mzc0NzNAcXEuY29tMIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0CsawvEZl42Vf+0BlTuZ3Dp10yW8Oty1tjim
-xUj3s0WPeKil6+TehnQELS8vGJfek+yT99nyrt+bkRmg1kxZ57FtQFEuthG4OQZo
-aMDUz6Ab+8P1PQ9VH0XimnnYabxztJiQjl8HdJt6N4WP35kGlcul7qQ+Qc7iwjhS
-adfAhXVycqVIcGQyHiPPfbmYRjueAIC4czmMUxwFKCwjepGYkwzWuGkpMD0hg/SI
-XpFJE2dcqYPR2nCah1gxZZG00lHU1X2pehNmmgeHRkB5S7mrsCdyyV/33SAYk6T6
-PT7dOqY54bfnh3C0k+T7IzvKTXKG76eG63STmxVa6luVoKMvxwIDAQABMA0GCSqG
-SIb3DQEBCwUAA4IBAQB/e8EO2XEtkYBxebR1w6i50vaegLsxQJR3l5qm7rsHu3Cr
-smJXGsc56axKCAqJ4XvSI65BT51FghAoGn62QNyiQgc0YoS99nwCCGFtnhZ2lmSe
-pfhUHegN/Qo4I8FemEMD+o9kGeAzwrnaIVIT/cNOEQgm+RzrgHHJh5QBn2XgJalU
-NeFTWaimyefwSezSa/vPbyMoAl9HkT6kdvnms/yOth4AOle6+5pM2StWjmMi4yx4
-16y3NvLTku6nAUazaHTOOu/MCqLWL2/qYTk3r7OCop2jr9Rp+HLbg5AfKLUIVXjG
-/1fnXJIuD+2u9qgDLN5PZNgz4MlU86ugtmYPFkVt
------END CERTIFICATE-----

server/devops/api/db.go

@@ -1,289 +0,0 @@
-package api
-
-import (
-	"fmt"
-	"io/ioutil"
-	"mayfly-go/base/biz"
-	"mayfly-go/base/ctx"
-	"mayfly-go/base/ginx"
-	"mayfly-go/base/model"
-	"mayfly-go/base/utils"
-	"mayfly-go/base/ws"
-	"mayfly-go/server/devops/api/form"
-	"mayfly-go/server/devops/api/vo"
-	"mayfly-go/server/devops/application"
-	"mayfly-go/server/devops/domain/entity"
-	sysApplication "mayfly-go/server/sys/application"
-	"strconv"
-	"strings"
-
-	"github.com/gin-gonic/gin"
-)
-
-type Db struct {
-	DbApp      application.Db
-	MsgApp     sysApplication.Msg
-	ProjectApp application.Project
-}
-
-// @router /api/dbs [get]
-func (d *Db) Dbs(rc *ctx.ReqCtx) {
-	g := rc.GinCtx
-	m := &entity.Db{EnvId: uint64(ginx.QueryInt(g, "envId", 0)),
-		ProjectId: uint64(ginx.QueryInt(g, "projectId", 0)),
-	}
-	m.CreatorId = rc.LoginAccount.Id
-	rc.ResData = d.DbApp.GetPageList(m, ginx.GetPageParam(rc.GinCtx), new([]vo.SelectDataDbVO))
-}
-
-func (d *Db) Save(rc *ctx.ReqCtx) {
-	form := &form.DbForm{}
-	ginx.BindJsonAndValid(rc.GinCtx, form)
-
-	rc.ReqParam = form
-
-	db := new(entity.Db)
-	utils.Copy(db, form)
-	db.SetBaseInfo(rc.LoginAccount)
-	d.DbApp.Save(db)
-}
-
-func (d *Db) DeleteDb(rc *ctx.ReqCtx) {
-	d.DbApp.Delete(GetDbId(rc.GinCtx))
-}
-
-func (d *Db) TableInfos(rc *ctx.ReqCtx) {
-	rc.ResData = d.DbApp.GetDbInstance(GetIdAndDb(rc.GinCtx)).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)
-}
-
-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)
-}
-
-// @router /api/db/:dbId/exec-sql [get]
-func (d *Db) ExecSql(rc *ctx.ReqCtx) {
-	g := rc.GinCtx
-
-	id, db := GetIdAndDb(g)
-	dbInstance := d.DbApp.GetDbInstance(id, db)
-	biz.ErrIsNilAppendErr(d.ProjectApp.CanAccess(rc.LoginAccount.Id, dbInstance.ProjectId), "%s")
-
-	// 去除前后空格及换行符
-	sql := strings.TrimFunc(g.Query("sql"), func(r rune) bool {
-		s := string(r)
-		return s == " " || s == "\n"
-	})
-	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") {
-		colNames, res, err := dbInstance.SelectData(sql)
-		biz.ErrIsNilAppendErr(err, "查询失败: %s")
-		colAndRes := make(map[string]interface{})
-		colAndRes["colNames"] = colNames
-		colAndRes["res"] = res
-		rc.ResData = colAndRes
-	} else {
-		rowsAffected, err := dbInstance.Exec(sql)
-		biz.ErrIsNilAppendErr(err, "执行失败: %s")
-		res := make([]map[string]string, 0)
-		resData := make(map[string]string)
-		resData["影响条数"] = fmt.Sprintf("%d", rowsAffected)
-		res = append(res, resData)
-
-		colAndRes := make(map[string]interface{})
-		colAndRes["colNames"] = []string{"影响条数"}
-		colAndRes["res"] = res
-
-		rc.ResData = colAndRes
-	}
-}
-
-// 执行sql文件
-func (d *Db) ExecSqlFile(rc *ctx.ReqCtx) {
-	g := rc.GinCtx
-	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)
-
-	go func() {
-		db := d.DbApp.GetDbInstance(dbId, db)
-
-		dbEntity := d.DbApp.GetById(dbId)
-		dbInfo := fmt.Sprintf("于%s的%s环境", dbEntity.Name, dbEntity.Env)
-
-		defer func() {
-			if err := recover(); err != nil {
-				switch t := err.(type) {
-				case *biz.BizError:
-					d.MsgApp.CreateAndSend(rc.LoginAccount, ws.ErrMsg("sql脚本执行失败", fmt.Sprintf("[%s]%s执行失败: [%s]", filename, dbInfo, t.Error())))
-				}
-			}
-		}()
-
-		biz.ErrIsNilAppendErr(d.ProjectApp.CanAccess(rc.LoginAccount.Id, db.ProjectId), "%s")
-
-		for _, sql := range sqls {
-			sql = strings.Trim(sql, " ")
-			if sql == "" || sql == "\n" {
-				continue
-			}
-			_, 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
-			}
-		}
-		d.MsgApp.CreateAndSend(rc.LoginAccount, ws.SuccessMsg("sql脚本执行成功", fmt.Sprintf("[%s]%s执行完成", filename, dbInfo)))
-	}()
-}
-
-// @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()
-}
-
-// @router /api/db/:dbId/c-metadata [get]
-func (d *Db) ColumnMA(rc *ctx.ReqCtx) {
-	g := rc.GinCtx
-	tn := g.Query("tableName")
-	biz.NotEmpty(tn, "tableName不能为空")
-
-	dbi := d.DbApp.GetDbInstance(GetIdAndDb(rc.GinCtx))
-	biz.ErrIsNilAppendErr(d.ProjectApp.CanAccess(rc.LoginAccount.Id, dbi.ProjectId), "%s")
-	rc.ResData = dbi.GetColumnMetadatas(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()
-
-	tableNames := make([]string, 0)
-	for _, v := range tables {
-		tableNames = append(tableNames, v["tableName"])
-	}
-	// key = 表名，value = 列名数组
-	res := make(map[string][]string)
-
-	// 表为空，则直接返回
-	if len(tableNames) == 0 {
-		rc.ResData = res
-		return
-	}
-
-	// 获取所有表下的所有列信息
-	columnMds := dbi.GetColumnMetadatas(tableNames...)
-	for _, v := range columnMds {
-		tName := v["tableName"]
-		if res[tName] == nil {
-			res[tName] = make([]string, 0)
-		}
-
-		columnName := fmt.Sprintf("%s  [%s]", v["columnName"], v["columnType"])
-		comment := v["columnComment"]
-		// 如果字段备注不为空，则加上备注信息
-		if comment != "" {
-			columnName = fmt.Sprintf("%s[%s]", columnName, comment)
-		}
-
-		res[tName] = append(res[tName], columnName)
-	}
-	rc.ResData = res
-}
-
-// @router /api/db/:dbId/sql [post]
-func (d *Db) SaveSql(rc *ctx.ReqCtx) {
-	g := rc.GinCtx
-	account := rc.LoginAccount
-	dbSqlForm := &form.DbSqlSaveForm{}
-	ginx.BindJsonAndValid(g, dbSqlForm)
-	rc.ReqParam = dbSqlForm
-
-	dbId := GetDbId(g)
-	// 判断dbId是否存在
-	err := model.GetById(new(entity.Db), dbId)
-	biz.ErrIsNil(err, "该数据库信息不存在")
-
-	// 获取用于是否有该dbsql的保存记录，有则更改，否则新增
-	dbSql := &entity.DbSql{Type: dbSqlForm.Type, DbId: dbId, Name: dbSqlForm.Name, Db: dbSqlForm.Db}
-	dbSql.CreatorId = account.Id
-	e := model.GetBy(dbSql)
-
-	dbSql.SetBaseInfo(account)
-	// 更新sql信息
-	dbSql.Sql = dbSqlForm.Sql
-	if e == nil {
-		model.UpdateById(dbSql)
-	} else {
-		model.Insert(dbSql)
-	}
-}
-
-// 获取所有保存的sql names
-func (d *Db) GetSqlNames(rc *ctx.ReqCtx) {
-	id, db := GetIdAndDb(rc.GinCtx)
-	// 获取用于是否有该dbsql的保存记录，有则更改，否则新增
-	dbSql := &entity.DbSql{Type: 1, DbId: id, Db: db}
-	dbSql.CreatorId = rc.LoginAccount.Id
-	var sqls []entity.DbSql
-	model.ListBy(dbSql, &sqls, "id", "name")
-
-	rc.ResData = sqls
-}
-
-// 删除保存的sql
-func (d *Db) DeleteSql(rc *ctx.ReqCtx) {
-	dbSql := &entity.DbSql{Type: 1, DbId: GetDbId(rc.GinCtx)}
-	dbSql.CreatorId = rc.LoginAccount.Id
-	dbSql.Name = rc.GinCtx.Query("name")
-
-	model.DeleteByCondition(dbSql)
-
-}
-
-// @router /api/db/:dbId/sql [get]
-func (d *Db) GetSql(rc *ctx.ReqCtx) {
-	id, db := GetIdAndDb(rc.GinCtx)
-	// 根据创建者id， 数据库id，以及sql模板名称查询保存的sql信息
-	dbSql := &entity.DbSql{Type: 1, DbId: id, Db: db}
-	dbSql.CreatorId = rc.LoginAccount.Id
-	dbSql.Name = rc.GinCtx.Query("name")
-
-	e := model.GetBy(dbSql)
-	if e != nil {
-		return
-	}
-	rc.ResData = dbSql
-}
-
-func GetDbId(g *gin.Context) uint64 {
-	dbId, _ := strconv.Atoi(g.Param("dbId"))
-	biz.IsTrue(dbId > 0, "dbId错误")
-	return uint64(dbId)
-}
-
-func GetIdAndDb(g *gin.Context) (uint64, string) {
-	db := g.Query("db")
-	biz.NotEmpty(db, "db不能为空")
-	return GetDbId(g), db
-}

server/devops/api/form/db.go

@@ -1,16 +0,0 @@
-package form
-
-type DbForm struct {
-	Id        uint64
-	Name      string `binding:"required" json:"name"`
-	Type      string `binding:"required" json:"type"` // 类型，mysql oracle等
-	Host      string `binding:"required" json:"host"`
-	Port      int    `binding:"required" json:"port"`
-	Username  string `binding:"required" json:"username"`
-	Password  string `json:"password"`
-	Database  string `binding:"required" json:"database"`
-	ProjectId uint64 `binding:"required" json:"projectId"`
-	Project   string `json:"project"`
-	Env       string `json:"env"`
-	EnvId     uint64 `binding:"required" json:"envId"`
-}

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

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

server/devops/api/machine.go

@@ -1,165 +0,0 @@
-package api
-
-import (
-	"fmt"
-	"mayfly-go/base/biz"
-	"mayfly-go/base/ctx"
-	"mayfly-go/base/ginx"
-	"mayfly-go/base/utils"
-	"mayfly-go/base/ws"
-	"mayfly-go/server/devops/api/form"
-	"mayfly-go/server/devops/api/vo"
-	"mayfly-go/server/devops/application"
-	"mayfly-go/server/devops/domain/entity"
-	"mayfly-go/server/devops/infrastructure/machine"
-	"strconv"
-
-	"github.com/gin-gonic/gin"
-	"github.com/gorilla/websocket"
-)
-
-type Machine struct {
-	MachineApp application.Machine
-	ProjectApp application.Project
-}
-
-func (m *Machine) Machines(rc *ctx.ReqCtx) {
-	condition := new(entity.Machine)
-	// 使用创建者id模拟账号成员id
-	condition.CreatorId = rc.LoginAccount.Id
-	condition.Ip = rc.GinCtx.Query("ip")
-	condition.Name = rc.GinCtx.Query("name")
-	condition.ProjectId = uint64(ginx.QueryInt(rc.GinCtx, "projectId", 0))
-
-	res := m.MachineApp.GetMachineList(condition, ginx.GetPageParam(rc.GinCtx), new([]*vo.MachineVO))
-	if res.Total == 0 {
-		rc.ResData = res
-		return
-	}
-
-	list := res.List.(*[]*vo.MachineVO)
-	for _, mv := range *list {
-		mv.HasCli = machine.HasCli(*mv.Id)
-	}
-	rc.ResData = res
-}
-
-func (m *Machine) MachineStats(rc *ctx.ReqCtx) {
-	stats := m.MachineApp.GetCli(GetMachineId(rc.GinCtx)).GetAllStats()
-	rc.ResData = stats
-}
-
-func (m *Machine) SaveMachine(rc *ctx.ReqCtx) {
-	g := rc.GinCtx
-	machineForm := new(form.MachineForm)
-	ginx.BindJsonAndValid(g, machineForm)
-
-	entity := new(entity.Machine)
-	utils.Copy(entity, machineForm)
-
-	entity.SetBaseInfo(rc.LoginAccount)
-	m.MachineApp.Save(entity)
-}
-
-func (m *Machine) ChangeStatus(rc *ctx.ReqCtx) {
-	g := rc.GinCtx
-	id := uint64(ginx.PathParamInt(g, "machineId"))
-	status := int8(ginx.PathParamInt(g, "status"))
-	rc.ReqParam = fmt.Sprintf("id: %d -- status: %d", id, status)
-	m.MachineApp.ChangeStatus(id, status)
-}
-
-func (m *Machine) DeleteMachine(rc *ctx.ReqCtx) {
-	id := uint64(ginx.PathParamInt(rc.GinCtx, "machineId"))
-	rc.ReqParam = id
-	m.MachineApp.Delete(id)
-}
-
-// 关闭机器客户端
-func (m *Machine) CloseCli(rc *ctx.ReqCtx) {
-	machine.DeleteCli(GetMachineId(rc.GinCtx))
-}
-
-// 获取进程列表信息
-func (m *Machine) GetProcess(rc *ctx.ReqCtx) {
-	g := rc.GinCtx
-	cmd := "ps -aux "
-	sortType := g.Query("sortType")
-	if sortType == "2" {
-		cmd += "--sort -pmem "
-	} else {
-		cmd += "--sort -pcpu "
-	}
-
-	pname := g.Query("name")
-	if pname != "" {
-		cmd += fmt.Sprintf("| grep %s ", pname)
-	}
-
-	count := g.Query("count")
-	if count == "" {
-		count = "10"
-	}
-
-	cmd += "| head -n " + count
-
-	cli := m.MachineApp.GetCli(GetMachineId(rc.GinCtx))
-	biz.ErrIsNilAppendErr(m.ProjectApp.CanAccess(rc.LoginAccount.Id, cli.GetMachine().ProjectId), "%s")
-
-	res, err := cli.Run(cmd)
-	biz.ErrIsNilAppendErr(err, "获取进程信息失败: %s")
-	rc.ResData = res
-}
-
-// 终止进程
-func (m *Machine) KillProcess(rc *ctx.ReqCtx) {
-	pid := rc.GinCtx.Query("pid")
-	biz.NotEmpty(pid, "进程id不能为空")
-
-	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)
-	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()))
-			wsConn.Close()
-		}
-	}()
-
-	if err != nil {
-		panic(biz.NewBizErr("升级websocket失败"))
-	}
-	// 权限校验
-	rc := ctx.NewReqCtxWithGin(g).WithRequiredPermission(ctx.NewPermission("machine:terminal"))
-	if err = ctx.PermissionHandler(rc); err != nil {
-		panic(biz.NewBizErr("没有权限"))
-	}
-
-	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, "连接失败：%s")
-	defer sws.Close()
-
-	quitChan := make(chan bool, 3)
-	sws.Start(quitChan)
-	go sws.Wait(quitChan)
-
-	<-quitChan
-}
-
-func GetMachineId(g *gin.Context) uint64 {
-	machineId, _ := strconv.Atoi(g.Param("machineId"))
-	biz.IsTrue(machineId != 0, "machineId错误")
-	return uint64(machineId)
-}

server/devops/api/redis.go

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

server/devops/api/vo/redis.go

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

server/devops/api/vo/vo.go

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

server/devops/application/db_app.go

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

server/devops/application/redis_app.go

@@ -1,161 +0,0 @@
-package application
-
-import (
-	"fmt"
-	"mayfly-go/base/biz"
-	"mayfly-go/base/cache"
-	"mayfly-go/base/global"
-	"mayfly-go/base/model"
-	"mayfly-go/server/devops/domain/entity"
-	"mayfly-go/server/devops/domain/repository"
-	"mayfly-go/server/devops/infrastructure/persistence"
-	"time"
-
-	"github.com/go-redis/redis"
-)
-
-type Redis interface {
-	// 分页获取机器脚本信息列表
-	GetPageList(condition *entity.Redis, pageParam *model.PageParam, toEntity interface{}, orderBy ...string) *model.PageResult
-
-	Count(condition *entity.Redis) int64
-
-	// 根据id获取
-	GetById(id uint64, cols ...string) *entity.Redis
-
-	// 根据条件获取
-	GetRedisBy(condition *entity.Redis, cols ...string) error
-
-	Save(entity *entity.Redis)
-
-	// 删除数据库信息
-	Delete(id uint64)
-
-	// 获取数据库连接实例
-	GetRedisInstance(id uint64) *RedisInstance
-}
-
-type redisAppImpl struct {
-	redisRepo repository.Redis
-}
-
-var RedisApp Redis = &redisAppImpl{
-	redisRepo: persistence.RedisDao,
-}
-
-// 分页获取机器脚本信息列表
-func (r *redisAppImpl) GetPageList(condition *entity.Redis, pageParam *model.PageParam, toEntity interface{}, orderBy ...string) *model.PageResult {
-	return r.redisRepo.GetRedisList(condition, pageParam, toEntity, orderBy...)
-}
-
-func (r *redisAppImpl) Count(condition *entity.Redis) int64 {
-	return r.redisRepo.Count(condition)
-}
-
-// 根据id获取
-func (r *redisAppImpl) GetById(id uint64, cols ...string) *entity.Redis {
-	return r.redisRepo.GetById(id, cols...)
-}
-
-// 根据条件获取
-func (r *redisAppImpl) GetRedisBy(condition *entity.Redis, cols ...string) error {
-	return r.redisRepo.GetRedis(condition, cols...)
-}
-
-func (r *redisAppImpl) Save(re *entity.Redis) {
-	TestRedisConnection(re)
-
-	// 查找是否存在该库
-	oldRedis := &entity.Redis{Host: re.Host, Db: re.Db}
-	err := r.GetRedisBy(oldRedis)
-
-	if re.Id == 0 {
-		biz.IsTrue(err != nil, "该库已存在")
-		r.redisRepo.Insert(re)
-	} else {
-		// 如果存在该库，则校验修改的库是否为该库
-		if err == nil {
-			biz.IsTrue(oldRedis.Id == re.Id, "该库已存在")
-		}
-		// 先关闭数据库连接
-		CloseRedis(re.Id)
-		r.redisRepo.Update(re)
-	}
-}
-
-// 删除Redis信息
-func (r *redisAppImpl) Delete(id uint64) {
-	CloseRedis(id)
-	r.redisRepo.Delete(id)
-}
-
-// 获取数据库连接实例
-func (r *redisAppImpl) GetRedisInstance(id uint64) *RedisInstance {
-	// Id不为0，则为需要缓存
-	needCache := id != 0
-	if needCache {
-		load, ok := redisCache.Get(id)
-		if ok {
-			return load.(*RedisInstance)
-		}
-	}
-	// 缓存不存在，则回调获取redis信息
-	re := r.GetById(id)
-	biz.NotNil(re, "redis信息不存在")
-	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
-}
-
-//------------------------------------------------------------------------------
-
-// redis客户端连接缓存，30分钟内没有访问则会被关闭
-var redisCache = cache.NewTimedCache(30*time.Minute, 5*time.Second).
-	WithUpdateAccessTime(true).
-	OnEvicted(func(key interface{}, value interface{}) {
-		global.Log.Info(fmt.Sprintf("删除redis连接缓存 id = %d", key))
-		value.(*RedisInstance).Cli.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
-	})
-	defer rcli.Close()
-	// 测试连接
-	_, e := rcli.Ping().Result()
-	biz.ErrIsNilAppendErr(e, "Redis连接失败: %s")
-}
-
-func (r *RedisInstance) Scan(cursor uint64, match string, count int64) ([]string, uint64) {
-	keys, newcursor, err := r.Cli.Scan(cursor, match, count).Result()
-	biz.ErrIsNilAppendErr(err, "scan失败: %s")
-	return keys, newcursor
-}

server/devops/domain/entity/db.go

@@ -1,22 +0,0 @@
-package entity
-
-import (
-	"mayfly-go/base/model"
-)
-
-type Db struct {
-	model.Model
-
-	Name      string `orm:"column(name)" json:"name"`
-	Type      string `orm:"column(type)" json:"type"` // 类型，mysql oracle等
-	Host      string `orm:"column(host)" json:"host"`
-	Port      int    `orm:"column(port)" json:"port"`
-	Network   string `orm:"column(network)" json:"network"`
-	Username  string `orm:"column(username)" json:"username"`
-	Password  string `orm:"column(password)" json:"-"`
-	Database  string `orm:"column(database)" json:"database"`
-	ProjectId uint64
-	Project   string
-	EnvId     uint64
-	Env       string
-}

server/devops/domain/entity/machine.go

@@ -1,23 +0,0 @@
-package entity
-
-import (
-	"mayfly-go/base/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"` // 备注
-}
-
-const (
-	MachineStatusEnable  int8 = 1  // 启用状态
-	MachineStatusDisable int8 = -1 // 禁用状态
-)

server/devops/domain/entity/redis.go

@@ -1,17 +0,0 @@
-package entity
-
-import (
-	"mayfly-go/base/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
-}

server/devops/infrastructure/machine/machine.go

@@ -1,186 +0,0 @@
-package machine
-
-import (
-	"errors"
-	"fmt"
-	"mayfly-go/base/biz"
-	"mayfly-go/base/cache"
-	"mayfly-go/base/global"
-	"mayfly-go/server/devops/domain/entity"
-	"net"
-	"time"
-
-	"github.com/pkg/sftp"
-
-	"golang.org/x/crypto/ssh"
-)
-
-// 客户端信息
-type Cli struct {
-	machine *entity.Machine
-	// ssh客户端
-	client *ssh.Client
-
-	sftpClient *sftp.Client
-}
-
-// 机器客户端连接缓存，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
-}
-
-//连接
-func (c *Cli) connect() error {
-	// 如果已经有client则直接返回
-	if c.client != nil {
-		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)
-	if err != nil {
-		return err
-	}
-	c.client = sshClient
-	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和并从缓存中移除
-func (c *Cli) Close() {
-	m := c.machine
-	global.Log.Info(fmt.Sprintf("关闭机器客户端连接-> id: %d, name: %s, ip: %s", m.Id, m.Name, m.Ip))
-	if c.client != nil {
-		c.client.Close()
-		c.client = nil
-	}
-	if c.sftpClient != nil {
-		c.sftpClient.Close()
-		c.sftpClient = nil
-	}
-}
-
-// 获取sftp client
-func (c *Cli) GetSftpCli() *sftp.Client {
-	if c.client == nil {
-		if err := c.connect(); err != nil {
-			panic(biz.NewBizErr("连接ssh失败：" + err.Error()))
-		}
-	}
-	sftpclient := c.sftpClient
-	// 如果sftpClient为nil，则连接
-	if sftpclient == nil {
-		sc, serr := sftp.NewClient(c.client)
-		if serr != nil {
-			panic(biz.NewBizErr("获取sftp client失败：" + serr.Error()))
-		}
-		sftpclient = sc
-		c.sftpClient = sftpclient
-	}
-
-	return sftpclient
-}
-
-// 获取session
-func (c *Cli) GetSession() (*ssh.Session, error) {
-	if c.client == nil {
-		if err := c.connect(); err != nil {
-			return nil, err
-		}
-	}
-	return c.client.NewSession()
-}
-
-//执行shell
-//@param shell shell脚本命令
-func (c *Cli) Run(shell string) (*string, error) {
-	session, err := c.GetSession()
-	if err != nil {
-		c.Close()
-		return nil, err
-	}
-	defer session.Close()
-	buf, rerr := session.CombinedOutput(shell)
-	if rerr != nil {
-		return nil, rerr
-	}
-	res := string(buf)
-	return &res, nil
-}
-
-func (c *Cli) GetMachine() *entity.Machine {
-	return c.machine
-}

server/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
-`