From 9366a76b84c233b8e06ceb70b532f9ccf2eadb07 Mon Sep 17 00:00:00 2001 From: "meilin.huang" <954537473@qq.com> Date: Thu, 21 Nov 2024 19:02:15 +0800 Subject: [PATCH] release: v1.9.1 --- README.md | 27 ++--- README_EN.md | 105 ++++++++++++++++++ build_release.sh | 45 ++++---- frontend/package.json | 2 +- frontend/src/common/config.ts | 2 +- frontend/src/i18n/en/tag.ts | 8 +- frontend/src/views/login/index.vue | 50 ++++++++- frontend/src/views/ops/db/DbList.vue | 5 +- frontend/src/views/ops/db/InstanceList.vue | 2 +- .../views/ops/machine/cronjob/CronJobList.vue | 2 +- .../ops/machine/security/CmdConfList.vue | 6 +- server/config.yml.example | 2 + server/internal/db/imsg/en.go | 39 ++++++- server/pkg/config/app.go | 2 +- server/pkg/config/server.go | 3 +- server/readme.txt | 2 +- server/readme_en.txt | 12 ++ 17 files changed, 253 insertions(+), 61 deletions(-) create mode 100644 README_EN.md create mode 100644 server/readme_en.txt diff --git a/README.md b/README.md index 9a268c86..34131b08 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,11 @@ # 🌈mayfly-go +

+ English | + 项目文档 | + 操作视频 | +

+

star @@ -20,30 +26,25 @@

-### 介绍 +## 前言 -web 版 **linux(终端[终端回放、命令过滤] 文件 脚本 进程 计划任务)、数据库（mysql postgres oracle sqlserver 达梦 高斯 sqlite）数据操作 数据同步 数据迁移、redis(单机 哨兵 集群)、mongo 等集工单流程审批于一体的统一管理操作平台** +web 版 **linux(终端[终端回放、命令过滤] 文件 脚本 进程 计划任务)。数据库（mysql postgres oracle sqlserver 达梦 高斯 sqlite）数据操作、数据同步、数据迁移。redis(单机 哨兵 集群)。mongo 等集工单流程审批于一体的统一管理操作平台。** -### 开发语言与主要框架 +## 开发语言与主要框架 - 前端：typescript、vue3、element-plus - 后端：golang、gin、gorm -### 交流及问题反馈加 QQ 群 +## 交流及问题反馈加 QQ 群 119699946 -### 系统相关资料 - -- 项目文档: https://www.yuque.com/may-fly/mayfly-go -- 系统操作视频: https://space.bilibili.com/484091081/channel/collectiondetail?sid=392854 - -### 演示环境 +## 演示环境 http://go.mayfly.run 账号/密码：test/test123. -### 系统核心功能截图 +## 系统核心功能截图 #### 首页 @@ -101,8 +102,8 @@ http://go.mayfly.run ![菜单资源管理](https://foruda.gitee.com/images/1714379321338009940/a00d6a02_1240250.png "屏幕截图") -**其他更多功能&操作指南可查看在线文档**: https://www.yuque.com/may-fly/mayfly-go +**其他更多功能&操作指南可查看上述项目文档** -#### 💌 支持作者 +## 💌 支持作者 如果觉得项目不错，或者已经在使用了，希望你可以去 Github 或者 Gitee 帮我点个 ⭐ Star，这将是对我极大的鼓励与支持。 diff --git a/README_EN.md b/README_EN.md new file mode 100644 index 00000000..2df6d8ae --- /dev/null +++ b/README_EN.md @@ -0,0 +1,105 @@ +# 🌈mayfly-go + +

+ 中文介绍 | + Documentation | + Operate Video +

+ +

+ + star + fork + + + github star + github fork + + + docker pulls + + + golang + + + vue + +

