From f7189e34cb66dcda14d81f41967e05b0eddd157d Mon Sep 17 00:00:00 2001 From: lijiahang Date: Wed, 15 May 2024 17:36:59 +0800 Subject: [PATCH] =?UTF-8?q?:bookmark:=20=E5=8D=87=E7=BA=A7=E7=89=88?= =?UTF-8?q?=E6=9C=AC.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- docker-compose.yml | 4 ++-- docker/mysql/build.sh | 2 +- docker/orion-ops-pro/build.sh | 2 +- docs/README.md | 2 +- docs/_coverpage.md | 2 +- docs/about/change-log.md | 9 +++++++++ docs/update/{v2.0.0.md => v1.1.0.md} | 2 +- orion-ops-dependencies/pom.xml | 2 +- .../orion/ops/framework/common/constant/AppConst.java | 2 +- orion-ops-ui/.env.development | 2 +- orion-ops-ui/.env.production | 2 +- orion-ops-ui/package.json | 2 +- orion-ops-ui/src/components/app/app-footer/index.vue | 2 +- .../src/views/host/terminal/types/terminal.const.ts | 2 +- pom.xml | 2 +- 16 files changed, 25 insertions(+), 16 deletions(-) rename docs/update/{v2.0.0.md => v1.1.0.md} (86%) diff --git a/README.md b/README.md index 327ef10c..613b5afe 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@

-当前版本: **1.0.8** +当前版本: **1.1.0** **github:** https://github.com/lijiahangmax/orion-ops-pro **gitee:** https://gitee.com/lijiahangmax/orion-ops-pro diff --git a/docker-compose.yml b/docker-compose.yml index 3b204e2b..2c1d369c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,7 @@ version: '3.3' services: orion-ops-pro: - image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-ops-pro:1.0.8 + image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-ops-pro:1.1.0 ports: - 1081:80 environment: @@ -19,7 +19,7 @@ services: - orion-ops-pro-db - orion-ops-pro-redis orion-ops-pro-db: - image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-ops-pro-mysql:1.0.8 + image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-ops-pro-mysql:1.1.0 privileged: true ports: - 3307:3306 diff --git a/docker/mysql/build.sh b/docker/mysql/build.sh index 4b3100c9..9f810c93 100644 --- a/docker/mysql/build.sh +++ b/docker/mysql/build.sh @@ -1,5 +1,5 @@ #/bin/bash -version=1.0.8 +version=1.1.0 cp -r ../../sql ./sql docker build -t orion-ops-pro-mysql:${version} . rm -rf ./sql diff --git a/docker/orion-ops-pro/build.sh b/docker/orion-ops-pro/build.sh index 012efdb4..1f8eb29f 100644 --- a/docker/orion-ops-pro/build.sh +++ b/docker/orion-ops-pro/build.sh @@ -1,5 +1,5 @@ #/bin/bash -version=1.0.8 +version=1.1.0 mv ../../orion-ops-launch/target/orion-ops-launch.jar ./orion-ops-launch.jar mv ../../orion-ops-ui/dist ./dist docker build -t orion-ops-pro:${version} . diff --git a/docs/README.md b/docs/README.md index 78db4771..5c59b0d0 100644 --- a/docs/README.md +++ b/docs/README.md @@ -26,7 +26,7 @@

