Merge pull request #8 from lijiahangmax/dev

Dev
⚡ 设置缓存过期时间.
2024-04-26 17:08:48 +08:00 · 2024-04-26 16:37:47 +08:00 · 2024-04-26 16:12:06 +08:00 · 2024-04-26 16:01:06 +08:00 · 2024-04-26 16:00:24 +08:00 · 2024-04-26 11:55:47 +08:00
365 changed files with 7256 additions and 2059 deletions
--- a/DISCLAIMER.md
+++ b/DISCLAIMER.md
@@ -14,4 +14,4 @@
 7. 任何单位或个人不得在未经本人书面授权的情况下对本项目本身申请相关的知识产权。
 8. 如果本声明的任何部分被认为无效或不可执行，则该部分将被解释为反映本人的初衷，其余部分仍具有完全效力。不可执行的部分声明，并不构成我们放弃执行该声明的权利。
 9. 本人有权随时对本声明条款及附件内容进行单方面的变更，并以消息推送、网页公告等方式予以公布，公布后立即自动生效，无需另行单独通知；若您在本声明内容公告变更后继续使用的，表示您已充分阅读、理解并接受修改后的声明内容。
-10. 本人对本声明拥有最终解释权。
+10. 本人保留对本声明的最终解释权。
--- a/README.md
+++ b/README.md
@@ -3,8 +3,7 @@
 </h1>

 `orion-ops-pro`
-是一款现代化、高颜值的一站式智能运维管理平台，集资产管理、资产授权、批量执行、计划任务、Web终端、WebSftp、角色管理、系统管理等功能于一体，致力于简化运维团队的治理工作。它是基于 `orion-ops`
-的产品思路进行重构，技术架构升级，并优化了交互逻辑，让操作更快捷更友好。
+是一款现代化、高颜值的一站式智能运维管理平台，集资产管理、资产授权、批量执行、计划任务、WebShell、WebSftp、角色管理、系统管理等功能于一体，致力于简化运维团队的治理工作。

 <p style="text-align: left">
    <a target="_blank" style="text-decoration: none" href="https://app.codacy.com/gh/lijiahangmax/orion-ops-pro/dashboard?utm_source=gh&utm_medium=referral&utm_content=&utm_campaign=Badge_grade">
@@ -22,45 +21,43 @@
 	<a target="_blank" style="text-decoration: none" href="https://gitee.com/lijiahangmax/orion-ops-pro/members">
 		<img src="https://gitee.com/lijiahangmax/orion-ops-pro/badge/fork.svg?theme=dark" alt="fork"/>
 	</a>		
-	<!-- <a target="_blank" style="text-decoration: none" href="https://github.com/lijiahangmax/orion-ops-pro">
+	<a target="_blank" style="text-decoration: none" href="https://github.com/lijiahangmax/orion-ops-pro">
 		<img src="https://img.shields.io/github/stars/lijiahangmax/orion-ops-pro.svg?style=social" alt="star"/>
-	</a> -->	
+	</a>  
 </p>

-<br/>  
+当前版本: **1.0.6**  

-当前版本: **1.0.4**  
-github: https://github.com/lijiahangmax/orion-ops-pro  
-gitee: https://gitee.com/lijiahangmax/orion-ops-pro  
-文档: https://lijiahangmax.gitee.io/orion-ops-pro/#/    
-demo: http://101.43.254.243:1081/
+**github:** https://github.com/lijiahangmax/orion-ops-pro  
+**gitee:** https://gitee.com/lijiahangmax/orion-ops-pro  
+**文档:** https://lijiahangmax.gitee.io/orion-ops-pro/#/  
+**demo:** http://101.43.254.243:1081/

 演示账号: `admin`    
 演示密码: `admin`  
-⭐ 体验后可以点一下 `star` 这对我很重要  
-📞 合作/功能定制请联系底部 备注: '定制'
+⭐ 体验后可以点一下 `star` 这对我很重要!  
+🌈 如果本项目对你有帮助请帮忙推广一下 让更多的人知道此项目!  
+📞 合作/功能定制请联系底部 备注: '合作'

 ## 特性

-* 易用便捷: 极简配置, 开箱即用, 支持 Docker 部署方式。
-* 资产管理: 支持灵活配置主机分组, 实现对主机、秘钥和身份的统一管理。
-* 资产授权: 可将资产数据授权给指定角色和用户, 确保数据安全性。
-* 权限控制: 全面管理用户角色, 支持动态菜单配置和强制下线等功能。
-* 在线终端: 提供便捷的在线 Web 终端服务, 支持快捷命令、自定义快捷键和主题风格。
-* 文件管理: 实现远程主机大文件的批量上传、下载和在线编辑等操作。
-* 批量操作: 支持远程主机批量执行 shell 命令。
-* 计划任务: 支持配置 cron 表达式, 定时执行主机 shell 命令。
-* 操作日志: 记录用户操作日志，确保操作可追溯, 提高系统安全性。
-* 可扩展性: 前后端代码规范统一、代码质量高、健壮且易于阅读和扩展。
+* **快速稳定**: 使用全新的系统架构, 提高系统性能以及稳定性。
+* **交互友好**: 对与用户的交互进行了细致化的打磨, 操作更加方便快捷。
+* **资产管理**: 支持对资产进行分组, 实现对主机、秘钥和身份的统一管理和授权。
+* **权限控制**: 全面管理用户角色, 支持动态菜单配置和强制下线等功能。
+* **在线终端**: 提供便捷的在线 Web 终端服务, 支持快捷命令、自定义快捷键和主题风格。
+* **文件管理**: 实现远程主机大文件的批量上传、下载和在线编辑等操作。
+* **批量操作**: 支持远程主机批量执行主机命令。
+* **计划任务**: 支持配置 cron 表达式, 定时执行主机命令。
+* **操作审计**: 记录用户操作日志，确保操作可追溯, 提高系统安全性。

 ## 快速开始

