From 55373bb7dcf62742826c310cb04acf328f5d23c0 Mon Sep 17 00:00:00 2001 From: lijiahang Date: Fri, 1 Mar 2024 15:56:00 +0800 Subject: [PATCH] =?UTF-8?q?:sparkles:=20=E7=BB=88=E7=AB=AF=E9=A2=9C?= =?UTF-8?q?=E8=89=B2=E9=85=8D=E7=BD=AE.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/_coverpage.md | 2 +- docs/about/change-log.md | 6 +++--- docs/about/update.md | 12 ++++++++++- docs/operator/host_ops.md | 8 ++++++-- .../define/cache/DataExtraCacheKeyDefine.java | 2 +- .../authentication/login/locale/zh-CN.ts | 2 +- .../setting/extra/color-setting-form.vue | 13 +++++++----- .../host/terminal/types/terminal.const.ts | 20 +++++-------------- sql/init-3-data.sql | 11 ++++++++++ 9 files changed, 47 insertions(+), 29 deletions(-) diff --git a/docs/_coverpage.md b/docs/_coverpage.md index f00a103b..d6f5103f 100644 --- a/docs/_coverpage.md +++ b/docs/_coverpage.md @@ -2,7 +2,7 @@ > 一款开箱即用的运维平台。 -- 易用 便捷 +- 友好 易用 - 安全 稳定 - 智能 高效 diff --git a/docs/about/change-log.md b/docs/about/change-log.md index 3e7618dd..1338e89e 100644 --- a/docs/about/change-log.md +++ b/docs/about/change-log.md @@ -1,13 +1,13 @@ > 版本号严格遵循 Semver 规范。 -[//]: # (🐞修复 [如何升级](/about/update.md?id=_100)) +[//]: # (🐞修复) ## 1.0.0 `2024-03-01` `release` -🌈 终端标签颜色 -🔨 推展数据模块添加缓存 +🌈 用户自定义终端标签颜色 +🔨 拓展数据模块添加缓存 [如何升级](/about/update.md?id=_100) diff --git a/docs/about/update.md b/docs/about/update.md index 653565e9..5cbde5b4 100644 --- a/docs/about/update.md +++ b/docs/about/update.md @@ -5,5 +5,15 @@ > sql 脚本 ```sql - +INSERT INTO `dict_key` VALUES (32, 'terminalTabColor', 'COLOR', '[]', '终端标签页颜色', '2024-03-01 15:01:44', '2024-03-01 15:01:44', '1', '1', 0); +INSERT INTO `dict_value` VALUES (203, 32, 'terminalTabColor', 'rgb(var(--red-6))', '红色', '{}', 10, '2024-03-01 15:07:41', '2024-03-01 15:07:41', '1', '1', 0); +INSERT INTO `dict_value` VALUES (204, 32, 'terminalTabColor', 'rgb(var(--orange-6))', '橙色', '{}', 20, '2024-03-01 15:07:55', '2024-03-01 15:07:55', '1', '1', 0); +INSERT INTO `dict_value` VALUES (205, 32, 'terminalTabColor', 'rgb(var(--yellow-6))', '黄色', '{}', 30, '2024-03-01 15:08:13', '2024-03-01 15:08:13', '1', '1', 0); +INSERT INTO `dict_value` VALUES (206, 32, 'terminalTabColor', 'rgb(var(--green-6))', '绿色', '{}', 40, '2024-03-01 15:08:23', '2024-03-01 15:08:23', '1', '1', 0); +INSERT INTO `dict_value` VALUES (207, 32, 'terminalTabColor', 'rgb(var(--cyan-6))', '青色', '{}', 50, '2024-03-01 15:08:46', '2024-03-01 15:08:46', '1', '1', 0); +INSERT INTO `dict_value` VALUES (208, 32, 'terminalTabColor', 'rgb(var(--blue-6))', '浅蓝', '{}', 60, '2024-03-01 15:11:01', '2024-03-01 15:11:01', '1', '1', 0); +INSERT INTO `dict_value` VALUES (209, 32, 'terminalTabColor', 'rgb(var(--arcoblue-6))', '蓝色', '{}', 70, '2024-03-01 15:11:11', '2024-03-01 15:11:11', '1', '1', 0); +INSERT INTO `dict_value` VALUES (210, 32, 'terminalTabColor', 'rgb(var(--purple-6))', '紫色', '{}', 80, '2024-03-01 15:11:20', '2024-03-01 15:11:20', '1', '1', 0); +INSERT INTO `dict_value` VALUES (211, 32, 'terminalTabColor', 'rgb(var(--pinkpurple-6))', '粉紫', '{}', 90, '2024-03-01 15:11:41', '2024-03-01 15:11:41', '1', '1', 0); +INSERT INTO `dict_value` VALUES (213, 32, 'terminalTabColor', 'rgb(var(--gray-6))', '灰色', '{}', 100, '2024-03-01 15:12:01', '2024-03-01 15:39:34', '1', '1', 0); ``` diff --git a/docs/operator/host_ops.md b/docs/operator/host_ops.md index 3919cb90..c30f8295 100644 --- a/docs/operator/host_ops.md +++ b/docs/operator/host_ops.md @@ -2,8 +2,12 @@ 主机终端页面 支持 SSH, SFTP。 打开后默认会进入新建连接页面, 页面的主机数据是用户授权的资产数据。 -鼠标移入列表内的主机上时, 右侧会出现 `打开 SSH` `打开 SFTP` `连接设置` `收藏` 的按钮。 -点击 `连接设置` 后, 会弹出模态框, 可以自定义配置连接主机的 密码/秘钥/身份, 仅对自己生效, 不会修改全局配置, `秘钥` `身份` 数据是用户授权的资产数据。 +鼠标移入列表内的主机上时, 右侧会出现 `打开 SSH` `打开 SFTP` `主机设置` `收藏` 的按钮。 + +> 主机设置 + +* SSH 配置: 可以自定义配置连接主机的 密码/秘钥/身份, 仅对自己生效, 不会修改全局配置, `秘钥` `身份` 数据是用户授权的资产数据 +* 标签颜色: 自定义配置标签的颜色, 可以用来区分环境等 > 顶部状态栏 diff --git a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/define/cache/DataExtraCacheKeyDefine.java b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/define/cache/DataExtraCacheKeyDefine.java index bf97e272..2ad76bb7 100644 --- a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/define/cache/DataExtraCacheKeyDefine.java +++ b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/define/cache/DataExtraCacheKeyDefine.java @@ -17,7 +17,7 @@ public interface DataExtraCacheKeyDefine { CacheKeyDefine DATA_EXTRA = new CacheKeyBuilder() .key("data:extra:{}:{}:{}") - .desc("数据推展信息 ${userId} ${type} ${item}") + .desc("数据拓展信息 ${userId} ${type} ${item}") .type(String.class) .struct(RedisCacheStruct.HASH) .timeout(1, TimeUnit.DAYS) diff --git a/orion-ops-ui/src/views/authentication/login/locale/zh-CN.ts b/orion-ops-ui/src/views/authentication/login/locale/zh-CN.ts index 896ffc11..34aa3f03 100644 --- a/orion-ops-ui/src/views/authentication/login/locale/zh-CN.ts +++ b/orion-ops-ui/src/views/authentication/login/locale/zh-CN.ts @@ -7,7 +7,7 @@ export default { 'login.form.userName.placeholder': '用户名', 'login.form.password.placeholder': '密码', 'login.form.login': '登录', - 'login.banner.slogan1': '开箱即用的运维平台', + 'login.banner.slogan1': '开箱即用的一站式智能运维平台', 'login.banner.subSlogan1': '一站式操作 智能运维 让运维变得更简单', 'login.banner.slogan2': '内置权限角色管理', 'login.banner.subSlogan2': '让每一次操作都安全可控可追溯', diff --git a/orion-ops-ui/src/views/host/terminal/components/setting/extra/color-setting-form.vue b/orion-ops-ui/src/views/host/terminal/components/setting/extra/color-setting-form.vue index 705f74e9..ff2c36c8 100644 --- a/orion-ops-ui/src/views/host/terminal/components/setting/extra/color-setting-form.vue +++ b/orion-ops-ui/src/views/host/terminal/components/setting/extra/color-setting-form.vue @@ -14,11 +14,11 @@ -