Compare commits
99 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
0656c18e85 | ||
|
|
cce511c4b4 | ||
|
|
4f0f320fcd | ||
|
|
2fed2aaa34 | ||
|
|
4eeedb85de | ||
|
|
4523138864 | ||
|
|
630291df46 | ||
|
|
8ff1ec35df | ||
|
|
5a51d598ac | ||
|
|
a23a2b292c | ||
|
|
a9dd8f2f36 | ||
|
|
c85ab97cc5 | ||
|
|
97d88ddea3 | ||
|
|
d13ec07f4c | ||
|
|
89d9cd4c25 | ||
|
|
9a7437e8db | ||
|
|
77cf635eea | ||
|
|
d3a045ec20 | ||
|
|
f7189e34cb | ||
|
|
31df0c6cdf | ||
|
|
81b7c7d592 | ||
|
|
a6209751de | ||
|
|
4fe6208d0e | ||
|
|
2fa3eb2251 | ||
|
|
a0717c3338 | ||
|
|
e86bf3f19d | ||
|
|
1ae47f8ab9 | ||
|
|
4b17d7b4ab | ||
|
|
faefed54c2 | ||
|
|
1e819eadc2 | ||
|
|
0bde1b0c05 | ||
|
|
f7a7b6905f | ||
|
|
cce6da2017 | ||
|
|
69a2cffaa6 | ||
|
|
049d102792 | ||
|
|
792ec067ab | ||
|
|
978d94dddf | ||
|
|
0a43e5db45 | ||
|
|
564e40a31d | ||
|
|
cd312ef5c8 | ||
|
|
cf17cf93b0 | ||
|
|
af00e71651 | ||
|
|
42f1c6f0cb | ||
|
|
26172ea651 | ||
|
|
0774662b4f | ||
|
|
f323690472 | ||
|
|
f416e63b66 | ||
|
|
1379150369 | ||
|
|
908c4a3345 | ||
|
|
b19911bfa7 | ||
|
|
320c4c272a | ||
|
|
69bad68cbc | ||
|
|
8c8098ea85 | ||
|
|
8cc801f3b7 | ||
|
|
bea8dc3511 | ||
|
|
4d43021cd6 | ||
|
|
2f48ba95a2 | ||
|
|
f420315d3e | ||
|
|
2b8d64da45 | ||
|
|
4fb4afdd53 | ||
|
|
1decd92bd9 | ||
|
|
91b25b8d0c | ||
|
|
af8fedbe44 | ||
|
|
142c0fff1d | ||
|
|
f5b07ee906 | ||
|
|
d52c1f4d88 | ||
|
|
d6a021b4d9 | ||
|
|
8ecb5a687e | ||
|
|
cdf10770d6 | ||
|
|
e04e14a6e4 | ||
|
|
f146989a1a | ||
|
|
c14c0248cb | ||
|
|
b6ee28731b | ||
|
|
c8c947d8a8 | ||
|
|
c66e62623e | ||
|
|
f1207be0ec | ||
|
|
be87c930e2 | ||
|
|
e057ab858f | ||
|
|
30e0d23d11 | ||
|
|
c46fa28d25 | ||
|
|
af99abab71 | ||
|
|
2224bc7ae7 | ||
|
|
d3fe012501 | ||
|
|
38f64eb3bb | ||
|
|
c880065e39 | ||
|
|
714940bdcf | ||
|
|
33cfb13342 | ||
|
|
83ceb0e1e5 | ||
|
|
fe4b87927e | ||
|
|
1034ba4896 | ||
|
|
256e54ffd8 | ||
|
|
339d86fc87 | ||
|
|
bc8e04b908 | ||
|
|
7f1f286a7d | ||
|
|
a3e354cea9 | ||
|
|
e3fd75e570 | ||
|
|
73537d8671 | ||
|
|
4150ab0666 | ||
|
|
07977124fe |
@@ -1,6 +1,6 @@
|
||||
## 免责声明
|
||||
|
||||
> 欢迎您选择使用 orion-ops-pro(以下简称「本项目」)。在使用本项目前,请您仔细阅读本免责声明,并确保您已充分理解其中的内容。您的使用行为将视为对本声明全部内容的认可和接受。
|
||||
> 欢迎您选择使用 orion-visor(以下简称「本项目」)。在使用本项目前,请您仔细阅读本免责声明,并确保您已充分理解其中的内容。您的使用行为将视为对本声明全部内容的认可和接受。
|
||||
|
||||
> 本项目为一款开源免费的运维管理工具,采用 Apache 2.0 许可证授权。您可在遵守相关法律法规及许可证条款的前提下,自由修改和使用本项目。
|
||||
|
||||
@@ -14,4 +14,4 @@
|
||||
7. 任何单位或个人不得在未经本人书面授权的情况下对本项目本身申请相关的知识产权。
|
||||
8. 如果本声明的任何部分被认为无效或不可执行,则该部分将被解释为反映本人的初衷,其余部分仍具有完全效力。不可执行的部分声明,并不构成我们放弃执行该声明的权利。
|
||||
9. 本人有权随时对本声明条款及附件内容进行单方面的变更,并以消息推送、网页公告等方式予以公布,公布后立即自动生效,无需另行单独通知;若您在本声明内容公告变更后继续使用的,表示您已充分阅读、理解并接受修改后的声明内容。
|
||||
10. 本人对本声明拥有最终解释权。
|
||||
10. 本人保留对本声明的最终解释权。
|
||||
|
||||
180
README.md
@@ -1,139 +1,125 @@
|
||||
<h1 style="display: flex; align-items: center;">
|
||||
<img style="margin-right: 8px;" src="https://bjuimg.obs.cn-north-4.myhuaweicloud.com/images/2024/2/27/8c687ef1-5711-4a93-9db0-79c010af7902.png" width="32px" height="32px"/> orion-ops-pro 是什么
|
||||
</h1>
|
||||
|
||||
`orion-ops-pro`
|
||||
是一款现代化、高颜值的一站式智能运维管理平台,集资产管理、资产授权、批量执行、计划任务、Web终端、WebSftp、角色管理、系统管理等功能于一体,致力于简化运维团队的治理工作。它是基于 `orion-ops`
|
||||
的产品思路进行重构,技术架构升级,并优化了交互逻辑,让操作更快捷更友好。
|
||||
|
||||
<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">
|
||||
<img src="https://app.codacy.com/project/badge/Grade/49eaab3a9a474af3b87e1d21ffec71c4" alt="quality"/>
|
||||
<div align="center"><img src="https://bjuimg.obs.cn-north-4.myhuaweicloud.com/images/2024/2/27/8c687ef1-5711-4a93-9db0-79c010af7902.png" alt="logo" width="32" /></div>
|
||||
<p style="margin-top: 12px" align="center"><b>一款高颜值、现代化的智能运维&轻量堡垒机平台。</b></p>
|
||||
<p align="center">
|
||||
<a target="_blank"
|
||||
style="text-decoration: none !important;"
|
||||
href="https://app.codacy.com/gh/lijiahangmax/orion-visor/dashboard?utm_source=gh&utm_medium=referral&utm_content=&utm_campaign=Badge_grade">
|
||||
<img src="https://app.codacy.com/project/badge/Grade/49eaab3a9a474af3b87e1d21ffec71c4" alt="quality" />
|
||||
</a>
|
||||
<a target="_blank"
|
||||
style="text-decoration: none !important;"
|
||||
href="https://www.apache.org/licenses/LICENSE-2.0">
|
||||
<img src="https://img.shields.io/github/license/lijiahangmax/orion-visor" alt="License" />
|
||||
</a>
|
||||
<a target="_blank"
|
||||
style="text-decoration: none !important;"
|
||||
href="https://github.com/lijiahangmax/orion-visor/releases">
|
||||
<img src="https://img.shields.io/github/v/release/lijiahangmax/orion-visor" alt="release" />
|
||||
</a>
|
||||
<a target="_blank"
|
||||
style="text-decoration: none !important;"
|
||||
href="https://gitee.com/lijiahangmax/orion-visor/stargazers">
|
||||
<img src="https://gitee.com/lijiahangmax/orion-visor/badge/star.svg?theme=dark" alt="star" />
|
||||
</a>
|
||||
<a target="_blank"
|
||||
style="text-decoration: none !important;"
|
||||
href="https://gitee.com/lijiahangmax/orion-visor/members">
|
||||
<img src="https://gitee.com/lijiahangmax/orion-visor/badge/fork.svg?theme=dark" alt="fork" />
|
||||
</a>
|
||||
<a target="_blank"
|
||||
style="text-decoration: none !important;"
|
||||
href="https://github.com/lijiahangmax/orion-visor">
|
||||
<img src="https://img.shields.io/github/stars/lijiahangmax/orion-visor" alt="star" />
|
||||
</a>
|
||||
<a target="_blank"
|
||||
style="text-decoration: none !important;"
|
||||
href="https://github.com/lijiahangmax/orion-visor">
|
||||
<img src="https://img.shields.io/github/forks/lijiahangmax/orion-visor" alt="star" />
|
||||
</a>
|
||||
<a target="_blank" style="text-decoration: none" href="https://www.oracle.com/java/technologies/javase/javase-jdk8-downloads.html">
|
||||
<img src="https://img.shields.io/badge/JDK-8+-green.svg" alt="jdk8"/>
|
||||
</a>
|
||||
<a target="_blank" style="text-decoration: none" href="https://www.apache.org/licenses/LICENSE-2.0">
|
||||
<img src="https://img.shields.io/github/license/lijiahangmax/orion-ops-pro" alt="License"/>
|
||||
</a>
|
||||
<a target="_blank" style="text-decoration: none" href="https://gitee.com/lijiahangmax/orion-ops-pro/stargazers">
|
||||
<img src="https://gitee.com/lijiahangmax/orion-ops-pro/badge/star.svg?theme=dark" alt="star"/>
|
||||
</a>
|
||||
<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">
|
||||
<img src="https://img.shields.io/github/stars/lijiahangmax/orion-ops-pro.svg?style=social" alt="star"/>
|
||||
</a> -->
|
||||
</p>
|
||||
|
||||
<br/>
|
||||
------------------------------
|
||||
|
||||
当前版本: **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/
|
||||
**`orion-visor`** 提供一站式服务器运维解决方案。
|
||||
|
||||
演示账号: `admin`
|
||||
演示密码: `admin`
|
||||
⭐ 体验后可以点一下 `star` 这对我很重要
|
||||
📞 合作/功能定制请联系底部 备注: '定制'
|
||||
* **资产管理**:支持对资产进行分组,实现对主机、密钥和身份的统一管理和授权。
|
||||
* **在线终端**:提供在线 Terminal 服务,支持快捷命令、大文件上传、在线编辑等操作。
|
||||
* **批量操作**:支持批量执行主机命令、多主机文件分发等功能。
|
||||
* **计划任务**:支持配置 cron 表达式,定时执行主机命令。
|
||||
* **安全可靠**:动态配置权限,记录用户操作日志,提供简单的审计功能。
|
||||
|
||||
## 特性
|
||||
## 演示环境
|
||||
|
||||
* 易用便捷: 极简配置, 开箱即用, 支持 Docker 部署方式。
|
||||
* 资产管理: 支持灵活配置主机分组, 实现对主机、秘钥和身份的统一管理。
|
||||
* 资产授权: 可将资产数据授权给指定角色和用户, 确保数据安全性。
|
||||
* 权限控制: 全面管理用户角色, 支持动态菜单配置和强制下线等功能。
|
||||
* 在线终端: 提供便捷的在线 Web 终端服务, 支持快捷命令、自定义快捷键和主题风格。
|
||||
* 文件管理: 实现远程主机大文件的批量上传、下载和在线编辑等操作。
|
||||
* 批量操作: 支持远程主机批量执行 shell 命令。
|
||||
* 计划任务: 支持配置 cron 表达式, 定时执行主机 shell 命令。
|
||||
* 操作日志: 记录用户操作日志,确保操作可追溯, 提高系统安全性。
|
||||
* 可扩展性: 前后端代码规范统一、代码质量高、健壮且易于阅读和扩展。
|
||||
演示地址: http://101.43.254.243:1081/
|
||||
演示账号: admin/admin
|
||||
|
||||
⭐ 体验后可以点一下 `star` 这对我很重要!
|
||||
🌈 如果本项目对你有帮助请帮忙推广一下 让更多的人知道此项目!
|
||||
|
||||
## 快速开始
|
||||
|
||||
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
|
||||
* [文档地址](https://lijiahangmax.github.io/orion-visor/#/)
|
||||
* [docker安装](https://lijiahangmax.github.io/orion-visor/#/quickstart/docker-install)
|
||||
* [普通安装](https://lijiahangmax.github.io/orion-visor/#/quickstart/install)
|
||||
* [更新日志](https://lijiahangmax.github.io/orion-visor/#/about/change-log)
|
||||
* [操作手册](https://lijiahangmax.github.io/orion-visor/#/operator/asset)
|
||||
* [常见问题](https://lijiahangmax.github.io/orion-visor/#/quickstart/faq)
|
||||
|
||||
## 技术栈
|
||||
|
||||
* Docker
|
||||
* SpringBoot
|
||||
* Mysql
|
||||
* Redis
|
||||
* Vue3
|
||||
* Arco Design
|
||||
* SpringBoot 2.7.17
|
||||
* Mysql 8.0.+
|
||||
* Redis 6.0.+
|
||||
* Vue3 3.2.+
|
||||
* Arco Design 2.55.+
|
||||
|
||||
## 功能预览
|
||||
## 主要功能预览
|
||||
|
||||
> 工作台
|
||||
#### 主机终端
|
||||
|
||||

|
||||

|
||||

|
||||

|
||||

|
||||
|
||||
> 资产管理
|
||||
#### 批量执行
|
||||
|
||||

|
||||

|
||||

|
||||
|
||||
> 主机终端
|
||||
#### 批量上传
|
||||
|
||||

|
||||

|
||||

|
||||

|
||||

|
||||

|
||||

|
||||
|
||||
> 批量执行
|
||||
#### 计划任务
|
||||
|
||||

|
||||

|
||||

|
||||

|
||||
|
||||
> 计划任务
|
||||
## Star History
|
||||
|
||||

|
||||

|
||||

|
||||
|
||||
> 用户管理
|
||||
|
||||

|
||||

|
||||

|
||||
|
||||
> 系统管理
|
||||
|
||||

|
||||

|
||||
[](https://star-history.com/#lijiahangmax/orion-visor&Date)
|
||||
|
||||
## 联系我
|
||||
|
||||
<div style="display: flex;">
|
||||
<img src="https://bjuimg.obs.cn-north-4.myhuaweicloud.com/images/2024/2/27/d452cd30-cecd-4236-86f5-5ecbf3eac091.jpg" alt="qq" width="268px" height="398px"/>
|
||||
<img src="https://bjuimg.obs.cn-north-4.myhuaweicloud.com/images/2024/2/27/4f1c4e77-8e36-45a3-8be6-9da5387bb96e.jpg" alt="wx" width="298px" height="398px"/>
|
||||
<img src="https://bjuimg.obs.cn-north-4.myhuaweicloud.com/images/2024/5/17/d42d91f3-f0ee-4c63-adab-a35809e0804c.jpg" alt="wx" width="298px" height="398px"/>
|
||||
</div>
|
||||
|
||||
📧 咨询问题微信备注: ops
|
||||

|
||||

|
||||
|
||||
📧 咨询问题微信备注: vis
|
||||
📧 合作/功能定制备注: 合作
|
||||
|
||||
## 支持一下
|
||||
|
||||
<img src="https://bjuimg.obs.cn-north-4.myhuaweicloud.com/images/2024/2/27/8063cf87-9de9-4df2-8009-d5dea6d69861.jpg" alt="收款码" width="540px"/>
|
||||
<img src="https://bjuimg.obs.cn-north-4.myhuaweicloud.com/images/2024/5/17/a5351e59-294c-4bec-b767-1a44c362fcbc.jpg" alt="收款码" width="540px"/>
|
||||
|
||||
🎁 为了项目能健康持续的发展, 我期望获得相应的资金支持, 你们的支持是我不断更新前进的动力!
|
||||
|
||||
## 免责声明
|
||||
|
||||
在使用本项目之前, 请确保您已经了解并同意相关的使用协议和隐私政策。[免责声明](https://github.com/lijiahangmax/orion-ops-pro/blob/main/DISCLAIMER.md)
|
||||
在使用本项目之前, 请确保您已经了解并同意相关的使用协议和隐私政策。[免责声明](https://github.com/lijiahangmax/orion-visor/blob/main/DISCLAIMER.md)
|
||||
|
||||
## License
|
||||
|
||||
本项目遵循 [Apache-2.0](https://github.com/lijiahangmax/orion-ops-pro/blob/main/LICENSE) 开源许可证。
|
||||
本项目遵循 [Apache-2.0](https://github.com/lijiahangmax/orion-visor/blob/main/LICENSE) 开源许可证。
|
||||
|
||||
@@ -1,45 +1,48 @@
|
||||
version: '3.3'
|
||||
services:
|
||||
orion-ops-pro:
|
||||
image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-ops-pro:1.0.4
|
||||
orion-visor-service:
|
||||
image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-service:2.0.1
|
||||
ports:
|
||||
- 1081:80
|
||||
environment:
|
||||
- MYSQL_HOST=orion-ops-pro-db
|
||||
- MYSQL_USER=orion
|
||||
- MYSQL_HOST=orion-visor-mysql
|
||||
- MYSQL_PORT=3306
|
||||
- MYSQL_DATABASE=orion_visor
|
||||
- MYSQL_USER=root
|
||||
- MYSQL_PASSWORD=Data@123456
|
||||
- REDIS_HOST=orion-ops-pro-redis
|
||||
- REDIS_HOST=orion-visor-redis
|
||||
- REDIS_PASSWORD=Data@123456
|
||||
- SECRET_KEY=uQeacXV8b3isvKLK
|
||||
volumes:
|
||||
- /data/orion-ops-pro-space/docker-volumes/orion-ops-pro/logs:/root/orion/logs/orion-ops-pro
|
||||
- /data/orion-visor-space/docker-volumes/orion-visor-service/root-orion:/root/orion
|
||||
depends_on:
|
||||
- orion-ops-pro-db
|
||||
- orion-ops-pro-redis
|
||||
orion-ops-pro-db:
|
||||
build:
|
||||
context: .
|
||||
dockerfile: docker/mysql/Dockerfile
|
||||
- orion-visor-mysql
|
||||
- orion-visor-redis
|
||||
orion-visor-mysql:
|
||||
image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-mysql:2.0.1
|
||||
privileged: true
|
||||
ports:
|
||||
- 3307:3306
|
||||
environment:
|
||||
- MYSQL_DATABASE=orion-ops-pro
|
||||
- MYSQL_DATABASE=orion_visor
|
||||
- MYSQL_USER=orion
|
||||
- MYSQL_PASSWORD=Data@123456
|
||||
- MYSQL_ROOT_PASSWORD=Data@123456
|
||||
volumes:
|
||||
- /data/orion-ops-pro-space/docker-volumes/mysql/var-lib-mysql:/var/lib/mysql
|
||||
- /data/orion-ops-pro-space/docker-volumes/mysql/var-lib-mysql-files:/var/lib/mysql-files
|
||||
- /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
|
||||
- /data/orion-visor-space/docker-volumes/orion-visor-mysql/var-lib-mysql:/var/lib/mysql
|
||||
- /data/orion-visor-space/docker-volumes/orion-visor-mysql/var-lib-mysql-files:/var/lib/mysql-files
|
||||
- /data/orion-visor-space/docker-volumes/orion-visor-mysql/etc-mysql:/etc/mysql
|
||||
orion-visor-redis:
|
||||
image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-redis:2.0.1
|
||||
privileged: true
|
||||
ports:
|
||||
- 6380:6379
|
||||
environment:
|
||||
- REDIS_PASSWORD=Data@123456
|
||||
volumes:
|
||||
- /data/orion-ops-pro-space/docker-volumes/redis/data:/data
|
||||
orion-ops-pro-adminer:
|
||||
- /data/orion-visor-space/docker-volumes/orion-visor-redis/data:/data
|
||||
command: sh -c "redis-server /usr/local/redis.conf --requirepass $${REDIS_PASSWORD}"
|
||||
orion-visor-adminer:
|
||||
image: adminer
|
||||
ports:
|
||||
- 8081:8080
|
||||
|
||||
4
docker-upgrade.sh
Normal file
@@ -0,0 +1,4 @@
|
||||
#/bin/bash
|
||||
docker compose down
|
||||
sh ./pull.sh
|
||||
docker compose up -d
|
||||
@@ -1,3 +0,0 @@
|
||||
mv ../../orion-ops-launch/target/orion-ops-launch.jar ./
|
||||
mv ../../orion-ops-ui/dist ./dist
|
||||
docker build -t orion-ops-pro:1.0.4 .
|
||||
@@ -1,8 +1,9 @@
|
||||
FROM mysql:8.0.28
|
||||
COPY sql/init-1-schema-databases.sql /tmp
|
||||
COPY sql/init-2-schema-tables.sql /tmp
|
||||
COPY sql/init-3-data.sql /tmp
|
||||
COPY docker/mysql/my.cnf /etc/mysql/conf.d/my.cnf
|
||||
COPY ./sql/init-1-schema-databases.sql /tmp
|
||||
COPY ./sql/init-2-schema-tables.sql /tmp
|
||||
COPY ./sql/init-3-schema-quartz.sql /tmp
|
||||
COPY ./sql/init-4-data.sql /tmp
|
||||
COPY ./my.cnf /etc/mysql/conf.d/my.cnf
|
||||
RUN cat /tmp/init-1-schema-databases.sql >> /tmp/init.sql && \
|
||||
cat /tmp/init-2-schema-tables.sql >> /tmp/init.sql && \
|
||||
cat /tmp/init-3-schema-quartz.sql >> /tmp/init.sql && \
|
||||
7
docker/orion-visor-mysql/build.sh
Normal file
@@ -0,0 +1,7 @@
|
||||
#/bin/bash
|
||||
version=2.0.1
|
||||
cp -r ../../sql ./sql
|
||||
docker build -t orion-visor-mysql:${version} .
|
||||
rm -rf ./sql
|
||||
docker tag orion-visor-mysql:${version} registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-mysql:${version}
|
||||
docker push registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-mysql:${version}
|
||||
4
docker/orion-visor-redis/Dockerfile
Normal file
@@ -0,0 +1,4 @@
|
||||
FROM redis:6.0.16-alpine
|
||||
WORKDIR /data
|
||||
COPY ./redis.conf /tmp
|
||||
RUN cat /tmp/redis.conf > /usr/local/redis.conf
|
||||
5
docker/orion-visor-redis/build.sh
Normal file
@@ -0,0 +1,5 @@
|
||||
#/bin/bash
|
||||
version=2.0.1
|
||||
docker build -t orion-visor-redis:${version} .
|
||||
docker tag orion-visor-redis:${version} registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-redis:${version}
|
||||
docker push registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-redis:${version}
|
||||
1877
docker/orion-visor-redis/redis.conf
Normal file
@@ -8,7 +8,7 @@ RUN \
|
||||
RUN apk add openjdk8
|
||||
RUN rm -rf /etc/nginx/conf.d/*
|
||||
WORKDIR /app
|
||||
COPY ./orion-ops-launch.jar /app/app.jar
|
||||
COPY ./orion-visor-launch.jar /app/app.jar
|
||||
COPY ./dist /usr/share/nginx/html
|
||||
COPY ./entrypoint.sh /app/entrypoint.sh
|
||||
COPY ./nginx.conf /etc/nginx/conf.d
|
||||
9
docker/orion-visor-service/build.sh
Normal file
@@ -0,0 +1,9 @@
|
||||
#/bin/bash
|
||||
version=2.0.1
|
||||
mv ../../orion-visor-launch/target/orion-visor-launch.jar ./orion-visor-launch.jar
|
||||
mv ../../orion-visor-ui/dist ./dist
|
||||
docker build -t orion-visor-service:${version} .
|
||||
rm -f ./orion-visor-launch.jar
|
||||
rm -rf ./dist
|
||||
docker tag orion-visor-service:${version} registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-service:${version}
|
||||
docker push registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-service:${version}
|
||||
@@ -26,16 +26,16 @@ server {
|
||||
try_files $uri $uri/ /index.html;
|
||||
}
|
||||
|
||||
location /orion/api {
|
||||
proxy_pass http://localhost:9200/orion/api;
|
||||
location /orion-visor/api {
|
||||
proxy_pass http://localhost:9200/orion-visor/api;
|
||||
proxy_set_header Host $host;
|
||||
proxy_set_header X-Real-IP $remote_addr;
|
||||
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
||||
proxy_set_header X-Forwarded-Proto $scheme;
|
||||
}
|
||||
|
||||
location /orion/keep-alive {
|
||||
proxy_pass http://localhost:9200/orion/keep-alive;
|
||||
location /orion-visor/keep-alive {
|
||||
proxy_pass http://localhost:9200/orion-visor/keep-alive;
|
||||
proxy_http_version 1.1;
|
||||
proxy_set_header Upgrade $http_upgrade;
|
||||
proxy_set_header Connection "upgrade";
|
||||
@@ -1,6 +1,6 @@
|
||||
## 免责声明
|
||||
|
||||
> 欢迎您选择使用 orion-ops-pro(以下简称「本项目」)。在使用本项目前,请您仔细阅读本免责声明,并确保您已充分理解其中的内容。您的使用行为将视为对本声明全部内容的认可和接受。
|
||||
> 欢迎您选择使用 orion-visor(以下简称「本项目」)。在使用本项目前,请您仔细阅读本免责声明,并确保您已充分理解其中的内容。您的使用行为将视为对本声明全部内容的认可和接受。
|
||||
|
||||
> 本项目为一款开源免费的运维管理工具,采用 Apache 2.0 许可证授权。您可在遵守相关法律法规及许可证条款的前提下,自由修改和使用本项目。
|
||||
|
||||
@@ -14,4 +14,4 @@
|
||||
7. 任何单位或个人不得在未经本人书面授权的情况下对本项目本身申请相关的知识产权。
|
||||
8. 如果本声明的任何部分被认为无效或不可执行,则该部分将被解释为反映本人的初衷,其余部分仍具有完全效力。不可执行的部分声明,并不构成我们放弃执行该声明的权利。
|
||||
9. 本人有权随时对本声明条款及附件内容进行单方面的变更,并以消息推送、网页公告等方式予以公布,公布后立即自动生效,无需另行单独通知;若您在本声明内容公告变更后继续使用的,表示您已充分阅读、理解并接受修改后的声明内容。
|
||||
10. 本人对本声明拥有最终解释权。
|
||||
10. 本人保留对本声明的最终解释权。
|
||||
|
||||
168
docs/README.md
@@ -1,127 +1,113 @@
|
||||
<h1 style="display: flex; align-items: center;">
|
||||
<img style="margin-right: 8px;" src="./assert/logo.svg" width="32px" height="32px"/> orion-ops-pro 是什么
|
||||
</h1>
|
||||
|
||||
`orion-ops-pro`
|
||||
是一款现代化、高颜值的一站式智能运维管理平台,集资产管理、资产授权、批量执行、计划任务、Web终端、WebSftp、角色管理、系统管理等功能于一体,致力于简化运维团队的治理工作。它是基于 `orion-ops`
|
||||
的产品思路进行重构,技术架构升级,并优化了交互逻辑,让操作更快捷更友好。
|
||||
|
||||
<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">
|
||||
<img src="https://app.codacy.com/project/badge/Grade/49eaab3a9a474af3b87e1d21ffec71c4" alt="quality"/>
|
||||
<div align="center"><img src="./assert/logo.svg" alt="logo" width="32" /></div>
|
||||
<p style="margin-top: 12px" align="center"><b>一款高颜值、现代化的智能运维&轻量堡垒机平台。</b></p>
|
||||
<p align="center">
|
||||
<a target="_blank"
|
||||
style="text-decoration: none !important;"
|
||||
href="https://app.codacy.com/gh/lijiahangmax/orion-visor/dashboard?utm_source=gh&utm_medium=referral&utm_content=&utm_campaign=Badge_grade">
|
||||
<img src="https://app.codacy.com/project/badge/Grade/49eaab3a9a474af3b87e1d21ffec71c4" alt="quality" />
|
||||
</a>
|
||||
<a target="_blank"
|
||||
style="text-decoration: none !important;"
|
||||
href="https://www.apache.org/licenses/LICENSE-2.0">
|
||||
<img src="https://img.shields.io/github/license/lijiahangmax/orion-visor" alt="License" />
|
||||
</a>
|
||||
<a target="_blank"
|
||||
style="text-decoration: none !important;"
|
||||
href="https://github.com/lijiahangmax/orion-visor/releases">
|
||||
<img src="https://img.shields.io/github/v/release/lijiahangmax/orion-visor" alt="release" />
|
||||
</a>
|
||||
<a target="_blank"
|
||||
style="text-decoration: none !important;"
|
||||
href="https://gitee.com/lijiahangmax/orion-visor/stargazers">
|
||||
<img src="https://gitee.com/lijiahangmax/orion-visor/badge/star.svg?theme=dark" alt="star" />
|
||||
</a>
|
||||
<a target="_blank"
|
||||
style="text-decoration: none !important;"
|
||||
href="https://gitee.com/lijiahangmax/orion-visor/members">
|
||||
<img src="https://gitee.com/lijiahangmax/orion-visor/badge/fork.svg?theme=dark" alt="fork" />
|
||||
</a>
|
||||
<a target="_blank"
|
||||
style="text-decoration: none !important;"
|
||||
href="https://github.com/lijiahangmax/orion-visor">
|
||||
<img src="https://img.shields.io/github/stars/lijiahangmax/orion-visor" alt="star" />
|
||||
</a>
|
||||
<a target="_blank"
|
||||
style="text-decoration: none !important;"
|
||||
href="https://github.com/lijiahangmax/orion-visor">
|
||||
<img src="https://img.shields.io/github/forks/lijiahangmax/orion-visor" alt="star" />
|
||||
</a>
|
||||
<a target="_blank" style="text-decoration: none" href="https://www.oracle.com/java/technologies/javase/javase-jdk8-downloads.html">
|
||||
<img src="https://img.shields.io/badge/JDK-8+-green.svg" alt="jdk8"/>
|
||||
</a>
|
||||
<a target="_blank" style="text-decoration: none" href="https://www.apache.org/licenses/LICENSE-2.0">
|
||||
<img src="https://img.shields.io/github/license/lijiahangmax/orion-ops-pro" alt="License"/>
|
||||
</a>
|
||||
<a target="_blank" style="text-decoration: none" href="https://gitee.com/lijiahangmax/orion-ops-pro/stargazers">
|
||||
<img src="https://gitee.com/lijiahangmax/orion-ops-pro/badge/star.svg?theme=dark" alt="star"/>
|
||||
</a>
|
||||
<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">
|
||||
<img src="https://img.shields.io/github/stars/lijiahangmax/orion-ops-pro.svg?style=social" alt="star"/>
|
||||
</a> -->
|
||||
</p>
|
||||
|
||||
<br/>
|
||||
------------------------------
|
||||
|
||||
当前版本: **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/
|
||||
**`orion-visor`** 提供一站式服务器运维解决方案。
|
||||
|
||||
演示账号: `admin`
|
||||
演示密码: `admin`
|
||||
⭐ 体验后可以点一下 `star` 这对我很重要
|
||||
📞 合作/功能定制请联系底部 备注: '合作'
|
||||
* **资产管理**:支持对资产进行分组,实现对主机、密钥和身份的统一管理和授权。
|
||||
* **在线终端**:提供在线 Terminal 服务,支持快捷命令、大文件上传、在线编辑等操作。
|
||||
* **批量操作**:支持批量执行主机命令、多主机文件分发等功能。
|
||||
* **计划任务**:支持配置 cron 表达式,定时执行主机命令。
|
||||
* **安全可靠**:动态配置权限,记录用户操作日志,提供简单的审计功能。
|
||||
|
||||
## 特性
|
||||
## 演示环境
|
||||
|
||||
* 易用便捷: 极简配置, 开箱即用, 支持 Docker 部署方式。
|
||||
* 资产管理: 支持灵活配置主机分组, 实现对主机、秘钥和身份的统一管理。
|
||||
* 资产授权: 可将资产数据授权给指定角色和用户, 确保数据安全性。
|
||||
* 权限控制: 全面管理用户角色, 支持动态菜单配置和强制下线等功能。
|
||||
* 在线终端: 提供便捷的在线 Web 终端服务, 支持快捷命令、自定义快捷键和主题风格。
|
||||
* 文件管理: 实现远程主机大文件的批量上传、下载和在线编辑等操作。
|
||||
* 批量操作: 支持远程主机批量执行 shell 命令。
|
||||
* 计划任务: 支持配置 cron 表达式, 定时执行主机 shell 命令。
|
||||
* 操作日志: 记录用户操作日志,确保操作可追溯, 提高系统安全性。
|
||||
* 可扩展性: 前后端代码规范统一、代码质量高、健壮且易于阅读和扩展。
|
||||
演示地址: http://101.43.254.243:1081/
|
||||
演示账号: admin/admin
|
||||
|
||||
⭐ 体验后可以点一下 `star` 这对我很重要!
|
||||
🌈 如果本项目对你有帮助请帮忙推广一下 让更多的人知道此项目!
|
||||
|
||||
## 快速开始
|
||||
|
||||
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
|
||||
* [文档地址](https://lijiahangmax.github.io/orion-visor/#/)
|
||||
* [docker安装](/quickstart/docker-install)
|
||||
* [普通安装](/quickstart/install)
|
||||
* [更新日志](/about/change-log)
|
||||
* [操作手册](/operator/asset)
|
||||
* [常见问题](/quickstart/faq)
|
||||
|
||||
## 技术栈
|
||||
|
||||
* Docker
|
||||
* SpringBoot
|
||||
* Mysql
|
||||
* Redis
|
||||
* Vue3
|
||||
* Arco Design
|
||||
* SpringBoot 2.7.17
|
||||
* Mysql 8.0.+
|
||||
* Redis 6.0.+
|
||||
* Vue3 3.2.+
|
||||
* Arco Design 2.55.+
|
||||
|
||||
## 功能预览
|
||||
## 主要功能预览
|
||||
|
||||
> 工作台
|
||||
|
||||

|
||||
|
||||
> 资产管理
|
||||
|
||||

|
||||

|
||||
|
||||
> 主机终端
|
||||
#### 主机终端
|
||||
|
||||

|
||||

|
||||

|
||||

|
||||

|
||||

|
||||

|
||||

|
||||
|
||||
> 批量执行
|
||||
#### 批量执行
|
||||
|
||||

|
||||

|
||||

|
||||
|
||||
> 计划任务
|
||||
#### 批量上传
|
||||
|
||||

|
||||

|
||||

|
||||

|
||||
|
||||
> 用户管理
|
||||
#### 计划任务
|
||||
|
||||

|
||||

|
||||

|
||||

|
||||
|
||||
> 系统管理
|
||||
## Star History
|
||||
|
||||

|
||||

|
||||
[](https://star-history.com/#lijiahangmax/orion-visor&Date)
|
||||
|
||||
## 联系我
|
||||
|
||||
<div style="display: flex;">
|
||||
<img src="./assert/img/qq_group1.jpg" alt="qq" width="268px" height="398px"/>
|
||||
<img src="./assert/img/wx.jpg" alt="wx" width="298px" height="398px"/>
|
||||
</div>
|
||||
|
||||
📧 咨询问题微信备注: ops
|
||||

|
||||

|
||||
|
||||
📧 咨询问题微信备注: vis
|
||||
📧 合作/功能定制备注: 合作
|
||||
|
||||
## 支持一下
|
||||
@@ -136,4 +122,4 @@ roadmap: https://lijiahangmax.gitee.io/orion-ops-pro/#/about/roadmap
|
||||
|
||||
## License
|
||||
|
||||
本项目遵循 [Apache-2.0](https://github.com/lijiahangmax/orion-ops-pro/blob/main/LICENSE) 开源许可证。
|
||||
本项目遵循 [Apache-2.0](https://github.com/lijiahangmax/orion-visor/blob/main/LICENSE) 开源许可证。
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
# orion-ops-pro <small>1.0.4</small>
|
||||
# orion-visor <small>2.0.1</small>
|
||||
|
||||
> 一款开箱即用的运维平台。
|
||||
|
||||
@@ -6,6 +6,6 @@
|
||||
- 安全 稳定
|
||||
- 智能 高效
|
||||
|
||||
[GitHub](https://github.com/lijiahangmax/orion-ops-pro)
|
||||
[Gitee](https://gitee.com/lijiahangmax/orion-ops-pro)
|
||||
[GitHub](https://github.com/lijiahangmax/orion-visor)
|
||||
[Gitee](https://gitee.com/lijiahangmax/orion-visor)
|
||||
[Get Started](README.md)
|
||||
|
||||
@@ -9,7 +9,8 @@
|
||||
* 操作手册
|
||||
* [资产管理](operator/asset.md)
|
||||
* [主机运维](operator/host-ops.md)
|
||||
* [命令执行](operator/exec.md)
|
||||
* [运维审计](operator/asset-audit.md)
|
||||
* [批量执行](operator/exec.md)
|
||||
* [计划任务](operator/job.md)
|
||||
* [用户管理](operator/user.md)
|
||||
* [系统管理](operator/system.md)
|
||||
|
||||
@@ -1,8 +1,104 @@
|
||||
> 版本号严格遵循 Semver 规范。
|
||||
|
||||
⚡ 注意: 应用不支持跨版本升级, 可以进行多次升级
|
||||
### 升级须知
|
||||
|
||||
## v1.0.4
|
||||
* 应用 **不支持** 跨版本升级, 可以进行 **多次升级**
|
||||
* docker 安装的 sql 脚本可以在 `adminer` 中执行
|
||||
* 执行完成菜单 sql 后请刷新缓存 `系统设置` > `系统菜单` > `刷新缓存`
|
||||
* 执行完成字典 sql 后请刷新缓存 `系统设置` > `数据字典项` > `刷新缓存`
|
||||
|
||||
### docker 升级流程
|
||||
|
||||
* 备份 `volumes` (必要时可以回滚)
|
||||
* 进入 `adminer` 执行升级的 `sql` 脚本
|
||||
* 执行 升级的 `bash` 脚本
|
||||
* 进入 代码目录执行 `sh docker-upgrade.sh` 进行容器升级 `down` > `pull` > `up -d`
|
||||
|
||||
### v2.0.1
|
||||
|
||||
`2024-05-21` `release`
|
||||
|
||||
* ⭐ 添加 cron 组件
|
||||
* 🐞 修复 批量执行后日志偶尔不展示的问题
|
||||
* 🐞 修复 批量上传进度条显示异常的问题
|
||||
|
||||
### v2.0.0
|
||||
|
||||
`2024-05-17` `release`
|
||||
|
||||
* ⭐ 修改 项目名称为 `orion-visor`
|
||||
* 🩰 修改 终端默认字体
|
||||
|
||||
[如何升级](/update/v2.0.0.md)
|
||||
|
||||
### v1.0.8
|
||||
|
||||
`2024-05-15` `release`
|
||||
|
||||
* 🌈 新增 站内信模块
|
||||
* 🔨 优化 执行命令日志跳转逻辑
|
||||
* 🔨 修改 `exitStatus` 改为 `exitCode`
|
||||
|
||||
[如何升级](/update/v1.0.8.md)
|
||||
|
||||
### v1.0.7
|
||||
|
||||
`2024-05-13` `release`
|
||||
|
||||
* 🐞 修复 查看计划任务日志时提示日志不存在
|
||||
* 🩰 修改 命令执行日志 UI 修改
|
||||
* 🌈 新增 文件传输列表添加操作栏
|
||||
* 🌈 新增 主机在线会话功能
|
||||
* 🌈 新增 文件批量上传功能
|
||||
|
||||
[如何升级](/update/v1.0.7.md)
|
||||
|
||||
### 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 +120,7 @@
|
||||
|
||||
[如何升级](/update/v1.0.4.md)
|
||||
|
||||
## v1.0.3
|
||||
### v1.0.3
|
||||
|
||||
`2024-03-25` `release`
|
||||
|
||||
@@ -39,7 +135,7 @@
|
||||
|
||||
[如何升级](/update/v1.0.3.md)
|
||||
|
||||
## v1.0.2
|
||||
### v1.0.2
|
||||
|
||||
`2024-03-22` `release`
|
||||
|
||||
@@ -58,7 +154,7 @@
|
||||
|
||||
[如何升级](/update/v1.0.2.md)
|
||||
|
||||
## v1.0.1
|
||||
### v1.0.1
|
||||
|
||||
`2024-03-06` `release`
|
||||
|
||||
@@ -69,11 +165,11 @@
|
||||
* 🌈 新增 主机连接日志删除/清理
|
||||
* 🌈 新增 用户操作日志日志删除/清理
|
||||
* 🌈 新增 用户操作日志日志删除/清理
|
||||
* 🔨 优化 用户锁定次数/时间可配置
|
||||
* 🔨 优化 用户锁定次数/时间可配置 `app.authentication`
|
||||
|
||||
[如何升级](/update/v1.0.1.md)
|
||||
|
||||
## v1.0.0
|
||||
### v1.0.0
|
||||
|
||||
`2024-03-01` `release`
|
||||
|
||||
@@ -82,12 +178,12 @@
|
||||
|
||||
[如何升级](/update/v1.0.0.md)
|
||||
|
||||
## v1.0.0-beta.1
|
||||
### v1.0.0-beta.1
|
||||
|
||||
`2024-02-28` `preview`
|
||||
|
||||
* 🌈 主机管理
|
||||
* 🌈 主机秘钥
|
||||
* 🌈 主机密钥
|
||||
* 🌈 主机身份
|
||||
* 🌈 资产授权
|
||||
* 🌈 主机终端
|
||||
|
||||
@@ -1,24 +1,12 @@
|
||||
## 功能排期 ⏳
|
||||
## 功能排期
|
||||
|
||||
* tracker 使用配置文件
|
||||
* 文件重复删除/重命名 可配置
|
||||
* 定时删除未引用的 tag
|
||||
* 管理员也需要自行授权资产
|
||||
* 使用文件执行命令
|
||||
* 主机身份类型
|
||||
* 文件夹书签
|
||||
* 批量上传
|
||||
* 优化文件传输列表进度显示
|
||||
* 终端断开连接后回车重新连接
|
||||
* 站内消息
|
||||
* 终端背景图片
|
||||
* 资产授权 UI 改版
|
||||
* RDP 远程桌面
|
||||
* 接入 config 后端动态配置
|
||||
* 文档中巡检模板
|
||||
* 批量执行 模板 定时任务 配置是否使用文件执行
|
||||
* 使用 vite press 开发文档
|
||||
* 导入快捷命令
|
||||
* 导入命令模板
|
||||
|
||||
## 已知问题 🐞
|
||||
## 已知问题
|
||||
|
||||
* 顶部菜单折叠宽度计算有问题 (arco 框架内问题)
|
||||
|
||||
|
Before Width: | Height: | Size: 106 KiB |
|
Before Width: | Height: | Size: 100 KiB |
|
Before Width: | Height: | Size: 120 KiB After Width: | Height: | Size: 128 KiB |
|
Before Width: | Height: | Size: 108 KiB After Width: | Height: | Size: 106 KiB |
|
Before Width: | Height: | Size: 140 KiB After Width: | Height: | Size: 155 KiB |
BIN
docs/assert/img/batch_upload_form.png
Normal file
|
After Width: | Height: | Size: 156 KiB |
BIN
docs/assert/img/batch_upload_uploading.png
Normal file
|
After Width: | Height: | Size: 156 KiB |
|
Before Width: | Height: | Size: 108 KiB After Width: | Height: | Size: 103 KiB |
BIN
docs/assert/img/exec_job_detail.png
Normal file
|
After Width: | Height: | Size: 113 KiB |
|
Before Width: | Height: | Size: 111 KiB |
|
Before Width: | Height: | Size: 127 KiB |
|
Before Width: | Height: | Size: 601 KiB |
|
Before Width: | Height: | Size: 156 KiB |
BIN
docs/assert/img/terminal_collections.png
Normal file
|
After Width: | Height: | Size: 82 KiB |
|
Before Width: | Height: | Size: 116 KiB After Width: | Height: | Size: 120 KiB |
|
Before Width: | Height: | Size: 63 KiB After Width: | Height: | Size: 187 KiB |
|
Before Width: | Height: | Size: 106 KiB |
|
Before Width: | Height: | Size: 94 KiB After Width: | Height: | Size: 85 KiB |
|
Before Width: | Height: | Size: 147 KiB After Width: | Height: | Size: 146 KiB |
|
Before Width: | Height: | Size: 91 KiB |
|
Before Width: | Height: | Size: 158 KiB |
|
Before Width: | Height: | Size: 96 KiB |
|
Before Width: | Height: | Size: 88 KiB |
BIN
docs/assert/img/user_login_session.png
Normal file
|
After Width: | Height: | Size: 112 KiB |
|
Before Width: | Height: | Size: 151 KiB After Width: | Height: | Size: 141 KiB |
|
Before Width: | Height: | Size: 136 KiB |
@@ -2,7 +2,7 @@
|
||||
<html lang="en">
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<title>关于 orion-ops-pro</title>
|
||||
<title>关于 orion-visor</title>
|
||||
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"/>
|
||||
<meta name="description" content="Description">
|
||||
<link rel="icon" href="./assert/logo.svg">
|
||||
@@ -18,9 +18,9 @@
|
||||
<script>
|
||||
window.$docsify = {
|
||||
// 左侧文档名称
|
||||
name: 'orion-ops-pro',
|
||||
name: 'orion-visor',
|
||||
// 右上角仓库
|
||||
repo: 'https://github.com/lijiahangmax/orion-ops-pro',
|
||||
repo: 'https://github.com/lijiahangmax/orion-visor',
|
||||
coverpage: true,
|
||||
// 加载侧边栏
|
||||
loadSidebar: true,
|
||||
|
||||
@@ -1,12 +1,18 @@
|
||||
### 连接日志
|
||||
|
||||
在主机终端页面打开的 `SSH` `SFTP` 连接都会记录下来。
|
||||
查看主机终端连接记录。
|
||||
|
||||
* 详情: 查看连接详情
|
||||
* 断开: 断开会话连接
|
||||
* 下线: 强制断开会话连接
|
||||
* 删除: 删除连接记录
|
||||
* 清理: 根据条件清理数据
|
||||
|
||||
### 在线会话
|
||||
|
||||
查看连接中的主机会话。
|
||||
|
||||
* 下线: 强制断开会话连接
|
||||
|
||||
### 文件操作日志
|
||||
|
||||
查看用户 SFTP 操作日志, 是从用户操作日志中过滤查询。
|
||||
|
||||
@@ -10,20 +10,20 @@
|
||||
* 配置: 修改主机配置信息
|
||||
* 删除: 删除这台主机以及主机关联的数据
|
||||
|
||||
### 主机秘钥
|
||||
### 主机密钥
|
||||
|
||||
统一管理和维护用于连接主机的秘钥。
|
||||
统一管理和维护用于连接主机的密钥。
|
||||
|
||||
* 角色授权: 跳转页面到主机秘钥授权页面(角色)
|
||||
* 用户授权: 跳转页面到主机秘钥授权页面(用户)
|
||||
* 新增: 添加一个主机秘钥
|
||||
* 修改: 修改主机秘钥信息
|
||||
* 详情: 查看主机秘钥信息
|
||||
* 删除: 删除当前主机秘钥
|
||||
* 角色授权: 跳转页面到主机密钥授权页面(角色)
|
||||
* 用户授权: 跳转页面到主机密钥授权页面(用户)
|
||||
* 新增: 添加一个主机密钥
|
||||
* 修改: 修改主机密钥信息
|
||||
* 详情: 查看主机密钥信息
|
||||
* 删除: 删除当前主机密钥
|
||||
|
||||
### 主机身份
|
||||
|
||||
统一管理和维护用于连接主机的身份。这里同时维护了用户名,密码/秘钥。
|
||||
统一管理和维护用于连接主机的身份。这里同时维护了用户名、密码和密钥。
|
||||
|
||||
* 角色授权: 跳转页面到主机身份授权页面(角色)
|
||||
* 用户授权: 跳转页面到主机身份授权页面(用户)
|
||||
|
||||
@@ -1,14 +1,16 @@
|
||||
### 批量执行
|
||||
### 命令执行
|
||||
|
||||
批量执行 ssh 主机 shell 脚本。
|
||||
|
||||
⚡ 如果只需要保存日志的原始输出则需要修改 `application.yaml` `app.exec-log.append-ansi` 为 `false`
|
||||
|
||||
* 重置: 重置全部参数
|
||||
* 执行: 执行所输入的命令
|
||||
* 返回: 返回到执行命令页面
|
||||
* 从模板中选择: 从模板中选择需要执行的命令
|
||||
* 执行历史: 点击历史命令可以快速填入
|
||||
|
||||
### 批量执行日志
|
||||
### 执行日志
|
||||
|
||||
查看批量执行任务日志。
|
||||
|
||||
@@ -22,28 +24,34 @@
|
||||
* 日志: 查看执行日志, ctrl + 左键点击会用新页面打开
|
||||
* 下载: 下载执行日志
|
||||
|
||||
### 计划任务
|
||||
### 批量上传
|
||||
|
||||
维护计划任务, 定时执行命令。
|
||||
将文件批量上传到远程服务器。
|
||||
|
||||
* 新增: 新增计划任务
|
||||
* 详情: 查看计划任务详情
|
||||
* 修改: 修改计划任务
|
||||
* 状态: 修改计划任务状态
|
||||
* 手动触发: 手动触发计划任务
|
||||
* 删除: 删除计划任务
|
||||
* 重置: 重置表单参数
|
||||
* 返回: 返回到表单页面
|
||||
* 开始上传: 执行文件上传
|
||||
* 取消上传: 取消文件上传
|
||||
* 清空: 清空已选择的文件
|
||||
* 选择文件: 批量选择上传的文件
|
||||
* 选择文件夹: 选择上传的文件夹
|
||||
|
||||
### 计划任务日志
|
||||
> 上传路径可以使用内置变量来替换。
|
||||
|
||||
查看计划任务执行日志
|
||||
| 参数 | 描述 | 参数示例 |
|
||||
|:------------|:------|-------------|
|
||||
| ${username} | 用户名 | admin |
|
||||
| ${home} | 用户家目录 | /home/admin |
|
||||
|
||||
* 清空: 清空执行日志
|
||||
* 删除: 删除执行日志
|
||||
* 命令: 查看执行时的命令
|
||||
* 参数: 查看执行时的参数
|
||||
* 中断: 中断命令执行
|
||||
* 日志: 查看执行日志, ctrl + 左键点击会用新页面打开
|
||||
* 下载: 下载执行日志
|
||||
### 上传任务
|
||||
|
||||
查看批量上传任务列表。
|
||||
|
||||
* 上传: 跳转到批量上传页面
|
||||
* 清空: 清空上传任务
|
||||
* 删除: 删除上传任务
|
||||
* 详情: 查看上传任务详情
|
||||
* 取消: 取消文件上传
|
||||
|
||||
### 执行模板
|
||||
|
||||
@@ -54,7 +62,7 @@
|
||||
* 修改: 修改执行模板
|
||||
* 删除: 删除执行模板
|
||||
|
||||
> 日志面板快捷键
|
||||
### 日志面板快捷键
|
||||
|
||||
* 回车: `Enter`
|
||||
* 向上滚动一行: `↑`
|
||||
@@ -66,27 +74,33 @@
|
||||
* 搜索: `ctrl` `F`
|
||||
* 清空: `ctrl` `L`
|
||||
|
||||
> 命令内置参数
|
||||
### 命令内置参数
|
||||
|
||||
⚡ 使用 `@{{ xxx }}` 来替换命令参数
|
||||
|
||||
| 参数 | 描述 |
|
||||
|:----------------|:--------------------------|
|
||||
| source | 执行来源 (BATCH/JOB) |
|
||||
| sourceId | 执行来源id (JOB特有) |
|
||||
| seq | 执行序列 (JOB特有) |
|
||||
| execId | 执行记录id |
|
||||
| hostId | 执行主机id |
|
||||
| hostName | 执行主机名称 |
|
||||
| hostCode | 执行主机编码 |
|
||||
| hostAddress | 执行主机地址 |
|
||||
| userId | 执行用户id |
|
||||
| username | 执行用户名 |
|
||||
| uuid | 生成任务维度 uuid |
|
||||
| uuidShort | 生成任务维度 uuid 无 '-' |
|
||||
| hostUuid | 生成机器维度 uuid |
|
||||
| hostUuidShort | 生成机器维度 uuid 无 '-' |
|
||||
| timestampMillis | 时间戳毫秒 |
|
||||
| timestamp | 时间戳 |
|
||||
| date | 执行时间 yyyy-MM-dd |
|
||||
| datetime | 执行时间 yyyy-MM-dd HH:mm :ss |
|
||||
| 参数 | 描述 | 参数示例 |
|
||||
|:----------------|:---------------------------|-----------------------------------------------|
|
||||
| source | 执行来源 (BATCH/JOB) | JOB |
|
||||
| sourceId | 执行来源id (JOB特有) | 6 |
|
||||
| seq | 执行序列 (JOB特有) | 920 |
|
||||
| userId | 执行用户id (JOB为0) | 1 |
|
||||
| username | 执行用户名 (JOB为system) | admin |
|
||||
| execId | 执行记录id | 2000 |
|
||||
| hostId | 执行主机id | 1 |
|
||||
| hostName | 执行主机名称 | server-127.0.0.1 |
|
||||
| hostCode | 执行主机编码 | server |
|
||||
| hostAddress | 执行主机地址 | 127.0.0.1 |
|
||||
| hostUsername | 执行主机用户名 | root |
|
||||
| osType | 执行主机系统版本 | LINUX |
|
||||
| port | SSH 端口 | 22 |
|
||||
| charset | SSH 编码集 | UTF-8 |
|
||||
| scriptExec | 是否使用脚本执行 (0否1是) | 1 |
|
||||
| scriptPath | 脚本文件路径 | /root/orion/orion-visor/script/exec_2000_1.sh |
|
||||
| uuid | 生成任务维度 uuid | 82b20e52-cea9-455b-a0b4-e4e25654e22b |
|
||||
| uuidShort | 生成任务维度 uuid 无 '-' | 82b20e52cea9455ba0b4e4e25654e22b |
|
||||
| hostUuid | 生成机器维度 uuid | 2687b09e-1046-4e8d-9cc2-a7e697836b88 |
|
||||
| hostUuidShort | 生成机器维度 uuid 无 '-' | 2687b09e10464e8d9cc2a7e697836b88 |
|
||||
| timestampMillis | 时间戳毫秒 | 1715173200848 |
|
||||
| timestamp | 时间戳 | 1715173200 |
|
||||
| date | 执行时间 `yyyy-MM-dd` | `2024-01-01` |
|
||||
| datetime | 执行时间 `yyyy-MM-dd HH:mm:ss` | `2024-01-01 21:00:00` |
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
|
||||
> 主机设置
|
||||
|
||||
* SSH 配置: 可以自定义配置连接主机的 密码/秘钥/身份, 仅对自己生效, 不会修改全局配置, `秘钥` `身份` 数据是用户授权的资产数据
|
||||
* SSH 配置: 可以自定义配置连接主机的密码、密钥、身份, 仅对自己生效, 不会修改全局配置。`密钥` `身份` 数据是用户授权的资产数据
|
||||
* 标签颜色: 自定义配置标签的颜色, 可以用来区分环境等
|
||||
|
||||
> 顶部状态栏
|
||||
|
||||
26
docs/operator/job.md
Normal file
@@ -0,0 +1,26 @@
|
||||
### 任务列表
|
||||
|
||||
⚡ 内置参数同 `批量执行 > 命令执行` [查看](/operator/exec.md?id=命令内置参数)
|
||||
|
||||
维护计划任务, 定时执行命令。
|
||||
|
||||
* 新增: 新增计划任务
|
||||
* 详情: 查看计划任务详情
|
||||
* 修改: 修改计划任务
|
||||
* 状态: 修改计划任务状态
|
||||
* 手动触发: 手动触发计划任务
|
||||
* 删除: 删除计划任务
|
||||
|
||||
### 任务日志
|
||||
|
||||
查看计划任务执行日志
|
||||
|
||||
⚡ 如果只需要保存日志的原始输出则需要修改 `application.yaml` `app.exec-log.append-ansi` 为 `false`
|
||||
|
||||
* 清空: 清空执行日志
|
||||
* 删除: 删除执行日志
|
||||
* 命令: 查看执行时的命令
|
||||
* 参数: 查看执行时的参数
|
||||
* 中断: 中断命令执行
|
||||
* 日志: 查看执行日志, ctrl + 左键点击会用新页面打开
|
||||
* 下载: 下载执行日志
|
||||
@@ -1,13 +1,15 @@
|
||||
### 所需环境
|
||||
|
||||
* JDK 1.8
|
||||
* Mysql 8.0(+)
|
||||
* Redis 5.0.5(+)
|
||||
* Node 16.16.0(+)
|
||||
* Maven 3.5.4(+)
|
||||
* jdk 1.8
|
||||
* mysql 8.0.+
|
||||
* redis 6.0.+
|
||||
* maven 3.5.+
|
||||
* node 18.12.+
|
||||
* pnpm 9.1.+
|
||||
|
||||
⚡ maven 推荐使用阿里云 mirror
|
||||
⚡ npm 建议使用淘宝镜像 `npm config set registry https://registry.npmmirror.com/`
|
||||
⚡ pnpm 建议使用淘宝镜像 `pnpm config set registry https://registry.npmmirror.com/`
|
||||
|
||||
### 配置
|
||||
|
||||
@@ -15,39 +17,40 @@
|
||||
|
||||
```
|
||||
# github
|
||||
git clone https://github.com/lijiahangmax/orion-ops-pro
|
||||
git clone https://github.com/lijiahangmax/orion-visor
|
||||
# gitee
|
||||
git clone https://gitee.com/lijiahangmax/orion-ops-pro
|
||||
git clone https://gitee.com/lijiahangmax/orion-visor
|
||||
```
|
||||
|
||||
2. 初始化数据库
|
||||
|
||||
```
|
||||
# 执行脚本
|
||||
orion-ops-pro/sql/init-1-schema-databases.sql
|
||||
orion-ops-pro/sql/init-2-schema-tables.sql
|
||||
orion-ops-pro/sql/init-3-data.sql
|
||||
orion-visor/sql/init-1-schema-databases.sql
|
||||
orion-visor/sql/init-2-schema-tables.sql
|
||||
orion-visor/sql/init-3-schema-quartz.sql
|
||||
orion-visor/sql/init-4-data.sql
|
||||
```
|
||||
|
||||
3. 修改后端配置
|
||||
|
||||
```
|
||||
# 修改配置文件 (mysql, redis, secret-key)
|
||||
orion-ops-pro/orion-ops-launch/src/main/resources/application-prod.yaml
|
||||
orion-visor/orion-visor-launch/src/main/resources/application-prod.yaml
|
||||
|
||||
# 进入代码目录
|
||||
cd orion-ops-pro
|
||||
cd orion-visor
|
||||
# 编译
|
||||
mvn -U clean install -DskipTests
|
||||
# 启动
|
||||
com.orion.ops.launch.LaunchApplication
|
||||
com.orion.visor.launch.LaunchApplication
|
||||
```
|
||||
|
||||
4. 修改前端配置
|
||||
|
||||
```
|
||||
# 进入代码目录
|
||||
cd orion-ops-pro/orion-ops-ui
|
||||
cd orion-visor/orion-visor-ui
|
||||
# 下载 pnpm
|
||||
npm i -g pnpm
|
||||
# 下载依赖
|
||||
|
||||
@@ -17,17 +17,26 @@ Dashboard 修改)
|
||||
}
|
||||
```
|
||||
|
||||
### 拉取代码
|
||||
|
||||
```
|
||||
# github
|
||||
git clone https://github.com/lijiahangmax/orion-visor
|
||||
# gitee
|
||||
git clone https://gitee.com/lijiahangmax/orion-visor
|
||||
```
|
||||
|
||||
### 构建镜像
|
||||
|
||||
```
|
||||
# 进入仓库目录
|
||||
cd orion-ops-pro
|
||||
cd orion-visor
|
||||
# 修改 docker-compose.yml (建议修改)
|
||||
# MYSQL_USER mysql 用户名
|
||||
# MYSQL_PASSWORD mysql 用户密码
|
||||
# MYSQL_ROOT_PASSWORD mysql root 密码
|
||||
# REDIS_PASSWORD redis 密码
|
||||
# SECRET_KEY 加密秘钥
|
||||
# SECRET_KEY 加密密钥
|
||||
# 构建
|
||||
docker compose build
|
||||
```
|
||||
@@ -42,10 +51,10 @@ docker compose up -d
|
||||
|
||||
```
|
||||
访问 adminer: http://localhost:8081
|
||||
服务器: orion-ops-pro-db
|
||||
服务器: orion-visor-mysql
|
||||
用户名: root
|
||||
密码: Data@123456
|
||||
数据库: orion-ops-pro
|
||||
数据库: orion-visor
|
||||
|
||||
点击左侧 SQL命令 输入:
|
||||
ALTER USER 'root'@'%' IDENTIFIED WITH mysql_native_password BY 'Data@123456';
|
||||
|
||||
@@ -1,35 +1,34 @@
|
||||
> ##### 1. 数据误删除怎么办?
|
||||
|
||||
数据库的数据都采用了逻辑删除, 可以将已删除的数据中的 `deleted` 字段改为 `0`
|
||||
如果不知道数据是哪一条, 可以查询用户操作日志, 点击 `参数` 寻找操作的id
|
||||
如果不知道数据是哪一条, 可以查询用户操作日志, 点击 `参数` 寻找操作的id
|
||||
|
||||
> ##### 2. 是否支持维护 Windows 主机?
|
||||
> ##### 2. 执行命令时为什么会找不到环境变量?
|
||||
|
||||
支持, 但是 Windows 的 ssh 命令兼容性不好, 一切需要执行ssh命令的地方都不友好
|
||||
如: 批量执行, 调度任务兼容性非常不友好
|
||||
可以在执行命令的第一行设置 `source /etc/profile` 来加载环境变量
|
||||
|
||||
> ##### 3. 执行命令时为什么会找不到环境变量?
|
||||
|
||||
可以在执行命令的第一行设置 `source /etc/profile` 来加载环境变量
|
||||
|
||||
> ##### 4. 命令中途执行失败如何设置中断执行?
|
||||
> ##### 3. 命令中途执行失败如何设置中断执行?
|
||||
|
||||
可以在执行命令的第一行设置 `set -e`
|
||||
作用是: 当执行出现意料之外的情况时, 立即退出
|
||||
作用是: 当执行出现意料之外的情况时, 立即退出
|
||||
|
||||
> ##### 5. 在调度任务、批量执行 命令执行成功的依据是什么?
|
||||
> ##### 4. 在调度任务、批量执行 命令执行成功的依据是什么?
|
||||
|
||||
是获取命令的 `exitcode` 判断是否为 `0` 如果非0则代表命令执行失败
|
||||
同理, 在命令的最后一行设置 `exit 1` 结果将会是失败, 可以用此来中断后续流程
|
||||
同理, 在命令的最后一行设置 `exit 1` 结果将会是失败, 可以用此来中断后续流程
|
||||
|
||||
> ##### 6. 为什么使用秘钥认证还是无法连接机器?
|
||||
> ##### 5. 调度任务、批量执行 的日志文件中如何只保存原始输出?
|
||||
|
||||
修改 `application.yaml` `app.exec-log.append-ansi` 为 `false`
|
||||
|
||||
> ##### 6. 为什么使用密钥认证还是无法连接机器?
|
||||
|
||||
```
|
||||
# 升级 openssh
|
||||
yum update openssh
|
||||
sshd -v (我的版本: OpenSSH_7.4p1, OpenSSL 1.0.2k-fips 26 Jan 2017)
|
||||
|
||||
# 生成秘钥时添加参数 -m PEM
|
||||
# 生成密钥时添加参数 -m PEM
|
||||
ssh-keygen -t rsa -m PEM
|
||||
chmod 700 ~/.ssh
|
||||
chmod 700 ~/.ssh/authorized_keys
|
||||
|
||||
@@ -1,14 +1,16 @@
|
||||
### 所需环境
|
||||
|
||||
* JDK 1.8
|
||||
* Mysql 8.0(+)
|
||||
* Redis 5.0.5(+)
|
||||
* Node 16.16.0(+)
|
||||
* Maven 3.5.4(+)
|
||||
* Nginx
|
||||
* jdk 1.8
|
||||
* mysql 8.0.+
|
||||
* redis 6.0.+
|
||||
* maven 3.5.+
|
||||
* node 18.12.+
|
||||
* pnpm 9.1.+
|
||||
* nginx
|
||||
|
||||
⚡ maven 推荐使用阿里云 mirror
|
||||
⚡ npm 建议使用淘宝镜像 `npm config set registry https://registry.npmmirror.com/`
|
||||
⚡ npm 建议使用淘宝镜像 `npm config set registry https://registry.npmmirror.com/`
|
||||
⚡ pnpm 建议使用淘宝镜像 `pnpm config set registry https://registry.npmmirror.com/`
|
||||
|
||||
### 构建
|
||||
|
||||
@@ -16,28 +18,29 @@
|
||||
|
||||
```
|
||||
# github
|
||||
git clone https://github.com/lijiahangmax/orion-ops-pro
|
||||
git clone https://github.com/lijiahangmax/orion-visor
|
||||
# gitee
|
||||
git clone https://gitee.com/lijiahangmax/orion-ops-pro
|
||||
git clone https://gitee.com/lijiahangmax/orion-visor
|
||||
```
|
||||
|
||||
2. 初始化数据库
|
||||
|
||||
```
|
||||
# 执行脚本
|
||||
orion-ops-pro/sql/init-1-schema-databases.sql
|
||||
orion-ops-pro/sql/init-2-schema-tables.sql
|
||||
orion-ops-pro/sql/init-3-data.sql
|
||||
orion-visor/sql/init-1-schema-databases.sql
|
||||
orion-visor/sql/init-2-schema-tables.sql
|
||||
orion-visor/sql/init-3-schema-quartz.sql
|
||||
orion-visor/sql/init-4-data.sql
|
||||
```
|
||||
|
||||
3. 构建后端代码
|
||||
|
||||
```
|
||||
# 修改配置文件 (mysql, redis, secret-key)
|
||||
orion-ops-pro/orion-ops-launch/src/main/resources/application-prod.yaml
|
||||
orion-visor/orion-visor-launch/src/main/resources/application-prod.yaml
|
||||
|
||||
# 进入代码目录
|
||||
cd orion-ops-pro
|
||||
cd orion-visor
|
||||
# 编译
|
||||
mvn -U clean install -DskipTests
|
||||
```
|
||||
@@ -46,7 +49,7 @@ mvn -U clean install -DskipTests
|
||||
|
||||
```
|
||||
# 进入代码目录
|
||||
cd orion-ops-pro/orion-ops-ui
|
||||
cd orion-visor/orion-visor-ui
|
||||
# 下载 pnpm
|
||||
npm i -g pnpm
|
||||
# 下载依赖
|
||||
@@ -86,16 +89,16 @@ server {
|
||||
try_files $uri $uri/ /index.html;
|
||||
}
|
||||
|
||||
location /orion/api {
|
||||
proxy_pass http://localhost:9200/orion/api;
|
||||
location /orion-visor/api {
|
||||
proxy_pass http://localhost:9200/orion-visor/api;
|
||||
proxy_set_header Host $host;
|
||||
proxy_set_header X-Real-IP $remote_addr;
|
||||
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
||||
proxy_set_header X-Forwarded-Proto $scheme;
|
||||
}
|
||||
|
||||
location /orion/keep-alive {
|
||||
proxy_pass http://localhost:9200/orion/keep-alive;
|
||||
location /orion-visor/keep-alive {
|
||||
proxy_pass http://localhost:9200/orion-visor/keep-alive;
|
||||
proxy_http_version 1.1;
|
||||
proxy_set_header Upgrade $http_upgrade;
|
||||
proxy_set_header Connection "upgrade";
|
||||
@@ -118,10 +121,10 @@ server {
|
||||
### 部署
|
||||
|
||||
```
|
||||
复制 orion-ops-pro/orion-ops-ui/dist 到 /usr/share/nginx/html
|
||||
复制 orion-ops-pro/orion-ops-launch/target/orion-ops-launch.jar 到 /data/orion
|
||||
复制 orion-visor/orion-visor-ui/dist 到 /usr/share/nginx/html
|
||||
复制 orion-visor/orion-visor-launch/target/orion-visor-launch.jar 到 /data/orion
|
||||
# 启动后台服务
|
||||
nohup java -jar orion-ops-launch.jar --spring.profiles.active=prod 2>&1 &
|
||||
nohup java -jar orion-visor-launch.jar --spring.profiles.active=prod 2>&1 &
|
||||
# 启动 nginx
|
||||
service nginx start
|
||||
```
|
||||
|
||||
@@ -90,9 +90,9 @@ CREATE TABLE `exec_template`
|
||||
TRUNCATE `system_menu`;
|
||||
INSERT INTO `system_menu` VALUES (1, 0, '工作台', NULL, 1, 10, 1, 1, 1, 0, 'IconComputer', NULL, 'workplace', '2023-07-28 10:51:50', '2023-09-11 15:27:52', '1', '1', 0);
|
||||
INSERT INTO `system_menu` VALUES (5, 0, '用户设置', NULL, 1, 700, 1, 1, 1, 0, 'icon-user', NULL, '', '2023-07-28 10:55:38', '2024-03-07 19:03:52', '1', '1', 0);
|
||||
INSERT INTO `system_menu` VALUES (8, 0, '项目地址 github', NULL, 1, 1000, 1, 1, 1, 0, 'icon-github', 'https://github.com/lijiahangmax/orion-ops-pro', '', '2023-07-28 11:04:59', '2023-10-12 15:21:22', '1', '1', 0);
|
||||
INSERT INTO `system_menu` VALUES (8, 0, '项目地址 github', NULL, 1, 1000, 1, 1, 1, 0, 'icon-github', 'https://github.com/lijiahangmax/orion-visor', '', '2023-07-28 11:04:59', '2023-10-12 15:21:22', '1', '1', 0);
|
||||
INSERT INTO `system_menu` VALUES (10, 5, '角色管理', NULL, 2, 10, 1, 1, 1, 0, 'IconUserGroup', '', 'role', '2023-07-28 10:55:52', '2024-03-07 19:10:13', '1', '1', 0);
|
||||
INSERT INTO `system_menu` VALUES (11, 0, '项目地址 gitee', NULL, 1, 1010, 1, 1, 1, 0, 'icon-gitlab', 'https://gitee.com/lijiahangmax/orion-ops-pro', '', '2023-08-02 18:08:07', '2023-08-11 18:11:34', '1', '1', 0);
|
||||
INSERT INTO `system_menu` VALUES (11, 0, '项目地址 gitee', NULL, 1, 1010, 1, 1, 1, 0, 'icon-gitlab', 'https://gitee.com/lijiahangmax/orion-visor', '', '2023-08-02 18:08:07', '2023-08-11 18:11:34', '1', '1', 0);
|
||||
INSERT INTO `system_menu` VALUES (12, 0, '系统设置', NULL, 1, 800, 1, 1, 1, 0, 'icon-tool', NULL, '', '2023-08-02 18:24:24', '2024-03-07 19:03:57', '1', '1', 0);
|
||||
INSERT INTO `system_menu` VALUES (13, 12, '系统菜单', '', 2, 10, 1, 1, 1, 0, 'icon-menu', NULL, 'systemMenu', '2023-08-02 18:29:01', '2024-03-07 22:25:00', '1', '1', 0);
|
||||
INSERT INTO `system_menu` VALUES (20, 10, '创建角色', 'infra:system-role:create', 3, 10, 1, 1, 1, 0, NULL, NULL, NULL, '2023-08-15 16:36:54', '2023-10-27 01:20:46', '1', '1', 0);
|
||||
@@ -127,12 +127,12 @@ INSERT INTO `system_menu` VALUES (73, 72, '查询主机身份', 'asset:host-iden
|
||||
INSERT INTO `system_menu` VALUES (74, 72, '创建主机身份', 'asset:host-identity:create', 3, 20, 1, 1, 1, 0, NULL, NULL, NULL, '2023-09-20 11:47:18', '2023-10-27 01:15:14', '1', '1', 0);
|
||||
INSERT INTO `system_menu` VALUES (75, 72, '修改主机身份', 'asset:host-identity:update', 3, 30, 1, 1, 1, 0, NULL, NULL, NULL, '2023-09-20 11:47:18', '2023-10-27 01:15:14', '1', '1', 0);
|
||||
INSERT INTO `system_menu` VALUES (76, 72, '删除主机身份', 'asset:host-identity:delete', 3, 40, 1, 1, 1, 0, NULL, NULL, NULL, '2023-09-20 11:47:18', '2023-10-27 01:15:14', '1', '1', 0);
|
||||
INSERT INTO `system_menu` VALUES (79, 63, '主机秘钥', NULL, 2, 50, 1, 1, 1, 0, 'IconLock', NULL, 'hostKey', '2023-09-20 11:47:18', '2024-03-07 19:09:26', '1', '1', 0);
|
||||
INSERT INTO `system_menu` VALUES (80, 79, '查询主机秘钥', 'asset:host-key:query', 3, 10, 1, 1, 1, 0, NULL, NULL, NULL, '2023-09-20 11:47:18', '2023-10-27 01:15:14', '1', '1', 0);
|
||||
INSERT INTO `system_menu` VALUES (81, 79, '创建主机秘钥', 'asset:host-key:create', 3, 20, 1, 1, 1, 0, NULL, NULL, NULL, '2023-09-20 11:47:18', '2023-10-27 01:15:14', '1', '1', 0);
|
||||
INSERT INTO `system_menu` VALUES (82, 79, '修改主机秘钥', 'asset:host-key:update', 3, 30, 1, 1, 1, 0, NULL, NULL, NULL, '2023-09-20 11:47:18', '2023-10-27 01:15:14', '1', '1', 0);
|
||||
INSERT INTO `system_menu` VALUES (83, 79, '删除主机秘钥', 'asset:host-key:delete', 3, 40, 1, 1, 1, 0, NULL, NULL, NULL, '2023-09-20 11:47:18', '2023-10-27 01:15:14', '1', '1', 0);
|
||||
INSERT INTO `system_menu` VALUES (84, 79, '查询主机秘钥详情', 'asset:host-key:query-detail', 3, 50, 1, 1, 1, 0, NULL, NULL, NULL, '2023-09-20 11:47:18', '2023-11-09 15:52:57', '1', '1', 0);
|
||||
INSERT INTO `system_menu` VALUES (79, 63, '主机密钥', NULL, 2, 50, 1, 1, 1, 0, 'IconLock', NULL, 'hostKey', '2023-09-20 11:47:18', '2024-03-07 19:09:26', '1', '1', 0);
|
||||
INSERT INTO `system_menu` VALUES (80, 79, '查询主机密钥', 'asset:host-key:query', 3, 10, 1, 1, 1, 0, NULL, NULL, NULL, '2023-09-20 11:47:18', '2023-10-27 01:15:14', '1', '1', 0);
|
||||
INSERT INTO `system_menu` VALUES (81, 79, '创建主机密钥', 'asset:host-key:create', 3, 20, 1, 1, 1, 0, NULL, NULL, NULL, '2023-09-20 11:47:18', '2023-10-27 01:15:14', '1', '1', 0);
|
||||
INSERT INTO `system_menu` VALUES (82, 79, '修改主机密钥', 'asset:host-key:update', 3, 30, 1, 1, 1, 0, NULL, NULL, NULL, '2023-09-20 11:47:18', '2023-10-27 01:15:14', '1', '1', 0);
|
||||
INSERT INTO `system_menu` VALUES (83, 79, '删除主机密钥', 'asset:host-key:delete', 3, 40, 1, 1, 1, 0, NULL, NULL, NULL, '2023-09-20 11:47:18', '2023-10-27 01:15:14', '1', '1', 0);
|
||||
INSERT INTO `system_menu` VALUES (84, 79, '查询主机密钥详情', 'asset:host-key:query-detail', 3, 50, 1, 1, 1, 0, NULL, NULL, NULL, '2023-09-20 11:47:18', '2023-11-09 15:52:57', '1', '1', 0);
|
||||
INSERT INTO `system_menu` VALUES (94, 5, '个人中心', NULL, 2, 20, 0, 1, 0, 0, 'IconUser', NULL, 'userInfo', '2023-10-08 18:53:01', '2023-11-02 11:47:34', '1', '1', 0);
|
||||
INSERT INTO `system_menu` VALUES (97, 12, '数据字典项', NULL, 2, 20, 1, 1, 1, 0, 'IconBook', NULL, 'dictKey', '2023-10-17 11:38:13', '2024-03-07 19:10:45', '1', '1', 0);
|
||||
INSERT INTO `system_menu` VALUES (99, 97, '创建字典配置项', 'infra:dict-key:create', 3, 110, 1, 1, 1, 0, NULL, NULL, NULL, '2023-10-17 11:38:13', '2023-10-27 01:16:10', '1', '1', 0);
|
||||
@@ -152,7 +152,7 @@ INSERT INTO `system_menu` VALUES (125, 48, '下线用户会话', 'infra:system-u
|
||||
INSERT INTO `system_menu` VALUES (126, 48, '查询用户登录日志', 'infra:system-user:login-history', 3, 70, 1, 1, 1, 0, NULL, NULL, NULL, '2023-12-27 15:05:37', '2023-12-27 15:07:19', '1', '1', 0);
|
||||
INSERT INTO `system_menu` VALUES (129, 64, '编辑主机分组', 'asset:host-group:update', 3, 100, 1, 1, 1, 0, NULL, NULL, NULL, '2023-11-13 18:16:32', '2023-12-01 01:47:58', '1', '1', 0);
|
||||
INSERT INTO `system_menu` VALUES (133, 144, '主机分组授权', 'asset:host-group:grant', 3, 10, 1, 1, 1, 0, NULL, NULL, NULL, '2023-11-23 18:08:57', '2023-11-30 22:39:53', '1', '1', 0);
|
||||
INSERT INTO `system_menu` VALUES (142, 144, '主机秘钥授权', 'asset:host-key:grant', 3, 20, 1, 1, 1, 0, NULL, NULL, NULL, '2023-11-30 21:06:13', '2023-11-30 22:39:47', '1', '1', 0);
|
||||
INSERT INTO `system_menu` VALUES (142, 144, '主机密钥授权', 'asset:host-key:grant', 3, 20, 1, 1, 1, 0, NULL, NULL, NULL, '2023-11-30 21:06:13', '2023-11-30 22:39:47', '1', '1', 0);
|
||||
INSERT INTO `system_menu` VALUES (143, 144, '主机身份授权', 'asset:host-identity:grant', 3, 30, 1, 1, 1, 0, NULL, NULL, NULL, '2023-11-30 21:06:26', '2023-11-30 22:40:11', '1', '1', 0);
|
||||
INSERT INTO `system_menu` VALUES (144, 63, '资产授权', NULL, 2, 70, 1, 1, 1, 0, 'icon-safe', NULL, 'assetGrant', '2023-11-30 22:38:57', '2023-11-30 22:39:06', '1', '1', 0);
|
||||
INSERT INTO `system_menu` VALUES (145, 0, '主机运维', NULL, 1, 400, 1, 1, 1, 1, 'IconDesktop', NULL, '', '2023-12-04 23:33:25', '2024-03-07 19:03:46', '1', '1', 0);
|
||||
|
||||
@@ -276,9 +276,9 @@ UPDATE operator_log SET module = 'asset:exec-command-log', type = 'exec-command-
|
||||
TRUNCATE `system_menu`;
|
||||
INSERT INTO `system_menu` VALUES (1, 0, '工作台', NULL, 1, 10, 1, 1, 1, 0, 'IconComputer', NULL, 'workplace', '2023-07-28 10:51:50', '2023-09-11 15:27:52', '1', '1', 0);
|
||||
INSERT INTO `system_menu` VALUES (5, 0, '用户设置', NULL, 1, 700, 1, 1, 1, 0, 'icon-user', NULL, 'userModule', '2023-07-28 10:55:38', '2024-04-03 00:56:30', '1', '1', 0);
|
||||
INSERT INTO `system_menu` VALUES (8, 0, '项目地址 github', NULL, 1, 1000, 1, 1, 1, 0, 'icon-github', 'https://github.com/lijiahangmax/orion-ops-pro', '', '2023-07-28 11:04:59', '2023-10-12 15:21:22', '1', '1', 0);
|
||||
INSERT INTO `system_menu` VALUES (8, 0, '项目地址 github', NULL, 1, 1000, 1, 1, 1, 0, 'icon-github', 'https://github.com/lijiahangmax/orion-visor', '', '2023-07-28 11:04:59', '2023-10-12 15:21:22', '1', '1', 0);
|
||||
INSERT INTO `system_menu` VALUES (10, 5, '角色管理', NULL, 2, 10, 1, 1, 1, 0, 'IconUserGroup', '', 'role', '2023-07-28 10:55:52', '2024-03-07 19:10:13', '1', '1', 0);
|
||||
INSERT INTO `system_menu` VALUES (11, 0, '项目地址 gitee', NULL, 1, 1010, 1, 1, 1, 0, 'icon-gitlab', 'https://gitee.com/lijiahangmax/orion-ops-pro', '', '2023-08-02 18:08:07', '2023-08-11 18:11:34', '1', '1', 0);
|
||||
INSERT INTO `system_menu` VALUES (11, 0, '项目地址 gitee', NULL, 1, 1010, 1, 1, 1, 0, 'icon-gitlab', 'https://gitee.com/lijiahangmax/orion-visor', '', '2023-08-02 18:08:07', '2023-08-11 18:11:34', '1', '1', 0);
|
||||
INSERT INTO `system_menu` VALUES (12, 0, '系统设置', NULL, 1, 800, 1, 1, 1, 0, 'icon-tool', NULL, 'systemModule', '2023-08-02 18:24:24', '2024-04-03 00:56:17', '1', '1', 0);
|
||||
INSERT INTO `system_menu` VALUES (13, 12, '系统菜单', '', 2, 10, 1, 1, 1, 0, 'icon-menu', NULL, 'systemMenu', '2023-08-02 18:29:01', '2024-03-07 22:25:00', '1', '1', 0);
|
||||
INSERT INTO `system_menu` VALUES (20, 10, '创建角色', 'infra:system-role:create', 3, 10, 1, 1, 1, 0, NULL, NULL, NULL, '2023-08-15 16:36:54', '2023-10-27 01:20:46', '1', '1', 0);
|
||||
@@ -313,12 +313,12 @@ INSERT INTO `system_menu` VALUES (73, 72, '查询主机身份', 'asset:host-iden
|
||||
INSERT INTO `system_menu` VALUES (74, 72, '创建主机身份', 'asset:host-identity:create', 3, 20, 1, 1, 1, 0, NULL, NULL, NULL, '2023-09-20 11:47:18', '2023-10-27 01:15:14', '1', '1', 0);
|
||||
INSERT INTO `system_menu` VALUES (75, 72, '修改主机身份', 'asset:host-identity:update', 3, 30, 1, 1, 1, 0, NULL, NULL, NULL, '2023-09-20 11:47:18', '2023-10-27 01:15:14', '1', '1', 0);
|
||||
INSERT INTO `system_menu` VALUES (76, 72, '删除主机身份', 'asset:host-identity:delete', 3, 40, 1, 1, 1, 0, NULL, NULL, NULL, '2023-09-20 11:47:18', '2023-10-27 01:15:14', '1', '1', 0);
|
||||
INSERT INTO `system_menu` VALUES (79, 63, '主机秘钥', NULL, 2, 50, 1, 1, 1, 0, 'IconLock', NULL, 'hostKey', '2023-09-20 11:47:18', '2024-03-07 19:09:26', '1', '1', 0);
|
||||
INSERT INTO `system_menu` VALUES (80, 79, '查询主机秘钥', 'asset:host-key:query', 3, 10, 1, 1, 1, 0, NULL, NULL, NULL, '2023-09-20 11:47:18', '2023-10-27 01:15:14', '1', '1', 0);
|
||||
INSERT INTO `system_menu` VALUES (81, 79, '创建主机秘钥', 'asset:host-key:create', 3, 20, 1, 1, 1, 0, NULL, NULL, NULL, '2023-09-20 11:47:18', '2023-10-27 01:15:14', '1', '1', 0);
|
||||
INSERT INTO `system_menu` VALUES (82, 79, '修改主机秘钥', 'asset:host-key:update', 3, 30, 1, 1, 1, 0, NULL, NULL, NULL, '2023-09-20 11:47:18', '2023-10-27 01:15:14', '1', '1', 0);
|
||||
INSERT INTO `system_menu` VALUES (83, 79, '删除主机秘钥', 'asset:host-key:delete', 3, 40, 1, 1, 1, 0, NULL, NULL, NULL, '2023-09-20 11:47:18', '2023-10-27 01:15:14', '1', '1', 0);
|
||||
INSERT INTO `system_menu` VALUES (84, 79, '查询主机秘钥详情', 'asset:host-key:query-detail', 3, 50, 1, 1, 1, 0, NULL, NULL, NULL, '2023-09-20 11:47:18', '2023-11-09 15:52:57', '1', '1', 0);
|
||||
INSERT INTO `system_menu` VALUES (79, 63, '主机密钥', NULL, 2, 50, 1, 1, 1, 0, 'IconLock', NULL, 'hostKey', '2023-09-20 11:47:18', '2024-03-07 19:09:26', '1', '1', 0);
|
||||
INSERT INTO `system_menu` VALUES (80, 79, '查询主机密钥', 'asset:host-key:query', 3, 10, 1, 1, 1, 0, NULL, NULL, NULL, '2023-09-20 11:47:18', '2023-10-27 01:15:14', '1', '1', 0);
|
||||
INSERT INTO `system_menu` VALUES (81, 79, '创建主机密钥', 'asset:host-key:create', 3, 20, 1, 1, 1, 0, NULL, NULL, NULL, '2023-09-20 11:47:18', '2023-10-27 01:15:14', '1', '1', 0);
|
||||
INSERT INTO `system_menu` VALUES (82, 79, '修改主机密钥', 'asset:host-key:update', 3, 30, 1, 1, 1, 0, NULL, NULL, NULL, '2023-09-20 11:47:18', '2023-10-27 01:15:14', '1', '1', 0);
|
||||
INSERT INTO `system_menu` VALUES (83, 79, '删除主机密钥', 'asset:host-key:delete', 3, 40, 1, 1, 1, 0, NULL, NULL, NULL, '2023-09-20 11:47:18', '2023-10-27 01:15:14', '1', '1', 0);
|
||||
INSERT INTO `system_menu` VALUES (84, 79, '查询主机密钥详情', 'asset:host-key:query-detail', 3, 50, 1, 1, 1, 0, NULL, NULL, NULL, '2023-09-20 11:47:18', '2023-11-09 15:52:57', '1', '1', 0);
|
||||
INSERT INTO `system_menu` VALUES (94, 5, '个人中心', NULL, 2, 20, 0, 1, 0, 0, 'IconUser', NULL, 'userInfo', '2023-10-08 18:53:01', '2023-11-02 11:47:34', '1', '1', 0);
|
||||
INSERT INTO `system_menu` VALUES (97, 12, '数据字典项', NULL, 2, 20, 1, 1, 1, 0, 'IconBook', NULL, 'dictKey', '2023-10-17 11:38:13', '2024-03-07 19:10:45', '1', '1', 0);
|
||||
INSERT INTO `system_menu` VALUES (99, 97, '创建字典配置项', 'infra:dict-key:create', 3, 110, 1, 1, 1, 0, NULL, NULL, NULL, '2023-10-17 11:38:13', '2023-10-27 01:16:10', '1', '1', 0);
|
||||
@@ -338,7 +338,7 @@ INSERT INTO `system_menu` VALUES (125, 48, '下线用户会话', 'infra:system-u
|
||||
INSERT INTO `system_menu` VALUES (126, 48, '查询用户登录日志', 'infra:system-user:login-history', 3, 70, 1, 1, 1, 0, NULL, NULL, NULL, '2023-12-27 15:05:37', '2023-12-27 15:07:19', '1', '1', 0);
|
||||
INSERT INTO `system_menu` VALUES (129, 64, '编辑主机分组', 'asset:host-group:update', 3, 100, 1, 1, 1, 0, NULL, NULL, NULL, '2023-11-13 18:16:32', '2023-12-01 01:47:58', '1', '1', 0);
|
||||
INSERT INTO `system_menu` VALUES (133, 144, '主机分组授权', 'asset:host-group:grant', 3, 10, 1, 1, 1, 0, NULL, NULL, NULL, '2023-11-23 18:08:57', '2023-11-30 22:39:53', '1', '1', 0);
|
||||
INSERT INTO `system_menu` VALUES (142, 144, '主机秘钥授权', 'asset:host-key:grant', 3, 20, 1, 1, 1, 0, NULL, NULL, NULL, '2023-11-30 21:06:13', '2023-11-30 22:39:47', '1', '1', 0);
|
||||
INSERT INTO `system_menu` VALUES (142, 144, '主机密钥授权', 'asset:host-key:grant', 3, 20, 1, 1, 1, 0, NULL, NULL, NULL, '2023-11-30 21:06:13', '2023-11-30 22:39:47', '1', '1', 0);
|
||||
INSERT INTO `system_menu` VALUES (143, 144, '主机身份授权', 'asset:host-identity:grant', 3, 30, 1, 1, 1, 0, NULL, NULL, NULL, '2023-11-30 21:06:26', '2023-11-30 22:40:11', '1', '1', 0);
|
||||
INSERT INTO `system_menu` VALUES (144, 63, '资产授权', NULL, 2, 70, 1, 1, 1, 0, 'icon-safe', NULL, 'assetGrant', '2023-11-30 22:38:57', '2023-11-30 22:39:06', '1', '1', 0);
|
||||
INSERT INTO `system_menu` VALUES (145, 0, '主机运维', NULL, 1, 400, 1, 1, 1, 1, 'IconDesktop', NULL, 'hostModule', '2023-12-04 23:33:25', '2024-04-03 00:57:16', '1', '1', 0);
|
||||
|
||||
@@ -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);
|
||||
```
|
||||
|
||||
106
docs/update/v1.0.6.md
Normal file
@@ -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-visor/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-visor', 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`;
|
||||
```
|
||||
111
docs/update/v1.0.7.md
Normal file
@@ -0,0 +1,111 @@
|
||||
## v1.0.7
|
||||
|
||||
> sql 脚本 - DDL
|
||||
|
||||
```sql
|
||||
ALTER TABLE `data_permission` COMMENT = '数据权限表';
|
||||
|
||||
DROP TABLE IF EXISTS `upload_task`;
|
||||
CREATE TABLE `upload_task`
|
||||
(
|
||||
`id` bigint(0) NOT NULL AUTO_INCREMENT COMMENT 'id',
|
||||
`user_id` bigint(0) NULL DEFAULT NULL COMMENT '用户id',
|
||||
`username` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '用户名',
|
||||
`remote_path` varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '远程路径',
|
||||
`description` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '描述',
|
||||
`status` char(16) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '状态',
|
||||
`file_count` int(0) NULL DEFAULT NULL COMMENT '文件数量',
|
||||
`host_count` int(0) NULL DEFAULT NULL COMMENT '主机数量',
|
||||
`extra_info` json NULL COMMENT '额外信息',
|
||||
`start_time` datetime(3) NULL DEFAULT NULL COMMENT '开始时间',
|
||||
`end_time` datetime(3) 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
|
||||
) ENGINE = InnoDB
|
||||
AUTO_INCREMENT = 1
|
||||
CHARACTER SET = utf8mb4
|
||||
COLLATE = utf8mb4_general_ci COMMENT = '上传任务'
|
||||
ROW_FORMAT = Dynamic;
|
||||
|
||||
DROP TABLE IF EXISTS `upload_task_file`;
|
||||
CREATE TABLE `upload_task_file`
|
||||
(
|
||||
`id` bigint(0) NOT NULL AUTO_INCREMENT COMMENT 'id',
|
||||
`task_id` bigint(0) NULL DEFAULT NULL COMMENT '用户id',
|
||||
`host_id` bigint(0) NULL DEFAULT NULL COMMENT '主机id',
|
||||
`file_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '文件id',
|
||||
`file_path` varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '文件路径',
|
||||
`file_size` bigint(0) NULL DEFAULT NULL COMMENT '文件大小',
|
||||
`status` char(16) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '状态',
|
||||
`start_time` datetime(3) NULL DEFAULT NULL COMMENT '开始时间',
|
||||
`end_time` datetime(3) 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_task_id` (`task_id`) USING BTREE
|
||||
) ENGINE = InnoDB
|
||||
AUTO_INCREMENT = 1
|
||||
CHARACTER SET = utf8mb4
|
||||
COLLATE = utf8mb4_general_ci COMMENT = '上传任务文件'
|
||||
ROW_FORMAT = Dynamic;
|
||||
```
|
||||
|
||||
> sql 脚本 - DML
|
||||
|
||||
```sql
|
||||
-- 字典项
|
||||
DELETE FROM `dict_key` WHERE id >= 40;
|
||||
INSERT INTO `dict_key` VALUES (40, 'sftpTransferStatus', 'STRING', '[{\"name\": \"status\", \"type\": \"STRING\"}, {\"name\": \"color\", \"type\": \"COLOR\"}, {\"name\": \"icon\", \"type\": \"STRING\"}]', 'SFTP 传输状态', '2024-05-06 11:54:49', '2024-05-06 11:54:49', '1', '1', 0);
|
||||
INSERT INTO `dict_key` VALUES (41, 'uploadTaskStatus', 'STRING', '[{\"name\": \"color\", \"type\": \"COLOR\"}]', '上传任务状态', '2024-05-07 22:18:48', '2024-05-08 22:06:23', '1', '1', 0);
|
||||
INSERT INTO `dict_key` VALUES (42, 'uploadTaskFileStatus', 'STRING', '[{\"name\": \"status\", \"type\": \"STRING\"}]', '上传任务文件状态', '2024-05-08 10:30:29', '2024-05-10 17:34:13', '1', '1', 0);
|
||||
-- 字典值
|
||||
DELETE FROM `dict_value` WHERE id >= 276;
|
||||
INSERT INTO `dict_value` VALUES (276, 40, 'sftpTransferStatus', 'waiting', '传输中', '{\"icon\": \"icon-clock-circle\", \"color\": \"gray\", \"status\": \"waiting\"}', 10, '2024-05-06 12:00:04', '2024-05-06 12:00:04', '1', '1', 0);
|
||||
INSERT INTO `dict_value` VALUES (277, 40, 'sftpTransferStatus', 'transferring', '传输中', '{\"icon\": \"icon-send\", \"color\": \"arcoblue\", \"status\": \"normal\"}', 20, '2024-05-06 12:01:22', '2024-05-06 12:01:22', '1', '1', 0);
|
||||
INSERT INTO `dict_value` VALUES (278, 40, 'sftpTransferStatus', 'success', '已完成', '{\"icon\": \"icon-check\", \"color\": \"green\", \"status\": \"success\"}', 30, '2024-05-06 12:02:50', '2024-05-06 12:02:50', '1', '1', 0);
|
||||
INSERT INTO `dict_value` VALUES (279, 40, 'sftpTransferStatus', 'error', '传输失败', '{\"icon\": \"icon-close\", \"color\": \"red\", \"status\": \"danger\"}', 40, '2024-05-06 12:03:27', '2024-05-06 12:03:27', '1', '1', 0);
|
||||
INSERT INTO `dict_value` VALUES (280, 41, 'uploadTaskStatus', 'WAITING', '等待中', '{\"color\": \"gray\"}', 10, '2024-05-07 22:18:48', '2024-05-10 11:28:22', '1', '1', 0);
|
||||
INSERT INTO `dict_value` VALUES (281, 41, 'uploadTaskStatus', 'UPLOADING', '上传中', '{\"color\": \"green\"}', 20, '2024-05-07 22:18:48', '2024-05-08 22:25:25', '1', '1', 0);
|
||||
INSERT INTO `dict_value` VALUES (282, 41, 'uploadTaskStatus', 'FINISHED', '已完成', '{\"color\": \"arcoblue\"}', 30, '2024-05-07 22:18:48', '2024-05-08 22:25:50', '1', '1', 0);
|
||||
INSERT INTO `dict_value` VALUES (283, 41, 'uploadTaskStatus', 'CANCELED', '已取消', '{\"color\": \"orange\"}', 50, '2024-05-07 22:18:48', '2024-05-10 11:28:56', '1', '1', 0);
|
||||
INSERT INTO `dict_value` VALUES (284, 42, 'uploadTaskFileStatus', 'WAITING', '等待中', '{\"color\": \"gray\", \"status\": \"normal\"}', 10, '2024-05-08 10:30:29', '2024-05-10 17:35:30', '1', '1', 0);
|
||||
INSERT INTO `dict_value` VALUES (285, 42, 'uploadTaskFileStatus', 'UPLOADING', '上传中', '{\"color\": \"green\", \"status\": \"normal\"}', 20, '2024-05-08 10:30:29', '2024-05-10 17:35:27', '1', '1', 0);
|
||||
INSERT INTO `dict_value` VALUES (286, 42, 'uploadTaskFileStatus', 'FINISHED', '已完成', '{\"color\": \"arcoblue\", \"status\": \"success\"}', 30, '2024-05-08 10:30:29', '2024-05-10 17:35:15', '1', '1', 0);
|
||||
INSERT INTO `dict_value` VALUES (287, 42, 'uploadTaskFileStatus', 'FAILED', '已失败', '{\"color\": \"red\", \"status\": \"danger\"}', 40, '2024-05-08 10:30:29', '2024-05-10 17:34:51', '1', '1', 0);
|
||||
INSERT INTO `dict_value` VALUES (288, 42, 'uploadTaskFileStatus', 'CANCELED', '已取消', '{\"color\": \"orange\", \"status\": \"warning\"}', 50, '2024-05-08 10:30:29', '2024-05-10 17:34:30', '1', '1', 0);
|
||||
INSERT INTO `dict_value` VALUES (289, 1, 'operatorLogModule', 'asset:upload-task', '批量上传', '{}', 2110, '2024-05-08 22:23:01', '2024-05-08 22:23:01', '1', '1', 0);
|
||||
INSERT INTO `dict_value` VALUES (290, 2, 'operatorLogType', 'upload-task:upload', '批量上传文件', '{}', 10, '2024-05-08 22:23:27', '2024-05-08 22:23:27', '1', '1', 0);
|
||||
INSERT INTO `dict_value` VALUES (291, 2, 'operatorLogType', 'upload-task:cancel', '取消上传文件', '{}', 20, '2024-05-08 22:23:36', '2024-05-08 22:23:36', '1', '1', 0);
|
||||
INSERT INTO `dict_value` VALUES (292, 2, 'operatorLogType', 'upload-task:delete', '删除上传记录', '{}', 30, '2024-05-08 22:23:44', '2024-05-08 22:23:44', '1', '1', 0);
|
||||
INSERT INTO `dict_value` VALUES (293, 2, 'operatorLogType', 'upload-task:clear', '清理上传记录', '{}', 40, '2024-05-08 22:23:59', '2024-05-08 22:23:59', '1', '1', 0);
|
||||
INSERT INTO `dict_value` VALUES (294, 41, 'uploadTaskStatus', 'FAILED', '已失败', '{\"color\": \"red\"}', 40, '2024-05-10 11:29:17', '2024-05-10 11:29:17', '1', '1', 0);
|
||||
-- 菜单
|
||||
DELETE FROM `system_menu` WHERE id IN (152, 158, 161, 167, 172, 176, 177, 184, 185) OR id >= 192;
|
||||
INSERT INTO `system_menu` VALUES (152, 0, '运维审计', NULL, 1, 410, 1, 1, 1, 0, 'IconSafe', NULL, 'assetAuditModule', '2024-01-04 17:54:56', '2024-04-28 15:30:04', '1', '1', 0);
|
||||
INSERT INTO `system_menu` VALUES (158, 152, '文件操作日志', NULL, 2, 30, 1, 1, 1, 0, 'IconFile', NULL, 'sftpLog', '2024-03-05 15:30:13', '2024-05-07 11:11:24', '1', '1', 0);
|
||||
INSERT INTO `system_menu` VALUES (161, 176, '执行模板', NULL, 2, 60, 1, 1, 1, 0, 'IconBookmark', NULL, 'execTemplate', '2024-03-07 18:32:41', '2024-04-28 17:14:30', '1', '1', 0);
|
||||
INSERT INTO `system_menu` VALUES (167, 176, '执行日志', NULL, 2, 20, 1, 1, 1, 0, 'icon-history', NULL, 'execCommandLog', '2024-03-13 15:08:23', '2024-04-28 15:36:36', '1', '1', 0);
|
||||
INSERT INTO `system_menu` VALUES (172, 176, '命令执行', NULL, 2, 10, 1, 1, 1, 0, 'icon-thunderbolt', NULL, 'execCommand', '2024-03-13 15:08:23', '2024-05-08 21:58:24', '1', '1', 0);
|
||||
INSERT INTO `system_menu` VALUES (176, 0, '批量执行', NULL, 1, 420, 1, 1, 1, 0, 'icon-relation', NULL, 'execModule', '2024-04-10 16:13:27', '2024-04-28 15:30:31', '1', '1', 0);
|
||||
INSERT INTO `system_menu` VALUES (177, 193, '任务列表', NULL, 2, 10, 1, 1, 1, 0, 'IconUnorderedList', NULL, 'execJob', '2024-04-10 16:13:27', '2024-04-28 15:36:10', '1', '1', 0);
|
||||
INSERT INTO `system_menu` VALUES (184, 193, '任务日志', NULL, 2, 20, 1, 1, 1, 0, 'icon-history', '', 'execJobLog', '2024-04-11 13:40:47', '2024-04-28 15:34:27', '2', '1', 0);
|
||||
INSERT INTO `system_menu` VALUES (185, 193, '计划任务日志新页面', NULL, 2, 30, 0, 1, 0, 1, NULL, NULL, 'execJobLogView', '2024-04-11 13:41:47', '2024-04-28 15:33:33', '2', '1', 0);
|
||||
INSERT INTO `system_menu` VALUES (192, 0, '点个赞~', NULL, 1, 1030, 1, 1, 0, 1, 'IconThumbUp', 'https://github.com/lijiahangmax/orion-visor', NULL, '2024-04-26 11:32:30', '2024-05-06 17:33:16', '1', '1', 0);
|
||||
INSERT INTO `system_menu` VALUES (193, 0, '计划任务', NULL, 1, 430, 1, 1, 1, 0, 'IconCalendarClock', NULL, 'jobModule', '2024-04-28 15:31:24', '2024-04-28 15:32:56', '1', '1', 0);
|
||||
INSERT INTO `system_menu` VALUES (194, 152, '在线会话', NULL, 2, 20, 1, 1, 1, 0, 'IconUserGroup', NULL, 'connectSession', '2024-05-07 11:12:17', '2024-05-07 11:12:35', '1', '1', 0);
|
||||
INSERT INTO `system_menu` VALUES (195, 194, '查询在线会话', 'asset:host-connect-session:management:query', 3, 10, 1, 1, 1, 0, NULL, NULL, NULL, '2024-05-07 11:13:16', '2024-05-07 11:13:16', '1', '1', 0);
|
||||
INSERT INTO `system_menu` VALUES (196, 194, '强制断开连接', 'asset:host-connect-session:management:force-offline', 3, 20, 1, 1, 1, 0, NULL, NULL, NULL, '2024-05-07 11:13:37', '2024-05-07 11:13:37', '1', '1', 0);
|
||||
INSERT INTO `system_menu` VALUES (197, 176, '批量上传', NULL, 2, 40, 1, 1, 1, 0, 'IconUpload', NULL, 'batchUpload', '2024-05-08 22:12:23', '2024-05-08 22:12:23', '1', '1', 0);
|
||||
INSERT INTO `system_menu` VALUES (198, 176, '上传任务', NULL, 2, 50, 1, 1, 1, 0, 'IconCloud', NULL, 'uploadTask', '2024-05-08 22:16:05', '2024-05-10 23:09:58', '1', '1', 0);
|
||||
INSERT INTO `system_menu` VALUES (199, 197, '上传文件', 'asset:upload-task:upload', 3, 10, 1, 1, 1, 0, NULL, NULL, NULL, '2024-05-08 22:19:35', '2024-05-08 22:19:35', '1', '1', 0);
|
||||
INSERT INTO `system_menu` VALUES (200, 198, '查询上传日志', 'asset:upload-task:query', 3, 10, 1, 1, 1, 0, NULL, NULL, NULL, '2024-05-08 22:20:01', '2024-05-08 22:20:01', '1', '1', 0);
|
||||
INSERT INTO `system_menu` VALUES (201, 198, '删除上传日志', 'asset:upload-task:delete', 3, 20, 1, 1, 1, 0, NULL, NULL, NULL, '2024-05-08 22:20:26', '2024-05-08 22:20:26', '1', '1', 0);
|
||||
INSERT INTO `system_menu` VALUES (202, 198, '清理上传日志', 'asset:upload-task:management:clear', 3, 30, 1, 1, 1, 0, NULL, NULL, NULL, '2024-05-08 22:20:37', '2024-05-08 22:20:37', '1', '1', 0);
|
||||
```
|
||||
55
docs/update/v1.0.8.md
Normal file
@@ -0,0 +1,55 @@
|
||||
## v1.0.8
|
||||
|
||||
> sql 脚本 - DDL
|
||||
|
||||
```sql
|
||||
-- 修改字段名称
|
||||
ALTER TABLE `exec_host_log`
|
||||
CHANGE COLUMN `exit_status` `exit_code` int(0) NULL DEFAULT NULL COMMENT '退出码' AFTER `parameter`;
|
||||
|
||||
-- 系统消息
|
||||
DROP TABLE IF EXISTS `system_message`;
|
||||
CREATE TABLE `system_message`
|
||||
(
|
||||
`id` bigint(0) NOT NULL AUTO_INCREMENT COMMENT 'id',
|
||||
`classify` char(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '消息分类',
|
||||
`type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '消息类型',
|
||||
`status` tinyint(0) NULL DEFAULT NULL COMMENT '消息状态',
|
||||
`rel_key` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '消息关联',
|
||||
`title` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标题',
|
||||
`content` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '消息内容',
|
||||
`receiver_id` bigint(0) NULL DEFAULT NULL COMMENT '接收人id',
|
||||
`receiver_username` varchar(32) 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 '修改时间',
|
||||
`deleted` tinyint(1) NULL DEFAULT 0 COMMENT '是否删除 0未删除 1已删除',
|
||||
PRIMARY KEY (`id`) USING BTREE,
|
||||
INDEX `idx_receiver_classify` (`receiver_id`, `classify`) USING BTREE
|
||||
) ENGINE = InnoDB
|
||||
AUTO_INCREMENT = 1
|
||||
CHARACTER SET = utf8mb4
|
||||
COLLATE = utf8mb4_general_ci COMMENT = '系统消息'
|
||||
ROW_FORMAT = Dynamic;
|
||||
```
|
||||
|
||||
> sql 脚本 - DML
|
||||
|
||||
```sql
|
||||
-- 菜单
|
||||
DELETE FROM system_menu WHERE id IN (161, 175, 197, 198) OR id > 202;
|
||||
INSERT INTO `system_menu` VALUES (161, 176, '执行模板', NULL, 2, 50, 1, 1, 1, 0, 'IconBookmark', NULL, 'execTemplate', '2024-03-07 18:32:41', '2024-05-14 15:58:51', '1', '1', 0);
|
||||
INSERT INTO `system_menu` VALUES (197, 176, '批量上传', NULL, 2, 30, 1, 1, 1, 0, 'IconUpload', NULL, 'batchUpload', '2024-05-08 22:12:23', '2024-05-14 15:58:44', '1', '1', 0);
|
||||
INSERT INTO `system_menu` VALUES (198, 176, '上传任务', NULL, 2, 40, 1, 1, 1, 0, 'IconCloud', NULL, 'uploadTask', '2024-05-08 22:16:05', '2024-05-14 15:58:46', '1', '1', 0);
|
||||
|
||||
-- 字典项
|
||||
DELETE FROM dict_key WHERE id >= 43;
|
||||
INSERT INTO `dict_key` VALUES (43, 'messageType', 'STRING', '[{\"name\": \"tagLabel\", \"type\": \"STRING\"}, {\"name\": \"tagVisible\", \"type\": \"STRING\"}, {\"name\": \"tagColor\", \"type\": \"STRING\"}, {\"name\": \"redirectComponent\", \"type\": \"STRING\"}]', '消息类型', '2024-05-13 12:07:56', '2024-05-14 14:48:28', '1', '1', 0);
|
||||
INSERT INTO `dict_key` VALUES (44, 'messageClassify', 'STRING', '[]', '消息分类', '2024-05-13 15:06:27', '2024-05-13 15:06:27', '1', '1', 0);
|
||||
|
||||
-- 字典值
|
||||
DELETE FROM dict_value WHERE id >= 295;
|
||||
INSERT INTO `dict_value` VALUES (295, 43, 'messageType', 'EXEC_FAILED', '执行失败', '{\"tagColor\": \"red\", \"tagLabel\": \"部分失败\", \"tagVisible\": \"true\", \"redirectComponent\": \"execCommand\"}', 10, '2024-05-13 12:07:56', '2024-05-14 15:19:19', '1', '1', 0);
|
||||
INSERT INTO `dict_value` VALUES (296, 43, 'messageType', 'UPLOAD_FAILED', '上传失败', '{\"tagColor\": \"red\", \"tagLabel\": \"部分失败\", \"tagVisible\": \"true\", \"redirectComponent\": \"batchUpload\"}', 20, '2024-05-13 12:07:56', '2024-05-14 15:11:21', '1', '1', 0);
|
||||
INSERT INTO `dict_value` VALUES (297, 44, 'messageClassify', 'NOTICE', '通知', '{}', 10, '2024-05-13 15:06:27', '2024-05-13 15:06:27', '1', '1', 0);
|
||||
INSERT INTO `dict_value` VALUES (298, 44, 'messageClassify', 'TODO', '待办', '{}', 20, '2024-05-13 15:06:27', '2024-05-13 15:06:27', '1', '1', 0);
|
||||
```
|
||||
137
docs/update/v2.0.0.md
Normal file
@@ -0,0 +1,137 @@
|
||||
## v2.0.0
|
||||
|
||||
### ⚡ **本次升级提示 本次更新较大 请仔细查阅** ⚡
|
||||
|
||||
##### 本次升级思路:
|
||||
|
||||
* 先执行以下 **`7`** 个脚本
|
||||
* 容器下线 `docker compose down`
|
||||
* 删除原代码目录 `rm -rf orion-ops-pro`
|
||||
* 克隆改名后的项目 `git clone https://github.com/lijiahangmax/orion-visor.git` or `gitee`
|
||||
* 启动容器 `docker compose up -d`
|
||||
|
||||
```readme
|
||||
sql 在 adminer/navicat 中执行, bash 脚本直接修改后粘贴执行 不要保存为文件执行否则会出错
|
||||
本次升级包含数据库重命名操作。#3 创建新数据库, #4 进行数据迁移, #5 删除旧数据库。
|
||||
[不推荐] 如果不想重命名可以修改 docker-compose.yml, 将 MYSQL_DATABASE 改为 orion-ops-pro 并且跳过步骤 #3 #4 #5
|
||||
```
|
||||
|
||||
> #1 sql 脚本 - DDL
|
||||
|
||||
```sql
|
||||
-- 修改默认值
|
||||
ALTER TABLE `exec_job`
|
||||
MODIFY COLUMN `status` tinyint(0) NULL DEFAULT 0 COMMENT '任务状态' AFTER `parameter_schema`;
|
||||
-- 修改备注
|
||||
ALTER TABLE `host_identity`
|
||||
MODIFY COLUMN `key_id` bigint(0) NULL DEFAULT NULL COMMENT '密钥id' AFTER `password`;
|
||||
-- 修改备注
|
||||
ALTER TABLE `host_key` COMMENT = '主机密钥';
|
||||
```
|
||||
|
||||
> #2 sql 脚本 - DML
|
||||
|
||||
```sql
|
||||
-- 删除 quartz 配置
|
||||
DELETE FROM QRTZ_CRON_TRIGGERS;
|
||||
DELETE FROM QRTZ_TRIGGERS;
|
||||
DELETE FROM QRTZ_JOB_DETAILS;
|
||||
DELETE FROM QRTZ_LOCKS;
|
||||
-- 修改计划任务为停用
|
||||
UPDATE exec_job SET status = 0;
|
||||
-- 菜单
|
||||
DELETE FROM `system_menu` WHERE id IN(8, 11, 79, 80, 81, 82, 83, 84, 142, 191, 192);
|
||||
INSERT INTO `system_menu` VALUES (8, 0, '项目地址 github', NULL, 1, 1000, 1, 1, 1, 0, 'icon-github', 'https://github.com/lijiahangmax/orion-visor', '', '2023-07-28 11:04:59', '2024-05-17 12:57:19', '1', '1', 0);
|
||||
INSERT INTO `system_menu` VALUES (11, 0, '项目地址 gitee', NULL, 1, 1010, 1, 1, 1, 0, 'icon-gitlab', 'https://gitee.com/lijiahangmax/orion-visor', '', '2023-08-02 18:08:07', '2024-05-17 12:57:26', '1', '1', 0);
|
||||
INSERT INTO `system_menu` VALUES (79, 63, '主机密钥', NULL, 2, 50, 1, 1, 1, 0, 'IconLock', NULL, 'hostKey', '2023-09-20 11:47:18', '2024-05-17 12:49:51', '1', '1', 0);
|
||||
INSERT INTO `system_menu` VALUES (80, 79, '查询主机密钥', 'asset:host-key:query', 3, 10, 1, 1, 1, 0, NULL, NULL, NULL, '2023-09-20 11:47:18', '2024-05-17 12:49:54', '1', '1', 0);
|
||||
INSERT INTO `system_menu` VALUES (81, 79, '创建主机密钥', 'asset:host-key:create', 3, 20, 1, 1, 1, 0, NULL, NULL, NULL, '2023-09-20 11:47:18', '2024-05-17 12:49:56', '1', '1', 0);
|
||||
INSERT INTO `system_menu` VALUES (82, 79, '修改主机密钥', 'asset:host-key:update', 3, 30, 1, 1, 1, 0, NULL, NULL, NULL, '2023-09-20 11:47:18', '2024-05-17 12:49:59', '1', '1', 0);
|
||||
INSERT INTO `system_menu` VALUES (83, 79, '删除主机密钥', 'asset:host-key:delete', 3, 40, 1, 1, 1, 0, NULL, NULL, NULL, '2023-09-20 11:47:18', '2024-05-17 12:50:01', '1', '1', 0);
|
||||
INSERT INTO `system_menu` VALUES (84, 79, '查询主机密钥详情', 'asset:host-key:query-detail', 3, 50, 1, 1, 1, 0, NULL, NULL, NULL, '2023-09-20 11:47:18', '2024-05-17 12:50:05', '1', '1', 0);
|
||||
INSERT INTO `system_menu` VALUES (142, 144, '主机密钥授权', 'asset:host-key:grant', 3, 20, 1, 1, 1, 0, NULL, NULL, NULL, '2023-11-30 21:06:13', '2024-05-17 12:50:14', '1', '1', 0);
|
||||
INSERT INTO `system_menu` VALUES (191, 0, '提交bug', NULL, 1, 1020, 1, 1, 0, 1, 'IconBug', 'https://github.com/lijiahangmax/orion-visor/issues', NULL, '2024-04-26 11:30:18', '2024-05-17 12:57:29', '1', '1', 0);
|
||||
INSERT INTO `system_menu` VALUES (192, 0, '点个赞~', NULL, 1, 1030, 1, 1, 0, 1, 'IconThumbUp', 'https://github.com/lijiahangmax/orion-visor', NULL, '2024-04-26 11:32:30', '2024-05-17 12:57:32', '1', '1', 0);
|
||||
-- 字典值
|
||||
DELETE FROM `dict_value` WHERE id IN(23, 62, 93, 94, 95, 122, 131, 132, 135, 137, 139, 140, 174, 271);
|
||||
INSERT INTO `dict_value` VALUES (23, 11, 'hostSshAuthType', 'KEY', '密钥验证', '{}', 20, '2023-10-27 14:29:35', '2024-05-17 12:48:53', '1', '1', 0);
|
||||
INSERT INTO `dict_value` VALUES (62, 1, 'operatorLogModule', 'asset:host-key', '主机密钥', '{}', 2020, '2023-10-31 10:48:17', '2024-05-17 12:48:58', '1', '1', 0);
|
||||
INSERT INTO `dict_value` VALUES (93, 2, 'operatorLogType', 'host-key:create', '创建主机密钥', '{}', 10, '2023-10-31 10:55:43', '2024-05-17 12:49:00', '1', '1', 0);
|
||||
INSERT INTO `dict_value` VALUES (94, 2, 'operatorLogType', 'host-key:update', '修改主机密钥', '{}', 20, '2023-10-31 10:55:43', '2024-05-17 12:49:03', '1', '1', 0);
|
||||
INSERT INTO `dict_value` VALUES (95, 2, 'operatorLogType', 'host-key:delete', '删除主机密钥', '{}', 30, '2023-10-31 10:55:43', '2024-05-17 12:49:06', '1', '1', 0);
|
||||
INSERT INTO `dict_value` VALUES (122, 2, 'operatorLogType', 'host-key:grant', '主机密钥授权', '{}', 40, '2023-11-30 21:03:55', '2024-05-17 12:49:10', '1', '1', 0);
|
||||
INSERT INTO `dict_value` VALUES (131, 21, 'terminalFontFamily', 'Fira Code', 'Fira Code', '{}', 60, '2023-12-11 16:47:04', '2024-05-15 15:27:12', '1', '1', 0);
|
||||
INSERT INTO `dict_value` VALUES (132, 21, 'terminalFontFamily', 'JetBrains Mono', 'JetBrains Mono', '{}', 70, '2023-12-11 16:47:09', '2024-05-15 15:27:16', '1', '1', 0);
|
||||
INSERT INTO `dict_value` VALUES (135, 21, 'terminalFontFamily', 'Consolas', 'Consolas', '{}', 50, '2023-12-11 16:47:28', '2024-05-15 15:26:51', '1', '1', 0);
|
||||
INSERT INTO `dict_value` VALUES (137, 21, 'terminalFontFamily', 'Source Code Pro', 'Source Code Pro', '{}', 80, '2023-12-11 16:47:43', '2024-05-15 15:27:21', '1', '1', 0);
|
||||
INSERT INTO `dict_value` VALUES (139, 21, 'terminalFontFamily', 'Lucida Console', 'Lucida Console', '{}', 30, '2023-12-11 16:47:58', '2024-05-15 15:26:28', '1', '1', 0);
|
||||
INSERT INTO `dict_value` VALUES (140, 21, 'terminalFontFamily', 'Courier', 'Courier', '{}', 40, '2023-12-11 16:48:03', '2024-05-15 15:26:42', '1', '1', 0);
|
||||
INSERT INTO `dict_value` VALUES (174, 26, 'hostExtraSshAuthType', 'CUSTOM_KEY', '自定义', '{}', 20, '2023-12-25 15:48:42', '2024-05-17 12:49:13', '1', '1', 0);
|
||||
INSERT INTO `dict_value` VALUES (271, 37, 'hostIdentityType', 'KEY', '密钥', '{\"color\": \"arcoblue\"}', 20, '2024-04-16 17:18:12', '2024-05-17 12:49:16', '2', '2', 0);
|
||||
```
|
||||
|
||||
> #3 sql 脚本 - 创建数据库 orion_visor
|
||||
|
||||
```sql
|
||||
-- 创建数据库
|
||||
CREATE DATABASE IF NOT EXISTS `orion_visor` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;
|
||||
```
|
||||
|
||||
> #4 bash 脚本 - 数据迁移
|
||||
|
||||
```bash
|
||||
# 可以使用 navicat 的数据迁移功能, 下面描述的是 bash 中执行, 注意下面的变量替换
|
||||
mysql_container_id=ea98e84527f6
|
||||
# 进入容器
|
||||
docker exec -it $mysql_container_id /bin/sh
|
||||
mysql_username=root
|
||||
mysql_password=Data@123456
|
||||
# 导出数据
|
||||
mysqldump -u $mysql_username -p$mysql_password orion-ops-pro > /tmp/orion-ops-pro_dump.sql
|
||||
mysql -u $mysql_username -p$mysql_password orion_visor < /tmp/orion-ops-pro_dump.sql
|
||||
# 等待数据导入完毕 建议在 5min 以上
|
||||
sleep 300
|
||||
# 删除 dump 文件
|
||||
rm -f /tmp/orion-ops-pro_dump.sql
|
||||
# 退出
|
||||
exit
|
||||
```
|
||||
|
||||
> #5 sql 脚本 - 删除数据库
|
||||
|
||||
```sql
|
||||
-- 删除数据库
|
||||
DROP DATABASE `orion-ops-pro`;
|
||||
```
|
||||
|
||||
> #6 bash 脚本 - 修改 nginx 配置
|
||||
|
||||
```bash
|
||||
pro_container_id=41dfd6aff736;
|
||||
# 进入容器
|
||||
docker exec -it $pro_container_id /bin/sh
|
||||
# 修改 nginx 配置
|
||||
sed -i 's/\/orion\//\/orion-visor\//g' /etc/nginx/conf.d/nginx.conf
|
||||
# 重新加载
|
||||
nginx -s reload
|
||||
# 退出
|
||||
exit
|
||||
```
|
||||
|
||||
> #7 bash 脚本 - 工作空间迁移
|
||||
|
||||
```bash
|
||||
# 迁移工作空间
|
||||
mv /data/orion-ops-pro-space /data/orion-visor-space
|
||||
# 迁移 volumes
|
||||
mv /data/orion-visor-space/docker-volumes/orion-ops-pro /data/orion-visor-space/docker-volumes/orion-visor-service
|
||||
mv /data/orion-visor-space/docker-volumes/mysql /data/orion-visor-space/docker-volumes/orion-visor-mysql
|
||||
# redis 的 volumes 直接删除
|
||||
rm -rf /data/orion-visor-space/docker-volumes/redis
|
||||
# 合并 service 文件夹
|
||||
mkdir -p /data/orion-visor-space/docker-volumes/orion-visor-service/root-orion/logs/orion-visor
|
||||
mv /data/orion-visor-space/docker-volumes/orion-visor-service/logs/* /data/orion-visor-space/docker-volumes/orion-visor-service/root-orion/logs/orion-visor
|
||||
rm -rf /data/orion-visor-space/docker-volumes/orion-visor-service/logs
|
||||
mv /data/orion-visor-space/docker-volumes/orion-visor-service/app /data/orion-visor-space/docker-volumes/orion-visor-service/orion-ops-pro
|
||||
mv /data/orion-visor-space/docker-volumes/orion-visor-service/orion-ops-pro /data/orion-visor-space/docker-volumes/orion-visor-service/root-orion
|
||||
```
|
||||
11
docs/update/v2.0.1.md
Normal file
@@ -0,0 +1,11 @@
|
||||
## v2.0.1
|
||||
|
||||
> sql 脚本 - DDL
|
||||
|
||||
```sql
|
||||
```
|
||||
|
||||
> sql 脚本 - DML
|
||||
|
||||
```sql
|
||||
```
|
||||
11
docs/update/v2.0.2.md
Normal file
@@ -0,0 +1,11 @@
|
||||
## v2.0.2
|
||||
|
||||
> sql 脚本 - DDL
|
||||
|
||||
```sql
|
||||
```
|
||||
|
||||
> sql 脚本 - DML
|
||||
|
||||
```sql
|
||||
```
|
||||
@@ -1,10 +1,10 @@
|
||||
{
|
||||
"local": {
|
||||
"baseUrl": "http://127.0.0.1:9200/orion/api",
|
||||
"baseUrl": "http://127.0.0.1:9200/orion-visor/api",
|
||||
"token": "Bearer YQJ3IpwJJv5HujIWY6ZTNDgUxXRY6aDt"
|
||||
},
|
||||
"gateway": {
|
||||
"baseUrl": "http://127.0.0.1:9200/orion/api",
|
||||
"baseUrl": "http://127.0.0.1:9200/orion-visor/api",
|
||||
"token": "Bearer YQJ3IpwJJv5HujIWY6ZTNDgUxXRY6aDt"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,23 +0,0 @@
|
||||
package com.orion.ops.framework.common.constant;
|
||||
|
||||
/**
|
||||
* 项目常量
|
||||
*
|
||||
* @author Jiahang Li
|
||||
* @version 1.0.0
|
||||
* @since 2023/6/19 18:56
|
||||
*/
|
||||
public interface OrionOpsProConst {
|
||||
|
||||
/**
|
||||
* 同 ${orion.version} 迭代时候需要手动更改
|
||||
*/
|
||||
String VERSION = "1.0.4";
|
||||
|
||||
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";
|
||||
|
||||
}
|
||||
@@ -1 +0,0 @@
|
||||
com.orion.ops.framework.common.configuration.OrionCommonAutoConfiguration
|
||||
@@ -1 +0,0 @@
|
||||
com.orion.ops.framework.banner.configuration.OrionBannerAutoConfiguration
|
||||
@@ -1,12 +0,0 @@
|
||||
${AnsiColor.BRIGHT_GREEN} _ ${AnsiColor.BLUE}
|
||||
${AnsiColor.BRIGHT_GREEN} ____ _____(_)___ ____ ____ ____ _____ ${AnsiColor.BLUE} ____ _________
|
||||
${AnsiColor.BRIGHT_GREEN} / __ \/ ___/ / __ \/ __ \ / __ \/ __ \/ ___/ ${AnsiColor.BLUE} / __ \/ ___/ __ \
|
||||
${AnsiColor.BRIGHT_GREEN}/ /_/ / / / / /_/ / / / / / /_/ / /_/ (__ ) ${AnsiColor.BLUE} / /_/ / / / /_/ /
|
||||
${AnsiColor.BRIGHT_GREEN}\____/_/ /_/\____/_/ /_/ \____/ .___/____/ ${AnsiColor.BLUE} / .___/_/ \____/
|
||||
${AnsiColor.BRIGHT_GREEN} /_/ ${AnsiColor.BLUE} /_/
|
||||
|
||||
${AnsiColor.BRIGHT_GREEN}:: Application Name ${AnsiColor.BLUE}${spring.application.name}
|
||||
${AnsiColor.BRIGHT_GREEN}:: Application Version ${AnsiColor.BLUE}${orion.version}
|
||||
${AnsiColor.BRIGHT_GREEN}:: SpringBoot Version ${AnsiColor.BLUE}${spring-boot.version}
|
||||
${AnsiColor.BRIGHT_GREEN}:: Active Profile ${AnsiColor.BLUE}${spring.profiles.active}
|
||||
${AnsiColor.DEFAULT}
|
||||
@@ -1 +0,0 @@
|
||||
com.orion.ops.framework.biz.operator.log.configuration.OrionOperatorLogAutoConfiguration
|
||||
@@ -1 +0,0 @@
|
||||
com.orion.ops.framework.datasource.configuration.OrionDataSourceAutoConfiguration
|
||||
@@ -1 +0,0 @@
|
||||
com.orion.ops.framework.desensitize.configuration.OrionDesensitizeAutoConfiguration
|
||||
@@ -1,2 +0,0 @@
|
||||
com.orion.ops.framework.job.configuration.OrionSchedulerAutoConfiguration
|
||||
com.orion.ops.framework.job.configuration.OrionQuartzAutoConfiguration
|
||||
@@ -1 +0,0 @@
|
||||
com.orion.ops.framework.log.configuration.OrionLogPrinterConfiguration
|
||||
@@ -1 +0,0 @@
|
||||
com.orion.ops.framework.monitor.configuration.OrionAdminAutoConfiguration
|
||||
@@ -1 +0,0 @@
|
||||
com.orion.ops.framework.mybatis.configuration.OrionMybatisAutoConfiguration
|
||||
@@ -1,21 +0,0 @@
|
||||
{
|
||||
"groups": [
|
||||
{
|
||||
"name": "spring.redisson",
|
||||
"type": "com.orion.ops.framework.redis.configuration.config.RedissonConfig",
|
||||
"sourceType": "com.orion.ops.framework.redis.configuration.config.RedissonConfig"
|
||||
}
|
||||
],
|
||||
"properties": [
|
||||
{
|
||||
"name": "spring.redisson.threads",
|
||||
"type": "java.lang.Integer",
|
||||
"description": "任务线程数."
|
||||
},
|
||||
{
|
||||
"name": "spring.redisson.netty-threads",
|
||||
"type": "java.lang.Integer",
|
||||
"description": "netty 线程数."
|
||||
}
|
||||
]
|
||||
}
|
||||
@@ -1,2 +0,0 @@
|
||||
com.orion.ops.framework.redis.configuration.OrionRedisAutoConfiguration
|
||||
com.orion.ops.framework.redis.configuration.OrionCacheAutoConfiguration
|
||||
@@ -1,2 +0,0 @@
|
||||
com.orion.ops.framework.security.configuration.OrionSecurityAutoConfiguration
|
||||
com.orion.ops.framework.security.configuration.OrionCryptoAutoConfiguration
|
||||
@@ -1 +0,0 @@
|
||||
com.orion.ops.framework.storage.configuration.OrionStorageAutoConfiguration
|
||||
@@ -1 +0,0 @@
|
||||
com.orion.ops.framework.swagger.configuration.OrionSwaggerAutoConfiguration
|
||||
@@ -1 +0,0 @@
|
||||
com.orion.ops.framework.web.configuration.OrionWebAutoConfiguration
|
||||
@@ -1 +0,0 @@
|
||||
com.orion.ops.framework.websocket.configuration.OrionWebSocketAutoConfiguration
|
||||
@@ -1,37 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project xmlns="http://maven.apache.org/POM/4.0.0"
|
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<parent>
|
||||
<groupId>com.orion.ops</groupId>
|
||||
<artifactId>orion-ops-pro</artifactId>
|
||||
<version>${revision}</version>
|
||||
</parent>
|
||||
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<artifactId>orion-ops-framework</artifactId>
|
||||
<packaging>pom</packaging>
|
||||
|
||||
<description>项目组件包</description>
|
||||
<url>https://github.com/lijiahangmax/orion-ops-pro</url>
|
||||
|
||||
<modules>
|
||||
<module>orion-ops-framework-common</module>
|
||||
<module>orion-ops-spring-boot-starter-web</module>
|
||||
<module>orion-ops-spring-boot-starter-banner</module>
|
||||
<module>orion-ops-spring-boot-starter-swagger</module>
|
||||
<module>orion-ops-spring-boot-starter-datasource</module>
|
||||
<module>orion-ops-spring-boot-starter-mybatis</module>
|
||||
<module>orion-ops-spring-boot-starter-job</module>
|
||||
<module>orion-ops-spring-boot-starter-websocket</module>
|
||||
<module>orion-ops-spring-boot-starter-redis</module>
|
||||
<module>orion-ops-spring-boot-starter-desensitize</module>
|
||||
<module>orion-ops-spring-boot-starter-log</module>
|
||||
<module>orion-ops-spring-boot-starter-storage</module>
|
||||
<module>orion-ops-spring-boot-starter-security</module>
|
||||
<module>orion-ops-spring-boot-starter-monitor</module>
|
||||
<module>orion-ops-spring-boot-starter-test</module>
|
||||
<module>orion-ops-spring-boot-starter-biz-operator-log</module>
|
||||
</modules>
|
||||
|
||||
</project>
|
||||
@@ -1,99 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project xmlns="http://maven.apache.org/POM/4.0.0"
|
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<parent>
|
||||
<groupId>com.orion.ops</groupId>
|
||||
<artifactId>orion-ops-module-asset</artifactId>
|
||||
<version>${revision}</version>
|
||||
</parent>
|
||||
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<artifactId>orion-ops-module-asset-service</artifactId>
|
||||
<packaging>jar</packaging>
|
||||
|
||||
<description>项目资产模块</description>
|
||||
<url>https://github.com/lijiahangmax/orion-ops-pro</url>
|
||||
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>com.orion.ops</groupId>
|
||||
<artifactId>orion-ops-framework-common</artifactId>
|
||||
</dependency>
|
||||
|
||||
<!-- infra provider -->
|
||||
<dependency>
|
||||
<groupId>com.orion.ops</groupId>
|
||||
<artifactId>orion-ops-module-infra-provider</artifactId>
|
||||
<version>${revision}</version>
|
||||
</dependency>
|
||||
|
||||
<!-- asset provider -->
|
||||
<dependency>
|
||||
<groupId>com.orion.ops</groupId>
|
||||
<artifactId>orion-ops-module-asset-provider</artifactId>
|
||||
<version>${revision}</version>
|
||||
</dependency>
|
||||
|
||||
<!-- web -->
|
||||
<dependency>
|
||||
<groupId>com.orion.ops</groupId>
|
||||
<artifactId>orion-ops-spring-boot-starter-web</artifactId>
|
||||
</dependency>
|
||||
|
||||
<!-- web-socket -->
|
||||
<dependency>
|
||||
<groupId>com.orion.ops</groupId>
|
||||
<artifactId>orion-ops-spring-boot-starter-websocket</artifactId>
|
||||
</dependency>
|
||||
|
||||
<!-- log -->
|
||||
<dependency>
|
||||
<groupId>com.orion.ops</groupId>
|
||||
<artifactId>orion-ops-spring-boot-starter-log</artifactId>
|
||||
</dependency>
|
||||
|
||||
<!-- operator-log -->
|
||||
<dependency>
|
||||
<groupId>com.orion.ops</groupId>
|
||||
<artifactId>orion-ops-spring-boot-starter-biz-operator-log</artifactId>
|
||||
</dependency>
|
||||
|
||||
<!-- desensitize -->
|
||||
<dependency>
|
||||
<groupId>com.orion.ops</groupId>
|
||||
<artifactId>orion-ops-spring-boot-starter-desensitize</artifactId>
|
||||
</dependency>
|
||||
|
||||
<!-- security -->
|
||||
<dependency>
|
||||
<groupId>com.orion.ops</groupId>
|
||||
<artifactId>orion-ops-spring-boot-starter-security</artifactId>
|
||||
</dependency>
|
||||
|
||||
<!-- redis -->
|
||||
<dependency>
|
||||
<groupId>com.orion.ops</groupId>
|
||||
<artifactId>orion-ops-spring-boot-starter-redis</artifactId>
|
||||
</dependency>
|
||||
|
||||
<!-- mybatis -->
|
||||
<dependency>
|
||||
<groupId>com.orion.ops</groupId>
|
||||
<artifactId>orion-ops-spring-boot-starter-mybatis</artifactId>
|
||||
</dependency>
|
||||
|
||||
<!-- storage -->
|
||||
<dependency>
|
||||
<groupId>com.orion.ops</groupId>
|
||||
<artifactId>orion-ops-spring-boot-starter-storage</artifactId>
|
||||
</dependency>
|
||||
|
||||
<!-- job -->
|
||||
<dependency>
|
||||
<groupId>com.orion.ops</groupId>
|
||||
<artifactId>orion-ops-spring-boot-starter-job</artifactId>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
||||
</project>
|
||||
@@ -1,37 +0,0 @@
|
||||
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 org.mapstruct.Mapper;
|
||||
import org.mapstruct.factory.Mappers;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 命令片段分组 内部对象转换器
|
||||
*
|
||||
* @author Jiahang Li
|
||||
* @version 1.0.0
|
||||
* @since 2024-1-24 12:28
|
||||
*/
|
||||
@Mapper
|
||||
public interface CommandSnippetGroupConvert {
|
||||
|
||||
CommandSnippetGroupConvert MAPPER = Mappers.getMapper(CommandSnippetGroupConvert.class);
|
||||
|
||||
CommandSnippetGroupDO to(CommandSnippetGroupCreateRequest request);
|
||||
|
||||
CommandSnippetGroupDO to(CommandSnippetGroupUpdateRequest request);
|
||||
|
||||
CommandSnippetGroupVO to(CommandSnippetGroupDO domain);
|
||||
|
||||
List<CommandSnippetGroupVO> to(List<CommandSnippetGroupDO> list);
|
||||
|
||||
CommandSnippetGroupVO to(CommandSnippetGroupCacheDTO cache);
|
||||
|
||||
CommandSnippetGroupCacheDTO toCache(CommandSnippetGroupDO domain);
|
||||
|
||||
}
|
||||
@@ -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> {
|
||||
|
||||
}
|
||||
@@ -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.HostKeyDO;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
/**
|
||||
* 主机秘钥 Mapper 接口
|
||||
*
|
||||
* @author Jiahang Li
|
||||
* @version 1.0.0
|
||||
* @since 2023-9-20 11:55
|
||||
*/
|
||||
@Mapper
|
||||
public interface HostKeyDAO extends IMapper<HostKeyDO> {
|
||||
|
||||
}
|
||||
@@ -1,38 +0,0 @@
|
||||
package com.orion.ops.module.asset.define.operator;
|
||||
|
||||
import com.orion.ops.framework.biz.operator.log.core.annotation.Module;
|
||||
import com.orion.ops.framework.biz.operator.log.core.factory.InitializingOperatorTypes;
|
||||
import com.orion.ops.framework.biz.operator.log.core.model.OperatorType;
|
||||
|
||||
import static com.orion.ops.framework.biz.operator.log.core.enums.OperatorRiskLevel.H;
|
||||
import static com.orion.ops.framework.biz.operator.log.core.enums.OperatorRiskLevel.L;
|
||||
|
||||
/**
|
||||
* 主机秘钥 操作日志类型
|
||||
*
|
||||
* @author Jiahang Li
|
||||
* @version 1.0.0
|
||||
* @since 2023/10/10 17:30
|
||||
*/
|
||||
@Module("asset:host-key")
|
||||
public class HostKeyOperatorType extends InitializingOperatorTypes {
|
||||
|
||||
public static final String CREATE = "host-key:create";
|
||||
|
||||
public static final String UPDATE = "host-key:update";
|
||||
|
||||
public static final String DELETE = "host-key:delete";
|
||||
|
||||
public static final String GRANT = "host-key:grant";
|
||||
|
||||
@Override
|
||||
public OperatorType[] types() {
|
||||
return new OperatorType[]{
|
||||
new OperatorType(L, CREATE, "创建主机秘钥 <sb>${name}</sb>"),
|
||||
new OperatorType(L, UPDATE, "修改主机秘钥 <sb>${name}</sb>"),
|
||||
new OperatorType(H, DELETE, "删除主机秘钥 <sb>${name}</sb>"),
|
||||
new OperatorType(H, GRANT, "将主机秘钥权限授予 <sb>${grantType}</sb> <sb>${grantName}</sb>"),
|
||||
};
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,24 +0,0 @@
|
||||
package com.orion.ops.module.asset.enums;
|
||||
|
||||
/**
|
||||
* 批量执行来源
|
||||
*
|
||||
* @author Jiahang Li
|
||||
* @version 1.0.0
|
||||
* @since 2024/3/11 16:00
|
||||
*/
|
||||
public enum ExecSourceEnum {
|
||||
|
||||
/**
|
||||
* 批量执行
|
||||
*/
|
||||
BATCH,
|
||||
|
||||
/**
|
||||
* 计划任务
|
||||
*/
|
||||
JOB,
|
||||
|
||||
;
|
||||
|
||||
}
|
||||
@@ -1,213 +0,0 @@
|
||||
package com.orion.ops.module.asset.handler.host.exec.command.handler;
|
||||
|
||||
import com.alibaba.fastjson.JSON;
|
||||
import com.orion.lang.exception.AuthenticationException;
|
||||
import com.orion.lang.exception.ConnectionRuntimeException;
|
||||
import com.orion.lang.exception.argument.InvalidArgumentException;
|
||||
import com.orion.lang.support.timeout.TimeoutChecker;
|
||||
import com.orion.lang.utils.Strings;
|
||||
import com.orion.lang.utils.io.Streams;
|
||||
import com.orion.net.host.SessionStore;
|
||||
import com.orion.net.host.ssh.command.CommandExecutor;
|
||||
import com.orion.ops.framework.common.file.FileClient;
|
||||
import com.orion.ops.module.asset.dao.ExecHostLogDAO;
|
||||
import com.orion.ops.module.asset.entity.domain.ExecHostLogDO;
|
||||
import com.orion.ops.module.asset.enums.ExecHostStatusEnum;
|
||||
import com.orion.ops.module.asset.handler.host.exec.command.dto.ExecCommandHostDTO;
|
||||
import com.orion.ops.module.asset.handler.host.exec.log.manager.ExecLogManager;
|
||||
import com.orion.ops.module.asset.service.HostTerminalService;
|
||||
import com.orion.spring.SpringHolder;
|
||||
import lombok.Getter;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.io.OutputStream;
|
||||
import java.util.Date;
|
||||
import java.util.concurrent.TimeUnit;
|
||||
|
||||
/**
|
||||
* 命令执行器
|
||||
*
|
||||
* @author Jiahang Li
|
||||
* @version 1.0.0
|
||||
* @since 2024/3/12 11:30
|
||||
*/
|
||||
@Slf4j
|
||||
public class ExecCommandHandler implements IExecCommandHandler {
|
||||
|
||||
private final FileClient fileClient = SpringHolder.getBean("logsFileClient");
|
||||
|
||||
private final ExecLogManager execLogManager = SpringHolder.getBean(ExecLogManager.class);
|
||||
|
||||
private final HostTerminalService hostTerminalService = SpringHolder.getBean(HostTerminalService.class);
|
||||
|
||||
private final ExecHostLogDAO execHostLogDAO = SpringHolder.getBean(ExecHostLogDAO.class);
|
||||
|
||||
private final ExecCommandHostDTO execHostCommand;
|
||||
|
||||
private final TimeoutChecker timeoutChecker;
|
||||
|
||||
@Getter
|
||||
private ExecHostStatusEnum status;
|
||||
|
||||
private SessionStore sessionStore;
|
||||
|
||||
private CommandExecutor executor;
|
||||
|
||||
private OutputStream logOutputStream;
|
||||
|
||||
private volatile boolean closed;
|
||||
|
||||
private volatile boolean interrupted;
|
||||
|
||||
public ExecCommandHandler(ExecCommandHostDTO execHostCommand, TimeoutChecker timeoutChecker) {
|
||||
this.status = ExecHostStatusEnum.WAITING;
|
||||
this.execHostCommand = execHostCommand;
|
||||
this.timeoutChecker = timeoutChecker;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void run() {
|
||||
Long id = execHostCommand.getHostLogId();
|
||||
Exception ex = null;
|
||||
log.info("ExecCommandHandler run start id: {}, info: {}", id, JSON.toJSONString(execHostCommand));
|
||||
// 更新状态
|
||||
this.updateStatus(ExecHostStatusEnum.RUNNING, null);
|
||||
try {
|
||||
// 执行命令
|
||||
this.execCommand();
|
||||
log.info("ExecCommandHandler run complete id: {}", id);
|
||||
} catch (Exception e) {
|
||||
log.error("ExecCommandHandler run error id: {}", id, e);
|
||||
ex = e;
|
||||
} finally {
|
||||
Streams.close(this);
|
||||
}
|
||||
// 执行回调
|
||||
if (this.interrupted) {
|
||||
// 中断执行
|
||||
this.updateStatus(ExecHostStatusEnum.INTERRUPTED, null);
|
||||
} else if (ex != null) {
|
||||
// 执行失败
|
||||
this.updateStatus(ExecHostStatusEnum.FAILED, ex);
|
||||
} else if (executor.isTimeout()) {
|
||||
// 更新执行超时
|
||||
this.updateStatus(ExecHostStatusEnum.TIMEOUT, null);
|
||||
} else {
|
||||
// 更新执行完成
|
||||
this.updateStatus(ExecHostStatusEnum.COMPLETED, null);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 执行命令
|
||||
*
|
||||
* @throws IOException IOException
|
||||
*/
|
||||
private void execCommand() throws Exception {
|
||||
// 打开日志流
|
||||
this.logOutputStream = fileClient.getContentOutputStream(execHostCommand.getLogPath());
|
||||
// 打开会话
|
||||
this.sessionStore = hostTerminalService.openSessionStore(execHostCommand.getHostId());
|
||||
this.executor = sessionStore.getCommandExecutor(Strings.replaceCRLF(execHostCommand.getCommand()));
|
||||
// 执行命令
|
||||
executor.timeout(execHostCommand.getTimeout(), TimeUnit.SECONDS, timeoutChecker);
|
||||
executor.merge();
|
||||
executor.transfer(logOutputStream);
|
||||
executor.connect();
|
||||
executor.exec();
|
||||
}
|
||||
|
||||
/**
|
||||
* 更新状态
|
||||
*
|
||||
* @param status status
|
||||
* @param ex ex
|
||||
*/
|
||||
private void updateStatus(ExecHostStatusEnum status, Exception ex) {
|
||||
this.status = status;
|
||||
Long id = execHostCommand.getHostLogId();
|
||||
String statusName = status.name();
|
||||
log.info("ExecCommandHandler.updateStatus start id: {}, status: {}", id, statusName);
|
||||
ExecHostLogDO update = new ExecHostLogDO();
|
||||
update.setId(id);
|
||||
update.setStatus(statusName);
|
||||
if (ExecHostStatusEnum.RUNNING.equals(status)) {
|
||||
// 运行中
|
||||
update.setStartTime(new Date());
|
||||
} else if (ExecHostStatusEnum.COMPLETED.equals(status)) {
|
||||
// 完成
|
||||
update.setFinishTime(new Date());
|
||||
update.setExitStatus(executor.getExitCode());
|
||||
} else if (ExecHostStatusEnum.FAILED.equals(status)) {
|
||||
// 失败
|
||||
update.setFinishTime(new Date());
|
||||
update.setErrorMessage(this.getErrorMessage(ex));
|
||||
} else if (ExecHostStatusEnum.TIMEOUT.equals(status)) {
|
||||
// 超时
|
||||
update.setFinishTime(new Date());
|
||||
} else if (ExecHostStatusEnum.INTERRUPTED.equals(status)) {
|
||||
// 中断
|
||||
update.setFinishTime(new Date());
|
||||
}
|
||||
int effect = execHostLogDAO.updateById(update);
|
||||
log.info("ExecCommandHandler.updateStatus finish id: {}, effect: {}", id, effect);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void write(String msg) {
|
||||
this.executor.write(msg);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void interrupted() {
|
||||
log.info("ExecCommandHandler.interrupted id: {}, interrupted: {}, closed: {}",
|
||||
execHostCommand.getHostLogId(), interrupted, closed);
|
||||
if (this.interrupted || this.closed) {
|
||||
return;
|
||||
}
|
||||
// 关闭
|
||||
this.interrupted = true;
|
||||
this.close();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void close() {
|
||||
log.info("ExecCommandHandler.closed id: {}, closed: {}",
|
||||
execHostCommand.getHostLogId(), closed);
|
||||
if (this.closed) {
|
||||
return;
|
||||
}
|
||||
this.closed = true;
|
||||
Streams.close(logOutputStream);
|
||||
Streams.close(executor);
|
||||
Streams.close(sessionStore);
|
||||
execLogManager.asyncCloseTailFile(execHostCommand.getLogPath());
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取错误信息
|
||||
*
|
||||
* @param ex ex
|
||||
* @return errorMessage
|
||||
*/
|
||||
private String getErrorMessage(Exception ex) {
|
||||
String message;
|
||||
if (ex instanceof InvalidArgumentException) {
|
||||
message = ex.getMessage();
|
||||
} else if (ex instanceof ConnectionRuntimeException) {
|
||||
message = "连接失败";
|
||||
} else if (ex instanceof AuthenticationException) {
|
||||
message = "认证失败";
|
||||
} else {
|
||||
message = "执行失败";
|
||||
}
|
||||
return Strings.retain(message, 250);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Long getHostId() {
|
||||
return execHostCommand.getHostId();
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,27 +0,0 @@
|
||||
package com.orion.ops.module.asset.handler.host.extra.model;
|
||||
|
||||
import com.orion.ops.framework.common.handler.data.model.GenericsDataModel;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
/**
|
||||
* 主机拓展信息 - color 模型
|
||||
*
|
||||
* @author Jiahang Li
|
||||
* @version 1.0.0
|
||||
* @since 2024/2/29 23:16
|
||||
*/
|
||||
@Data
|
||||
@Builder
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
@Schema(name = "HostExtraSshModel", description = "主机拓展信息 - color 模型")
|
||||
public class HostColorExtraModel implements GenericsDataModel {
|
||||
|
||||
@Schema(description = "颜色")
|
||||
private String color;
|
||||
|
||||
}
|
||||
@@ -1,37 +0,0 @@
|
||||
package com.orion.ops.module.asset.handler.host.extra.strategy;
|
||||
|
||||
import com.orion.ops.framework.common.handler.data.strategy.MapDataStrategy;
|
||||
import com.orion.ops.module.asset.handler.host.extra.model.HostColorExtraModel;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
/**
|
||||
* 主机拓展信息 - 颜色 模型处理策略
|
||||
*
|
||||
* @author Jiahang Li
|
||||
* @version 1.0.0
|
||||
* @since 2024/2/29 23:16
|
||||
*/
|
||||
@Component
|
||||
public class HostColorExtraStrategy implements MapDataStrategy<HostColorExtraModel> {
|
||||
|
||||
@Override
|
||||
public HostColorExtraModel getDefault() {
|
||||
return HostColorExtraModel.builder()
|
||||
// 默认透明
|
||||
.color("")
|
||||
.build();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void updateFill(HostColorExtraModel beforeModel, HostColorExtraModel afterModel) {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void preValid(HostColorExtraModel model) {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void valid(HostColorExtraModel model) {
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,399 +0,0 @@
|
||||
package com.orion.ops.module.asset.service.impl;
|
||||
|
||||
import com.alibaba.fastjson.JSON;
|
||||
import com.orion.lang.function.Functions;
|
||||
import com.orion.lang.utils.Refs;
|
||||
import com.orion.lang.utils.collect.Lists;
|
||||
import com.orion.lang.utils.collect.Maps;
|
||||
import com.orion.ops.framework.common.constant.Const;
|
||||
import com.orion.ops.framework.common.utils.TreeUtils;
|
||||
import com.orion.ops.framework.common.utils.Valid;
|
||||
import com.orion.ops.module.asset.convert.HostGroupConvert;
|
||||
import com.orion.ops.module.asset.entity.request.asset.AssetAuthorizedDataQueryRequest;
|
||||
import com.orion.ops.module.asset.entity.vo.*;
|
||||
import com.orion.ops.module.asset.enums.HostConfigTypeEnum;
|
||||
import com.orion.ops.module.asset.enums.HostConnectTypeEnum;
|
||||
import com.orion.ops.module.asset.handler.host.extra.model.HostColorExtraModel;
|
||||
import com.orion.ops.module.asset.service.*;
|
||||
import com.orion.ops.module.infra.api.*;
|
||||
import com.orion.ops.module.infra.constant.DataExtraItems;
|
||||
import com.orion.ops.module.infra.entity.dto.data.DataGroupDTO;
|
||||
import com.orion.ops.module.infra.entity.dto.tag.TagDTO;
|
||||
import com.orion.ops.module.infra.enums.*;
|
||||
import lombok.SneakyThrows;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import java.util.*;
|
||||
import java.util.concurrent.Future;
|
||||
import java.util.function.Function;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
/**
|
||||
* 资产模块 授权数据服务实现类
|
||||
*
|
||||
* @author Jiahang Li
|
||||
* @version 1.0.0
|
||||
* @since 2023/11/30 18:35
|
||||
*/
|
||||
@Slf4j
|
||||
@Service
|
||||
public class AssetAuthorizedDataServiceImpl implements AssetAuthorizedDataService {
|
||||
|
||||
@Resource
|
||||
private DataGroupApi dataGroupApi;
|
||||
|
||||
@Resource
|
||||
private DataGroupRelApi dataGroupRelApi;
|
||||
|
||||
@Resource
|
||||
private DataPermissionApi dataPermissionApi;
|
||||
|
||||
@Resource
|
||||
private SystemUserApi systemUserApi;
|
||||
|
||||
@Resource
|
||||
private HostService hostService;
|
||||
|
||||
@Resource
|
||||
private HostConfigService hostConfigService;
|
||||
|
||||
@Resource
|
||||
private HostKeyService hostKeyService;
|
||||
|
||||
@Resource
|
||||
private HostIdentityService hostIdentityService;
|
||||
|
||||
@Resource
|
||||
private HostConnectLogService hostConnectLogService;
|
||||
|
||||
@Resource
|
||||
private FavoriteApi favoriteApi;
|
||||
|
||||
@Resource
|
||||
private TagRelApi tagRelApi;
|
||||
|
||||
@Resource
|
||||
private DataExtraApi dataExtraApi;
|
||||
|
||||
@Override
|
||||
public List<Long> getAuthorizedDataRelId(DataPermissionTypeEnum type, AssetAuthorizedDataQueryRequest request) {
|
||||
Long userId = request.getUserId();
|
||||
Long roleId = request.getRoleId();
|
||||
Valid.isTrue(userId != null || roleId != null);
|
||||
if (userId != null) {
|
||||
// 查询用户数据
|
||||
return dataPermissionApi.getRelIdListByUserId(type, userId);
|
||||
} else {
|
||||
// 查询角色数据
|
||||
return dataPermissionApi.getRelIdListByRoleId(type, roleId);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<Long> getUserAuthorizedHostId(Long userId, HostConfigTypeEnum type) {
|
||||
final boolean allData = systemUserApi.isAdminUser(userId);
|
||||
if (allData) {
|
||||
// 管理员查询所有
|
||||
return this.getEnabledConfigHostId(true, Maps.empty(), type.name());
|
||||
} else {
|
||||
// 其他用户 查询授权的数据
|
||||
Map<Long, Set<Long>> dataGroupRel = dataGroupRelApi.getGroupRelList(DataGroupTypeEnum.HOST);
|
||||
// 查询配置启用的主机
|
||||
return this.getEnabledConfigHostId(false, dataGroupRel, type.name());
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public AuthorizedHostWrapperVO getUserAuthorizedHost(Long userId, String type) {
|
||||
if (systemUserApi.isAdminUser(userId)) {
|
||||
// 管理员查询所有
|
||||
return this.buildUserAuthorizedHost(userId, null, type);
|
||||
} else {
|
||||
// 其他用户 查询授权的数据
|
||||
List<Long> authorizedIdList = dataPermissionApi.getUserAuthorizedRelIdList(DataPermissionTypeEnum.HOST_GROUP, userId);
|
||||
if (authorizedIdList.isEmpty()) {
|
||||
// 无数据
|
||||
return AuthorizedHostWrapperVO.builder()
|
||||
.groupTree(Lists.empty())
|
||||
.hostList(Lists.empty())
|
||||
.build();
|
||||
}
|
||||
return this.buildUserAuthorizedHost(userId, authorizedIdList, type);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<Long> getUserAuthorizedHostId(Long userId) {
|
||||
// 查询授权的分组
|
||||
List<Long> authorizedIdList = dataPermissionApi.getUserAuthorizedRelIdList(DataPermissionTypeEnum.HOST_GROUP, userId);
|
||||
if (authorizedIdList.isEmpty()) {
|
||||
return Lists.empty();
|
||||
}
|
||||
// 查询分组主机映射
|
||||
Map<Long, Set<Long>> dataGroupRel = dataGroupRelApi.getGroupRelList(DataGroupTypeEnum.HOST);
|
||||
// 返回
|
||||
return authorizedIdList.stream()
|
||||
.map(dataGroupRel::get)
|
||||
.filter(Lists::isNotEmpty)
|
||||
.flatMap(Collection::stream)
|
||||
.distinct()
|
||||
.collect(Collectors.toList());
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<HostKeyVO> getUserAuthorizedHostKey(Long userId) {
|
||||
if (systemUserApi.isAdminUser(userId)) {
|
||||
// 管理员查询所有
|
||||
return hostKeyService.getHostKeyList();
|
||||
} else {
|
||||
// 其他用户 查询授权的数据
|
||||
List<Long> authorizedIdList = dataPermissionApi.getUserAuthorizedRelIdList(DataPermissionTypeEnum.HOST_KEY, userId);
|
||||
if (authorizedIdList.isEmpty()) {
|
||||
return Lists.empty();
|
||||
}
|
||||
// 映射数据
|
||||
Map<Long, HostKeyVO> keys = hostKeyService.getHostKeyList()
|
||||
.stream()
|
||||
.collect(Collectors.toMap(HostKeyVO::getId, Function.identity(), Functions.right()));
|
||||
return authorizedIdList.stream()
|
||||
.map(keys::get)
|
||||
.filter(Objects::nonNull)
|
||||
.collect(Collectors.toList());
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<HostIdentityVO> getUserAuthorizedHostIdentity(Long userId) {
|
||||
if (systemUserApi.isAdminUser(userId)) {
|
||||
// 管理员查询所有
|
||||
return hostIdentityService.getHostIdentityList();
|
||||
} else {
|
||||
// 其他用户 查询授权的数据
|
||||
List<Long> authorizedIdList = dataPermissionApi.getUserAuthorizedRelIdList(DataPermissionTypeEnum.HOST_IDENTITY, userId);
|
||||
if (authorizedIdList.isEmpty()) {
|
||||
return Lists.empty();
|
||||
}
|
||||
// 映射数据
|
||||
Map<Long, HostIdentityVO> identities = hostIdentityService.getHostIdentityList()
|
||||
.stream()
|
||||
.collect(Collectors.toMap(HostIdentityVO::getId, Function.identity(), Functions.right()));
|
||||
return authorizedIdList.stream()
|
||||
.map(identities::get)
|
||||
.filter(Objects::nonNull)
|
||||
.collect(Collectors.toList());
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 构建授权的主机分组树
|
||||
*
|
||||
* @param userId userId
|
||||
* @param authorizedGroupIdList authorizedGroupIdList
|
||||
* @param type type
|
||||
* @return tree
|
||||
*/
|
||||
@SneakyThrows
|
||||
private AuthorizedHostWrapperVO buildUserAuthorizedHost(Long userId, List<Long> authorizedGroupIdList, String type) {
|
||||
final boolean allData = Lists.isEmpty(authorizedGroupIdList);
|
||||
AuthorizedHostWrapperVO wrapper = new AuthorizedHostWrapperVO();
|
||||
// 查询我的收藏
|
||||
Future<List<Long>> favoriteResult = favoriteApi.getFavoriteRelIdListAsync(FavoriteTypeEnum.HOST, userId);
|
||||
// 查询最近连接的主机
|
||||
Future<List<Long>> latestConnectHostIdList = hostConnectLogService.getLatestConnectHostIdAsync(HostConnectTypeEnum.of(type), userId);
|
||||
// 查询主机拓展信息
|
||||
Future<List<Map<Long, String>>> hostExtraResult = dataExtraApi.getExtraItemsValuesByCacheAsync(userId,
|
||||
DataExtraTypeEnum.HOST,
|
||||
Lists.of(DataExtraItems.ALIAS, DataExtraItems.COLOR));
|
||||
// 查询分组
|
||||
List<DataGroupDTO> dataGroup = dataGroupApi.getDataGroupList(DataGroupTypeEnum.HOST);
|
||||
// 查询分组引用
|
||||
Map<Long, Set<Long>> dataGroupRel = dataGroupRelApi.getGroupRelList(DataGroupTypeEnum.HOST);
|
||||
// 查询配置启用的主机
|
||||
List<Long> enabledConfigHostId = this.getEnabledConfigHostId(allData, dataGroupRel, type);
|
||||
// 过滤已经授权的分组
|
||||
if (!allData) {
|
||||
// 构建已授权的分组
|
||||
List<DataGroupDTO> relNodes = new ArrayList<>();
|
||||
TreeUtils.getAllNodes(dataGroup, authorizedGroupIdList, relNodes);
|
||||
dataGroup = new ArrayList<>(new HashSet<>(relNodes));
|
||||
}
|
||||
// 设置主机分组树
|
||||
wrapper.setGroupTree(this.getAuthorizedHostGroupTree(dataGroup));
|
||||
// 设置主机分组下的主机
|
||||
wrapper.setTreeNodes(this.getAuthorizedHostGroupNodes(allData,
|
||||
dataGroup,
|
||||
dataGroupRel,
|
||||
authorizedGroupIdList));
|
||||
// 设置已授权的所有主机
|
||||
wrapper.setHostList(this.getAuthorizedHostList(allData,
|
||||
dataGroup,
|
||||
dataGroupRel,
|
||||
authorizedGroupIdList,
|
||||
enabledConfigHostId));
|
||||
// 设置主机拓展信息
|
||||
this.getAuthorizedHostExtra(wrapper.getHostList(),
|
||||
favoriteResult.get(),
|
||||
hostExtraResult.get());
|
||||
// 设置最近连接的主机
|
||||
wrapper.setLatestHosts(new LinkedHashSet<>(latestConnectHostIdList.get()));
|
||||
return wrapper;
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取已启用配置的 hostId
|
||||
*
|
||||
* @param allData allData
|
||||
* @param dataGroupRel dataGroupRel
|
||||
* @param type type
|
||||
* @return enabledHostIdList
|
||||
*/
|
||||
private List<Long> getEnabledConfigHostId(boolean allData,
|
||||
Map<Long, Set<Long>> dataGroupRel,
|
||||
String type) {
|
||||
List<Long> hostIdList = null;
|
||||
if (!allData) {
|
||||
// 非全部数据从分组映射中获取
|
||||
hostIdList = dataGroupRel.values()
|
||||
.stream()
|
||||
.flatMap(Collection::stream)
|
||||
.distinct()
|
||||
.collect(Collectors.toList());
|
||||
if (hostIdList.isEmpty()) {
|
||||
return Lists.empty();
|
||||
}
|
||||
}
|
||||
// 查询启用配置的主机
|
||||
List<Long> enabledConfigHostId = hostConfigService.getEnabledConfigHostId(type, hostIdList);
|
||||
// 从分组引用中移除
|
||||
dataGroupRel.forEach((k, v) -> v.removeIf(s -> !enabledConfigHostId.contains(s)));
|
||||
return enabledConfigHostId;
|
||||
}
|
||||
|
||||
/**
|
||||
* 构建主机分组树
|
||||
*
|
||||
* @param dataGroup dataGroup
|
||||
* @return tree
|
||||
*/
|
||||
private List<HostGroupTreeVO> getAuthorizedHostGroupTree(List<DataGroupDTO> dataGroup) {
|
||||
List<HostGroupTreeVO> groupList = HostGroupConvert.MAPPER.toList(dataGroup);
|
||||
HostGroupTreeVO rootNode = HostGroupTreeVO.builder()
|
||||
.id(Const.ROOT_PARENT_ID)
|
||||
.sort(Const.DEFAULT_SORT)
|
||||
.build();
|
||||
TreeUtils.buildGroupTree(rootNode, groupList);
|
||||
return rootNode.getChildren();
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取主机分组树 主机节点映射
|
||||
*
|
||||
* @param allData allData
|
||||
* @param dataGroup dataGroup
|
||||
* @param dataGroupRel dataGroupRel
|
||||
* @param authorizedGroupIdList authorizedGroupIdList
|
||||
* @return hostGroupId:hostIdList
|
||||
*/
|
||||
private Map<String, Set<Long>> getAuthorizedHostGroupNodes(boolean allData,
|
||||
List<DataGroupDTO> dataGroup,
|
||||
Map<Long, Set<Long>> dataGroupRel,
|
||||
List<Long> authorizedGroupIdList) {
|
||||
Map<String, Set<Long>> result = new HashMap<>();
|
||||
dataGroup.stream()
|
||||
.map(DataGroupDTO::getId)
|
||||
// 因为可能父菜单没有授权 这里需要判断分组权限
|
||||
.filter(id -> allData || authorizedGroupIdList.contains(id))
|
||||
.forEach(s -> result.put(String.valueOf(s), dataGroupRel.get(s)));
|
||||
return result;
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询已授权的所有主机
|
||||
*
|
||||
* @param allData allData
|
||||
* @param dataGroup dataGroup
|
||||
* @param dataGroupRel dataGroupRel
|
||||
* @param authorizedGroupIdList authorizedGroupIdList
|
||||
* @param enabledConfigHostId enabledConfigHostId
|
||||
* @return hosts
|
||||
*/
|
||||
private List<HostVO> getAuthorizedHostList(boolean allData,
|
||||
List<DataGroupDTO> dataGroup,
|
||||
Map<Long, Set<Long>> dataGroupRel,
|
||||
List<Long> authorizedGroupIdList,
|
||||
List<Long> enabledConfigHostId) {
|
||||
// 查询主机列表
|
||||
List<HostVO> hosts = hostService.getHostListByCache()
|
||||
.stream()
|
||||
.filter(s -> enabledConfigHostId.contains(s.getId()))
|
||||
.collect(Collectors.toList());
|
||||
// 全部数据直接返回
|
||||
if (allData) {
|
||||
return hosts;
|
||||
}
|
||||
Map<Long, HostVO> hostMap = hosts.stream()
|
||||
.collect(Collectors.toMap(HostVO::getId, Function.identity(), Functions.right()));
|
||||
// 仅设置已授权的数据
|
||||
return dataGroup.stream()
|
||||
.map(DataGroupDTO::getId)
|
||||
// 因为可能父菜单没有授权 这里需要判断分组权限
|
||||
.filter(authorizedGroupIdList::contains)
|
||||
.map(dataGroupRel::get)
|
||||
.filter(Lists::isNoneEmpty)
|
||||
.flatMap(Collection::stream)
|
||||
.distinct()
|
||||
.map(hostMap::get)
|
||||
.filter(Objects::nonNull)
|
||||
.collect(Collectors.toList());
|
||||
}
|
||||
|
||||
/**
|
||||
* 设置授权主机的额外参数
|
||||
*
|
||||
* @param hosts hosts
|
||||
* @param favorite favorite
|
||||
* @param extraList extraList
|
||||
*/
|
||||
private void getAuthorizedHostExtra(List<HostVO> hosts,
|
||||
List<Long> favorite,
|
||||
List<Map<Long, String>> extraList) {
|
||||
if (Lists.isEmpty(hosts)) {
|
||||
return;
|
||||
}
|
||||
// 设置收藏结果
|
||||
if (!Lists.isEmpty(favorite)) {
|
||||
hosts.forEach(s -> s.setFavorite(favorite.contains(s.getId())));
|
||||
}
|
||||
List<Long> hostIdList = hosts.stream()
|
||||
.map(HostVO::getId)
|
||||
.collect(Collectors.toList());
|
||||
// 查询 tag 信息
|
||||
List<List<TagDTO>> tags = tagRelApi.getRelTags(TagTypeEnum.HOST, hostIdList);
|
||||
for (int i = 0; i < hosts.size(); i++) {
|
||||
hosts.get(i).setTags(tags.get(i));
|
||||
}
|
||||
// 设置主机别名
|
||||
Map<Long, String> aliasMap = extraList.get(0);
|
||||
if (!Maps.isEmpty(aliasMap)) {
|
||||
hosts.forEach(s -> {
|
||||
String alias = aliasMap.get(s.getId());
|
||||
if (alias != null) {
|
||||
s.setAlias(Refs.unrefToString(alias));
|
||||
}
|
||||
});
|
||||
}
|
||||
// 设置主机颜色
|
||||
Map<Long, String> colorMap = extraList.get(1);
|
||||
if (!Maps.isEmpty(colorMap)) {
|
||||
hosts.forEach(s -> {
|
||||
HostColorExtraModel color = JSON.parseObject(colorMap.get(s.getId()), HostColorExtraModel.class);
|
||||
if (color != null) {
|
||||
s.setColor(color.getColor());
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,158 +0,0 @@
|
||||
package com.orion.ops.module.asset.service.impl;
|
||||
|
||||
import com.alibaba.fastjson.JSON;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.orion.lang.utils.Booleans;
|
||||
import com.orion.ops.framework.common.constant.ErrorMessage;
|
||||
import com.orion.ops.framework.common.utils.Valid;
|
||||
import com.orion.ops.framework.redis.core.utils.RedisMaps;
|
||||
import com.orion.ops.framework.redis.core.utils.barrier.CacheBarriers;
|
||||
import com.orion.ops.framework.security.core.utils.SecurityUtils;
|
||||
import com.orion.ops.module.asset.convert.CommandSnippetGroupConvert;
|
||||
import com.orion.ops.module.asset.dao.CommandSnippetGroupDAO;
|
||||
import com.orion.ops.module.asset.define.cache.CommandSnippetCacheKeyDefine;
|
||||
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.CommandSnippetGroupDeleteRequest;
|
||||
import com.orion.ops.module.asset.entity.request.command.CommandSnippetGroupUpdateRequest;
|
||||
import com.orion.ops.module.asset.entity.vo.CommandSnippetGroupVO;
|
||||
import com.orion.ops.module.asset.service.CommandSnippetGroupService;
|
||||
import com.orion.ops.module.asset.service.CommandSnippetService;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import java.util.Comparator;
|
||||
import java.util.List;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
/**
|
||||
* 命令片段分组 服务实现类
|
||||
*
|
||||
* @author Jiahang Li
|
||||
* @version 1.0.0
|
||||
* @since 2024-1-24 12:28
|
||||
*/
|
||||
@Slf4j
|
||||
@Service
|
||||
public class CommandSnippetGroupServiceImpl implements CommandSnippetGroupService {
|
||||
|
||||
@Resource
|
||||
private CommandSnippetGroupDAO commandSnippetGroupDAO;
|
||||
|
||||
@Resource
|
||||
private CommandSnippetService commandSnippetService;
|
||||
|
||||
@Override
|
||||
public Long createCommandSnippetGroup(CommandSnippetGroupCreateRequest request) {
|
||||
Long userId = SecurityUtils.getLoginUserId();
|
||||
log.info("CommandSnippetGroupService-createCommandSnippetGroup request: {}", JSON.toJSONString(request));
|
||||
// 转换
|
||||
CommandSnippetGroupDO record = CommandSnippetGroupConvert.MAPPER.to(request);
|
||||
record.setUserId(userId);
|
||||
// 查询数据是否冲突
|
||||
this.checkCommandSnippetGroupPresent(record);
|
||||
// 插入
|
||||
int effect = commandSnippetGroupDAO.insert(record);
|
||||
Long id = record.getId();
|
||||
log.info("CommandSnippetGroupService-createCommandSnippetGroup id: {}, effect: {}", id, effect);
|
||||
// 删除缓存
|
||||
String cacheKey = CommandSnippetCacheKeyDefine.SNIPPET_GROUP.format(userId);
|
||||
RedisMaps.delete(cacheKey);
|
||||
return id;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Integer updateCommandSnippetGroupById(CommandSnippetGroupUpdateRequest request) {
|
||||
Long id = Valid.notNull(request.getId(), ErrorMessage.ID_MISSING);
|
||||
log.info("CommandSnippetGroupService-updateCommandSnippetGroupById id: {}, request: {}", id, JSON.toJSONString(request));
|
||||
// 查询
|
||||
CommandSnippetGroupDO record = commandSnippetGroupDAO.selectById(id);
|
||||
Valid.notNull(record, ErrorMessage.DATA_ABSENT);
|
||||
// 转换
|
||||
CommandSnippetGroupDO updateRecord = CommandSnippetGroupConvert.MAPPER.to(request);
|
||||
updateRecord.setUserId(record.getUserId());
|
||||
// 查询数据是否冲突
|
||||
this.checkCommandSnippetGroupPresent(updateRecord);
|
||||
// 更新
|
||||
int effect = commandSnippetGroupDAO.updateById(updateRecord);
|
||||
log.info("CommandSnippetGroupService-updateCommandSnippetGroupById effect: {}", effect);
|
||||
// 删除缓存
|
||||
String cacheKey = CommandSnippetCacheKeyDefine.SNIPPET_GROUP.format(record.getUserId());
|
||||
RedisMaps.delete(cacheKey);
|
||||
return effect;
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<CommandSnippetGroupVO> getCommandSnippetGroupList() {
|
||||
Long userId = SecurityUtils.getLoginUserId();
|
||||
// 查询缓存
|
||||
String cacheKey = CommandSnippetCacheKeyDefine.SNIPPET_GROUP.format(userId);
|
||||
List<CommandSnippetGroupCacheDTO> list = RedisMaps.valuesJson(cacheKey, CommandSnippetCacheKeyDefine.SNIPPET_GROUP);
|
||||
if (list.isEmpty()) {
|
||||
// 查询数据库
|
||||
list = commandSnippetGroupDAO.of()
|
||||
.createWrapper()
|
||||
.eq(CommandSnippetGroupDO::getUserId, userId)
|
||||
.then()
|
||||
.list(CommandSnippetGroupConvert.MAPPER::toCache);
|
||||
// 设置屏障 防止穿透
|
||||
CacheBarriers.checkBarrier(list, CommandSnippetGroupCacheDTO::new);
|
||||
// 设置缓存
|
||||
RedisMaps.putAllJson(cacheKey, s -> s.getId().toString(), list);
|
||||
}
|
||||
// 删除屏障
|
||||
CacheBarriers.removeBarrier(list);
|
||||
// 转换
|
||||
return list.stream()
|
||||
.map(CommandSnippetGroupConvert.MAPPER::to)
|
||||
.sorted(Comparator.comparing(CommandSnippetGroupVO::getId))
|
||||
.collect(Collectors.toList());
|
||||
}
|
||||
|
||||
@Override
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public Integer deleteCommandSnippetGroup(CommandSnippetGroupDeleteRequest request) {
|
||||
Long id = request.getId();
|
||||
log.info("CommandSnippetGroupService-deleteCommandSnippetGroupById id: {}", id);
|
||||
// 检查数据是否存在
|
||||
CommandSnippetGroupDO record = commandSnippetGroupDAO.selectById(id);
|
||||
Valid.notNull(record, ErrorMessage.DATA_ABSENT);
|
||||
Long userId = record.getUserId();
|
||||
// 删除
|
||||
int effect = commandSnippetGroupDAO.deleteById(id);
|
||||
log.info("CommandSnippetGroupService-deleteCommandSnippetGroupById id: {}, effect: {}", id, effect);
|
||||
if (Booleans.isTrue(request.getDeleteItem())) {
|
||||
// 删除组内数据
|
||||
commandSnippetService.deleteByGroupId(userId, id);
|
||||
} else {
|
||||
// 移动到根节点
|
||||
commandSnippetService.setGroupNull(userId, id);
|
||||
}
|
||||
// 删除缓存
|
||||
String cacheKey = CommandSnippetCacheKeyDefine.SNIPPET_GROUP.format(userId);
|
||||
RedisMaps.delete(cacheKey, id);
|
||||
return effect;
|
||||
}
|
||||
|
||||
/**
|
||||
* 检查对象是否存在
|
||||
*
|
||||
* @param domain domain
|
||||
*/
|
||||
private void checkCommandSnippetGroupPresent(CommandSnippetGroupDO domain) {
|
||||
// 构造条件
|
||||
LambdaQueryWrapper<CommandSnippetGroupDO> wrapper = commandSnippetGroupDAO.wrapper()
|
||||
// 更新时忽略当前记录
|
||||
.ne(CommandSnippetGroupDO::getId, domain.getId())
|
||||
// 用其他字段做重复校验
|
||||
.eq(CommandSnippetGroupDO::getUserId, domain.getUserId())
|
||||
.eq(CommandSnippetGroupDO::getName, domain.getName());
|
||||
// 检查是否存在
|
||||
boolean present = commandSnippetGroupDAO.of(wrapper).present();
|
||||
Valid.isFalse(present, ErrorMessage.DATA_PRESENT);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,86 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project xmlns="http://maven.apache.org/POM/4.0.0"
|
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<parent>
|
||||
<groupId>com.orion.ops</groupId>
|
||||
<artifactId>orion-ops-module-infra</artifactId>
|
||||
<version>${revision}</version>
|
||||
</parent>
|
||||
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<artifactId>orion-ops-module-infra-service</artifactId>
|
||||
<packaging>jar</packaging>
|
||||
|
||||
<description>项目基建模块 用户 菜单 日志等</description>
|
||||
<url>https://github.com/lijiahangmax/orion-ops-pro</url>
|
||||
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>com.orion.ops</groupId>
|
||||
<artifactId>orion-ops-framework-common</artifactId>
|
||||
</dependency>
|
||||
|
||||
<!-- infra provider -->
|
||||
<dependency>
|
||||
<groupId>com.orion.ops</groupId>
|
||||
<artifactId>orion-ops-module-infra-provider</artifactId>
|
||||
<version>${revision}</version>
|
||||
</dependency>
|
||||
|
||||
<!-- web -->
|
||||
<dependency>
|
||||
<groupId>com.orion.ops</groupId>
|
||||
<artifactId>orion-ops-spring-boot-starter-web</artifactId>
|
||||
</dependency>
|
||||
|
||||
<!-- log -->
|
||||
<dependency>
|
||||
<groupId>com.orion.ops</groupId>
|
||||
<artifactId>orion-ops-spring-boot-starter-log</artifactId>
|
||||
</dependency>
|
||||
|
||||
<!-- operator-log -->
|
||||
<dependency>
|
||||
<groupId>com.orion.ops</groupId>
|
||||
<artifactId>orion-ops-spring-boot-starter-biz-operator-log</artifactId>
|
||||
</dependency>
|
||||
|
||||
<!-- desensitize -->
|
||||
<dependency>
|
||||
<groupId>com.orion.ops</groupId>
|
||||
<artifactId>orion-ops-spring-boot-starter-desensitize</artifactId>
|
||||
</dependency>
|
||||
|
||||
<!-- security -->
|
||||
<dependency>
|
||||
<groupId>com.orion.ops</groupId>
|
||||
<artifactId>orion-ops-spring-boot-starter-security</artifactId>
|
||||
</dependency>
|
||||
|
||||
<!-- redis -->
|
||||
<dependency>
|
||||
<groupId>com.orion.ops</groupId>
|
||||
<artifactId>orion-ops-spring-boot-starter-redis</artifactId>
|
||||
</dependency>
|
||||
|
||||
<!-- mybatis -->
|
||||
<dependency>
|
||||
<groupId>com.orion.ops</groupId>
|
||||
<artifactId>orion-ops-spring-boot-starter-mybatis</artifactId>
|
||||
</dependency>
|
||||
|
||||
<!-- storage -->
|
||||
<dependency>
|
||||
<groupId>com.orion.ops</groupId>
|
||||
<artifactId>orion-ops-spring-boot-starter-storage</artifactId>
|
||||
</dependency>
|
||||
|
||||
<!-- test -->
|
||||
<dependency>
|
||||
<groupId>com.orion.ops</groupId>
|
||||
<artifactId>orion-ops-spring-boot-starter-test</artifactId>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
||||
</project>
|
||||