-当前版本: **1.0.8** +当前版本: **1.1.0** **github:** https://github.com/lijiahangmax/orion-ops-pro **gitee:** https://gitee.com/lijiahangmax/orion-ops-pro diff --git a/docs/_coverpage.md b/docs/_coverpage.md index f1676b7e..a0e49213 100644 --- a/docs/_coverpage.md +++ b/docs/_coverpage.md @@ -1,4 +1,4 @@ -# orion-ops-pro 1.0.8 +# orion-ops-pro 1.1.0 > 一款开箱即用的运维平台。 diff --git a/docs/about/change-log.md b/docs/about/change-log.md index e400c15b..64856468 100644 --- a/docs/about/change-log.md +++ b/docs/about/change-log.md @@ -7,6 +7,15 @@ * 执行完成菜单 sql 后请刷新缓存 `系统设置` > `系统菜单` > `刷新缓存` * 执行完成字典 sql 后请刷新缓存 `系统设置` > `数据字典项` > `刷新缓存` +### v1.1.0 + +`2024-05-` `release` + +* ⭐ 修改 项目名称为 `orion-visor` +* 🔨 修改 终端默认字体 + +[如何升级](/update/v1.1.0.md) + ### v1.0.8 `2024-05-15` `release` diff --git a/docs/update/v2.0.0.md b/docs/update/v1.1.0.md similarity index 86% rename from docs/update/v2.0.0.md rename to docs/update/v1.1.0.md index 712bfab8..dfb50a63 100644 --- a/docs/update/v2.0.0.md +++ b/docs/update/v1.1.0.md @@ -1,4 +1,4 @@ -## v2.0.0 +## v1.1.0 > sql 脚本 - DDL diff --git a/orion-ops-dependencies/pom.xml b/orion-ops-dependencies/pom.xml index c75a58c9..5076af9f 100644 --- a/orion-ops-dependencies/pom.xml +++ b/orion-ops-dependencies/pom.xml @@ -14,7 +14,7 @@ https://github.com/lijiahangmax/orion-ops-pro - 1.0.8 + 1.1.0 2.7.17 2.7.15 1.5.0 diff --git a/orion-ops-framework/orion-ops-framework-common/src/main/java/com/orion/ops/framework/common/constant/AppConst.java b/orion-ops-framework/orion-ops-framework-common/src/main/java/com/orion/ops/framework/common/constant/AppConst.java index 6a9c1740..1ce6a131 100644 --- a/orion-ops-framework/orion-ops-framework-common/src/main/java/com/orion/ops/framework/common/constant/AppConst.java +++ b/orion-ops-framework/orion-ops-framework-common/src/main/java/com/orion/ops/framework/common/constant/AppConst.java @@ -14,7 +14,7 @@ public interface AppConst extends OrionConst { /** * 同 ${orion.version} 迭代时候需要手动更改 */ - String VERSION = "1.0.8"; + String VERSION = "1.1.0"; String ORION_OPS_PRO = "orion-ops-pro"; diff --git a/orion-ops-ui/.env.development b/orion-ops-ui/.env.development index 8baf6503..b85c8dd1 100644 --- a/orion-ops-ui/.env.development +++ b/orion-ops-ui/.env.development @@ -1,4 +1,4 @@ VITE_API_BASE_URL= 'http://127.0.0.1:9200/orion/api' VITE_WS_BASE_URL= 'ws://127.0.0.1:9200/orion/keep-alive' -VITE_APP_VERSION= '1.0.8' +VITE_APP_VERSION= '1.1.0' VITE_SFTP_PREVIEW_MB= 2 diff --git a/orion-ops-ui/.env.production b/orion-ops-ui/.env.production index 58105ca7..641b5e1e 100644 --- a/orion-ops-ui/.env.production +++ b/orion-ops-ui/.env.production @@ -1,4 +1,4 @@ VITE_API_BASE_URL= '/orion/api' VITE_WS_BASE_URL= '/orion/keep-alive' -VITE_APP_VERSION= '1.0.8' +VITE_APP_VERSION= '1.1.0' VITE_SFTP_PREVIEW_MB= 2 diff --git a/orion-ops-ui/package.json b/orion-ops-ui/package.json index 7f16e257..ef05004a 100644 --- a/orion-ops-ui/package.json +++ b/orion-ops-ui/package.json @@ -1,7 +1,7 @@ { "name": "orion-ops-pro-ui", "description": "Orion Ops Pro for Vue", - "version": "1.0.8", + "version": "1.1.0", "private": true, "author": "Jiahang Li", "license": "Apache 2.0", diff --git a/orion-ops-ui/src/components/app/app-footer/index.vue b/orion-ops-ui/src/components/app/app-footer/index.vue index 612112a0..3e1b9419 100644 --- a/orion-ops-ui/src/components/app/app-footer/index.vue +++ b/orion-ops-ui/src/components/app/app-footer/index.vue @@ -8,7 +8,7 @@ gitee 文档 License - v{{ version }} 开源版 + v{{ version }} Community Copyright {{ new Date().getFullYear() }} Li Jiahang All rights reserved. diff --git a/orion-ops-ui/src/views/host/terminal/types/terminal.const.ts b/orion-ops-ui/src/views/host/terminal/types/terminal.const.ts index 813926d3..d2a64499 100644 --- a/orion-ops-ui/src/views/host/terminal/types/terminal.const.ts +++ b/orion-ops-ui/src/views/host/terminal/types/terminal.const.ts @@ -366,7 +366,7 @@ export const openSftpChmodModalKey = Symbol(); export const openSftpUploadModalKey = Symbol(); // 字体后缀 兜底 -export const fontFamilySuffix = ',courier-new, courier, monospace'; +export const fontFamilySuffix = ', Courier New, Monaco, courier, monospace'; // 终端字体样式 export const fontFamilyKey = 'terminalFontFamily'; diff --git a/pom.xml b/pom.xml index 60d9252c..6591164b 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ - 1.0.8 + 1.1.0 8 8 3.0.0-M5