-docker安装: https://lijiahangmax.gitee.io/orion-ops-pro/#/quickstart/docker-install   
-安装文档: https://lijiahangmax.gitee.io/orion-ops-pro/#/quickstart/install   
-开发文档: https://lijiahangmax.gitee.io/orion-ops-pro/#/advance/dev   
-操作手册: https://lijiahangmax.gitee.io/orion-ops-pro/#/operator/asset  
-常见问题: https://lijiahangmax.gitee.io/orion-ops-pro/#/quickstart/faq  
-roadmap: https://lijiahangmax.gitee.io/orion-ops-pro/#/about/roadmap
+* [docker安装](https://lijiahangmax.gitee.io/orion-ops-pro/#/quickstart/docker-install)
+* [普通安装](https://lijiahangmax.gitee.io/orion-ops-pro/#/quickstart/install)
+* [更新日志](https://lijiahangmax.gitee.io/orion-ops-pro/#/about/change-log)
+* [操作手册](https://lijiahangmax.gitee.io/orion-ops-pro/#/operator/asset)
+* [常见问题](https://lijiahangmax.gitee.io/orion-ops-pro/#/quickstart/faq)

 ## 技术栈

@@ -71,49 +68,32 @@ roadmap: https://lijiahangmax.gitee.io/orion-ops-pro/#/about/roadmap
 * Vue3
 * Arco Design

-## 功能预览
-
-> 工作台
-
-![工作台](https://bjuimg.obs.cn-north-4.myhuaweicloud.com/images/2024/3/22/13d79a89-aadf-4100-8bb3-afb03758001f.png "工作台")
-
-> 资产管理
-
-![主机列表](https://bjuimg.obs.cn-north-4.myhuaweicloud.com/images/2024/3/22/d9954335-9afa-4579-b040-a1c3006cb1f0.png "主机列表")
-![资产授权](https://bjuimg.obs.cn-north-4.myhuaweicloud.com/images/2024/3/22/ffbdd0e2-4811-4776-a96c-7b5d9b4f3e89.png "资产授权")
+## 主要功能预览

 > 主机终端

-![主机终端](https://bjuimg.obs.cn-north-4.myhuaweicloud.com/images/2024/3/22/de6ae2bb-3d9a-44d6-b530-664febee7dbc.png "主机终端")
-![命令片段](https://bjuimg.obs.cn-north-4.myhuaweicloud.com/images/2024/3/22/0a2a8077-fb47-4c87-8327-9d6b93ecc552.png "命令片段")
+![新建连接](https://bjuimg.obs.cn-north-4.myhuaweicloud.com/images/2024/4/20/fb90febf-b1aa-45d4-a6f8-ed681dd259b2.png "新建连接")
+![主机终端](https://bjuimg.obs.cn-north-4.myhuaweicloud.com/images/2024/4/20/8055df25-82d5-434d-8846-78afb2ee4638.png "主机终端")
+![sftp](https://bjuimg.obs.cn-north-4.myhuaweicloud.com/images/2024/4/20/b7f2b644-a3d8-4562-8d05-d860805fb815.png "sftp")
 ![主题设置](https://bjuimg.obs.cn-north-4.myhuaweicloud.com/images/2024/3/22/20741d51-af62-40f0-bd6f-6e954d9b0398.png "主题设置")
 ![终端设置](https://bjuimg.obs.cn-north-4.myhuaweicloud.com/images/2024/3/22/a3bf32bc-26b5-4ec7-b429-54c17ccd136b.png "终端设置")
-![sftp](https://bjuimg.obs.cn-north-4.myhuaweicloud.com/images/2024/3/22/0ae07072-1740-4f84-aaf7-c18a8074ce61.png "sftp")
-![传输列表](https://bjuimg.obs.cn-north-4.myhuaweicloud.com/images/2024/3/22/ccf880a4-c393-4a35-9f35-fe7572256edd.png "传输列表")

 > 批量执行

-![批量执行](https://bjuimg.obs.cn-north-4.myhuaweicloud.com/images/2024/3/22/0a222b64-d2c1-481c-99b8-c3a0616d2fab.png "批量执行")
+![批量执行](https://bjuimg.obs.cn-north-4.myhuaweicloud.com/images/2024/4/20/197804f2-cb69-4ebb-b1e1-b52372972301.png "批量执行")
 ![执行日志](https://bjuimg.obs.cn-north-4.myhuaweicloud.com/images/2024/3/22/06d02d38-70ef-43c2-950c-9f8c73a105ba.png "执行日志")
 ![执行记录](https://bjuimg.obs.cn-north-4.myhuaweicloud.com/images/2024/3/22/0e474cc2-f7cf-49bc-be3c-f6445783ad7c.png "执行记录")

 > 计划任务

 ![计划任务](https://bjuimg.obs.cn-north-4.myhuaweicloud.com/images/2024/4/15/ba5c0635-50c1-4c43-8062-3470ad33830e.png "计划任务")
-![计划任务编辑](https://bjuimg.obs.cn-north-4.myhuaweicloud.com/images/2024/4/15/03176f22-0e21-4a07-8511-7b08211594d6.png "计划任务编辑")
-![计划任务日志](https://bjuimg.obs.cn-north-4.myhuaweicloud.com/images/2024/4/15/1528c6a2-4813-4c3c-aa7b-f13a979065ba.png "计划任务日志")
+![计划任务编辑](https://bjuimg.obs.cn-north-4.myhuaweicloud.com/images/2024/4/20/b6ba7ec0-011f-48ff-a36e-c8d93bd1f75c.png "计划任务编辑")

 > 用户管理

-![用户列表](https://bjuimg.obs.cn-north-4.myhuaweicloud.com/images/2024/3/22/0d5f26e0-de4e-4342-800c-30a0d5d3078e.png "用户列表")  
 ![个人中心](https://bjuimg.obs.cn-north-4.myhuaweicloud.com/images/2024/3/22/ed1e5e02-f854-44ee-bb37-ea6e45526457.png "个人中心")
 ![操作日志](https://bjuimg.obs.cn-north-4.myhuaweicloud.com/images/2024/3/22/ba6f1526-da00-4a3d-a550-470a6b3d2803.png "操作日志")

-> 系统管理
-
-![系统菜单](https://bjuimg.obs.cn-north-4.myhuaweicloud.com/images/2024/3/22/5087cd35-6a65-4338-bc87-c81969cdb947.png "系统菜单")  
-![分配菜单](https://bjuimg.obs.cn-north-4.myhuaweicloud.com/images/2024/3/22/5a7804ed-179c-4d25-820f-af2af1aabbba.png "分配菜单")
-
 ## 联系我

 <div style="display: flex;">
--- 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.4
+    image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-ops-pro:1.0.6
    ports:
      - 1081:80
    environment:
@@ -13,6 +13,7 @@ services:
      - SECRET_KEY=uQeacXV8b3isvKLK
    volumes:
      - /data/orion-ops-pro-space/docker-volumes/orion-ops-pro/logs:/root/orion/logs/orion-ops-pro
+      - /data/orion-ops-pro-space/docker-volumes/orion-ops-pro/app:/root/orion/orion-ops-pro
    depends_on:
      - orion-ops-pro-db
      - orion-ops-pro-redis
@@ -34,11 +35,12 @@ services:
      - /data/orion-ops-pro-space/docker-volumes/mysql/etc-mysql:/etc/mysql
  orion-ops-pro-redis:
    image: redis:6.0.16-alpine
-    command: redis-server --requirepass Data@123456
+    command: redis-server --appendonly yes --requirepass Data@123456
    ports:
      - 6380:6379
    volumes:
      - /data/orion-ops-pro-space/docker-volumes/redis/data:/data
+      - /data/orion-ops-pro-space/docker-volumes/redis/redis.conf:/usr/local/etc/redis/redis.conf
  orion-ops-pro-adminer:
    image: adminer
    ports:
--- a/docker/orion-ops-pro/build.sh
+++ b/docker/orion-ops-pro/build.sh
@@ -1,3 +1,3 @@
 mv ../../orion-ops-launch/target/orion-ops-launch.jar ./
 mv ../../orion-ops-ui/dist ./dist
-docker build -t orion-ops-pro:1.0.4 .
+docker build -t orion-ops-pro:1.0.6 .
--- a/docs/DISCLAIMER.md
+++ b/docs/DISCLAIMER.md
@@ -14,4 +14,4 @@
 7. 任何单位或个人不得在未经本人书面授权的情况下对本项目本身申请相关的知识产权。
 8. 如果本声明的任何部分被认为无效或不可执行，则该部分将被解释为反映本人的初衷，其余部分仍具有完全效力。不可执行的部分声明，并不构成我们放弃执行该声明的权利。
 9. 本人有权随时对本声明条款及附件内容进行单方面的变更，并以消息推送、网页公告等方式予以公布，公布后立即自动生效，无需另行单独通知；若您在本声明内容公告变更后继续使用的，表示您已充分阅读、理解并接受修改后的声明内容。
-10. 本人对本声明拥有最终解释权。
+10. 本人保留对本声明的最终解释权。
--- a/docs/README.md
+++ b/docs/README.md
@@ -3,8 +3,7 @@
 </h1>

 `orion-ops-pro`
-是一款现代化、高颜值的一站式智能运维管理平台，集资产管理、资产授权、批量执行、计划任务、Web终端、WebSftp、角色管理、系统管理等功能于一体，致力于简化运维团队的治理工作。它是基于 `orion-ops`
-的产品思路进行重构，技术架构升级，并优化了交互逻辑，让操作更快捷更友好。
+是一款现代化、高颜值的一站式智能运维管理平台，集资产管理、资产授权、批量执行、计划任务、WebShell、WebSftp、角色管理、系统管理等功能于一体，致力于简化运维团队的治理工作。

 <p style="text-align: left">
    <a target="_blank" style="text-decoration: none" href="https://app.codacy.com/gh/lijiahangmax/orion-ops-pro/dashboard?utm_source=gh&utm_medium=referral&utm_content=&utm_campaign=Badge_grade">
@@ -22,45 +21,43 @@
 	<a target="_blank" style="text-decoration: none" href="https://gitee.com/lijiahangmax/orion-ops-pro/members">
 		<img src="https://gitee.com/lijiahangmax/orion-ops-pro/badge/fork.svg?theme=dark" alt="fork"/>
 	</a>		
-	<!-- <a target="_blank" style="text-decoration: none" href="https://github.com/lijiahangmax/orion-ops-pro">
+	<a target="_blank" style="text-decoration: none" href="https://github.com/lijiahangmax/orion-ops-pro">
 		<img src="https://img.shields.io/github/stars/lijiahangmax/orion-ops-pro.svg?style=social" alt="star"/>
-	</a> -->	
+	</a>  
 </p>

-<br/>  
+当前版本: **1.0.6**

-当前版本: **1.0.4**  
-github: https://github.com/lijiahangmax/orion-ops-pro  
-gitee: https://gitee.com/lijiahangmax/orion-ops-pro  
-文档: https://lijiahangmax.gitee.io/orion-ops-pro/#/    
-demo: http://101.43.254.243:1081/
+**github:** https://github.com/lijiahangmax/orion-ops-pro  
+**gitee:** https://gitee.com/lijiahangmax/orion-ops-pro  
+**文档:** https://lijiahangmax.gitee.io/orion-ops-pro/#/  
+**demo:** http://101.43.254.243:1081/

 演示账号: `admin`    
 演示密码: `admin`  
-⭐ 体验后可以点一下 `star` 这对我很重要  
+⭐ 体验后可以点一下 `star` 这对我很重要!  
+🌈 如果本项目对你有帮助请帮忙推广一下 让更多的人知道此项目!  
 📞 合作/功能定制请联系底部 备注: '合作'

 ## 特性

-* 易用便捷: 极简配置, 开箱即用, 支持 Docker 部署方式。
-* 资产管理: 支持灵活配置主机分组, 实现对主机、秘钥和身份的统一管理。
-* 资产授权: 可将资产数据授权给指定角色和用户, 确保数据安全性。
-* 权限控制: 全面管理用户角色, 支持动态菜单配置和强制下线等功能。
-* 在线终端: 提供便捷的在线 Web 终端服务, 支持快捷命令、自定义快捷键和主题风格。
-* 文件管理: 实现远程主机大文件的批量上传、下载和在线编辑等操作。
-* 批量操作: 支持远程主机批量执行 shell 命令。
-* 计划任务: 支持配置 cron 表达式, 定时执行主机 shell 命令。
-* 操作日志: 记录用户操作日志，确保操作可追溯, 提高系统安全性。
-* 可扩展性: 前后端代码规范统一、代码质量高、健壮且易于阅读和扩展。
+* **快速稳定**: 使用全新的系统架构, 提高系统性能以及稳定性。
+* **交互友好**: 对与用户的交互进行了细致化的打磨, 操作更加方便快捷。
+* **资产管理**: 支持对资产进行分组, 实现对主机、秘钥和身份的统一管理和授权。
+* **权限控制**: 全面管理用户角色, 支持动态菜单配置和强制下线等功能。
+* **在线终端**: 提供便捷的在线 Web 终端服务, 支持快捷命令、自定义快捷键和主题风格。
+* **文件管理**: 实现远程主机大文件的批量上传、下载和在线编辑等操作。
+* **批量操作**: 支持远程主机批量执行主机命令。
+* **计划任务**: 支持配置 cron 表达式, 定时执行主机命令。
+* **操作审计**: 记录用户操作日志，确保操作可追溯, 提高系统安全性。

 ## 快速开始

-docker安装: https://lijiahangmax.gitee.io/orion-ops-pro/#/quickstart/docker-install   
-安装文档: https://lijiahangmax.gitee.io/orion-ops-pro/#/quickstart/install   
-开发文档: https://lijiahangmax.gitee.io/orion-ops-pro/#/advance/dev   
-操作手册: https://lijiahangmax.gitee.io/orion-ops-pro/#/operator/asset  
-常见问题: https://lijiahangmax.gitee.io/orion-ops-pro/#/quickstart/faq  
-roadmap: https://lijiahangmax.gitee.io/orion-ops-pro/#/about/roadmap
+* [docker安装](https://lijiahangmax.gitee.io/orion-ops-pro/#/quickstart/docker-install)
+* [普通安装](https://lijiahangmax.gitee.io/orion-ops-pro/#/quickstart/install)
+* [更新日志](https://lijiahangmax.gitee.io/orion-ops-pro/#/about/change-log)
+* [操作手册](https://lijiahangmax.gitee.io/orion-ops-pro/#/operator/asset)
+* [常见问题](https://lijiahangmax.gitee.io/orion-ops-pro/#/quickstart/faq)

 ## 技术栈

@@ -71,25 +68,15 @@ roadmap: https://lijiahangmax.gitee.io/orion-ops-pro/#/about/roadmap
 * Vue3
 * Arco Design

-## 功能预览
-
-> 工作台
-
-![工作台](./assert/img/workplace.png "工作台")
-
-> 资产管理
-
-![主机列表](./assert/img/asset_host_list.png "主机列表")
-![资产授权](./assert/img/asset_grant.png "资产授权")
+## 主要功能预览

 > 主机终端

+![新建连接](./assert/img/terminal_collections.png "新建连接")
 ![主机终端](./assert/img/terminal_ssh.png "主机终端")
-![命令片段](./assert/img/terminal_snippet.png "命令片段")
+![sftp](./assert/img/terminal_sftp.png "sftp")
 ![主题设置](./assert/img/terminal_theme.png "主题设置")
 ![终端设置](./assert/img/terminal_setting.png "终端设置")
-![sftp](./assert/img/terminal_sftp.png "sftp")
-![传输列表](./assert/img/terminal_transfer.png "传输列表")

 > 批量执行

@@ -101,19 +88,12 @@ roadmap: https://lijiahangmax.gitee.io/orion-ops-pro/#/about/roadmap

 ![计划任务](./assert/img/exec_job.png "计划任务")
 ![计划任务编辑](./assert/img/exec_job_edit.png "计划任务编辑")
-![计划任务日志](./assert/img/exec_job_log.png "计划任务日志")

 > 用户管理

-![用户列表](./assert/img/user_list.png "用户列表")  
 ![个人中心](./assert/img/user_info.png "个人中心")
 ![操作日志](./assert/img/user_operator_log.png "操作日志")

-> 系统管理
-
-![系统菜单](./assert/img/system_menu.png "系统菜单")  
-![分配菜单](./assert/img/user_grant_menu.png "分配菜单")
-
 ## 联系我

 <div style="display: flex;">
--- a/docs/_coverpage.md
+++ b/docs/_coverpage.md
@@ -1,4 +1,4 @@
-# orion-ops-pro <small>1.0.4</small>
+# orion-ops-pro <small>1.0.6</small>

 > 一款开箱即用的运维平台。

--- a/docs/about/change-log.md
+++ b/docs/about/change-log.md
@@ -1,8 +1,58 @@
 > 版本号严格遵循 Semver 规范。

-⚡ 注意: 应用不支持跨版本升级, 可以进行多次升级
+### 升级须知

-## v1.0.4
+* 应用 **不支持** 跨版本升级, 可以进行 **多次升级**。
+* docker 安装的 sql 脚本可以在 `adminer` 中执行。
+* 执行完成菜单 sql 后请刷新缓存 `系统设置` > `系统菜单` > `刷新缓存`
+* 执行完成字典 sql 后请刷新缓存 `系统设置` > `数据字典项` > `刷新缓存`
+
+### v1.0.6
+
+`2024-04-26` `release`
+
+* 🐞 修复 终端页签关闭后不会自动切换
+* 🩰 修改 命令执行日志 UI 修改
+* 🌈 新增 命令执行模板配置默认主机
+* 🌈 新增 主机终端书签路径
+* 🌈 新增 命令执行日志添加 `ansi` 日志 `app.exec-log.append-ansi`
+* 🌈 新增 定时删除命令执行日志文件 `app.exec-log.auto-clear`
+* 🌈 新增 终端设置添加了几个全局快捷键
+* 🔨 优化 通用分组模型添加 `userId`
+* 🔨 优化 退出登录不重定向
+* 🔨 优化 动态设置页面标题
+* 🔨 优化 终端断开后回车重连
+* 🔨 优化 自动删除未使用的命令片段分组
+* 🔨 优化 添加分布式锁工具类
+
+[如何升级](/update/v1.0.6.md)
+
+### v1.0.5
+
+`2024-04-22` `release`
+
+* 🐞 修复 用户列表用户名显示错误
+* 🐞 修复 主机分组页面无法编辑的问题
+* 🐞 修复 资产授权时提示数据发生变更的问题
+* 🐞 修复 删除资产时授权记录未删除的问题
+* 🐞 修复 命令执行权限控制失效的问题
+* 🌈 新增 定时删除未引用的 `tag`
+* 🌈 新增 执行命令时可使用脚本文件执行
+* 🌈 新增 主机身份添加类型字段
+* 🔨 优化 文件传输列表进度显示
+* 🔨 优化 命令执行日志持续时间
+* 🔨 优化 命令执行添加内置参数
+* 🔨 优化 tracker 监听文件可配置 `app.tracker`
+* 🔨 优化 sftp 上传文件重复处理可配置 `app.sftp`
+* 🔨 优化 用户状态调整交互逻辑
+* 🔨 优化 角色状态调整交互逻辑
+* 🔨 优化 优化资产授权交互逻辑
+* 🔨 优化 SFTP 交互逻辑
+* 🧹 删除 用户锁定状态
+
+[如何升级](/update/v1.0.5.md)
+
+### v1.0.4

 `2024-04-15` `release`

@@ -24,7 +74,7 @@

 [如何升级](/update/v1.0.4.md)

-## v1.0.3
+### v1.0.3

 `2024-03-25` `release`

@@ -39,7 +89,7 @@

 [如何升级](/update/v1.0.3.md)

-## v1.0.2
+### v1.0.2

 `2024-03-22` `release`

@@ -58,7 +108,7 @@

 [如何升级](/update/v1.0.2.md)

-## v1.0.1
+### v1.0.1

 `2024-03-06` `release`

@@ -69,11 +119,11 @@
 * 🌈 新增 主机连接日志删除/清理
 * 🌈 新增 用户操作日志日志删除/清理
 * 🌈 新增 用户操作日志日志删除/清理
-* 🔨 优化 用户锁定次数/时间可配置
+* 🔨 优化 用户锁定次数/时间可配置 `app.authentication`

 [如何升级](/update/v1.0.1.md)

-## v1.0.0
+### v1.0.0

 `2024-03-01` `release`

@@ -82,7 +132,7 @@

 [如何升级](/update/v1.0.0.md)

-## v1.0.0-beta.1
+### v1.0.0-beta.1

 `2024-02-28` `preview`

--- a/docs/about/roadmap.md
+++ b/docs/about/roadmap.md
@@ -1,24 +1,16 @@
-## 功能排期 ⏳
+## 功能排期

-* tracker 使用配置文件
-* 文件重复删除/重命名 可配置
-* 定时删除未引用的 tag
-* 管理员也需要自行授权资产
-* 使用文件执行命令
-* 主机身份类型
-* 文件夹书签
 * 批量上传
-* 优化文件传输列表进度显示
-* 终端断开连接后回车重新连接
 * 站内消息
 * 终端背景图片
 * 资产授权 UI 改版
 * RDP 远程桌面
 * 接入 config 后端动态配置
 * 文档中巡检模板
-* 批量执行 模板 定时任务 配置是否使用文件执行
+* 导入快捷命令
+* 导入命令模板
 * 使用 vite press 开发文档

-## 已知问题 🐞
+## 已知问题

 * 顶部菜单折叠宽度计算有问题 (arco 框架内问题)
--- a/docs/assert/img/asset_grant.png
+++ b/docs/assert/img/asset_grant.png
--- a/docs/assert/img/asset_host_list.png
+++ b/docs/assert/img/asset_host_list.png
--- a/docs/assert/img/batch_exec.png
+++ b/docs/assert/img/batch_exec.png
--- a/docs/assert/img/exec_job_edit.png
+++ b/docs/assert/img/exec_job_edit.png
--- a/docs/assert/img/exec_job_log.png
+++ b/docs/assert/img/exec_job_log.png
--- a/docs/assert/img/system_menu.png
+++ b/docs/assert/img/system_menu.png
--- a/docs/assert/img/terminal_collections.png
+++ b/docs/assert/img/terminal_collections.png
--- a/docs/assert/img/terminal_sftp.png
+++ b/docs/assert/img/terminal_sftp.png
--- a/docs/assert/img/terminal_snippet.png
+++ b/docs/assert/img/terminal_snippet.png
--- a/docs/assert/img/terminal_ssh.png
+++ b/docs/assert/img/terminal_ssh.png
--- a/docs/assert/img/terminal_transfer.png
+++ b/docs/assert/img/terminal_transfer.png
--- a/docs/assert/img/user_grant_menu.png
+++ b/docs/assert/img/user_grant_menu.png
--- a/docs/assert/img/user_list.png
+++ b/docs/assert/img/user_list.png
--- a/docs/assert/img/workplace.png
+++ b/docs/assert/img/workplace.png
--- a/docs/operator/exec.md
+++ b/docs/operator/exec.md
@@ -75,13 +75,19 @@
 | source          | 执行来源 (BATCH/JOB)          |
 | sourceId        | 执行来源id (JOB特有)            |
 | seq             | 执行序列 (JOB特有)              |
+| userId          | 执行用户id                    |
+| username        | 执行用户名                     |
 | execId          | 执行记录id                    |
 | hostId          | 执行主机id                    | 
 | hostName        | 执行主机名称                    |
 | hostCode        | 执行主机编码                    |
 | hostAddress     | 执行主机地址                    |
-| userId          | 执行用户id                    |
-| username        | 执行用户名                     |
+| hostUsername    | 执行主机用户名                   |
+| osType          | 执行主机系统版本                  |
+| port            | SSH 端口                    |
+| charset         | SSH 编码集                   |
+| scriptExec      | 是否使用脚本执行                  |
+| scriptPath      | 脚本文件路径                    |
 | uuid            | 生成任务维度 uuid               |
 | uuidShort       | 生成任务维度 uuid 无 '-'         |
 | hostUuid        | 生成机器维度 uuid               |
--- a/docs/quickstart/faq.md
+++ b/docs/quickstart/faq.md
@@ -3,25 +3,24 @@
 数据库的数据都采用了逻辑删除, 可以将已删除的数据中的 `deleted` 字段改为 `0`   
 如果不知道数据是哪一条, 可以查询用户操作日志, 点击 `参数` 寻找操作的id       

-> ##### 2. 是否支持维护 Windows 主机?
-
-支持, 但是 Windows 的 ssh 命令兼容性不好, 一切需要执行ssh命令的地方都不友好  
-如: 批量执行, 调度任务兼容性非常不友好  
-
-> ##### 3. 执行命令时为什么会找不到环境变量?
+> ##### 2. 执行命令时为什么会找不到环境变量?

 可以在执行命令的第一行设置 `source /etc/profile` 来加载环境变量  

-> ##### 4. 命令中途执行失败如何设置中断执行?
+> ##### 3. 命令中途执行失败如何设置中断执行?

 可以在执行命令的第一行设置 `set -e`  
 作用是: 当执行出现意料之外的情况时, 立即退出   

-> ##### 5. 在调度任务、批量执行 命令执行成功的依据是什么?
+> ##### 4. 在调度任务、批量执行 命令执行成功的依据是什么?

 是获取命令的 `exitcode` 判断是否为 `0` 如果非0则代表命令执行失败  
 同理, 在命令的最后一行设置 `exit 1` 结果将会是失败, 可以用此来中断后续流程  

+> ##### 5. 调度任务、批量执行 的日志文件中如何只保存原始输出?
+
+修改 application.yaml `app.exec-log.append-ansi` 为 false
+
 > ##### 6. 为什么使用秘钥认证还是无法连接机器?

 ```
--- a/docs/update/v1.0.5.md
+++ b/docs/update/v1.0.5.md
@@ -3,9 +3,55 @@
 > sql 脚本 - DDL

 ```sql
+ALTER TABLE `system_user` 
+MODIFY COLUMN `status` tinyint(0) NULL DEFAULT 1 COMMENT '用户状态 0停用 1启用' AFTER `email`;
+
+ALTER TABLE `host_identity` 
+ADD COLUMN `type` char(12) NULL COMMENT '类型' AFTER `name`;
+
+ALTER TABLE `exec_log` 
+ADD COLUMN `script_exec` tinyint(0) NULL DEFAULT 0 COMMENT '是否使用脚本执行' AFTER `timeout`;
+
+ALTER TABLE `exec_job` 
+ADD COLUMN `script_exec` tinyint(0) NULL DEFAULT 0 COMMENT '是否使用脚本执行' AFTER `timeout`;
+
+ALTER TABLE `exec_template` 
+ADD COLUMN `script_exec` tinyint(0) NULL DEFAULT 0 COMMENT '是否使用脚本执行' AFTER `timeout`;
+
+ALTER TABLE `exec_host_log` 
+ADD COLUMN `script_path` varchar(512) NULL COMMENT '脚本路径' AFTER `log_path`;
 ```

 > sql 脚本 - DML

 ```sql
+-- 初始化主机身份类型
+UPDATE `host_identity` SET type = IF(key_id IS NOT NULL, 'KEY', 'PASSWORD');
+-- 重新设置用户状态
+UPDATE `system_user` SET status = 0 WHERE status = 2;
+DELETE FROM `dict_value` WHERE id = 19;
+-- 设置主机配置中的 osType
+UPDATE host_config SET config = JSON_SET(config, '$.osType', 'LINUX') WHERE type = 'ssh' AND deleted = 0;
+-- 重新设置额外数据
+UPDATE data_extra alias
+LEFT JOIN data_extra color 
+ON alias.user_id = color.user_id 
+AND alias.rel_id = color.rel_id 
+AND alias.type= color.type
+AND color.item = 'color'
+SET alias.item = 'label',
+alias.value = JSON_OBJECT('alias', JSON_EXTRACT(alias.value, '$.value'), 'color', JSON_EXTRACT(color.value, '$.color')) 
+WHERE alias.item = 'alias';
+-- 删除 color 数据
+DELETE FROM data_extra WHERE type = 'HOST' AND item = 'color';
+-- 初始化字典项
+DELETE FROM dict_key WHERE id >= 37;
+INSERT INTO `dict_key` VALUES (37, 'hostIdentityType', 'STRING', '[{\"name\": \"color\", \"type\": \"COLOR\"}]', '主机身份类型', '2024-04-16 17:15:31', '2024-04-16 17:15:31', '2', '2', 0);
+INSERT INTO `dict_key` VALUES (38, 'hostSshOsType', 'STRING', '[]', '主机系统类型', '2024-04-16 22:18:59', '2024-04-16 22:30:59', '1', '1', 0);
+-- 初始化字典值
+DELETE FROM dict_value WHERE id >= 270;
+INSERT INTO `dict_value` VALUES (270, 37, 'hostIdentityType', 'PASSWORD', '密码', '{\"color\": \"purple\"}', 10, '2024-04-16 17:17:49', '2024-04-16 17:17:49', '2', '2', 0);
+INSERT INTO `dict_value` VALUES (271, 37, 'hostIdentityType', 'KEY', '秘钥', '{\"color\": \"arcoblue\"}', 20, '2024-04-16 17:18:12', '2024-04-16 17:18:12', '2', '2', 0);
+INSERT INTO `dict_value` VALUES (272, 38, 'hostSshOsType', 'LINUX', 'linux', '{}', 10, '2024-04-16 22:19:25', '2024-04-16 22:30:59', '1', '1', 0);
+INSERT INTO `dict_value` VALUES (273, 38, 'hostSshOsType', 'WINDOWS', 'windows', '{}', 20, '2024-04-16 22:19:39', '2024-04-16 22:30:59', '1', '1', 0);
 ```
--- a/docs/update/v1.0.6.md
+++ b/docs/update/v1.0.6.md
@@ -0,0 +1,106 @@
+## v1.0.6
+
+> sql 脚本 - DDL
+
+```sql
+-- 数据分组添加 userId
+ALTER TABLE `data_group` 
+ADD COLUMN `user_id` bigint(0) NULL COMMENT '用户id' AFTER `type`,
+MODIFY COLUMN `name` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '组名称' AFTER `user_id`,
+DROP INDEX `idx_type`,
+ADD INDEX `idx_type_user`(`type`, `user_id`) USING BTREE;
+
+ALTER TABLE `data_group_rel` 
+MODIFY COLUMN `type` char(16) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '组类型' AFTER `id`,
+ADD COLUMN `user_id` bigint(0) NULL COMMENT '用户id' AFTER `type`,
+DROP INDEX `idx_type`,
+ADD INDEX `idx_type_user`(`type`, `user_id`) USING BTREE;
+
+-- 执行模板主机表
+DROP TABLE IF EXISTS `exec_template_host`;
+CREATE TABLE `exec_template_host`
+(
+    `id`          bigint(0)                                                    NOT NULL AUTO_INCREMENT COMMENT 'id',
+    `template_id` bigint(0)                                                    NULL DEFAULT NULL COMMENT '模板id',
+    `host_id`     bigint(0)                                                    NULL DEFAULT NULL COMMENT '主机id',
+    `create_time` datetime(0)                                                  NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    `update_time` datetime(0)                                                  NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '修改时间',
+    `creator`     varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '创建人',
+    `updater`     varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '更新人',
+    `deleted`     tinyint(1)                                                   NULL DEFAULT 0 COMMENT '是否删除 0未删除 1已删除',
+    PRIMARY KEY (`id`) USING BTREE,
+    INDEX `template_id` (`template_id`) USING BTREE
+) ENGINE = InnoDB
+  AUTO_INCREMENT = 1
+  CHARACTER SET = utf8mb4
+  COLLATE = utf8mb4_general_ci COMMENT = '执行模板主机'
+  ROW_FORMAT = Dynamic;
+
+-- 路径书签表
+DROP TABLE IF EXISTS `path_bookmark`;
+CREATE TABLE `path_bookmark`
+(
+    `id`          bigint(0)                                                      NOT NULL AUTO_INCREMENT COMMENT 'id',
+    `user_id`     bigint(0)                                                      NULL DEFAULT NULL COMMENT '用户id',
+    `group_id`    bigint(0)                                                      NULL DEFAULT NULL COMMENT '分组id',
+    `name`        varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci   NULL DEFAULT NULL COMMENT '名称',
+    `type`        char(4) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci       NULL DEFAULT NULL COMMENT '类型',
+    `path`        varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '路径',
+    `create_time` datetime(0)                                                    NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    `update_time` datetime(0)                                                    NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '修改时间',
+    `creator`     varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci   NULL DEFAULT NULL COMMENT '创建人',
+    `updater`     varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci   NULL DEFAULT NULL COMMENT '更新人',
+    `deleted`     tinyint(1)                                                     NULL DEFAULT 0 COMMENT '是否删除 0未删除 1已删除',
+    PRIMARY KEY (`id`) USING BTREE,
+    INDEX `idx_user` (`user_id`) USING BTREE
+) ENGINE = InnoDB
+  AUTO_INCREMENT = 1
+  CHARACTER SET = utf8mb4
+  COLLATE = utf8mb4_general_ci COMMENT = '路径书签'
+  ROW_FORMAT = Dynamic;
+
+```
+
+> sql 脚本 - DML
+
+```sql
+-- 设置数据分组 user_id
+UPDATE data_group SET user_id = 0;
+UPDATE data_group_rel SET user_id = 0;
+-- 菜单
+DELETE FROM `system_menu` WHERE id >= 190;
+INSERT INTO `system_menu` VALUES (190, 184, '中断计划任务', 'asset:exec-job-log:interrupt', 3, 40, 1, 1, 1, 0, NULL, NULL, NULL, '2024-03-13 15:08:23', '2024-04-12 00:00:33', '1', '1', 0);
+INSERT INTO `system_menu` VALUES (191, 0, '提交bug', NULL, 1, 1020, 1, 1, 0, 1, 'IconBug', 'https://github.com/lijiahangmax/orion-ops-pro/issues', NULL, '2024-04-26 11:30:18', '2024-04-26 11:30:30', '1', '1', 0);
+INSERT INTO `system_menu` VALUES (192, 0, '点个赞~', NULL, 1, 1030, 1, 1, 0, 1, 'IconThumbUp', 'https://gitee.com/lijiahangmax/orion-ops-pro', NULL, '2024-04-26 11:32:30', '2024-04-26 11:32:30', '1', '1', 0);
+-- 字典项
+DELETE FROM `dict_key` WHERE id = 27 OR id >= 39;
+INSERT INTO `dict_key` VALUES (27, 'hostConnectType', 'STRING', '[{\"name\": \"color\", \"type\": \"COLOR\"}]', '主机连接类型', '2023-12-26 23:23:08', '2024-04-24 16:37:48', '1', '1', 0);
+INSERT INTO `dict_key` VALUES (39, 'pathBookmarkType', 'STRING', '[]', '路径标签类型', '2024-04-24 13:43:12', '2024-04-24 13:43:12', '1', '1', 0);
+-- 字典值
+DELETE FROM `dict_value` WHERE id IN (7, 9, 18, 21, 176, 193) OR id >= 274;
+INSERT INTO `dict_value` VALUES (7, 5, 'systemMenuStatus', '1', '启用', '{\"color\": \"arcoblue\"}', 20, '2023-10-26 17:00:54', '2024-04-24 16:35:09', '1', '1', 0);
+INSERT INTO `dict_value` VALUES (9, 6, 'systemMenuVisible', '1', '显示', '{\"color\": \"arcoblue\"}', 20, '2023-10-27 00:25:30', '2024-04-24 16:35:05', '1', '1', 0);
+INSERT INTO `dict_value` VALUES (18, 9, 'systemUserStatus', '1', '启用', '{\"color\": \"arcoblue\"}', 20, '2023-10-27 12:13:17', '2024-04-24 16:35:00', '1', '1', 0);
+INSERT INTO `dict_value` VALUES (21, 10, 'systemRoleStatus', '1', '启用', '{\"color\": \"arcoblue\", \"status\": \"default\"}', 20, '2023-10-27 12:33:56', '2024-04-24 16:34:52', '1', '1', 0);
+INSERT INTO `dict_value` VALUES (176, 27, 'hostConnectType', 'SSH', 'SSH', '{\"color\": \"arcoblue\"}', 10, '2023-12-26 23:23:18', '2024-04-24 16:38:28', '1', '1', 0);
+INSERT INTO `dict_value` VALUES (193, 27, 'hostConnectType', 'SFTP', 'SFTP', '{\"color\": \"purple\"}', 20, '2024-02-04 18:23:10', '2024-04-24 16:38:22', '1', '1', 0);
+INSERT INTO `dict_value` VALUES (274, 39, 'pathBookmarkType', 'FILE', '文件', '{}', 10, '2024-04-24 13:43:28', '2024-04-24 13:43:28', '1', '1', 0);
+INSERT INTO `dict_value` VALUES (275, 39, 'pathBookmarkType', 'DIR', '文件夹', '{}', 20, '2024-04-24 13:43:39', '2024-04-24 13:43:39', '1', '1', 0);
+```
+
+> sql 脚本 - 命令分组初始化
+
+```sql
+-- 插入命令片段分组
+INSERT INTO `data_group` (`parent_id`, `type`, `user_id`, `name`, `sort`, `creator`, `updater`, `deleted`) 
+SELECT 0, 'COMMAND_SNIPPET', user_id, name, id, creator, updater, deleted
+FROM command_snippet_group;
+
+-- 需要命令分组 groupId
+UPDATE command_snippet s
+LEFT JOIN data_group g ON g.type = 'COMMAND_SNIPPET' AND g.sort = s.group_id
+SET s.group_id = g.id;
+
+-- 删除命令片段分组表
+DROP TABLE IF EXISTS `command_snippet_group`;
+```
--- a/docs/update/v1.0.7.md
+++ b/docs/update/v1.0.7.md
@@ -0,0 +1,11 @@
+## v1.0.7
+
+> sql 脚本 - DDL
+
+```sql
+```
+
+> sql 脚本 - DML
+
+```sql
+```
--- a/orion-ops-dependencies/pom.xml
+++ b/orion-ops-dependencies/pom.xml
@@ -14,7 +14,7 @@
    <url>https://github.com/lijiahangmax/orion-ops-pro</url>

    <properties>
-        <revision>1.0.4</revision>
+        <revision>1.0.6</revision>
        <spring.boot.version>2.7.17</spring.boot.version>
        <spring.boot.admin.version>2.7.15</spring.boot.admin.version>
        <flatten.maven.plugin.version>1.5.0</flatten.maven.plugin.version>
--- a/orion-ops-framework/orion-ops-framework-common/src/main/java/com/orion/ops/framework/common/constant/OrionOpsProConst.java
+++ b/orion-ops-framework/orion-ops-framework-common/src/main/java/com/orion/ops/framework/common/constant/OrionOpsProConst.java
@@ -1,5 +1,7 @@
 package com.orion.ops.framework.common.constant;

+import com.orion.lang.constant.OrionConst;
+
 /**
 * 项目常量
 *
@@ -7,17 +9,19 @@ package com.orion.ops.framework.common.constant;
 * @version 1.0.0
 * @since 2023/6/19 18:56
 */
-public interface OrionOpsProConst {
+public interface AppConst extends OrionConst {

    /**
     * 同 ${orion.version} 迭代时候需要手动更改
     */
-    String VERSION = "1.0.4";
+    String VERSION = "1.0.6";
+
+    String ORION_OPS_PRO = "orion-ops-pro";

    String GITHUB = "https://github.com/lijiahangmax/orion-ops-pro";

    String GITEE = "https://gitee.com/lijiahangmax/orion-ops-pro";

-    String ISSUES = "https://gitee.com/lijiahangmax/orion-ops-pro/issues";
+    String ISSUES = "https://github.com/lijiahangmax/orion-ops-pro/issues";

 }
--- a/orion-ops-framework/orion-ops-framework-common/src/main/java/com/orion/ops/framework/common/constant/Const.java
+++ b/orion-ops-framework/orion-ops-framework-common/src/main/java/com/orion/ops/framework/common/constant/Const.java
@@ -35,6 +35,4 @@ public interface Const extends com.orion.lang.constant.Const, FieldConst, CnCons

    String SYSTEM_USERNAME = "system";

-    String ERROR_LOG = "error.log";
-
 }
--- a/orion-ops-framework/orion-ops-framework-common/src/main/java/com/orion/ops/framework/common/constant/ErrorCode.java
+++ b/orion-ops-framework/orion-ops-framework-common/src/main/java/com/orion/ops/framework/common/constant/ErrorCode.java
@@ -38,7 +38,7 @@ public enum ErrorCode implements CodeInfo {

    PAYLOAD_TOO_LARGE(413, "请求过大"),

-    LOCKED(423, "当前已被锁定"),
+    LOCKED(423, "当前操作已被锁定"),

    TOO_MANY_REQUESTS(429, "请求过快"),

@@ -48,11 +48,9 @@ public enum ErrorCode implements CodeInfo {

    USER_DISABLED(700, "当前用户已禁用"),

-    USER_LOCKED(701, "当前用户已被锁定"),
+    USER_OTHER_DEVICE_LOGIN(701, "该账号于 {} 已在其他设备登录 {}({})"),

-    OTHER_DEVICE_LOGIN(702, "该账号于 {} 已在其他设备登录 {}({})"),
-
-    SESSION_OFFLINE(703, "该账号于 {} 已被强制下线 {}({})"),
+    USER_OFFLINE(702, "该账号于 {} 已被强制下线 {}({})"),

    // -------------------- 自定义 - 通用 --------------------

--- a/orion-ops-framework/orion-ops-framework-common/src/main/java/com/orion/ops/framework/common/constant/PathConst.java
+++ b/orion-ops-framework/orion-ops-framework-common/src/main/java/com/orion/ops/framework/common/constant/PathConst.java
@@ -0,0 +1,18 @@
+package com.orion.ops.framework.common.constant;
+
+/**
+ * 路径常量
+ *
+ * @author Jiahang Li
+ * @version 1.0.0
+ * @since 2024/4/17 10:35
+ */
+public interface PathConst {
+
+    String ERROR_LOG = "error.log";
+
+    String EXEC = "exec";
+
+    String SCRIPT = "script";
+
+}
--- a/orion-ops-framework/orion-ops-framework-common/src/main/java/com/orion/ops/framework/common/utils/PathUtils.java
+++ b/orion-ops-framework/orion-ops-framework-common/src/main/java/com/orion/ops/framework/common/utils/PathUtils.java
@@ -0,0 +1,69 @@
+package com.orion.ops.framework.common.utils;
+
+import com.orion.lang.utils.Objects1;
+import com.orion.ops.framework.common.constant.AppConst;
+import com.orion.ops.framework.common.constant.Const;
+
+/**
+ * 路径工具类
+ *
+ * @author Jiahang Li
+ * @version 1.0.0
+ * @since 2024/4/17 10:28
+ */
+public class PathUtils {
+
+    private PathUtils() {
+    }
+
+    /**
+     * 获取用户根目录
+     *
+     * @param isWindows isWindows
+     * @param username  用户名
+     * @return 用户目录
+     */
+    public static String getHomePath(boolean isWindows, String username) {
+        if (isWindows) {
+            // windows
+            return "C:/Users/" + username;
+        } else {
+            // linux
+            if (Const.ROOT.equals(username)) {
+                return "/" + Const.ROOT;
+            } else {
+                return "/home/" + username;
+            }
+        }
+    }
+
+    /**
+     * 获取应用路径
+     *
+     * @param isWindows isWindows
+     * @param username  username
+     * @return path
+     */
+    public static String getAppPath(boolean isWindows, String username) {
+        return getHomePath(isWindows, username)
+                + "/" + AppConst.ORION
+                + "/" + AppConst.ORION_OPS_PRO;
+    }
+
+    /**
+     * 构建应用路径
+     *
+     * @param isWindows isWindows,
+     * @param username  username
+     * @param paths     paths
+     * @return path
+     */
+    public static String buildAppPath(boolean isWindows, String username, Object... paths) {
+        StringBuilder path = new StringBuilder(getAppPath(isWindows, username));
+        for (Object o : paths) {
+            path.append("/").append(Objects1.toString(o));
+        }
+        return path.toString();
+    }
+
+}
--- a/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/java/com/orion/ops/framework/mybatis/core/generator/CodeGenerators.java
+++ b/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/java/com/orion/ops/framework/mybatis/core/generator/CodeGenerators.java
@@ -10,6 +10,7 @@ import com.orion.ops.framework.mybatis.core.generator.template.Table;
 import com.orion.ops.framework.mybatis.core.generator.template.Template;

 import java.io.File;
+import java.util.concurrent.TimeUnit;

 /**
 * 代码生成器
@@ -33,7 +34,7 @@ public class CodeGenerators {
                //         .enableProviderApi()
                //         .disableUnitTest()
                //         .cache("dict:keys", "字典配置项")
-                //         .expire(1, TimeUnit.DAYS)
+                //         .expire(8, TimeUnit.HOURS)
                //         .vue("system", "dict-key")
                //         .enableRowSelection()
                //         .enableCardView()
@@ -44,20 +45,15 @@ public class CodeGenerators {
                //         .color("blue", "gray", "red", "green", "white")
                //         .valueUseFields()
                //         .build(),
-                Template.create("exec_job", "计划任务", "exec")
+                // Template.create("exec_template_host", "执行模板主机", "exec")
+                //         .disableUnitTest()
+                //         .vue("exec", "exec-template-host")
+                //         .build(),
+                Template.create("path_bookmark", "路径标签", "path")
                        .disableUnitTest()
-                        .vue("exec", "exec-job")
-                        .enableDrawerForm()
-                        .dict("execJobStatus", "status")
-                        .comment("计划任务状态")
-                        .field("execJobStatus")
-                        .fields("DISABLED", "ENABLED")
-                        .labels("禁用", "启用")
-                        .values(0, 1)
-                        .build(),
-                Template.create("exec_job_host", "计划任务主机", "exec")
-                        .disableUnitTest()
-                        .vue("exec", "exec-job-host")
+                        .cache("path:bookmark:list:{}", "路径标签列表 ${userId}")
+                        .expire(8, TimeUnit.HOURS)
+                        .vue("host", "path-bookmark")
                        .build(),
        };
        // jdbc 配置 - 使用配置文件
--- a/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/java/com/orion/ops/framework/mybatis/core/generator/core/CodeGeneratorEngine.java
+++ b/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/java/com/orion/ops/framework/mybatis/core/generator/core/CodeGeneratorEngine.java
@@ -10,7 +10,7 @@ import com.orion.lang.utils.io.Files1;
 import com.orion.lang.utils.reflect.BeanMap;
 import com.orion.lang.utils.reflect.Fields;
 import com.orion.ops.framework.common.constant.Const;
-import com.orion.ops.framework.common.constant.OrionOpsProConst;
+import com.orion.ops.framework.common.constant.AppConst;
 import com.orion.ops.framework.mybatis.core.generator.template.Table;
 import org.jetbrains.annotations.NotNull;

@@ -97,7 +97,7 @@ public class CodeGeneratorEngine extends VelocityTemplateEngine {
        // http 注释标识
        objectMap.put("httpComment", "###");
        // 版本
-        objectMap.put("version", OrionOpsProConst.VERSION);
+        objectMap.put("version", AppConst.VERSION);
        // api 注释
        Map<String, String> apiComment = new HashMap<>(12);
        String comment = tableInfo.getComment();
--- a/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/resources/templates/orion-vue-views-components-card-list.vue.vm
+++ b/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/resources/templates/orion-vue-views-components-card-list.vue.vm
@@ -20,8 +20,7 @@
              size="small"
              ref="formRef"
              label-align="right"
-              :label-col-props="{ span: 6 }"
-              :wrapper-col-props="{ span: 18 }"
+              :auto-label-width="true"
              @keyup.enter="() => fetchCardData()">
        #foreach($field in ${table.fields})
        <!-- $field.comment -->
--- a/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/resources/templates/orion-vue-views-components-form-drawer.vue.vm
+++ b/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/resources/templates/orion-vue-views-components-form-drawer.vue.vm
@@ -8,12 +8,11 @@
            :cancel-button-props="{ disabled: loading }"
            :on-before-ok="handlerOk"
            @cancel="handleClose">
-    <a-spin class="full modal-form" :loading="loading">
+    <a-spin class="full modal-form-small" :loading="loading">
      <a-form :model="formModel"
              ref="formRef"
              label-align="right"
-              :label-col-props="{ span: 5 }"
-              :wrapper-col-props="{ span: 18 }"
+              :auto-label-width="true"
              :rules="formRules">
        #foreach($field in ${table.fields})
        #if("$field.propertyName" != "id")
--- a/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/resources/templates/orion-vue-views-components-form-modal.vue.vm
+++ b/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/resources/templates/orion-vue-views-components-form-modal.vue.vm
@@ -1,6 +1,6 @@
 <template>
  <a-modal v-model:visible="visible"
-           body-class="modal-form"
+           body-class="modal-form-large"
           title-align="start"
           :title="title"
           :top="80"
@@ -16,8 +16,7 @@
      <a-form :model="formModel"
              ref="formRef"
              label-align="right"
-              :label-col-props="{ span: 5 }"
-              :wrapper-col-props="{ span: 18 }"
+              :auto-label-width="true"
              :rules="formRules">
        #foreach($field in ${table.fields})
        #if("$field.propertyName" != "id")
--- a/orion-ops-framework/orion-ops-spring-boot-starter-redis/src/main/java/com/orion/ops/framework/redis/configuration/OrionRedisAutoConfiguration.java
+++ b/orion-ops-framework/orion-ops-spring-boot-starter-redis/src/main/java/com/orion/ops/framework/redis/configuration/OrionRedisAutoConfiguration.java
@@ -2,7 +2,10 @@ package com.orion.ops.framework.redis.configuration;

 import com.orion.ops.framework.common.constant.AutoConfigureOrderConst;
 import com.orion.ops.framework.redis.configuration.config.RedissonConfig;
+import com.orion.ops.framework.redis.core.lock.RedisLocker;
+import com.orion.ops.framework.redis.core.utils.RedisLocks;
 import com.orion.ops.framework.redis.core.utils.RedisUtils;
+import org.redisson.api.RedissonClient;
 import org.redisson.spring.starter.RedissonAutoConfigurationCustomizer;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.AutoConfigureOrder;
@@ -56,5 +59,16 @@ public class OrionRedisAutoConfiguration {
        };
    }

+    /**
+     * @param redissonClient redissonClient
+     * @return redis 分布式锁
+     */
+    @Bean
+    public RedisLocker redisLocker(RedissonClient redissonClient) {
+        RedisLocker redisLocker = new RedisLocker(redissonClient);
+        RedisLocks.setRedisLocker(redisLocker);
+        return redisLocker;
+    }
+
 }

--- a/orion-ops-framework/orion-ops-spring-boot-starter-redis/src/main/java/com/orion/ops/framework/redis/core/lock/RedisLocker.java
+++ b/orion-ops-framework/orion-ops-spring-boot-starter-redis/src/main/java/com/orion/ops/framework/redis/core/lock/RedisLocker.java
@@ -0,0 +1,74 @@
+package com.orion.ops.framework.redis.core.lock;
+
+import com.orion.lang.utils.Exceptions;
+import lombok.extern.slf4j.Slf4j;
+import org.redisson.api.RLock;
+import org.redisson.api.RedissonClient;
+
+import java.util.function.Supplier;
+
+/**
+ * redis 分布式锁
+ *
+ * @author Jiahang Li
+ * @version 1.0.0
+ * @since 2024/4/25 16:42
+ */
+@Slf4j
+public class RedisLocker {
+
+    private final RedissonClient redissonClient;
+
+    public RedisLocker(RedissonClient redissonClient) {
+        this.redissonClient = redissonClient;
+    }
+
+    /**
+     * 尝试获取锁
+     *
+     * @param key key
+     * @param run run
+     * @return 是否获取到锁
+     */
+    public boolean tryLock(String key, Runnable run) {
+        // 获取锁
+        RLock lock = redissonClient.getLock(key);
+        // 未获取到直接返回
+        if (!lock.tryLock()) {
+            log.info("RedisLocks.tryLock failed {}", key);
+            return false;
+        }
+        // 执行
+        try {
+            run.run();
+        } finally {
+            lock.unlock();
+        }
+        return true;
+    }
+
+    /**
+     * 尝试获取锁
+     *
+     * @param key  key
+     * @param call call
+     * @param <T>  T
+     * @return 执行结果
+     */
+    public <T> T tryLock(String key, Supplier<T> call) {
+        // 获取锁
+        RLock lock = redissonClient.getLock(key);
+        // 未获取到直接返回
+        if (!lock.tryLock()) {
+            log.info("RedisLocks.tryLock failed {}", key);
+            throw Exceptions.lock();
+        }
+        // 执行
+        try {
+            return call.get();
+        } finally {
+            lock.unlock();
+        }
+    }
+
+}
--- a/orion-ops-framework/orion-ops-spring-boot-starter-redis/src/main/java/com/orion/ops/framework/redis/core/utils/RedisLocks.java
+++ b/orion-ops-framework/orion-ops-spring-boot-starter-redis/src/main/java/com/orion/ops/framework/redis/core/utils/RedisLocks.java
@@ -0,0 +1,55 @@
+package com.orion.ops.framework.redis.core.utils;
+
+import com.orion.lang.utils.Exceptions;
+import com.orion.ops.framework.redis.core.lock.RedisLocker;
+import lombok.extern.slf4j.Slf4j;
+
+import java.util.function.Supplier;
+
+/**
+ * redis 分布式锁工具类
+ *
+ * @author Jiahang Li
+ * @version 1.0.0
+ * @since 2024/4/25 16:42
+ */
+@Slf4j
+public class RedisLocks {
+
+    private static RedisLocker redisLocker;
+
+    private RedisLocks() {
+    }
+
+    /**
+     * 尝试获取锁
+     *
+     * @param key key
+     * @param run run
+     * @return 是否获取到锁
+     */
+    public static boolean tryLock(String key, Runnable run) {
+        return redisLocker.tryLock(key, run);
+    }
+
+    /**
+     * 尝试获取锁
+     *
+     * @param key  key
+     * @param call call
+     * @param <T>  T
+     * @return 执行结果
+     */
+    public static <T> T tryLock(String key, Supplier<T> call) {
+        return redisLocker.tryLock(key, call);
+    }
+
+    public static void setRedisLocker(RedisLocker redisLocker) {
+        if (RedisLocks.redisLocker != null) {
+            // unmodified
+            throw Exceptions.state();
+        }
+        RedisLocks.redisLocker = redisLocker;
+    }
+
+}
--- a/orion-ops-launch/src/main/resources/application.yaml
+++ b/orion-ops-launch/src/main/resources/application.yaml
@@ -84,8 +84,7 @@ spring:
            tablePrefix: QRTZ_
            misfireThreshold: 60000
            clusterCheckinInterval: 5000
-            # 打开群集功能
-            isClustered: false
+            isClustered: true
          #连接池
          threadPool:
            class: org.quartz.simpl.SimpleThreadPool
@@ -152,6 +151,7 @@ logging:

 # 应用配置
 app:
+  # 认证配置
  authentication:
    # 是否允许多端登录
    allow-multi-device: true
@@ -163,6 +163,28 @@ app:
    login-failed-lock-count: 5
    # 登录失败锁定时间 (分)
    login-failed-lock-time: 30
+  # tracker 配置
+  tracker:
+    # 加载偏移量 (行)
+    offset: 300
+    # 延迟时间 (ms)
+    delay: 100
+    # 文件未找到等待次数
+    wait-times: 100
+  # sftp 配置
+  sftp:
+    # 上传文件时 文件存在是否备份
+    upload-present-backup: true
+    # 备份文件名称
+    backup-file-name: bk_${fileName}_${timestamp}
+  # 执行日志
+  exec-log:
+    # 是否拼接 ansi 执行状态日志
+    append-ansi: true
+    # 自动清理执行文件
+    auto-clear: true
+    # 保留周期 (天)
+    keep-period: 60

 # orion framework config
 orion:
--- a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/controller/ExecCommandController.http
+++ b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/controller/ExecCommandController.http
@@ -6,6 +6,7 @@ Authorization: {{token}}
 {
  "description": 1,
  "timeout": 10,
+  "scriptExec": 0,
  "command": "echo 这是日志@{{ hostAddress }}\nsleep 1\necho @{{ hostName }}",
  "parameterSchema": "[]",
  "hostIdList": [1]
--- a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/controller/ExecJobController.http
+++ b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/controller/ExecJobController.http
@@ -6,7 +6,8 @@ Authorization: {{token}}
 {
  "name": "测试 1",
  "expression": "0 */3 * * * ?",
-  "timeout": "0",
+  "timeout": 0,
+  "scriptExec": 0,
  "command": "echo 123",
  "parameterSchema": "[]",
  "hostIdList": [1]
@@ -22,7 +23,8 @@ Authorization: {{token}}
  "id": 5,
  "name": "测试 1",
  "expression": "0 */10 * * * ?",
-  "timeout": "0",
+  "timeout": 0,
+  "scriptExec": 0,
  "command": "echo 123",
  "parameterSchema": "[]",
  "hostIdList": [
--- a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/controller/ExecTemplateController.http
+++ b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/controller/ExecTemplateController.http
@@ -6,7 +6,8 @@ Authorization: {{token}}
 {
  "name": "",
  "command": "",
-  "timeout": "",
+  "timeout": 0,
+  "scriptExec": 0,
  "parameterSchema": ""
 }

@@ -20,7 +21,8 @@ Authorization: {{token}}
  "id": "",
  "name": "",
  "command": "",
-  "timeout": "",
+  "timeout": 0,
+  "scriptExec": 0,
  "parameterSchema": ""
 }

@@ -47,7 +49,8 @@ Authorization: {{token}}
  "id": "",
  "name": "",
  "command": "",
-  "timeout": "",
+  "timeout": 0,
+  "scriptExec": 0,
  "parameterSchema": ""
 }

--- a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/controller/ExecTemplateController.java
+++ b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/controller/ExecTemplateController.java
@@ -66,6 +66,15 @@ public class ExecTemplateController {
        return execTemplateService.getExecTemplateById(id);
    }

+    @IgnoreLog(IgnoreLogMode.RET)
+    @GetMapping("/get-with-authorized")
+    @Operation(summary = "查询执行模板 (查询认证的主机)")
+    @Parameter(name = "id", description = "id", required = true)
+    @PreAuthorize("@ss.hasPermission('asset:exec-template:query')")
+    public ExecTemplateVO getExecTemplateWithAuthorized(@RequestParam("id") Long id) {
+        return execTemplateService.getExecTemplateWithAuthorized(id);
+    }
+
    @IgnoreLog(IgnoreLogMode.RET)
    @PostMapping("/query")
    @Operation(summary = "分页查询执行模板")
@@ -83,6 +92,5 @@ public class ExecTemplateController {
        return execTemplateService.deleteExecTemplateById(id);
    }

-
 }

--- a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/controller/HostExtraController.http
+++ b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/controller/HostExtraController.http
@@ -1,13 +1,3 @@
-### 修改主机别名
-PUT {{baseUrl}}/asset/host-extra/update-alias
-Content-Type: application/json
-Authorization: {{token}}
-
-{
-  "id": 1,
-  "name": "alias"
-}
-
 ### 获取主机拓展信息
 GET {{baseUrl}}/asset/host-extra/get?hostId=1&item=ssh
 Authorization: {{token}}
--- a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/controller/HostExtraController.java
+++ b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/controller/HostExtraController.java
@@ -3,7 +3,6 @@ package com.orion.ops.module.asset.controller;
 import com.orion.ops.framework.log.core.annotation.IgnoreLog;
 import com.orion.ops.framework.log.core.enums.IgnoreLogMode;
 import com.orion.ops.framework.web.core.annotation.RestWrapper;
-import com.orion.ops.module.asset.entity.request.host.HostAliasUpdateRequest;
 import com.orion.ops.module.asset.entity.request.host.HostExtraQueryRequest;
 import com.orion.ops.module.asset.entity.request.host.HostExtraUpdateRequest;
 import com.orion.ops.module.asset.service.HostExtraService;
@@ -36,12 +35,6 @@ public class HostExtraController {
    @Resource
    private HostExtraService hostExtraService;

-    @PutMapping("/update-alias")
-    @Operation(summary = "修改主机别名")
-    public Integer updateHostAlias(@Validated @RequestBody HostAliasUpdateRequest request) {
-        return hostExtraService.updateHostAlias(request);
-    }
-
    @IgnoreLog(IgnoreLogMode.RET)
    @GetMapping("/get")
    @Operation(summary = "获取主机拓展信息")
--- a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/controller/PathBookmarkController.http
+++ b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/controller/PathBookmarkController.http
@@ -0,0 +1,34 @@
+### 创建路径标签
+POST {{baseUrl}}/asset/path-bookmark/create
+Content-Type: application/json
+Authorization: {{token}}
+
+{
+  "name": "",
+  "path": ""
+}
+
+
+### 更新路径标签
+PUT {{baseUrl}}/asset/path-bookmark/update
+Content-Type: application/json
+Authorization: {{token}}
+
+{
+  "id": "",
+  "name": "",
+  "path": ""
+}
+
+
+### 查询全部路径标签
+GET {{baseUrl}}/asset/path-bookmark/list
+Authorization: {{token}}
+
+
+### 删除路径标签
+DELETE {{baseUrl}}/asset/path-bookmark/delete?id=1
+Authorization: {{token}}
+
+
+###
--- a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/controller/PathBookmarkController.java
+++ b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/controller/PathBookmarkController.java
@@ -0,0 +1,62 @@
+package com.orion.ops.module.asset.controller;
+
+import com.orion.ops.framework.web.core.annotation.RestWrapper;
+import com.orion.ops.module.asset.entity.request.path.PathBookmarkCreateRequest;
+import com.orion.ops.module.asset.entity.request.path.PathBookmarkUpdateRequest;
+import com.orion.ops.module.asset.entity.vo.PathBookmarkWrapperVO;
+import com.orion.ops.module.asset.service.PathBookmarkService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+/**
+ * 路径标签 api
+ *
+ * @author Jiahang Li
+ * @version 1.0.6
+ * @since 2024-4-23 23:15
+ */
+@Tag(name = "asset - 路径标签服务")
+@Slf4j
+@Validated
+@RestWrapper
+@RestController
+@RequestMapping("/asset/path-bookmark")
+@SuppressWarnings({"ELValidationInJSP", "SpringElInspection"})
+public class PathBookmarkController {
+
+    @Resource
+    private PathBookmarkService pathBookmarkService;
+
+    @PostMapping("/create")
+    @Operation(summary = "创建路径标签")
+    public Long createPathBookmark(@Validated @RequestBody PathBookmarkCreateRequest request) {
+        return pathBookmarkService.createPathBookmark(request);
+    }
+
+    @PutMapping("/update")
+    @Operation(summary = "更新路径标签")
+    public Integer updatePathBookmark(@Validated @RequestBody PathBookmarkUpdateRequest request) {
+        return pathBookmarkService.updatePathBookmarkById(request);
+    }
+
+    @GetMapping("/list")
+    @Operation(summary = "查询全部路径标签")
+    public PathBookmarkWrapperVO getPathBookmarkList() {
+        return pathBookmarkService.getPathBookmark();
+    }
+
+    @DeleteMapping("/delete")
+    @Operation(summary = "删除路径标签")
+    @Parameter(name = "id", description = "id", required = true)
+    public Integer deletePathBookmark(@RequestParam("id") Long id) {
+        return pathBookmarkService.deletePathBookmarkById(id);
+    }
+
+}
+
--- a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/controller/PathBookmarkGroupController.http
+++ b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/controller/PathBookmarkGroupController.http
@@ -0,0 +1,32 @@
+### 创建路径标签分组
+POST {{baseUrl}}/asset/path-bookmark-group/create
+Content-Type: application/json
+Authorization: {{token}}
+
+{
+  "name": ""
+}
+
+
+### 更新路径标签分组
+PUT {{baseUrl}}/asset/path-bookmark-group/update
+Content-Type: application/json
+Authorization: {{token}}
+
+{
+  "id": "",
+  "name": ""
+}
+
+
+### 查询全部路径标签分组
+GET {{baseUrl}}/asset/path-bookmark-group/list
+Authorization: {{token}}
+
+
+### 删除路径标签分组
+DELETE {{baseUrl}}/asset/path-bookmark-group/delete?id=1
+Authorization: {{token}}
+
+
+###
--- a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/controller/PathBookmarkGroupController.java
+++ b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/controller/PathBookmarkGroupController.java
@@ -0,0 +1,66 @@
+package com.orion.ops.module.asset.controller;
+
+import com.orion.ops.framework.common.validator.group.Id;
+import com.orion.ops.framework.log.core.annotation.IgnoreLog;
+import com.orion.ops.framework.log.core.enums.IgnoreLogMode;
+import com.orion.ops.framework.web.core.annotation.RestWrapper;
+import com.orion.ops.module.asset.entity.request.path.PathBookmarkGroupCreateRequest;
+import com.orion.ops.module.asset.entity.request.path.PathBookmarkGroupDeleteRequest;
+import com.orion.ops.module.asset.entity.request.path.PathBookmarkGroupUpdateRequest;
+import com.orion.ops.module.asset.entity.vo.PathBookmarkGroupVO;
+import com.orion.ops.module.asset.service.PathBookmarkGroupService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 路径标签分组 api
+ *
+ * @author Jiahang Li
+ * @version 1.0.0
+ * @since 2024-1-24 12:28
+ */
+@Tag(name = "asset - 路径标签分组服务")
+@Slf4j
+@Validated
+@RestWrapper
+@RestController
+@RequestMapping("/asset/path-bookmark-group")
+@SuppressWarnings({"ELValidationInJSP", "SpringElInspection"})
+public class PathBookmarkGroupController {
+
+    @Resource
+    private PathBookmarkGroupService pathBookmarkGroupService;
+
+    @PostMapping("/create")
+    @Operation(summary = "创建路径标签分组")
+    public Long createPathBookmarkGroup(@Validated @RequestBody PathBookmarkGroupCreateRequest request) {
+        return pathBookmarkGroupService.createPathBookmarkGroup(request);
+    }
+
+    @PutMapping("/update")
+    @Operation(summary = "更新路径标签分组")
+    public Integer updatePathBookmarkGroup(@Validated @RequestBody PathBookmarkGroupUpdateRequest request) {
+        return pathBookmarkGroupService.updatePathBookmarkGroupById(request);
+    }
+
+    @IgnoreLog(IgnoreLogMode.RET)
+    @GetMapping("/list")
+    @Operation(summary = "查询全部路径标签分组")
+    public List<PathBookmarkGroupVO> getPathBookmarkGroupList() {
+        return pathBookmarkGroupService.getPathBookmarkGroupList();
+    }
+
+    @DeleteMapping("/delete")
+    @Operation(summary = "删除路径标签分组")
+    public Integer deletePathBookmarkGroup(@Validated(Id.class) @RequestBody PathBookmarkGroupDeleteRequest request) {
+        return pathBookmarkGroupService.deletePathBookmarkGroup(request);
+    }
+
+}
+
--- a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/convert/CommandSnippetGroupConvert.java
+++ b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/convert/CommandSnippetGroupConvert.java
@@ -1,15 +1,14 @@
 package com.orion.ops.module.asset.convert;

-import com.orion.ops.module.asset.entity.domain.CommandSnippetGroupDO;
-import com.orion.ops.module.asset.entity.dto.CommandSnippetGroupCacheDTO;
 import com.orion.ops.module.asset.entity.request.command.CommandSnippetGroupCreateRequest;
 import com.orion.ops.module.asset.entity.request.command.CommandSnippetGroupUpdateRequest;
 import com.orion.ops.module.asset.entity.vo.CommandSnippetGroupVO;
+import com.orion.ops.module.infra.entity.dto.data.DataGroupCreateDTO;
+import com.orion.ops.module.infra.entity.dto.data.DataGroupDTO;
+import com.orion.ops.module.infra.entity.dto.data.DataGroupRenameDTO;
 import org.mapstruct.Mapper;
 import org.mapstruct.factory.Mappers;

-import java.util.List;
-
 /**
 * 命令片段分组 内部对象转换器
 *
@@ -22,16 +21,10 @@ public interface CommandSnippetGroupConvert {

    CommandSnippetGroupConvert MAPPER = Mappers.getMapper(CommandSnippetGroupConvert.class);

-    CommandSnippetGroupDO to(CommandSnippetGroupCreateRequest request);
+    DataGroupCreateDTO to(CommandSnippetGroupCreateRequest request);

-    CommandSnippetGroupDO to(CommandSnippetGroupUpdateRequest request);
+    DataGroupRenameDTO to(CommandSnippetGroupUpdateRequest request);

-    CommandSnippetGroupVO to(CommandSnippetGroupDO domain);
-
-    List<CommandSnippetGroupVO> to(List<CommandSnippetGroupDO> list);
-
-    CommandSnippetGroupVO to(CommandSnippetGroupCacheDTO cache);
-
-    CommandSnippetGroupCacheDTO toCache(CommandSnippetGroupDO domain);
+    CommandSnippetGroupVO to(DataGroupDTO domain);

 }
--- a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/convert/ExecConvert.java
+++ b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/convert/ExecConvert.java
@@ -1,6 +1,6 @@
 package com.orion.ops.module.asset.convert;

-import com.orion.ops.module.asset.entity.request.exec.ExecCommandExecRequest;
+import com.orion.ops.module.asset.entity.dto.ExecCommandExecDTO;
 import com.orion.ops.module.asset.entity.request.exec.ExecCommandRequest;
 import org.mapstruct.Mapper;
 import org.mapstruct.factory.Mappers;
@@ -17,6 +17,6 @@ public interface ExecConvert {

    ExecConvert MAPPER = Mappers.getMapper(ExecConvert.class);

-    ExecCommandExecRequest to(ExecCommandRequest request);
+    ExecCommandExecDTO to(ExecCommandRequest request);

 }
--- a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/convert/PathBookmarkConvert.java
+++ b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/convert/PathBookmarkConvert.java
@@ -0,0 +1,37 @@
+package com.orion.ops.module.asset.convert;
+
+import com.orion.ops.module.asset.entity.domain.PathBookmarkDO;
+import com.orion.ops.module.asset.entity.dto.PathBookmarkCacheDTO;
+import com.orion.ops.module.asset.entity.request.path.PathBookmarkCreateRequest;
+import com.orion.ops.module.asset.entity.request.path.PathBookmarkUpdateRequest;
+import com.orion.ops.module.asset.entity.vo.PathBookmarkVO;
+import org.mapstruct.Mapper;
+import org.mapstruct.factory.Mappers;
+
+import java.util.List;
+
+/**
+ * 路径标签 内部对象转换器
+ *
+ * @author Jiahang Li
+ * @version 1.0.6
+ * @since 2024-4-23 23:15
+ */
+@Mapper
+public interface PathBookmarkConvert {
+
+    PathBookmarkConvert MAPPER = Mappers.getMapper(PathBookmarkConvert.class);
+
+    PathBookmarkDO to(PathBookmarkCreateRequest request);
+
+    PathBookmarkDO to(PathBookmarkUpdateRequest request);
+
+    PathBookmarkVO to(PathBookmarkDO domain);
+
+    List<PathBookmarkVO> to(List<PathBookmarkDO> list);
+
+    PathBookmarkVO to(PathBookmarkCacheDTO cache);
+
+    PathBookmarkCacheDTO toCache(PathBookmarkDO domain);
+
+}
--- a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/convert/PathBookmarkGroupConvert.java
+++ b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/convert/PathBookmarkGroupConvert.java
@@ -0,0 +1,30 @@
+package com.orion.ops.module.asset.convert;
+
+import com.orion.ops.module.asset.entity.request.path.PathBookmarkGroupCreateRequest;
+import com.orion.ops.module.asset.entity.request.path.PathBookmarkGroupUpdateRequest;
+import com.orion.ops.module.asset.entity.vo.PathBookmarkGroupVO;
+import com.orion.ops.module.infra.entity.dto.data.DataGroupCreateDTO;
+import com.orion.ops.module.infra.entity.dto.data.DataGroupDTO;
+import com.orion.ops.module.infra.entity.dto.data.DataGroupRenameDTO;
+import org.mapstruct.Mapper;
+import org.mapstruct.factory.Mappers;
+
+/**
+ * 路径标签分组 内部对象转换器
+ *
+ * @author Jiahang Li
+ * @version 1.0.0
+ * @since 2024-1-24 12:28
+ */
+@Mapper
+public interface PathBookmarkGroupConvert {
+
+    PathBookmarkGroupConvert MAPPER = Mappers.getMapper(PathBookmarkGroupConvert.class);
+
+    DataGroupCreateDTO to(PathBookmarkGroupCreateRequest request);
+
+    DataGroupRenameDTO to(PathBookmarkGroupUpdateRequest request);
+
+    PathBookmarkGroupVO to(DataGroupDTO domain);
+
+}
--- a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/dao/CommandSnippetGroupDAO.java
+++ b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/dao/CommandSnippetGroupDAO.java
@@ -1,17 +0,0 @@
-package com.orion.ops.module.asset.dao;
-
-import com.orion.ops.framework.mybatis.core.mapper.IMapper;
-import com.orion.ops.module.asset.entity.domain.CommandSnippetGroupDO;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * 命令片段分组 Mapper 接口
- *
- * @author Jiahang Li
- * @version 1.0.0
- * @since 2024-1-24 12:28
- */
-@Mapper
-public interface CommandSnippetGroupDAO extends IMapper<CommandSnippetGroupDO> {
-
-}
--- a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/dao/ExecTemplateHostDAO.java
+++ b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/dao/ExecTemplateHostDAO.java
@@ -0,0 +1,17 @@
+package com.orion.ops.module.asset.dao;
+
+import com.orion.ops.framework.mybatis.core.mapper.IMapper;
+import com.orion.ops.module.asset.entity.domain.ExecTemplateHostDO;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 执行模板主机 Mapper 接口
+ *
+ * @author Jiahang Li
+ * @version 1.0.6
+ * @since 2024-4-22 12:13
+ */
+@Mapper
+public interface ExecTemplateHostDAO extends IMapper<ExecTemplateHostDO> {
+
+}
--- a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/dao/PathBookmarkDAO.java
+++ b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/dao/PathBookmarkDAO.java
@@ -0,0 +1,45 @@
+package com.orion.ops.module.asset.dao;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.orion.ops.framework.mybatis.core.mapper.IMapper;
+import com.orion.ops.module.asset.entity.domain.PathBookmarkDO;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 路径标签 Mapper 接口
+ *
+ * @author Jiahang Li
+ * @version 1.0.6
+ * @since 2024-4-23 23:15
+ */
+@Mapper
+public interface PathBookmarkDAO extends IMapper<PathBookmarkDO> {
+
+    /**
+     * 设置 groupId 为 null
+     *
+     * @param groupId groupId
+     * @return effect
+     */
+    default int setGroupIdWithNull(Long groupId) {
+        LambdaUpdateWrapper<PathBookmarkDO> wrapper = Wrappers.<PathBookmarkDO>lambdaUpdate()
+                .set(PathBookmarkDO::getGroupId, null)
+                .eq(PathBookmarkDO::getGroupId, groupId);
+        return this.update(null, wrapper);
+    }
+
+    /**
+     * 通过 groupId 删除
+     *
+     * @param groupId groupId
+     * @return effect
+     */
+    default int deleteByGroupId(Long groupId) {
+        LambdaQueryWrapper<PathBookmarkDO> wrapper = this.lambda()
+                .eq(PathBookmarkDO::getGroupId, groupId);
+        return this.delete(wrapper);
+    }
+
+}
--- a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/define/cache/CommandSnippetCacheKeyDefine.java
+++ b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/define/cache/CommandSnippetCacheKeyDefine.java
@@ -4,7 +4,6 @@ import com.orion.lang.define.cache.key.CacheKeyBuilder;
 import com.orion.lang.define.cache.key.CacheKeyDefine;
 import com.orion.lang.define.cache.key.struct.RedisCacheStruct;
 import com.orion.ops.module.asset.entity.dto.CommandSnippetCacheDTO;
-import com.orion.ops.module.asset.entity.dto.CommandSnippetGroupCacheDTO;

 import java.util.concurrent.TimeUnit;

@@ -22,15 +21,7 @@ public interface CommandSnippetCacheKeyDefine {
            .desc("命令片段列表 ${userId}")
            .type(CommandSnippetCacheDTO.class)
            .struct(RedisCacheStruct.HASH)
-            .timeout(1, TimeUnit.DAYS)
-            .build();
-
-    CacheKeyDefine SNIPPET_GROUP = new CacheKeyBuilder()
-            .key("command:snippet:group:{}")
-            .desc("命令片段分组 ${userId}")
-            .type(CommandSnippetGroupCacheDTO.class)
-            .struct(RedisCacheStruct.HASH)
-            .timeout(1, TimeUnit.DAYS)
+            .timeout(8, TimeUnit.HOURS)
            .build();

 }
--- a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/define/cache/HostCacheKeyDefine.java
+++ b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/define/cache/HostCacheKeyDefine.java
@@ -23,7 +23,7 @@ public interface HostCacheKeyDefine {
            .desc("主机列表")
            .type(HostCacheDTO.class)
            .struct(RedisCacheStruct.HASH)
-            .timeout(1, TimeUnit.DAYS)
+            .timeout(8, TimeUnit.HOURS)
            .build();

    CacheKeyDefine HOST_KEY = new CacheKeyBuilder()
@@ -31,7 +31,7 @@ public interface HostCacheKeyDefine {
            .desc("主机秘钥列表")
            .type(HostKeyCacheDTO.class)
            .struct(RedisCacheStruct.HASH)
-            .timeout(1, TimeUnit.DAYS)
+            .timeout(8, TimeUnit.HOURS)
            .build();

    CacheKeyDefine HOST_IDENTITY = new CacheKeyBuilder()
@@ -39,7 +39,7 @@ public interface HostCacheKeyDefine {
            .desc("主机身份列表")
            .type(HostIdentityCacheDTO.class)
            .struct(RedisCacheStruct.HASH)
-            .timeout(1, TimeUnit.DAYS)
+            .timeout(8, TimeUnit.HOURS)
            .build();

 }
--- a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/define/cache/PathBookmarkCacheKeyDefine.java
+++ b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/define/cache/PathBookmarkCacheKeyDefine.java
@@ -0,0 +1,27 @@
+package com.orion.ops.module.asset.define.cache;
+
+import com.orion.lang.define.cache.key.CacheKeyBuilder;
+import com.orion.lang.define.cache.key.CacheKeyDefine;
+import com.orion.lang.define.cache.key.struct.RedisCacheStruct;
+import com.orion.ops.module.asset.entity.dto.PathBookmarkCacheDTO;
+
+import java.util.concurrent.TimeUnit;
+
+/**
+ * 路径标签缓存 key
+ *
+ * @author Jiahang Li
+ * @version 1.0.6
+ * @since 2024-4-23 23:15
+ */
+public interface PathBookmarkCacheKeyDefine {
+
+    CacheKeyDefine PATH_BOOKMARK = new CacheKeyBuilder()
+            .key("path:bookmark:list:{}")
+            .desc("路径标签列表 ${userId}")
+            .type(PathBookmarkCacheDTO.class)
+            .struct(RedisCacheStruct.HASH)
+            .timeout(8, TimeUnit.HOURS)
+            .build();
+
+}
--- a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/define/config/AppExecLogConfig.java
+++ b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/define/config/AppExecLogConfig.java
@@ -0,0 +1,40 @@
+package com.orion.ops.module.asset.define.config;
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+/**
+ * 应用执行日志配置
+ *
+ * @author Jiahang Li
+ * @version 1.0.0
+ * @since 2024/4/25 13:36
+ */
+@Data
+@Component
+@ConfigurationProperties(prefix = "app.exec-log")
+public class AppExecLogConfig {
+
+    /**
+     * 是否拼接 ansi 执行状态日志
+     */
+    private Boolean appendAnsi;
+
+    /**
+     * 自动清理执行文件
+     */
+    private Boolean autoClear;
+
+    /**
+     * 保留周期 (天)
+     */
+    private Integer keepPeriod;
+
+    public AppExecLogConfig() {
+        this.appendAnsi = true;
+        this.autoClear = true;
+        this.keepPeriod = 60;
+    }
+
+}
--- a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/define/config/AppSftpConfig.java
+++ b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/define/config/AppSftpConfig.java
@@ -0,0 +1,34 @@
+package com.orion.ops.module.asset.define.config;
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+/**
+ * 应用 sftp 配置
+ *
+ * @author Jiahang Li
+ * @version 1.0.0
+ * @since 2024/4/15 22:00
+ */
+@Data
+@Component
+@ConfigurationProperties(prefix = "app.sftp")
+public class AppSftpConfig {
+
+    /**
+     * 上传文件时 文件存在是否备份
+     */
+    private Boolean uploadPresentBackup;
+
+    /**
+     * 备份文件名称
+     */
+    private String backupFileName;
+
+    public AppSftpConfig() {
+        this.uploadPresentBackup = true;
+        this.backupFileName = "bk_${fileName}_${timestamp}";
+    }
+
+}
--- a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/define/config/AppTrackerConfig.java
+++ b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/define/config/AppTrackerConfig.java
@@ -0,0 +1,39 @@
+package com.orion.ops.module.asset.define.config;
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+/**
+ * 应用 tracker 配置
+ *
+ * @author Jiahang Li
+ * @version 1.0.0
+ * @since 2024/4/15 22:00
+ */
+@Data
+@Component
+@ConfigurationProperties(prefix = "app.tracker")
+public class AppTrackerConfig {
+
+    /**
+     * 加载偏移量 (行)
+     */
+    private Integer offset;
+
+    /**
+     * 延迟时间 (ms)
+     */
+    private Integer delay;
+
+    /**
+     * 文件未找到等待次数
+     */
+    private Integer waitTimes;
+
+    public AppTrackerConfig() {
+        this.offset = 300;
+        this.delay = 100;
+        this.waitTimes = 100;
+    }
+}
--- a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/define/operator/ExecTemplateOperatorType.java
+++ b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/define/operator/ExecTemplateOperatorType.java
@@ -25,9 +25,9 @@ public class ExecTemplateOperatorType extends InitializingOperatorTypes {
    @Override
    public OperatorType[] types() {
        return new OperatorType[]{
-                new OperatorType(L, CREATE, "创建执行模板 ${name}"),
-                new OperatorType(M, UPDATE, "更新执行模板 ${name}"),
-                new OperatorType(H, DELETE, "删除执行模板 ${name}"),
+                new OperatorType(L, CREATE, "创建执行模板 <sb>${name}</sb>"),
+                new OperatorType(M, UPDATE, "更新执行模板 <sb>${name}</sb>"),
+                new OperatorType(H, DELETE, "删除执行模板 <sb>${name}</sb>"),
        };
    }

--- a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/domain/ExecHostLogDO.java
+++ b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/domain/ExecHostLogDO.java
@@ -68,6 +68,10 @@ public class ExecHostLogDO extends BaseDO {
    @TableField("log_path")
    private String logPath;

+    @Schema(description = "脚本路径")
+    @TableField("script_path")
+    private String scriptPath;
+
    @Schema(description = "错误信息")
    @TableField("error_message")
    private String errorMessage;
--- a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/domain/ExecJobDO.java
+++ b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/domain/ExecJobDO.java
@@ -46,6 +46,10 @@ public class ExecJobDO extends BaseDO {
    @TableField("timeout")
    private Integer timeout;

+    @Schema(description = "是否使用脚本执行")
+    @TableField("script_exec")
+    private Integer scriptExec;
+
    @Schema(description = "执行命令")
    @TableField("command")
    private String command;
--- a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/domain/ExecLogDO.java
+++ b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/domain/ExecLogDO.java
@@ -68,6 +68,10 @@ public class ExecLogDO extends BaseDO {
    @TableField("timeout")
    private Integer timeout;

+    @Schema(description = "是否使用脚本执行")
+    @TableField("script_exec")
+    private Integer scriptExec;
+
    @Schema(description = "执行状态")
    @TableField("status")
    private String status;
--- a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/domain/ExecTemplateDO.java
+++ b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/domain/ExecTemplateDO.java
@@ -42,6 +42,10 @@ public class ExecTemplateDO extends BaseDO {
    @TableField("timeout")
    private Integer timeout;

+    @Schema(description = "是否使用脚本执行")
+    @TableField("script_exec")
+    private Integer scriptExec;
+
    @Schema(description = "参数定义")
    @TableField("parameter_schema")
    private String parameterSchema;
--- a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/domain/ExecTemplateHostDO.java
+++ b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/domain/ExecTemplateHostDO.java
@@ -0,0 +1,41 @@
+package com.orion.ops.module.asset.entity.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.orion.ops.framework.mybatis.core.domain.BaseDO;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+
+/**
+ * 执行模板主机 实体对象
+ *
+ * @author Jiahang Li
+ * @version 1.0.6
+ * @since 2024-4-22 12:13
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@EqualsAndHashCode(callSuper = true)
+@TableName(value = "exec_template_host", autoResultMap = true)
+@Schema(name = "ExecTemplateHostDO", description = "执行模板主机 实体对象")
+public class ExecTemplateHostDO extends BaseDO {
+
+    private static final long serialVersionUID = 1L;
+
+    @Schema(description = "id")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    @Schema(description = "模板id")
+    @TableField("template_id")
+    private Long templateId;
+
+    @Schema(description = "主机id")
+    @TableField("host_id")
+    private Long hostId;
+
+}
--- a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/domain/HostIdentityDO.java
+++ b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/domain/HostIdentityDO.java
@@ -31,6 +31,10 @@ public class HostIdentityDO extends BaseDO {
    @TableField("name")
    private String name;

+    @Schema(description = "类型")
+    @TableField("type")
+    private String type;
+
    @Schema(description = "用户名")
    @TableField("username")
    private String username;
--- a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/domain/CommandSnippetGroupDO.java
+++ b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/domain/CommandSnippetGroupDO.java
@@ -9,20 +9,20 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;

 /**
- * 命令片段分组 实体对象
+ * 路径标签 实体对象
 *
 * @author Jiahang Li
- * @version 1.0.0
- * @since 2024-1-24 12:28
+ * @version 1.0.6
+ * @since 2024-4-23 23:15
 */
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
@EqualsAndHashCode(callSuper = true)
-@TableName(value = "command_snippet_group", autoResultMap = true)
-@Schema(name = "CommandSnippetGroupDO", description = "命令片段分组 实体对象")
-public class CommandSnippetGroupDO extends BaseDO {
+@TableName(value = "path_bookmark", autoResultMap = true)
+@Schema(name = "PathBookmarkDO", description = "路径标签 实体对象")
+public class PathBookmarkDO extends BaseDO {

    private static final long serialVersionUID = 1L;

@@ -34,8 +34,20 @@ public class CommandSnippetGroupDO extends BaseDO {
    @TableField("user_id")
    private Long userId;

-    @Schema(description = "分组名称")
+    @Schema(description = "分组id")
+    @TableField("group_id")
+    private Long groupId;
+
+    @Schema(description = "名称")
    @TableField("name")
    private String name;

+    @Schema(description = "类型")
+    @TableField("type")
+    private String type;
+
+    @Schema(description = "路径")
+    @TableField("path")
+    private String path;
+
 }
--- a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/request/exec/ExecCommandExecRequest.java
+++ b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/request/exec/ExecCommandExecRequest.java
@@ -1,4 +1,4 @@
-package com.orion.ops.module.asset.entity.request.exec;
+package com.orion.ops.module.asset.entity.dto;

 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
@@ -19,8 +19,8 @@ import java.util.List;
@Builder
@NoArgsConstructor
@AllArgsConstructor
-@Schema(name = "ExecCommandExecRequest", description = "批量执行命令 请求对象")
-public class ExecCommandExecRequest {
+@Schema(name = "ExecCommandExecDTO", description = "批量执行命令对象")
+public class ExecCommandExecDTO {

    @Schema(description = "执行用户id")
    private Long userId;
@@ -43,6 +43,9 @@ public class ExecCommandExecRequest {
    @Schema(description = "超时时间")
    private Integer timeout;

+    @Schema(description = "是否使用脚本执行")
+    private Integer scriptExec;
+
    @Schema(description = "执行命令")
    private String command;

--- a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/dto/HostIdentityCacheDTO.java
+++ b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/dto/HostIdentityCacheDTO.java
@@ -30,6 +30,9 @@ public class HostIdentityCacheDTO implements LongCacheIdModel, Serializable {
    @Schema(description = "名称")
    private String name;

+    @Schema(description = "类型")
+    private String type;
+
    @Schema(description = "用户名")
    private String username;

--- a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/dto/PathBookmarkCacheDTO.java
+++ b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/dto/PathBookmarkCacheDTO.java
@@ -0,0 +1,43 @@
+package com.orion.ops.module.asset.entity.dto;
+
+import com.orion.lang.define.cache.key.model.LongCacheIdModel;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * 路径标签 缓存对象
+ *
+ * @author Jiahang Li
+ * @version 1.0.6
+ * @since 2024-4-23 23:15
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@Schema(name = "PathBookmarkCacheDTO", description = "路径标签 缓存对象")
+public class PathBookmarkCacheDTO implements LongCacheIdModel, Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @Schema(description = "id")
+    private Long id;
+
+    @Schema(description = "分组id")
+    private Long groupId;
+
+    @Schema(description = "名称")
+    private String name;
+
+    @Schema(description = "类型")
+    private String type;
+
+    @Schema(description = "路径")
+    private String path;
+
+}
--- a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/request/command/CommandSnippetCreateRequest.java
+++ b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/request/command/CommandSnippetCreateRequest.java
@@ -26,14 +26,14 @@ public class CommandSnippetCreateRequest implements Serializable {

    private static final long serialVersionUID = 1L;

+    @Schema(description = "分组id")
+    private Long groupId;
+
    @NotBlank
    @Size(max = 64)
    @Schema(description = "名称")
    private String name;

-    @Schema(description = "分组id")
-    private Long groupId;
-
    @NotBlank
    @Schema(description = "代码片段")
    private String command;
--- a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/request/exec/ExecCommandRequest.java
+++ b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/request/exec/ExecCommandRequest.java
@@ -1,5 +1,7 @@
 package com.orion.ops.module.asset.entity.request.exec;

+import com.orion.ops.framework.desensitize.core.annotation.Desensitize;
+import com.orion.ops.framework.desensitize.core.annotation.DesensitizeObject;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;

@@ -19,6 +21,7 @@ import java.util.List;
@Builder
@NoArgsConstructor
@AllArgsConstructor
+@DesensitizeObject
@Schema(name = "ExecCommandRequest", description = "批量执行命令 请求对象")
 public class ExecCommandRequest {

@@ -30,7 +33,12 @@ public class ExecCommandRequest {
    @Schema(description = "超时时间")
    private Integer timeout;

+    @NonNull
+    @Schema(description = "是否使用脚本执行")
+    private Integer scriptExec;
+
    @NotBlank
+    @Desensitize(toEmpty = true)
    @Schema(description = "执行命令")
    private String command;

--- a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/request/exec/ExecJobCreateRequest.java
+++ b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/request/exec/ExecJobCreateRequest.java
@@ -1,10 +1,9 @@
 package com.orion.ops.module.asset.entity.request.exec;

+import com.orion.ops.framework.desensitize.core.annotation.Desensitize;
+import com.orion.ops.framework.desensitize.core.annotation.DesensitizeObject;
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
+import lombok.*;

 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
@@ -24,6 +23,7 @@ import java.util.List;
@Builder
@NoArgsConstructor
@AllArgsConstructor
+@DesensitizeObject
@Schema(name = "ExecJobCreateRequest", description = "计划任务 创建请求对象")
 public class ExecJobCreateRequest implements Serializable {

@@ -43,7 +43,12 @@ public class ExecJobCreateRequest implements Serializable {
    @Schema(description = "超时时间")
    private Integer timeout;

+    @NonNull
+    @Schema(description = "是否使用脚本执行")
+    private Integer scriptExec;
+
    @NotBlank
+    @Desensitize(toEmpty = true)
    @Schema(description = "执行命令")
    private String command;

--- a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/request/exec/ExecJobUpdateRequest.java
+++ b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/request/exec/ExecJobUpdateRequest.java
@@ -1,10 +1,9 @@
 package com.orion.ops.module.asset.entity.request.exec;

+import com.orion.ops.framework.desensitize.core.annotation.Desensitize;
+import com.orion.ops.framework.desensitize.core.annotation.DesensitizeObject;
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
+import lombok.*;

 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
@@ -24,6 +23,7 @@ import java.util.List;
@Builder
@NoArgsConstructor
@AllArgsConstructor
+@DesensitizeObject
@Schema(name = "ExecJobUpdateRequest", description = "计划任务 更新请求对象")
 public class ExecJobUpdateRequest implements Serializable {

@@ -47,7 +47,12 @@ public class ExecJobUpdateRequest implements Serializable {
    @Schema(description = "超时时间")
    private Integer timeout;

+    @NonNull
+    @Schema(description = "是否使用脚本执行")
+    private Integer scriptExec;
+
    @NotBlank
+    @Desensitize(toEmpty = true)
    @Schema(description = "执行命令")
    private String command;

--- a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/request/exec/ExecTemplateCreateRequest.java
+++ b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/request/exec/ExecTemplateCreateRequest.java
@@ -1,5 +1,7 @@
 package com.orion.ops.module.asset.entity.request.exec;

+import com.orion.ops.framework.desensitize.core.annotation.Desensitize;
+import com.orion.ops.framework.desensitize.core.annotation.DesensitizeObject;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -10,6 +12,7 @@ import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
 import java.io.Serializable;
+import java.util.List;

 /**
 * 执行模板 创建请求对象
@@ -22,6 +25,7 @@ import java.io.Serializable;
@Builder
@NoArgsConstructor
@AllArgsConstructor
+@DesensitizeObject
@Schema(name = "ExecTemplateCreateRequest", description = "执行模板 创建请求对象")
 public class ExecTemplateCreateRequest implements Serializable {

@@ -33,6 +37,7 @@ public class ExecTemplateCreateRequest implements Serializable {
    private String name;

    @NotBlank
+    @Desensitize(toEmpty = true)
    @Schema(description = "命令")
    private String command;

@@ -40,7 +45,14 @@ public class ExecTemplateCreateRequest implements Serializable {
    @Schema(description = "超时时间秒 0不超时")
    private Integer timeout;

+    @NotNull
+    @Schema(description = "是否使用脚本执行")
+    private Integer scriptExec;
+
    @Schema(description = "参数定义")
    private String parameterSchema;

+    @Schema(description = "模板主机")
+    private List<Long> hostIdList;
+
 }
--- a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/request/exec/ExecTemplateUpdateRequest.java
+++ b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/request/exec/ExecTemplateUpdateRequest.java
@@ -1,5 +1,7 @@
 package com.orion.ops.module.asset.entity.request.exec;

+import com.orion.ops.framework.desensitize.core.annotation.Desensitize;
+import com.orion.ops.framework.desensitize.core.annotation.DesensitizeObject;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -10,6 +12,7 @@ import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
 import java.io.Serializable;
+import java.util.List;

 /**
 * 执行模板 更新请求对象
@@ -22,6 +25,7 @@ import java.io.Serializable;
@Builder
@NoArgsConstructor
@AllArgsConstructor
+@DesensitizeObject
@Schema(name = "ExecTemplateUpdateRequest", description = "执行模板 更新请求对象")
 public class ExecTemplateUpdateRequest implements Serializable {

@@ -38,13 +42,21 @@ public class ExecTemplateUpdateRequest implements Serializable {

    @NotBlank
    @Schema(description = "命令")
+    @Desensitize(toEmpty = true)
    private String command;

    @NotNull
    @Schema(description = "超时时间秒 0不超时")
    private Integer timeout;

+    @NotNull
+    @Schema(description = "是否使用脚本执行")
+    private Integer scriptExec;
+
    @Schema(description = "参数定义")
    private String parameterSchema;

+    @Schema(description = "模板主机")
+    private List<Long> hostIdList;
+
 }
--- a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/request/host/HostIdentityCreateRequest.java
+++ b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/request/host/HostIdentityCreateRequest.java
@@ -29,6 +29,11 @@ public class HostIdentityCreateRequest implements Serializable {
    @Schema(description = "名称")
    private String name;

+    @NotBlank
+    @Size(max = 12)
+    @Schema(description = "类型")
+    private String type;
+
    @NotBlank
    @Size(max = 128)
    @Schema(description = "用户名")
--- a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/request/host/HostIdentityQueryRequest.java
+++ b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/request/host/HostIdentityQueryRequest.java
@@ -31,6 +31,10 @@ public class HostIdentityQueryRequest extends PageRequest {
    @Schema(description = "名称")
    private String name;

+    @Size(max = 12)
+    @Schema(description = "类型")
+    private String type;
+
    @Size(max = 128)
    @Schema(description = "用户名")
    private String username;
--- a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/request/host/HostIdentityUpdateRequest.java
+++ b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/request/host/HostIdentityUpdateRequest.java
@@ -34,6 +34,11 @@ public class HostIdentityUpdateRequest implements UpdatePasswordAction {
    @Schema(description = "名称")
    private String name;

+    @NotBlank
+    @Size(max = 12)
+    @Schema(description = "类型")
+    private String type;
+
    @NotBlank
    @Size(max = 128)
    @Schema(description = "用户名")
--- a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/request/path/PathBookmarkCreateRequest.java
+++ b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/request/path/PathBookmarkCreateRequest.java
@@ -0,0 +1,47 @@
+package com.orion.ops.module.asset.entity.request.path;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Size;
+import java.io.Serializable;
+
+/**
+ * 路径标签 创建请求对象
+ *
+ * @author Jiahang Li
+ * @version 1.0.6
+ * @since 2024-4-23 23:15
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@Schema(name = "PathBookmarkCreateRequest", description = "路径标签 创建请求对象")
+public class PathBookmarkCreateRequest implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @Schema(description = "分组id")
+    private Long groupId;
+
+    @NotBlank
+    @Size(max = 64)
+    @Schema(description = "名称")
+    private String name;
+
+    @NotBlank
+    @Size(max = 4)
+    @Schema(description = "类型")
+    private String type;
+
+    @NotBlank
+    @Size(max = 1024)
+    @Schema(description = "路径")
+    private String path;
+
+}
--- a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/request/path/PathBookmarkGroupCreateRequest.java
+++ b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/request/path/PathBookmarkGroupCreateRequest.java
@@ -0,0 +1,34 @@
+package com.orion.ops.module.asset.entity.request.path;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Size;
+import java.io.Serializable;
+
+/**
+ * 路径标签分组 创建请求对象
+ *
+ * @author Jiahang Li
+ * @version 1.0.0
+ * @since 2024-1-24 12:28
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@Schema(name = "PathBookmarkGroupCreateRequest", description = "路径标签分组 创建请求对象")
+public class PathBookmarkGroupCreateRequest implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @NotBlank
+    @Size(max = 64)
+    @Schema(description = "分组名称")
+    private String name;
+
+}
--- a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/request/path/PathBookmarkGroupDeleteRequest.java
+++ b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/request/path/PathBookmarkGroupDeleteRequest.java
@@ -0,0 +1,37 @@
+package com.orion.ops.module.asset.entity.request.path;
+
+import com.orion.ops.framework.common.validator.group.Id;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+/**
+ * 路径标签分组 删除请求对象
+ *
+ * @author Jiahang Li
+ * @version 1.0.0
+ * @since 2024-1-24 12:28
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@Schema(name = "PathBookmarkGroupDeleteRequest", description = "路径标签分组 删除请求对象")
+public class PathBookmarkGroupDeleteRequest implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @NotNull(groups = Id.class)
+    @Schema(description = "id")
+    private Long id;
+
+    @NotNull
+    @Schema(description = "是否删除组内数据")
+    private Boolean deleteItem;
+
+}
--- a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/request/path/PathBookmarkGroupUpdateRequest.java
+++ b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/request/path/PathBookmarkGroupUpdateRequest.java
@@ -1,4 +1,4 @@
-package com.orion.ops.module.asset.entity.request.host;
+package com.orion.ops.module.asset.entity.request.path;

 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
@@ -6,31 +6,34 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;

+import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
 import java.io.Serializable;

 /**
- * 主机别名 更新请求对象
+ * 路径标签分组 更新请求对象
 *
 * @author Jiahang Li
 * @version 1.0.0
- * @since 2023-9-13 14:31
+ * @since 2024-1-24 12:28
 */
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
-@Schema(name = "HostAliasUpdateRequest", description = "主机别名 更新请求对象")
-public class HostAliasUpdateRequest implements Serializable {
+@Schema(name = "PathBookmarkGroupUpdateRequest", description = "路径标签分组 更新请求对象")
+public class PathBookmarkGroupUpdateRequest implements Serializable {
+
+    private static final long serialVersionUID = 1L;

    @NotNull
    @Schema(description = "id")
    private Long id;

-    @NotNull
-    @Size(max = 32)
-    @Schema(description = "别名")
+    @NotBlank
+    @Size(max = 64)
+    @Schema(description = "分组名称")
    private String name;

 }
--- a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/request/path/PathBookmarkUpdateRequest.java
+++ b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/request/path/PathBookmarkUpdateRequest.java
@@ -0,0 +1,52 @@
+package com.orion.ops.module.asset.entity.request.path;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
+import java.io.Serializable;
+
+/**
+ * 路径标签 更新请求对象
+ *
+ * @author Jiahang Li
+ * @version 1.0.6
+ * @since 2024-4-23 23:15
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@Schema(name = "PathBookmarkUpdateRequest", description = "路径标签 更新请求对象")
+public class PathBookmarkUpdateRequest implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @NotNull
+    @Schema(description = "id")
+    private Long id;
+
+    @Schema(description = "分组id")
+    private Long groupId;
+
+    @NotBlank
+    @Size(max = 64)
+    @Schema(description = "名称")
+    private String name;
+
+    @NotBlank
+    @Size(max = 4)
+    @Schema(description = "类型")
+    private String type;
+
+    @NotBlank
+    @Size(max = 1024)
+    @Schema(description = "路径")
+    private String path;
+
+}
--- a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/vo/ExecJobVO.java
+++ b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/vo/ExecJobVO.java
@@ -38,6 +38,9 @@ public class ExecJobVO implements Serializable {
    @Schema(description = "超时时间")
    private Integer timeout;

+    @Schema(description = "是否使用脚本执行")
+    private Integer scriptExec;
+
    @Schema(description = "执行命令")
    private String command;

--- a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/vo/ExecLogVO.java
+++ b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/vo/ExecLogVO.java
@@ -50,6 +50,9 @@ public class ExecLogVO implements Serializable {
    @Schema(description = "超时时间")
    private Integer timeout;

+    @Schema(description = "是否使用脚本执行")
+    private Integer scriptExec;
+
    @Schema(description = "执行状态")
    private String status;

--- a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/vo/ExecTemplateVO.java
+++ b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/vo/ExecTemplateVO.java
@@ -8,6 +8,7 @@ import lombok.NoArgsConstructor;

 import java.io.Serializable;
 import java.util.Date;
+import java.util.Set;

 /**
 * 执行模板 视图响应对象
@@ -37,6 +38,9 @@ public class ExecTemplateVO implements Serializable {
    @Schema(description = "超时时间秒 0不超时")
    private Integer timeout;

+    @Schema(description = "是否使用脚本执行")
+    private Integer scriptExec;
+
    @Schema(description = "参数定义")
    private String parameterSchema;

@@ -52,4 +56,7 @@ public class ExecTemplateVO implements Serializable {
    @Schema(description = "修改人")
    private String updater;

+    @Schema(description = "模板主机")
+    private Set<Long> hostIdList;
+
 }
--- a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/vo/HostIdentityVO.java
+++ b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/vo/HostIdentityVO.java
@@ -31,6 +31,9 @@ public class HostIdentityVO implements Serializable {
    @Schema(description = "名称")
    private String name;

+    @Schema(description = "类型")
+    private String type;
+
    @Schema(description = "用户名")
    private String username;

--- a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/dto/CommandSnippetGroupCacheDTO.java
+++ b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/dto/CommandSnippetGroupCacheDTO.java
@@ -1,6 +1,5 @@
-package com.orion.ops.module.asset.entity.dto;
+package com.orion.ops.module.asset.entity.vo;

-import com.orion.lang.define.cache.key.model.LongCacheIdModel;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -8,9 +7,10 @@ import lombok.Data;
 import lombok.NoArgsConstructor;

 import java.io.Serializable;
+import java.util.List;

 /**
- * 命令片段分组 缓存对象
+ * 路径标签分组 视图响应对象
 *
 * @author Jiahang Li
 * @version 1.0.0
@@ -20,8 +20,8 @@ import java.io.Serializable;
@Builder
@NoArgsConstructor
@AllArgsConstructor
-@Schema(name = "CommandSnippetGroupCacheDTO", description = "命令片段分组 缓存对象")
-public class CommandSnippetGroupCacheDTO implements LongCacheIdModel, Serializable {
+@Schema(name = "PathBookmarkGroupVO", description = "路径标签分组 视图响应对象")
+public class PathBookmarkGroupVO implements Serializable {

    private static final long serialVersionUID = 1L;

@@ -31,4 +31,7 @@ public class CommandSnippetGroupCacheDTO implements LongCacheIdModel, Serializab
    @Schema(description = "分组名称")
    private String name;

+    @Schema(description = "路径标签列表")
+    private List<PathBookmarkVO> items;
+
 }
--- a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/vo/PathBookmarkVO.java
+++ b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/vo/PathBookmarkVO.java
@@ -0,0 +1,45 @@
+package com.orion.ops.module.asset.entity.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * 路径标签 视图响应对象
+ *
+ * @author Jiahang Li
+ * @version 1.0.6
+ * @since 2024-4-23 23:15
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@Schema(name = "PathBookmarkVO", description = "路径标签 视图响应对象")
+public class PathBookmarkVO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @Schema(description = "id")
+    private Long id;
+
+    @Schema(description = "用户id")
+    private Long userId;
+
+    @Schema(description = "分组id")
+    private Long groupId;
+
+    @Schema(description = "名称")
+    private String name;
+
+    @Schema(description = "类型")
+    private String type;
+
+    @Schema(description = "路径")
+    private String path;
+
+}
--- a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/vo/PathBookmarkWrapperVO.java
+++ b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/vo/PathBookmarkWrapperVO.java
@@ -0,0 +1,34 @@
+package com.orion.ops.module.asset.entity.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 路径标签组合 视图响应对象
+ *
+ * @author Jiahang Li
+ * @version 1.0.0
+ * @since 2024/1/24 17:30
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@Schema(name = "PathBookmarkWrapperVO", description = "路径标签组合 视图响应对象")
+public class PathBookmarkWrapperVO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @Schema(description = "分组")
+    private List<PathBookmarkGroupVO> groups;
+
+    @Schema(description = "未分组的路径标签")
+    private List<PathBookmarkVO> ungroupedItems;
+
+}
--- a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/enums/HostExtraItemEnum.java
+++ b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/enums/HostExtraItemEnum.java
@@ -3,9 +3,9 @@ package com.orion.ops.module.asset.enums;
 import com.orion.ops.framework.common.handler.data.GenericsDataDefinition;
 import com.orion.ops.framework.common.handler.data.model.GenericsDataModel;
 import com.orion.ops.framework.common.handler.data.strategy.MapDataStrategy;
-import com.orion.ops.module.asset.handler.host.extra.model.HostColorExtraModel;
+import com.orion.ops.module.asset.handler.host.extra.model.HostLabelExtraModel;
 import com.orion.ops.module.asset.handler.host.extra.model.HostSshExtraModel;
-import com.orion.ops.module.asset.handler.host.extra.strategy.HostColorExtraStrategy;
+import com.orion.ops.module.asset.handler.host.extra.strategy.HostLabelExtraStrategy;
 import com.orion.ops.module.asset.handler.host.extra.strategy.HostSshExtraStrategy;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
@@ -27,9 +27,9 @@ public enum HostExtraItemEnum implements GenericsDataDefinition {
    SSH("ssh", HostSshExtraModel.class, HostSshExtraStrategy.class),

    /**
-     * 颜色额外配置
+     * 标签额外配置
     */
-    COLOR("color", HostColorExtraModel.class, HostColorExtraStrategy.class),
+    LABEL("label", HostLabelExtraModel.class, HostLabelExtraStrategy.class),

    ;

--- a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/enums/HostIdentityTypeEnum.java
+++ b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/enums/HostIdentityTypeEnum.java
@@ -0,0 +1,36 @@
+package com.orion.ops.module.asset.enums;
+
+/**
+ * 主机身份类型
+ *
+ * @author Jiahang Li
+ * @version 1.0.0
+ * @since 2023/9/21 19:01
+ */
+public enum HostIdentityTypeEnum {
+
+    /**
+     * 密码
+     */
+    PASSWORD,
+
+    /**
+     * 秘钥
+     */
+    KEY,
+
+    ;
+
+    public static HostIdentityTypeEnum of(String type) {
+        if (type == null) {
+            return null;
+        }
+        for (HostIdentityTypeEnum value : values()) {
+            if (value.name().equals(type)) {
+                return value;
+            }
+        }
+        return null;
+    }
+
+}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
lijiahangmax	2f48ba95a2	Merge pull request #8 from lijiahangmax/dev Dev	2024-04-26 17:08:48 +08:00
lijiahang	f420315d3e	⚡ 设置缓存过期时间.	2024-04-26 16:37:47 +08:00
lijiahang	2b8d64da45	🚀 修复构建失败.	2024-04-26 16:12:06 +08:00
lijiahang	4fb4afdd53	✨ 查询用户角色.	2024-04-26 16:01:06 +08:00
lijiahang	1decd92bd9	✨ 添加终端快捷键.	2024-04-26 16:00:24 +08:00
lijiahang	91b25b8d0c	📝 更新文档.	2024-04-26 11:55:47 +08:00
lijiahang	af8fedbe44	✨ ansi 执行日志.	2024-04-26 11:21:56 +08:00
lijiahang	142c0fff1d	✨ 添加分布式锁组件.	2024-04-25 19:00:12 +08:00
lijiahang	f5b07ee906	✨ 执行日志文件自动清理.	2024-04-25 16:40:00 +08:00
lijiahang	d52c1f4d88	✨ 定时删除未使用的分组.	2024-04-25 11:50:09 +08:00
lijiahang	d6a021b4d9	✨ 路径标签.	2024-04-24 16:43:59 +08:00
lijiahang	8ecb5a687e	✨ 路径标签.	2024-04-24 13:39:21 +08:00
lijiahangmax	cdf10770d6	🚧 命令书签.	2024-04-24 00:13:42 +08:00
lijiahang	e04e14a6e4	🔨 命令分组替换为通用分组模型.	2024-04-23 19:10:15 +08:00
lijiahang	f146989a1a	⚡ 修改缓存时间.	2024-04-23 16:38:47 +08:00
lijiahang	c14c0248cb	🔨 数据分组添加 userId.	2024-04-23 16:26:55 +08:00
lijiahang	b6ee28731b	✨ 回车重连.	2024-04-23 11:07:01 +08:00
lijiahangmax	c8c947d8a8	✨ 回车重连.	2024-04-23 09:15:22 +08:00
lijiahangmax	c66e62623e	🐛 释放资源.	2024-04-22 21:43:12 +08:00
lijiahang	f1207be0ec	🔨 回车重连.	2024-04-22 18:48:52 +08:00
lijiahang	be87c930e2	🔨 执行模板主机.	2024-04-22 16:27:19 +08:00
lijiahang	e057ab858f	🔨 模板主机后端服务.	2024-04-22 13:59:55 +08:00
lijiahang	30e0d23d11	Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # README.md # docs/README.md	2024-04-22 11:26:05 +08:00
lijiahang	c46fa28d25	🔖 升级版本.	2024-04-22 10:54:37 +08:00
lijiahangmax	af99abab71	Merge pull request #7 from lijiahangmax/dev Dev	2024-04-21 12:06:48 +08:00
lijiahangmax	2224bc7ae7	📝 修改文档.	2024-04-21 12:01:57 +08:00
lijiahangmax	d3fe012501	📝 初始化 sql.	2024-04-20 22:10:40 +08:00
lijiahang	38f64eb3bb	✨ windows 使用脚本执行命令.	2024-04-19 17:31:24 +08:00
lijiahang	c880065e39	⚡ 操作日志不用记录 command.	2024-04-19 13:56:17 +08:00
lijiahang	714940bdcf	⚡ 合并主机额外配置.	2024-04-19 10:18:56 +08:00
lijiahang	33cfb13342	💄 优化表单视觉显示.	2024-04-18 14:56:01 +08:00
lijiahang	83ceb0e1e5	⚡ 优化 SFTP 操作逻辑.	2024-04-18 11:59:32 +08:00
lijiahang	fe4b87927e	⚡ 优化资产授权交互逻辑.	2024-04-18 11:31:05 +08:00
lijiahang	1034ba4896	⚡ 修改授权逻辑.	2024-04-18 09:59:10 +08:00
lijiahang	256e54ffd8	✨ 使用脚本执行命令.	2024-04-17 13:13:01 +08:00
lijiahang	339d86fc87	✨ 添加主机身份类型.	2024-04-17 10:11:36 +08:00
lijiahangmax	bc8e04b908	🔨 是否使用脚本执行.	2024-04-17 00:14:23 +08:00
lijiahangmax	7f1f286a7d	✨ 主机配置添加系统类型.	2024-04-17 00:10:44 +08:00
lijiahang	a3e354cea9	⚡ 优化用户状态交互逻辑.	2024-04-16 12:01:44 +08:00
lijiahang	e3fd75e570	⚡ 优化传输进度显示.	2024-04-16 10:55:08 +08:00
lijiahangmax	73537d8671	✨ 定时清理未使用的 tag.	2024-04-16 00:41:20 +08:00
lijiahangmax	4150ab0666	✨ tracker/sftp 策略配置化.	2024-04-16 00:39:51 +08:00
lijiahangmax	07977124fe	🔖 升级版本	2024-04-16 00:37:30 +08:00