+ +## Preface + +Browser-based management platform. **linux(Terminal [terminal playback, command filtering], file, script, process, cronjob), database (mysql, postgres, oracle, sqlserver, Dameng, gauss, sqlite) data operation, data synchronization, data migration, redis(standlone, sentinel, cluster), mongo and other unified management and operation platforms that integrate work order process approval.** + +## Development languages and major frameworks + +- frontend：typescript、vue3、element-plus +- backend：golang、gin、gorm + +## Demo + +http://go.mayfly.run +account/password：test/test123. + +## Screenshots of core features + +#### Home page + +![首页](https://foruda.gitee.com/images/1714378104294194769/149fd257_1240250.png "屏幕截图") + +#### Machine Operation + +##### Status + +![机器状态查看](https://foruda.gitee.com/images/1714378556642584686/93c46ec0_1240250.png "屏幕截图") + +##### SSH Terminal + +![终端操作](https://foruda.gitee.com/images/1714378353790214943/2864ba66_1240250.png "屏幕截图") + +##### File Operation + +![文件操作](https://foruda.gitee.com/images/1714378417206086701/74a188d8_1240250.png "屏幕截图") + +![文件查看](https://foruda.gitee.com/images/1714378482611638688/7753faf6_1240250.png "屏幕截图") + +#### Database Operation + +##### SQL Editor + +![sql编辑器](https://foruda.gitee.com/images/1714378747473077515/3c9387c0_1240250.png "屏幕截图") + +##### Add, delete, update and check data online + +![选表查数据](https://foruda.gitee.com/images/1714378625059063750/3951e5a8_1240250.png "屏幕截图") + +#### Redis Operation + +![redis操作](https://foruda.gitee.com/images/1714378855845451114/4c3f0097_1240250.png "屏幕截图") + +#### Mongo Operation + +![mongo操作](https://foruda.gitee.com/images/1714378916425714642/77fc0ed9_1240250.png "屏幕截图") + +#### Work order process approval + +![流程审批](https://foruda.gitee.com/images/1714379057627690037/ad136862_1240250.png "屏幕截图") + +#### System Management + +##### Account + +![账号管理](https://foruda.gitee.com/images/1714379179491881231/c6d802ae_1240250.png "屏幕截图") + +##### Role + +![角色管理](https://foruda.gitee.com/images/1714379269408676381/6ac1e85c_1240250.png "屏幕截图") + +##### Menu & Permission + +![菜单资源管理](https://foruda.gitee.com/images/1714379321338009940/a00d6a02_1240250.png "屏幕截图") + +**Additional features & instructions can be found in the project documentation above.** + +## 💌 Supporting Author + +If you think the project is good, or you are already using it, I hope you can go to Github to help me click ⭐ Star, which will be a great encouragement and support for me. diff --git a/build_release.sh b/build_release.sh index 52fb077e..4816c838 100755 --- a/build_release.sh +++ b/build_release.sh @@ -28,13 +28,13 @@ function buildWeb() { cd ${web_folder} copy2Server=$1 - echo_yellow "-------------------打包前端开始-------------------" + echo_yellow "-------------------Start bundling frontends-------------------" yarn run build if [ "${copy2Server}" == "2" ] ; then - echo_green '将打包后的静态文件拷贝至server/static/static' + echo_green 'Copy the packaged static files to 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" + echo_yellow ">>>>>>>>>>>>>>>>>>>End of packaging frontend<<<<<<<<<<<<<<<<<<<<\n" } function build() { @@ -46,10 +46,10 @@ function build() { arch=$3 copyDocScript=$4 - echo_yellow "-------------------${os}-${arch}打包构建开始-------------------" + echo_yellow "-------------------Start a bundle build - ${os}-${arch}-------------------" cd ${server_folder} - echo_green "打包构建可执行文件..." + echo_green "Package build executables..." execFileName=${exec_file_name} # 如果是windows系统,可执行文件需要添加.exe结尾 @@ -59,13 +59,13 @@ function build() { CGO_ENABLE=0 GOOS=${os} GOARCH=${arch} go build -ldflags=-w -o ${execFileName} main.go if [ -d ${toFolder} ] ; then - echo_green "目标文件夹已存在,清空文件夹" + echo_green "The desired folder already exists. Clear the folder" sudo rm -rf ${toFolder} fi - echo_green "创建'${toFolder}'目录" + echo_green "Create '${toFolder}' Directory" mkdir ${toFolder} - echo_green "移动二进制文件至'${toFolder}'" + echo_green "Move binary to '${toFolder}'" mv ${server_folder}/${execFileName} ${toFolder} # if [ "${copy2Server}" == "1" ] ; then @@ -74,16 +74,17 @@ function build() { # fi if [ "${copyDocScript}" == "1" ] ; then - echo_green "拷贝脚本等资源文件[config.yml.example、mayfly-go.sql、mayfly-go.sqlite、readme.txt、startup.sh、shutdown.sh]" + echo_green "Copy resources such as scripts [config.yml.example、mayfly-go.sql、mayfly-go.sqlite、readme.txt、startup.sh、shutdown.sh]" cp ${server_folder}/config.yml.example ${toFolder} cp ${server_folder}/readme.txt ${toFolder} + cp ${server_folder}/readme_cn.txt ${toFolder} cp ${server_folder}/resources/script/startup.sh ${toFolder} cp ${server_folder}/resources/script/shutdown.sh ${toFolder} cp ${server_folder}/resources/script/sql/mayfly-go.sql ${toFolder} cp ${server_folder}/resources/data/mayfly-go.sqlite ${toFolder} fi - echo_yellow ">>>>>>>>>>>>>>>>>>>${os}-${arch}打包构建完成<<<<<<<<<<<<<<<<<<<<\n" + echo_yellow ">>>>>>>>>>>>>>>>>>> ${os}-${arch} - Bundle build complete <<<<<<<<<<<<<<<<<<<<\n" } function buildLinuxAmd64() { @@ -103,25 +104,25 @@ function buildMac() { } function buildDocker() { - echo_yellow "-------------------构建docker镜像开始-------------------" + echo_yellow "-------------------Start building the docker image-------------------" imageVersion=$1 imageName="mayfly/mayfly-go:${imageVersion}" docker build --no-cache --platform linux/amd64 --build-arg MAYFLY_GO_VERSION="${imageVersion}" -t "${imageName}" . - echo_green "docker镜像构建完成->[${imageName}]" - echo_yellow "-------------------构建docker镜像结束-------------------" + echo_green "The docker image is built -> [${imageName}]" + echo_yellow "-------------------Finished building the docker image-------------------" } function buildxDocker() { - echo_yellow "-------------------docker buildx构建镜像开始-------------------" + echo_yellow "-------------------The docker buildx build image starts-------------------" imageVersion=$1 imageName="ccr.ccs.tencentyun.com/mayfly/mayfly-go:${imageVersion}" docker buildx build --no-cache --push --platform linux/amd64,linux/arm64 --build-arg MAYFLY_GO_VERSION="${imageVersion}" -t "${imageName}" . - echo_green "docker多版本镜像构建完成->[${imageName}]" - echo_yellow "-------------------docker buildx构建镜像结束-------------------" + echo_green "The docker multi-architecture version image is built -> [${imageName}]" + echo_yellow "-------------------The docker buildx image is finished-------------------" } function runBuild() { - read -p "请选择构建版本[0|其他->除docker镜像外其他 1->linux-amd64 2->linux-arm64 3->windows 4->mac 5->docker 6->docker buildx]: " buildType + read -p "Select build version [0 | Other->Other than docker image 1->linux-amd64 2->linux-arm64 3->windows 4->mac 5->docker 6->docker buildx]: " buildType toPath="." imageVersion="latest" @@ -129,16 +130,16 @@ function runBuild() { if [[ "${buildType}" != "5" ]] && [[ "${buildType}" != "6" ]] ; then # 构建结果的目的路径 - read -p "请输入构建产物输出目录[默认当前路径]: " toPath + read -p "Please enter the build product output directory [default current path]: " toPath if [ ! -d ${toPath} ] ; then - echo_red "构建产物输出目录不存在!" + echo_red "Build product output directory does not exist!" exit; fi if [ "${toPath}" == "" ] ; then toPath="." fi - read -p "是否拷贝文档&脚本[0->否 1->是][默认是]: " copyDocScript + read -p "Whether to copy documents & Scripts [0-> No 1-> Yes][Default yes]: " copyDocScript if [ "${copyDocScript}" == "" ] ; then copyDocScript="1" fi @@ -154,7 +155,7 @@ function runBuild() { fi if [[ "${buildType}" == "5" ]] || [[ "${buildType}" == "6" ]] ; then - read -p "请输入docker镜像版本号[默认latest]: " imageVersion + read -p "Please enter the docker image version (default latest) : " imageVersion if [ "${imageVersion}" == "" ] ; then imageVersion="latest" @@ -189,7 +190,7 @@ function runBuild() { esac if [[ "${buildType}" != "5" ]] && [[ "${buildType}" != "6" ]] ; then - echo_green "删除['${server_folder}/static/static']下静态资源文件." + echo_green "Delete static assets under ['${server_folder}/static/static']." # 删除静态资源文件，保留一个favicon.ico，否则后端启动会报错 rm -rf ${server_folder}/static/static/assets rm -rf ${server_folder}/static/static/config.js diff --git a/frontend/package.json b/frontend/package.json index 2587b58a..d15cfe7f 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -59,7 +59,7 @@ "eslint": "^8.35.0", "eslint-plugin-vue": "^9.28.0", "prettier": "^3.2.5", - "sass": "^1.80.6", + "sass": "^1.81.0", "typescript": "^5.6.3", "vite": "^5.4.11", "vue-eslint-parser": "^9.4.3" diff --git a/frontend/src/common/config.ts b/frontend/src/common/config.ts index e8092eea..ad716390 100644 --- a/frontend/src/common/config.ts +++ b/frontend/src/common/config.ts @@ -15,7 +15,7 @@ const config = { baseWsUrl: `${(window as any).globalConfig.BaseWsUrl || `${location.protocol == 'https:' ? 'wss:' : 'ws:'}//${getBaseApiUrl()}`}/api`, // 系统版本 - version: 'v1.9.0', + version: 'v1.9.1', }; export default config; diff --git a/frontend/src/i18n/en/tag.ts b/frontend/src/i18n/en/tag.ts index 095afbba..6266f8d8 100644 --- a/frontend/src/i18n/en/tag.ts +++ b/frontend/src/i18n/en/tag.ts @@ -44,10 +44,10 @@ export default { testConn: 'Test Connection', usernameExist: 'The username already exists in the account list', publicAc: 'Public credentials', - acTypeEnumPublic: 'Public credentials', - acTypeEnumPrivate: 'Ordinary certificate', - acTypeEnumPrivileged: 'Privilege credentials', - acTypeEnumPrivateDefault: 'Default credentials', + acTypeEnumPublic: 'Public', + acTypeEnumPrivate: 'Ordinary', + acTypeEnumPrivileged: 'Privilege', + acTypeEnumPrivateDefault: 'Default', ciphertextTypeEnumPassword: 'Password', ciphertextTypeEnumPrivateKey: 'Private key', ciphertextTypeEnumPublic: 'Public credentials', diff --git a/frontend/src/views/login/index.vue b/frontend/src/views/login/index.vue index 641c9b50..29262d5c 100644 --- a/frontend/src/views/login/index.vue +++ b/frontend/src/views/login/index.vue @@ -5,7 +5,6 @@
{{ themeConfig.globalViceTitle }} -
@@ -13,12 +12,49 @@
+
- + +