Compare commits
37 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
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 |
25
README.md
25
README.md
@@ -3,7 +3,7 @@
|
||||
</h1>
|
||||
|
||||
`orion-ops-pro`
|
||||
是一款现代化、高颜值的一站式智能运维管理平台，集资产管理、资产授权、批量执行、计划任务、WebShell、WebSftp、角色管理、系统管理等功能于一体，致力于简化运维团队的治理工作。
|
||||
是一款现代化、高颜值的一站式智能运维管理平台，集资产管理、资产授权、批量执行、批量上传、计划任务、WebShell、WebSftp、角色管理、系统管理等功能于一体，致力于简化运维团队的治理工作。
|
||||
|
||||
<p style="text-align: left">
|
||||
<a target="_blank" style="text-decoration: none" href="https://app.codacy.com/gh/lijiahangmax/orion-ops-pro/dashboard?utm_source=gh&utm_medium=referral&utm_content=&utm_campaign=Badge_grade">
|
||||
@@ -26,11 +26,11 @@
|
||||
</a>
|
||||
</p>
|
||||
|
||||
当前版本: **1.0.6**
|
||||
当前版本: **1.0.8**
|
||||
|
||||
**github:** https://github.com/lijiahangmax/orion-ops-pro
|
||||
**gitee:** https://gitee.com/lijiahangmax/orion-ops-pro
|
||||
**文档:** https://lijiahangmax.gitee.io/orion-ops-pro/#/
|
||||
**文档:** https://lijiahangmax.github.io/orion-ops-pro/#/
|
||||
**demo:** http://101.43.254.243:1081/
|
||||
|
||||
演示账号: `admin`
|
||||
@@ -47,17 +47,17 @@
|
||||
* **权限控制**: 全面管理用户角色, 支持动态菜单配置和强制下线等功能。
|
||||
* **在线终端**: 提供便捷的在线 Web 终端服务, 支持快捷命令、自定义快捷键和主题风格。
|
||||
* **文件管理**: 实现远程主机大文件的批量上传、下载和在线编辑等操作。
|
||||
* **批量操作**: 支持远程主机批量执行主机命令。
|
||||
* **批量操作**: 支持远程主机批量执行主机命令、多主机文件分发。
|
||||
* **计划任务**: 支持配置 cron 表达式, 定时执行主机命令。
|
||||
* **操作审计**: 记录用户操作日志，确保操作可追溯, 提高系统安全性。
|
||||
|
||||
## 快速开始
|
||||
|
||||
* [docker安装](https://lijiahangmax.gitee.io/orion-ops-pro/#/quickstart/docker-install)
|
||||
* [普通安装](https://lijiahangmax.gitee.io/orion-ops-pro/#/quickstart/install)
|
||||
* [更新日志](https://lijiahangmax.gitee.io/orion-ops-pro/#/about/change-log)
|
||||
* [操作手册](https://lijiahangmax.gitee.io/orion-ops-pro/#/operator/asset)
|
||||
* [常见问题](https://lijiahangmax.gitee.io/orion-ops-pro/#/quickstart/faq)
|
||||
* [docker安装](https://lijiahangmax.github.io/orion-ops-pro/#/quickstart/docker-install)
|
||||
* [普通安装](https://lijiahangmax.github.io/orion-ops-pro/#/quickstart/install)
|
||||
* [更新日志](https://lijiahangmax.github.io/orion-ops-pro/#/about/change-log)
|
||||
* [操作手册](https://lijiahangmax.github.io/orion-ops-pro/#/operator/asset)
|
||||
* [常见问题](https://lijiahangmax.github.io/orion-ops-pro/#/quickstart/faq)
|
||||
|
||||
## 技术栈
|
||||
|
||||
@@ -84,10 +84,15 @@
|
||||
|
||||
|
||||
|
||||
> 批量上传
|
||||
|
||||
|
||||
|
||||
|
||||
> 计划任务
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
> 用户管理
|
||||
|
||||
|
||||
@@ -1,11 +1,12 @@
|
||||
version: '3.3'
|
||||
services:
|
||||
orion-ops-pro:
|
||||
image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-ops-pro:1.0.6
|
||||
image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-ops-pro:1.0.8
|
||||
ports:
|
||||
- 1081:80
|
||||
environment:
|
||||
- MYSQL_HOST=orion-ops-pro-db
|
||||
- MYSQL_PORT=3306
|
||||
- MYSQL_USER=orion
|
||||
- MYSQL_PASSWORD=Data@123456
|
||||
- REDIS_HOST=orion-ops-pro-redis
|
||||
@@ -18,9 +19,7 @@ services:
|
||||
- orion-ops-pro-db
|
||||
- orion-ops-pro-redis
|
||||
orion-ops-pro-db:
|
||||
build:
|
||||
context: .
|
||||
dockerfile: docker/mysql/Dockerfile
|
||||
image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-ops-pro-mysql:1.0.8
|
||||
privileged: true
|
||||
ports:
|
||||
- 3307:3306
|
||||
|
||||
@@ -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/mysql/build.sh
Normal file
7
docker/mysql/build.sh
Normal file
@@ -0,0 +1,7 @@
|
||||
#/bin/bash
|
||||
version=1.0.8
|
||||
cp -r ../../sql ./sql
|
||||
docker build -t orion-ops-pro-mysql:${version} .
|
||||
rm -rf ./sql
|
||||
docker tag orion-ops-pro-mysql:${version} registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-ops-pro-mysql:${version}
|
||||
docker push registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-ops-pro-mysql:${version}
|
||||
@@ -1,3 +1,9 @@
|
||||
mv ../../orion-ops-launch/target/orion-ops-launch.jar ./
|
||||
#/bin/bash
|
||||
version=1.0.8
|
||||
mv ../../orion-ops-launch/target/orion-ops-launch.jar ./orion-ops-launch.jar
|
||||
mv ../../orion-ops-ui/dist ./dist
|
||||
docker build -t orion-ops-pro:1.0.6 .
|
||||
docker build -t orion-ops-pro:${version} .
|
||||
rm -f ./orion-ops-launch.jar
|
||||
rm -rf ./dist
|
||||
docker tag orion-ops-pro:${version} registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-ops-pro:${version}
|
||||
docker push registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-ops-pro:${version}
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
</h1>
|
||||
|
||||
`orion-ops-pro`
|
||||
是一款现代化、高颜值的一站式智能运维管理平台，集资产管理、资产授权、批量执行、计划任务、WebShell、WebSftp、角色管理、系统管理等功能于一体，致力于简化运维团队的治理工作。
|
||||
是一款现代化、高颜值的一站式智能运维管理平台，集资产管理、资产授权、批量执行、批量上传、计划任务、WebShell、WebSftp、角色管理、系统管理等功能于一体，致力于简化运维团队的治理工作。
|
||||
|
||||
<p style="text-align: left">
|
||||
<a target="_blank" style="text-decoration: none" href="https://app.codacy.com/gh/lijiahangmax/orion-ops-pro/dashboard?utm_source=gh&utm_medium=referral&utm_content=&utm_campaign=Badge_grade">
|
||||
@@ -26,11 +26,11 @@
|
||||
</a>
|
||||
</p>
|
||||
|
||||
当前版本: **1.0.6**
|
||||
当前版本: **1.0.8**
|
||||
|
||||
**github:** https://github.com/lijiahangmax/orion-ops-pro
|
||||
**gitee:** https://gitee.com/lijiahangmax/orion-ops-pro
|
||||
**文档:** https://lijiahangmax.gitee.io/orion-ops-pro/#/
|
||||
**文档:** https://lijiahangmax.github.io/orion-ops-pro/#/
|
||||
**demo:** http://101.43.254.243:1081/
|
||||
|
||||
演示账号: `admin`
|
||||
@@ -47,17 +47,17 @@
|
||||
* **权限控制**: 全面管理用户角色, 支持动态菜单配置和强制下线等功能。
|
||||
* **在线终端**: 提供便捷的在线 Web 终端服务, 支持快捷命令、自定义快捷键和主题风格。
|
||||
* **文件管理**: 实现远程主机大文件的批量上传、下载和在线编辑等操作。
|
||||
* **批量操作**: 支持远程主机批量执行主机命令。
|
||||
* **批量操作**: 支持远程主机批量执行主机命令、多主机文件分发。
|
||||
* **计划任务**: 支持配置 cron 表达式, 定时执行主机命令。
|
||||
* **操作审计**: 记录用户操作日志，确保操作可追溯, 提高系统安全性。
|
||||
|
||||
## 快速开始
|
||||
|
||||
* [docker安装](https://lijiahangmax.gitee.io/orion-ops-pro/#/quickstart/docker-install)
|
||||
* [普通安装](https://lijiahangmax.gitee.io/orion-ops-pro/#/quickstart/install)
|
||||
* [更新日志](https://lijiahangmax.gitee.io/orion-ops-pro/#/about/change-log)
|
||||
* [操作手册](https://lijiahangmax.gitee.io/orion-ops-pro/#/operator/asset)
|
||||
* [常见问题](https://lijiahangmax.gitee.io/orion-ops-pro/#/quickstart/faq)
|
||||
* [docker安装](/quickstart/docker-install)
|
||||
* [普通安装](/quickstart/install)
|
||||
* [更新日志](/about/change-log)
|
||||
* [操作手册](/operator/asset)
|
||||
* [常见问题](/quickstart/faq)
|
||||
|
||||
## 技术栈
|
||||
|
||||
@@ -84,10 +84,15 @@
|
||||
|
||||
|
||||
|
||||
> 批量上传
|
||||
|
||||
|
||||
|
||||
|
||||
> 计划任务
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
> 用户管理
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
# orion-ops-pro <small>1.0.6</small>
|
||||
# orion-ops-pro <small>1.0.8</small>
|
||||
|
||||
> 一款开箱即用的运维平台。
|
||||
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -7,6 +7,28 @@
|
||||
* 执行完成菜单 sql 后请刷新缓存 `系统设置` > `系统菜单` > `刷新缓存`
|
||||
* 执行完成字典 sql 后请刷新缓存 `系统设置` > `数据字典项` > `刷新缓存`
|
||||
|
||||
### 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`
|
||||
|
||||
@@ -1,7 +1,5 @@
|
||||
## 功能排期
|
||||
|
||||
* 批量上传
|
||||
* 站内消息
|
||||
* 终端背景图片
|
||||
* 资产授权 UI 改版
|
||||
* RDP 远程桌面
|
||||
|
||||
BIN
docs/assert/img/batch_upload_form.png
Normal file
BIN
docs/assert/img/batch_upload_form.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 156 KiB |
BIN
docs/assert/img/batch_upload_uploading.png
Normal file
BIN
docs/assert/img/batch_upload_uploading.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 157 KiB |
@@ -1,12 +1,18 @@
|
||||
### 连接日志
|
||||
|
||||
在主机终端页面打开的 `SSH` `SFTP` 连接都会记录下来。
|
||||
查看主机终端连接记录。
|
||||
|
||||
* 详情: 查看连接详情
|
||||
* 断开: 断开会话连接
|
||||
* 下线: 强制断开会话连接
|
||||
* 删除: 删除连接记录
|
||||
* 清理: 根据条件清理数据
|
||||
|
||||
### 在线会话
|
||||
|
||||
查看连接中的主机会话。
|
||||
|
||||
* 下线: 强制断开会话连接
|
||||
|
||||
### 文件操作日志
|
||||
|
||||
查看用户 SFTP 操作日志, 是从用户操作日志中过滤查询。
|
||||
|
||||
@@ -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,33 +74,33 @@
|
||||
* 搜索: `ctrl` `F`
|
||||
* 清空: `ctrl` `L`
|
||||
|
||||
> 命令内置参数
|
||||
### 命令内置参数
|
||||
|
||||
⚡ 使用 `@{{ xxx }}` 来替换命令参数
|
||||
|
||||
| 参数 | 描述 |
|
||||
|:----------------|:--------------------------|
|
||||
| source | 执行来源 (BATCH/JOB) |
|
||||
| sourceId | 执行来源id (JOB特有) |
|
||||
| seq | 执行序列 (JOB特有) |
|
||||
| userId | 执行用户id |
|
||||
| username | 执行用户名 |
|
||||
| execId | 执行记录id |
|
||||
| hostId | 执行主机id |
|
||||
| hostName | 执行主机名称 |
|
||||
| hostCode | 执行主机编码 |
|
||||
| hostAddress | 执行主机地址 |
|
||||
| hostUsername | 执行主机用户名 |
|
||||
| osType | 执行主机系统版本 |
|
||||
| port | SSH 端口 |
|
||||
| charset | SSH 编码集 |
|
||||
| scriptExec | 是否使用脚本执行 |
|
||||
| scriptPath | 脚本文件路径 |
|
||||
| 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-ops-pro/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` |
|
||||
|
||||
26
docs/operator/job.md
Normal file
26
docs/operator/job.md
Normal file
@@ -0,0 +1,26 @@
|
||||
### 任务列表
|
||||
|
||||
⚡ 内置参数同 `批量执行 > 命令执行` [查看](/operator/exec.md?id=命令内置参数)
|
||||
|
||||
维护计划任务, 定时执行命令。
|
||||
|
||||
* 新增: 新增计划任务
|
||||
* 详情: 查看计划任务详情
|
||||
* 修改: 修改计划任务
|
||||
* 状态: 修改计划任务状态
|
||||
* 手动触发: 手动触发计划任务
|
||||
* 删除: 删除计划任务
|
||||
|
||||
### 任务日志
|
||||
|
||||
查看计划任务执行日志
|
||||
|
||||
⚡ 如果只需要保存日志的原始输出则需要修改 `application.yaml` `app.exec-log.append-ansi` 为 `false`
|
||||
|
||||
* 清空: 清空执行日志
|
||||
* 删除: 删除执行日志
|
||||
* 命令: 查看执行时的命令
|
||||
* 参数: 查看执行时的参数
|
||||
* 中断: 中断命令执行
|
||||
* 日志: 查看执行日志, ctrl + 左键点击会用新页面打开
|
||||
* 下载: 下载执行日志
|
||||
@@ -26,7 +26,8 @@ git clone https://gitee.com/lijiahangmax/orion-ops-pro
|
||||
# 执行脚本
|
||||
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-ops-pro/sql/init-3-schema-quartz.sql
|
||||
orion-ops-pro/sql/init-4-data.sql
|
||||
```
|
||||
|
||||
3. 修改后端配置
|
||||
|
||||
@@ -17,6 +17,15 @@ Dashboard 修改)
|
||||
}
|
||||
```
|
||||
|
||||
### 拉取代码
|
||||
|
||||
```
|
||||
# github
|
||||
git clone https://github.com/lijiahangmax/orion-ops-pro
|
||||
# gitee
|
||||
git clone https://gitee.com/lijiahangmax/orion-ops-pro
|
||||
```
|
||||
|
||||
### 构建镜像
|
||||
|
||||
```
|
||||
|
||||
@@ -1,25 +1,25 @@
|
||||
> ##### 1. 数据误删除怎么办?
|
||||
|
||||
数据库的数据都采用了逻辑删除, 可以将已删除的数据中的 `deleted` 字段改为 `0`
|
||||
如果不知道数据是哪一条, 可以查询用户操作日志, 点击 `参数` 寻找操作的id
|
||||
如果不知道数据是哪一条, 可以查询用户操作日志, 点击 `参数` 寻找操作的id
|
||||
|
||||
> ##### 2. 执行命令时为什么会找不到环境变量?
|
||||
|
||||
可以在执行命令的第一行设置 `source /etc/profile` 来加载环境变量
|
||||
可以在执行命令的第一行设置 `source /etc/profile` 来加载环境变量
|
||||
|
||||
> ##### 3. 命令中途执行失败如何设置中断执行?
|
||||
|
||||
可以在执行命令的第一行设置 `set -e`
|
||||
作用是: 当执行出现意料之外的情况时, 立即退出
|
||||
作用是: 当执行出现意料之外的情况时, 立即退出
|
||||
|
||||
> ##### 4. 在调度任务、批量执行 命令执行成功的依据是什么?
|
||||
|
||||
是获取命令的 `exitcode` 判断是否为 `0` 如果非0则代表命令执行失败
|
||||
同理, 在命令的最后一行设置 `exit 1` 结果将会是失败, 可以用此来中断后续流程
|
||||
同理, 在命令的最后一行设置 `exit 1` 结果将会是失败, 可以用此来中断后续流程
|
||||
|
||||
> ##### 5. 调度任务、批量执行 的日志文件中如何只保存原始输出?
|
||||
|
||||
修改 application.yaml `app.exec-log.append-ansi` 为 false
|
||||
修改 `application.yaml` `app.exec-log.append-ansi` 为 `false`
|
||||
|
||||
> ##### 6. 为什么使用秘钥认证还是无法连接机器?
|
||||
|
||||
|
||||
@@ -27,7 +27,8 @@ git clone https://gitee.com/lijiahangmax/orion-ops-pro
|
||||
# 执行脚本
|
||||
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-ops-pro/sql/init-3-schema-quartz.sql
|
||||
orion-ops-pro/sql/init-4-data.sql
|
||||
```
|
||||
|
||||
3. 构建后端代码
|
||||
|
||||
@@ -3,9 +3,109 @@
|
||||
> 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-ops-pro', 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
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);
|
||||
```
|
||||
11
docs/update/v2.0.0.md
Normal file
11
docs/update/v2.0.0.md
Normal file
@@ -0,0 +1,11 @@
|
||||
## v2.0.0
|
||||
|
||||
> sql 脚本 - DDL
|
||||
|
||||
```sql
|
||||
```
|
||||
|
||||
> sql 脚本 - DML
|
||||
|
||||
```sql
|
||||
```
|
||||
@@ -14,7 +14,7 @@
|
||||
<url>https://github.com/lijiahangmax/orion-ops-pro</url>
|
||||
|
||||
<properties>
|
||||
<revision>1.0.6</revision>
|
||||
<revision>1.0.8</revision>
|
||||
<spring.boot.version>2.7.17</spring.boot.version>
|
||||
<spring.boot.admin.version>2.7.15</spring.boot.admin.version>
|
||||
<flatten.maven.plugin.version>1.5.0</flatten.maven.plugin.version>
|
||||
|
||||
@@ -14,7 +14,7 @@ public interface AppConst extends OrionConst {
|
||||
/**
|
||||
* 同 ${orion.version} 迭代时候需要手动更改
|
||||
*/
|
||||
String VERSION = "1.0.6";
|
||||
String VERSION = "1.0.8";
|
||||
|
||||
String ORION_OPS_PRO = "orion-ops-pro";
|
||||
|
||||
|
||||
@@ -87,6 +87,8 @@ public interface ErrorMessage {
|
||||
|
||||
String LOG_ABSENT = "日志不存在";
|
||||
|
||||
String TASK_ABSENT = "任务不存在";
|
||||
|
||||
String ILLEGAL_STATUS = "当前状态不支持此操作";
|
||||
|
||||
String CHECK_AUTHORIZED_HOST = "请选择已授权的主机";
|
||||
|
||||
@@ -55,6 +55,10 @@ public interface FieldConst {
|
||||
|
||||
String COUNT = "count";
|
||||
|
||||
String DATE = "date";
|
||||
|
||||
String TIME = "time";
|
||||
|
||||
String LOCATION = "location";
|
||||
|
||||
String USER_AGENT = "userAgent";
|
||||
|
||||
@@ -10,7 +10,6 @@ import com.orion.ops.framework.mybatis.core.generator.template.Table;
|
||||
import com.orion.ops.framework.mybatis.core.generator.template.Template;
|
||||
|
||||
import java.io.File;
|
||||
import java.util.concurrent.TimeUnit;
|
||||
|
||||
/**
|
||||
* 代码生成器
|
||||
@@ -27,7 +26,7 @@ public class CodeGenerators {
|
||||
// 作者
|
||||
String author = Const.ORION_AUTHOR;
|
||||
// 模块
|
||||
String module = "asset";
|
||||
String module = "infra";
|
||||
// 生成的表
|
||||
Table[] tables = {
|
||||
// Template.create("dict_key", "字典配置项", "dict")
|
||||
@@ -40,6 +39,7 @@ public class CodeGenerators {
|
||||
// .enableCardView()
|
||||
// .enableDrawerForm()
|
||||
// .dict("dictValueType", "value_type")
|
||||
// .comment("字典值类型")
|
||||
// .fields("STRING", "INTEGER", "DECIMAL", "BOOLEAN", "COLOR")
|
||||
// .labels("字符串", "整数", "小数", "布尔值", "颜色")
|
||||
// .color("blue", "gray", "red", "green", "white")
|
||||
@@ -49,11 +49,23 @@ public class CodeGenerators {
|
||||
// .disableUnitTest()
|
||||
// .vue("exec", "exec-template-host")
|
||||
// .build(),
|
||||
Template.create("path_bookmark", "路径标签", "path")
|
||||
Template.create("system_message", "系统消息", "message")
|
||||
.disableUnitTest()
|
||||
.cache("path:bookmark:list:{}", "路径标签列表 ${userId}")
|
||||
.expire(8, TimeUnit.HOURS)
|
||||
.vue("host", "path-bookmark")
|
||||
.enableProviderApi()
|
||||
.vue("system", "message")
|
||||
.dict("messageClassify", "classify", "messageClassify")
|
||||
.comment("消息分类")
|
||||
.fields("NOTICE", "TODO")
|
||||
.labels("通知", "待办")
|
||||
.valueUseFields()
|
||||
.dict("messageType", "type", "messageType")
|
||||
.comment("消息类型")
|
||||
.fields("EXEC_FAILED", "UPLOAD_FAILED")
|
||||
.labels("执行失败", "上传失败")
|
||||
.extra("tagLabel", "执行失败", "上传失败")
|
||||
.extra("tagVisible", true, true)
|
||||
.extra("tagColor", "red", "red")
|
||||
.valueUseFields()
|
||||
.build(),
|
||||
};
|
||||
// jdbc 配置 - 使用配置文件
|
||||
|
||||
@@ -14,6 +14,17 @@ import java.util.LinkedHashMap;
|
||||
*/
|
||||
public class DictTemplate extends Template {
|
||||
|
||||
// // $comment
|
||||
// export const $field = {
|
||||
// // labels[0]
|
||||
// fields[0]: 'values[0]',
|
||||
// // labels[1]
|
||||
// fields[0]: 'values[1]',
|
||||
// };
|
||||
//
|
||||
// // $comment 字典项
|
||||
// export const $keyField = '$keyName';
|
||||
|
||||
private final DictMeta dictMeta;
|
||||
|
||||
public DictTemplate(Table table, String keyName, String variable) {
|
||||
|
||||
@@ -83,13 +83,13 @@ public class Template {
|
||||
/**
|
||||
* 设置字典
|
||||
*
|
||||
* @param keyName 字典配置名称
|
||||
* @param variable 替换字段 数据库/小驼峰
|
||||
* @param className 字段名称
|
||||
* @param keyName 字典配置名称
|
||||
* @param variable 替换字段 数据库/小驼峰
|
||||
* @param field 字段名称
|
||||
* @return dict
|
||||
*/
|
||||
public DictTemplate dict(String keyName, String variable, String className) {
|
||||
return new DictTemplate(table, keyName, variable, className);
|
||||
public DictTemplate dict(String keyName, String variable, String field) {
|
||||
return new DictTemplate(table, keyName, variable, field);
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -184,7 +184,7 @@ app:
|
||||
# 自动清理执行文件
|
||||
auto-clear: true
|
||||
# 保留周期 (天)
|
||||
keep-period: 60
|
||||
keep-period: 30
|
||||
|
||||
# orion framework config
|
||||
orion:
|
||||
|
||||
@@ -41,7 +41,7 @@
|
||||
<artifactId>orion-ops-spring-boot-starter-web</artifactId>
|
||||
</dependency>
|
||||
|
||||
<!-- web-socket -->
|
||||
<!-- websocket -->
|
||||
<dependency>
|
||||
<groupId>com.orion.ops</groupId>
|
||||
<artifactId>orion-ops-spring-boot-starter-websocket</artifactId>
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
package com.orion.ops.module.asset.controller;
|
||||
|
||||
import com.orion.lang.define.wrapper.HttpWrapper;
|
||||
import com.orion.ops.framework.biz.operator.log.core.annotation.OperatorLog;
|
||||
import com.orion.ops.framework.log.core.annotation.IgnoreLog;
|
||||
import com.orion.ops.framework.log.core.enums.IgnoreLogMode;
|
||||
@@ -48,9 +47,9 @@ public class AssetDataGrantServiceController {
|
||||
@PutMapping("/grant-host-group")
|
||||
@Operation(summary = "主机分组授权")
|
||||
@PreAuthorize("@ss.hasPermission('asset:host-group:grant')")
|
||||
public HttpWrapper<?> grantHostGroup(@RequestBody AssetDataGrantRequest request) {
|
||||
public Boolean grantHostGroup(@RequestBody AssetDataGrantRequest request) {
|
||||
assetDataGrantService.grantHostGroup(request);
|
||||
return HttpWrapper.ok();
|
||||
return true;
|
||||
}
|
||||
|
||||
@IgnoreLog(IgnoreLogMode.RET)
|
||||
@@ -65,9 +64,9 @@ public class AssetDataGrantServiceController {
|
||||
@PutMapping("/grant-host-key")
|
||||
@Operation(summary = "主机秘钥授权")
|
||||
@PreAuthorize("@ss.hasPermission('asset:host-key:grant')")
|
||||
public HttpWrapper<?> grantHostKey(@RequestBody AssetDataGrantRequest request) {
|
||||
public Boolean grantHostKey(@RequestBody AssetDataGrantRequest request) {
|
||||
assetDataGrantService.grantHostKey(request);
|
||||
return HttpWrapper.ok();
|
||||
return true;
|
||||
}
|
||||
|
||||
@IgnoreLog(IgnoreLogMode.RET)
|
||||
@@ -82,9 +81,9 @@ public class AssetDataGrantServiceController {
|
||||
@PutMapping("/grant-host-identity")
|
||||
@Operation(summary = "主机身份授权")
|
||||
@PreAuthorize("@ss.hasPermission('asset:host-identity:grant')")
|
||||
public HttpWrapper<?> grantHostIdentity(@RequestBody AssetDataGrantRequest request) {
|
||||
public Boolean grantHostIdentity(@RequestBody AssetDataGrantRequest request) {
|
||||
assetDataGrantService.grantHostIdentity(request);
|
||||
return HttpWrapper.ok();
|
||||
return true;
|
||||
}
|
||||
|
||||
@IgnoreLog(IgnoreLogMode.RET)
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
package com.orion.ops.module.asset.controller;
|
||||
|
||||
import com.orion.lang.define.wrapper.DataGrid;
|
||||
import com.orion.lang.define.wrapper.HttpWrapper;
|
||||
import com.orion.ops.framework.biz.operator.log.core.annotation.OperatorLog;
|
||||
import com.orion.ops.framework.common.utils.Valid;
|
||||
import com.orion.ops.framework.common.validator.group.Page;
|
||||
@@ -10,7 +9,6 @@ import com.orion.ops.framework.log.core.enums.IgnoreLogMode;
|
||||
import com.orion.ops.framework.security.core.utils.SecurityUtils;
|
||||
import com.orion.ops.framework.web.core.annotation.RestWrapper;
|
||||
import com.orion.ops.module.asset.define.operator.ExecCommandLogOperatorType;
|
||||
import com.orion.ops.module.asset.define.operator.ExecCommandOperatorType;
|
||||
import com.orion.ops.module.asset.entity.request.exec.ExecInterruptRequest;
|
||||
import com.orion.ops.module.asset.entity.request.exec.ExecLogQueryRequest;
|
||||
import com.orion.ops.module.asset.entity.request.exec.ExecLogTailRequest;
|
||||
@@ -160,24 +158,24 @@ public class ExecCommandLogController {
|
||||
execLogService.downloadLogFile(id, SOURCE, response);
|
||||
}
|
||||
|
||||
@OperatorLog(ExecCommandLogOperatorType.INTERRUPT)
|
||||
@OperatorLog(value = ExecCommandLogOperatorType.INTERRUPT)
|
||||
@PutMapping("/interrupt")
|
||||
@Operation(summary = "中断批量执行命令")
|
||||
@PreAuthorize("@ss.hasPermission('asset:exec-command-log:interrupt')")
|
||||
public HttpWrapper<?> interruptExecCommand(@RequestBody ExecInterruptRequest request) {
|
||||
public Boolean interruptExecCommand(@RequestBody ExecInterruptRequest request) {
|
||||
Long logId = Valid.notNull(request.getLogId());
|
||||
execLogService.interruptExec(logId, SOURCE);
|
||||
return HttpWrapper.ok();
|
||||
return true;
|
||||
}
|
||||
|
||||
@OperatorLog(ExecCommandLogOperatorType.INTERRUPT_HOST)
|
||||
@OperatorLog(value = ExecCommandLogOperatorType.INTERRUPT_HOST)
|
||||
@PutMapping("/interrupt-host")
|
||||
@Operation(summary = "中断批量执行主机命令")
|
||||
@PreAuthorize("@ss.hasPermission('asset:exec-command-log:interrupt')")
|
||||
public HttpWrapper<?> interruptHostExecCommand(@RequestBody ExecInterruptRequest request) {
|
||||
public Boolean interruptHostExecCommand(@RequestBody ExecInterruptRequest request) {
|
||||
Long hostLogId = Valid.notNull(request.getHostLogId());
|
||||
execLogService.interruptHostExec(hostLogId, SOURCE);
|
||||
return HttpWrapper.ok();
|
||||
return true;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -10,7 +10,9 @@ Authorization: {{token}}
|
||||
"scriptExec": 0,
|
||||
"command": "echo 123",
|
||||
"parameterSchema": "[]",
|
||||
"hostIdList": [1]
|
||||
"hostIdList": [
|
||||
1
|
||||
]
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
package com.orion.ops.module.asset.controller;
|
||||
|
||||
import com.orion.lang.define.wrapper.DataGrid;
|
||||
import com.orion.lang.define.wrapper.HttpWrapper;
|
||||
import com.orion.ops.framework.biz.operator.log.core.annotation.OperatorLog;
|
||||
import com.orion.ops.framework.common.validator.group.Page;
|
||||
import com.orion.ops.framework.log.core.annotation.IgnoreLog;
|
||||
@@ -103,9 +102,9 @@ public class ExecJobController {
|
||||
@PostMapping("/trigger")
|
||||
@Operation(summary = "手动触发计划任务")
|
||||
@PreAuthorize("@ss.hasPermission('asset:exec-job:trigger')")
|
||||
public HttpWrapper<?> triggerExecJob(@Validated @RequestBody ExecJobTriggerRequest request) {
|
||||
public Boolean triggerExecJob(@Validated @RequestBody ExecJobTriggerRequest request) {
|
||||
execJobService.manualTriggerExecJob(request.getId());
|
||||
return HttpWrapper.ok();
|
||||
return true;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -1,14 +1,12 @@
|
||||
package com.orion.ops.module.asset.controller;
|
||||
|
||||
import com.orion.lang.define.wrapper.DataGrid;
|
||||
import com.orion.lang.define.wrapper.HttpWrapper;
|
||||
import com.orion.ops.framework.biz.operator.log.core.annotation.OperatorLog;
|
||||
import com.orion.ops.framework.common.utils.Valid;
|
||||
import com.orion.ops.framework.common.validator.group.Page;
|
||||
import com.orion.ops.framework.log.core.annotation.IgnoreLog;
|
||||
import com.orion.ops.framework.log.core.enums.IgnoreLogMode;
|
||||
import com.orion.ops.framework.web.core.annotation.RestWrapper;
|
||||
import com.orion.ops.module.asset.define.operator.ExecCommandLogOperatorType;
|
||||
import com.orion.ops.module.asset.define.operator.ExecJobLogOperatorType;
|
||||
import com.orion.ops.module.asset.entity.request.exec.ExecInterruptRequest;
|
||||
import com.orion.ops.module.asset.entity.request.exec.ExecLogQueryRequest;
|
||||
@@ -153,20 +151,20 @@ public class ExecJobLogController {
|
||||
@PutMapping("/interrupt")
|
||||
@Operation(summary = "中断计划任务命令")
|
||||
@PreAuthorize("@ss.hasPermission('asset:exec-job-log:interrupt')")
|
||||
public HttpWrapper<?> interruptExecCommand(@RequestBody ExecInterruptRequest request) {
|
||||
public Boolean interruptExecCommand(@RequestBody ExecInterruptRequest request) {
|
||||
Long logId = Valid.notNull(request.getLogId());
|
||||
execLogService.interruptExec(logId, SOURCE);
|
||||
return HttpWrapper.ok();
|
||||
return true;
|
||||
}
|
||||
|
||||
@OperatorLog(ExecJobLogOperatorType.INTERRUPT_HOST)
|
||||
@PutMapping("/interrupt-host")
|
||||
@Operation(summary = "中断计划任务主机命令")
|
||||
@PreAuthorize("@ss.hasPermission('asset:exec-job-log:interrupt')")
|
||||
public HttpWrapper<?> interruptHostExecCommand(@RequestBody ExecInterruptRequest request) {
|
||||
public Boolean interruptHostExecCommand(@RequestBody ExecInterruptRequest request) {
|
||||
Long hostLogId = Valid.notNull(request.getHostLogId());
|
||||
execLogService.interruptHostExec(hostLogId, SOURCE);
|
||||
return HttpWrapper.ok();
|
||||
return true;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -49,6 +49,14 @@ public class HostConnectLogController {
|
||||
return hostConnectLogService.getHostConnectLogPage(request);
|
||||
}
|
||||
|
||||
@IgnoreLog(IgnoreLogMode.RET)
|
||||
@PostMapping("/session")
|
||||
@Operation(summary = "查询全部主机连接会话")
|
||||
@PreAuthorize("@ss.hasPermission('asset:host-connect-session:management:query')")
|
||||
public List<HostConnectLogVO> getHostConnectSessions(@Validated @RequestBody HostConnectLogQueryRequest request) {
|
||||
return hostConnectLogService.getHostConnectSessions(request);
|
||||
}
|
||||
|
||||
@IgnoreLog(IgnoreLogMode.RET)
|
||||
@PostMapping("/latest-connect")
|
||||
@Operation(summary = "查询用户最近连接的主机")
|
||||
@@ -83,7 +91,7 @@ public class HostConnectLogController {
|
||||
@OperatorLog(HostConnectLogOperatorType.FORCE_OFFLINE)
|
||||
@PutMapping("/force-offline")
|
||||
@Operation(summary = "强制断开主机连接")
|
||||
@PreAuthorize("@ss.hasPermission('asset:host-connect-log:management:force-offline')")
|
||||
@PreAuthorize("@ss.hasAnyPermission('asset:host-connect-log:management:force-offline', 'asset:host-connect-session:management:force-offline')")
|
||||
public Integer forceOffline(@Validated(Id.class) @RequestBody HostConnectLogQueryRequest request) {
|
||||
return hostConnectLogService.forceOffline(request);
|
||||
}
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
package com.orion.ops.module.asset.controller;
|
||||
|
||||
import com.orion.lang.define.wrapper.HttpWrapper;
|
||||
import com.orion.ops.framework.biz.operator.log.core.annotation.OperatorLog;
|
||||
import com.orion.ops.framework.log.core.annotation.IgnoreLog;
|
||||
import com.orion.ops.framework.log.core.enums.IgnoreLogMode;
|
||||
@@ -96,9 +95,9 @@ public class HostGroupController {
|
||||
@PutMapping("/update-rel")
|
||||
@Operation(summary = "修改分组内主机")
|
||||
@PreAuthorize("@ss.hasPermission('asset:host-group:update')")
|
||||
public HttpWrapper<?> updateHostGroupRel(@Validated @RequestBody HostGroupRelUpdateRequest request) {
|
||||
public Boolean updateHostGroupRel(@Validated @RequestBody HostGroupRelUpdateRequest request) {
|
||||
hostGroupService.updateHostGroupRel(request);
|
||||
return HttpWrapper.ok();
|
||||
return true;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -0,0 +1,68 @@
|
||||
### 创建上传任务
|
||||
POST {{baseUrl}}/asset/upload-task/create
|
||||
Content-Type: application/json
|
||||
Authorization: {{token}}
|
||||
|
||||
{
|
||||
"remotePath": "/root/batch",
|
||||
"description": "",
|
||||
"hostIdList": [
|
||||
1,
|
||||
7,
|
||||
8
|
||||
],
|
||||
"files": [
|
||||
{
|
||||
"fileId": "1",
|
||||
"filePath": "qr.txt",
|
||||
"fileSize": 3
|
||||
},
|
||||
{
|
||||
"fileId": "2",
|
||||
"filePath": "dir/key.txt",
|
||||
"fileSize": 3
|
||||
}
|
||||
]
|
||||
}
|
||||
|
||||
|
||||
### 开始上传
|
||||
POST {{baseUrl}}/asset/upload-task/start
|
||||
Content-Type: application/json
|
||||
Authorization: {{token}}
|
||||
|
||||
{
|
||||
"id": 1
|
||||
}
|
||||
|
||||
|
||||
### 查询上传任务
|
||||
GET {{baseUrl}}/asset/upload-task/get?id=1
|
||||
Authorization: {{token}}
|
||||
|
||||
|
||||
### 分页查询上传任务
|
||||
POST {{baseUrl}}/asset/upload-task/query
|
||||
Content-Type: application/json
|
||||
Authorization: {{token}}
|
||||
|
||||
{
|
||||
"page": 1,
|
||||
"limit": 10,
|
||||
"id": "",
|
||||
"userId": "",
|
||||
"description": "",
|
||||
"status": ""
|
||||
}
|
||||
|
||||
|
||||
### 删除上传任务
|
||||
DELETE {{baseUrl}}/asset/upload-task/delete?id=1
|
||||
Authorization: {{token}}
|
||||
|
||||
|
||||
### 批量删除上传任务
|
||||
DELETE {{baseUrl}}/asset/upload-task/batch-delete?idList=1,2,3
|
||||
Authorization: {{token}}
|
||||
|
||||
###
|
||||
@@ -0,0 +1,132 @@
|
||||
package com.orion.ops.module.asset.controller;
|
||||
|
||||
import com.orion.lang.define.wrapper.DataGrid;
|
||||
import com.orion.ops.framework.biz.operator.log.core.annotation.OperatorLog;
|
||||
import com.orion.ops.framework.common.validator.group.Page;
|
||||
import com.orion.ops.framework.log.core.annotation.IgnoreLog;
|
||||
import com.orion.ops.framework.log.core.enums.IgnoreLogMode;
|
||||
import com.orion.ops.framework.web.core.annotation.RestWrapper;
|
||||
import com.orion.ops.module.asset.define.operator.UploadTaskOperatorType;
|
||||
import com.orion.ops.module.asset.entity.request.upload.UploadTaskCreateRequest;
|
||||
import com.orion.ops.module.asset.entity.request.upload.UploadTaskQueryRequest;
|
||||
import com.orion.ops.module.asset.entity.request.upload.UploadTaskRequest;
|
||||
import com.orion.ops.module.asset.entity.vo.UploadTaskCreateVO;
|
||||
import com.orion.ops.module.asset.entity.vo.UploadTaskStatusVO;
|
||||
import com.orion.ops.module.asset.entity.vo.UploadTaskVO;
|
||||
import com.orion.ops.module.asset.service.UploadTaskService;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
import io.swagger.v3.oas.annotations.Parameter;
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.security.access.prepost.PreAuthorize;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 上传任务 api
|
||||
*
|
||||
* @author Jiahang Li
|
||||
* @version 1.0.7
|
||||
* @since 2024-5-7 22:15
|
||||
*/
|
||||
@Tag(name = "asset - 上传任务服务")
|
||||
@Slf4j
|
||||
@Validated
|
||||
@RestWrapper
|
||||
@RestController
|
||||
@RequestMapping("/asset/upload-task")
|
||||
@SuppressWarnings({"ELValidationInJSP", "SpringElInspection"})
|
||||
public class UploadTaskController {
|
||||
|
||||
@Resource
|
||||
private UploadTaskService uploadTaskService;
|
||||
|
||||
@OperatorLog(UploadTaskOperatorType.UPLOAD)
|
||||
@PostMapping("/create")
|
||||
@Operation(summary = "创建上传任务")
|
||||
@PreAuthorize("@ss.hasPermission('asset:upload-task:upload')")
|
||||
public UploadTaskCreateVO createUploadTask(@Validated @RequestBody UploadTaskCreateRequest request) {
|
||||
return uploadTaskService.createUploadTask(request);
|
||||
}
|
||||
|
||||
@PostMapping("/start")
|
||||
@Operation(summary = "开始上传")
|
||||
@PreAuthorize("@ss.hasPermission('asset:upload-task:upload')")
|
||||
public Boolean startUploadTask(@Validated @RequestBody UploadTaskRequest request) {
|
||||
uploadTaskService.startUploadTask(request.getId());
|
||||
return true;
|
||||
}
|
||||
|
||||
@OperatorLog(UploadTaskOperatorType.CANCEL)
|
||||
@PostMapping("/cancel")
|
||||
@Operation(summary = "取消上传")
|
||||
@PreAuthorize("@ss.hasPermission('asset:upload-task:upload')")
|
||||
public Boolean cancelUploadTask(@Validated @RequestBody UploadTaskRequest request) {
|
||||
uploadTaskService.cancelUploadTask(request);
|
||||
return true;
|
||||
}
|
||||
|
||||
@IgnoreLog(IgnoreLogMode.RET)
|
||||
@GetMapping("/get")
|
||||
@Operation(summary = "查询上传任务")
|
||||
@Parameter(name = "id", description = "id", required = true)
|
||||
@PreAuthorize("@ss.hasPermission('asset:upload-task:query')")
|
||||
public UploadTaskVO getUploadTask(@RequestParam("id") Long id) {
|
||||
return uploadTaskService.getUploadTask(id);
|
||||
}
|
||||
|
||||
@IgnoreLog(IgnoreLogMode.RET)
|
||||
@PostMapping("/query")
|
||||
@Operation(summary = "分页查询上传任务")
|
||||
@PreAuthorize("@ss.hasPermission('asset:upload-task:query')")
|
||||
public DataGrid<UploadTaskVO> getUploadTaskPage(@Validated(Page.class) @RequestBody UploadTaskQueryRequest request) {
|
||||
return uploadTaskService.getUploadTaskPage(request);
|
||||
}
|
||||
|
||||
@IgnoreLog(IgnoreLogMode.ALL)
|
||||
@GetMapping("/status")
|
||||
@Operation(summary = "查询上传状态")
|
||||
@Parameter(name = "id", description = "id", required = true)
|
||||
@PreAuthorize("@ss.hasPermission('asset:upload-task:query')")
|
||||
public List<UploadTaskStatusVO> getUploadTaskStatus(@RequestParam("idList") List<Long> idList, @RequestParam("queryFiles") Boolean queryFiles) {
|
||||
return uploadTaskService.getUploadTaskStatus(idList, queryFiles);
|
||||
}
|
||||
|
||||
@OperatorLog(UploadTaskOperatorType.DELETE)
|
||||
@DeleteMapping("/delete")
|
||||
@Operation(summary = "删除上传任务")
|
||||
@Parameter(name = "id", description = "id", required = true)
|
||||
@PreAuthorize("@ss.hasPermission('asset:upload-task:delete')")
|
||||
public Integer deleteUploadTask(@RequestParam("id") Long id) {
|
||||
return uploadTaskService.deleteUploadTaskById(id);
|
||||
}
|
||||
|
||||
@OperatorLog(UploadTaskOperatorType.DELETE)
|
||||
@DeleteMapping("/batch-delete")
|
||||
@Operation(summary = "批量删除上传任务")
|
||||
@Parameter(name = "idList", description = "idList", required = true)
|
||||
@PreAuthorize("@ss.hasPermission('asset:upload-task:delete')")
|
||||
public Integer batchDeleteUploadTask(@RequestParam("idList") List<Long> idList) {
|
||||
return uploadTaskService.deleteUploadTaskByIdList(idList);
|
||||
}
|
||||
|
||||
@PostMapping("/query-count")
|
||||
@Operation(summary = "查询上传任务数量")
|
||||
@PreAuthorize("@ss.hasPermission('asset:upload-task:management:clear')")
|
||||
public Long getUploadTaskCount(@RequestBody UploadTaskQueryRequest request) {
|
||||
return uploadTaskService.getUploadTaskCount(request);
|
||||
}
|
||||
|
||||
@OperatorLog(UploadTaskOperatorType.CLEAR)
|
||||
@PostMapping("/clear")
|
||||
@Operation(summary = "清空上传任务")
|
||||
@PreAuthorize("@ss.hasPermission('asset:upload-task:management:clear')")
|
||||
public Integer clearUploadTask(@RequestBody UploadTaskQueryRequest request) {
|
||||
return uploadTaskService.clearUploadTask(request);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -5,6 +5,7 @@ import com.orion.ops.module.asset.entity.dto.HostCacheDTO;
|
||||
import com.orion.ops.module.asset.entity.request.host.HostCreateRequest;
|
||||
import com.orion.ops.module.asset.entity.request.host.HostQueryRequest;
|
||||
import com.orion.ops.module.asset.entity.request.host.HostUpdateRequest;
|
||||
import com.orion.ops.module.asset.entity.vo.HostBaseVO;
|
||||
import com.orion.ops.module.asset.entity.vo.HostVO;
|
||||
import org.mapstruct.Mapper;
|
||||
import org.mapstruct.factory.Mappers;
|
||||
@@ -35,6 +36,8 @@ public interface HostConvert {
|
||||
|
||||
HostCacheDTO toCache(HostDO domain);
|
||||
|
||||
HostBaseVO toBase(HostDO domain);
|
||||
|
||||
List<HostVO> toList(List<HostDO> domain);
|
||||
|
||||
}
|
||||
|
||||
@@ -0,0 +1,35 @@
|
||||
package com.orion.ops.module.asset.convert;
|
||||
|
||||
import com.orion.ops.module.asset.entity.domain.UploadTaskDO;
|
||||
import com.orion.ops.module.asset.entity.request.upload.UploadTaskCreateRequest;
|
||||
import com.orion.ops.module.asset.entity.request.upload.UploadTaskQueryRequest;
|
||||
import com.orion.ops.module.asset.entity.vo.UploadTaskStatusVO;
|
||||
import com.orion.ops.module.asset.entity.vo.UploadTaskVO;
|
||||
import org.mapstruct.Mapper;
|
||||
import org.mapstruct.factory.Mappers;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 上传任务 内部对象转换器
|
||||
*
|
||||
* @author Jiahang Li
|
||||
* @version 1.0.7
|
||||
* @since 2024-5-7 22:15
|
||||
*/
|
||||
@Mapper
|
||||
public interface UploadTaskConvert {
|
||||
|
||||
UploadTaskConvert MAPPER = Mappers.getMapper(UploadTaskConvert.class);
|
||||
|
||||
UploadTaskDO to(UploadTaskCreateRequest request);
|
||||
|
||||
UploadTaskDO to(UploadTaskQueryRequest request);
|
||||
|
||||
UploadTaskVO to(UploadTaskDO domain);
|
||||
|
||||
List<UploadTaskVO> toList(List<UploadTaskDO> list);
|
||||
|
||||
UploadTaskStatusVO toStatus(UploadTaskDO domain);
|
||||
|
||||
}
|
||||
@@ -0,0 +1,26 @@
|
||||
package com.orion.ops.module.asset.convert;
|
||||
|
||||
import com.orion.ops.module.asset.entity.domain.UploadTaskFileDO;
|
||||
import com.orion.ops.module.asset.entity.vo.UploadTaskFileVO;
|
||||
import org.mapstruct.Mapper;
|
||||
import org.mapstruct.factory.Mappers;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 上传任务文件 内部对象转换器
|
||||
*
|
||||
* @author Jiahang Li
|
||||
* @version 1.0.7
|
||||
* @since 2024-5-8 10:31
|
||||
*/
|
||||
@Mapper
|
||||
public interface UploadTaskFileConvert {
|
||||
|
||||
UploadTaskFileConvert MAPPER = Mappers.getMapper(UploadTaskFileConvert.class);
|
||||
|
||||
UploadTaskFileVO to(UploadTaskFileDO domain);
|
||||
|
||||
List<UploadTaskFileVO> to(List<UploadTaskFileDO> list);
|
||||
|
||||
}
|
||||
@@ -0,0 +1,17 @@
|
||||
package com.orion.ops.module.asset.dao;
|
||||
|
||||
import com.orion.ops.framework.mybatis.core.mapper.IMapper;
|
||||
import com.orion.ops.module.asset.entity.domain.UploadTaskDO;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
/**
|
||||
* 上传任务 Mapper 接口
|
||||
*
|
||||
* @author Jiahang Li
|
||||
* @version 1.0.7
|
||||
* @since 2024-5-7 22:15
|
||||
*/
|
||||
@Mapper
|
||||
public interface UploadTaskDAO extends IMapper<UploadTaskDO> {
|
||||
|
||||
}
|
||||
@@ -0,0 +1,79 @@
|
||||
package com.orion.ops.module.asset.dao;
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.orion.ops.framework.mybatis.core.mapper.IMapper;
|
||||
import com.orion.ops.framework.mybatis.core.query.Conditions;
|
||||
import com.orion.ops.module.asset.entity.domain.UploadTaskFileDO;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 上传任务文件 Mapper 接口
|
||||
*
|
||||
* @author Jiahang Li
|
||||
* @version 1.0.7
|
||||
* @since 2024-5-8 10:31
|
||||
*/
|
||||
@Mapper
|
||||
public interface UploadTaskFileDAO extends IMapper<UploadTaskFileDO> {
|
||||
|
||||
/**
|
||||
* 通过 taskId 查询
|
||||
*
|
||||
* @param taskId taskId
|
||||
* @return files
|
||||
*/
|
||||
default List<UploadTaskFileDO> selectByTaskId(Long taskId) {
|
||||
return this.selectList(Conditions.eq(UploadTaskFileDO::getTaskId, taskId));
|
||||
}
|
||||
|
||||
/**
|
||||
* 通过 taskId 查询
|
||||
*
|
||||
* @param taskId taskId
|
||||
* @return files
|
||||
*/
|
||||
default List<UploadTaskFileDO> selectByTaskId(Long taskId, String status) {
|
||||
// 条件
|
||||
LambdaQueryWrapper<UploadTaskFileDO> wrapper = this.wrapper()
|
||||
.eq(UploadTaskFileDO::getTaskId, taskId)
|
||||
.eq(UploadTaskFileDO::getStatus, status);
|
||||
return this.selectList(wrapper);
|
||||
}
|
||||
|
||||
/**
|
||||
* 通过 taskId hostId 更新状态
|
||||
*
|
||||
* @param taskId taskId
|
||||
* @param hostId hostId
|
||||
* @param status status
|
||||
* @return effect
|
||||
*/
|
||||
default int updateStatusByTaskHostId(Long taskId, Long hostId, String status) {
|
||||
// 条件
|
||||
LambdaQueryWrapper<UploadTaskFileDO> wrapper = this.wrapper()
|
||||
.eq(UploadTaskFileDO::getTaskId, taskId)
|
||||
.eq(UploadTaskFileDO::getHostId, hostId);
|
||||
// 修改值
|
||||
UploadTaskFileDO update = new UploadTaskFileDO();
|
||||
update.setStatus(status);
|
||||
// 更新
|
||||
return this.update(update, wrapper);
|
||||
}
|
||||
|
||||
/**
|
||||
* 通过 id 更新状态
|
||||
*
|
||||
* @param idList idList
|
||||
* @param status status
|
||||
* @return effect
|
||||
*/
|
||||
default int updateStatusByIdList(List<Long> idList, String status) {
|
||||
UploadTaskFileDO update = new UploadTaskFileDO();
|
||||
update.setStatus(status);
|
||||
// 更新
|
||||
return this.update(update, Conditions.in(UploadTaskFileDO::getId, idList));
|
||||
}
|
||||
|
||||
}
|
||||
@@ -87,4 +87,28 @@ public interface AssetThreadPools {
|
||||
.allowCoreThreadTimeout(true)
|
||||
.build();
|
||||
|
||||
/**
|
||||
* 批量上传任务线程池
|
||||
*/
|
||||
ThreadPoolExecutor UPLOAD_TASK = ExecutorBuilder.create()
|
||||
.namedThreadFactory("upload-task-")
|
||||
.corePoolSize(1)
|
||||
.maxPoolSize(Integer.MAX_VALUE)
|
||||
.keepAliveTime(Const.MS_S_60)
|
||||
.workQueue(new SynchronousQueue<>())
|
||||
.allowCoreThreadTimeout(true)
|
||||
.build();
|
||||
|
||||
/**
|
||||
* 批量上传主机线程池
|
||||
*/
|
||||
ThreadPoolExecutor UPLOAD_HOST = ExecutorBuilder.create()
|
||||
.namedThreadFactory("upload-host-")
|
||||
.corePoolSize(1)
|
||||
.maxPoolSize(Integer.MAX_VALUE)
|
||||
.keepAliveTime(Const.MS_S_60)
|
||||
.workQueue(new SynchronousQueue<>())
|
||||
.allowCoreThreadTimeout(true)
|
||||
.build();
|
||||
|
||||
}
|
||||
|
||||
@@ -34,7 +34,7 @@ public class AppExecLogConfig {
|
||||
public AppExecLogConfig() {
|
||||
this.appendAnsi = true;
|
||||
this.autoClear = true;
|
||||
this.keepPeriod = 60;
|
||||
this.keepPeriod = 30;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -0,0 +1,53 @@
|
||||
package com.orion.ops.module.asset.define.message;
|
||||
|
||||
import com.orion.ops.module.infra.define.SystemMessageDefine;
|
||||
import com.orion.ops.module.infra.enums.MessageClassifyEnum;
|
||||
import lombok.Getter;
|
||||
|
||||
/**
|
||||
* 命令执行 系统消息定义
|
||||
*
|
||||
* @author Jiahang Li
|
||||
* @version 1.0.0
|
||||
* @since 2024/5/14 17:23
|
||||
*/
|
||||
@Getter
|
||||
public enum ExecMessageDefine implements SystemMessageDefine {
|
||||
|
||||
/**
|
||||
* 命令执行部分失败
|
||||
*/
|
||||
EXEC_FAILED(MessageClassifyEnum.NOTICE,
|
||||
"命令执行失败",
|
||||
"您在 <sb>${time}</sb> 执行的命令部分失败, 或者返回了非零的 exitCode。点击查看详情 <sb>#${id}</sb> >>>"),
|
||||
|
||||
;
|
||||
|
||||
ExecMessageDefine(MessageClassifyEnum classify, String title, String content) {
|
||||
this.classify = classify;
|
||||
this.type = this.name();
|
||||
this.title = title;
|
||||
this.content = content;
|
||||
}
|
||||
|
||||
/**
|
||||
* 消息分类
|
||||
*/
|
||||
private final MessageClassifyEnum classify;
|
||||
|
||||
/**
|
||||
* 消息类型
|
||||
*/
|
||||
private final String type;
|
||||
|
||||
/**
|
||||
* 标题
|
||||
*/
|
||||
private final String title;
|
||||
|
||||
/**
|
||||
* 内容
|
||||
*/
|
||||
private final String content;
|
||||
|
||||
}
|
||||
@@ -0,0 +1,53 @@
|
||||
package com.orion.ops.module.asset.define.message;
|
||||
|
||||
import com.orion.ops.module.infra.define.SystemMessageDefine;
|
||||
import com.orion.ops.module.infra.enums.MessageClassifyEnum;
|
||||
import lombok.Getter;
|
||||
|
||||
/**
|
||||
* 上传任务 系统消息定义
|
||||
*
|
||||
* @author Jiahang Li
|
||||
* @version 1.0.0
|
||||
* @since 2024/5/14 17:23
|
||||
*/
|
||||
@Getter
|
||||
public enum UploadMessageDefine implements SystemMessageDefine {
|
||||
|
||||
/**
|
||||
* 上传任务部分失败
|
||||
*/
|
||||
UPLOAD_FAILED(MessageClassifyEnum.NOTICE,
|
||||
"批量上传失败",
|
||||
"您在 <sb>${time}</sb> 提交的上传任务中, 有部分主机文件上传失败。点击查看详情 <sb>#${id}</sb> >>>"),
|
||||
|
||||
;
|
||||
|
||||
UploadMessageDefine(MessageClassifyEnum classify, String title, String content) {
|
||||
this.classify = classify;
|
||||
this.type = this.name();
|
||||
this.title = title;
|
||||
this.content = content;
|
||||
}
|
||||
|
||||
/**
|
||||
* 消息分类
|
||||
*/
|
||||
private final MessageClassifyEnum classify;
|
||||
|
||||
/**
|
||||
* 消息类型
|
||||
*/
|
||||
private final String type;
|
||||
|
||||
/**
|
||||
* 标题
|
||||
*/
|
||||
private final String title;
|
||||
|
||||
/**
|
||||
* 内容
|
||||
*/
|
||||
private final String content;
|
||||
|
||||
}
|
||||
@@ -4,7 +4,8 @@ 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.*;
|
||||
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.M;
|
||||
|
||||
/**
|
||||
* 主机连接日志 操作日志类型
|
||||
|
||||
@@ -0,0 +1,38 @@
|
||||
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.M;
|
||||
|
||||
/**
|
||||
* 上传任务 操作日志类型
|
||||
*
|
||||
* @author Jiahang Li
|
||||
* @version 1.0.7
|
||||
* @since 2024-5-7 22:15
|
||||
*/
|
||||
@Module("asset:upload-task")
|
||||
public class UploadTaskOperatorType extends InitializingOperatorTypes {
|
||||
|
||||
public static final String UPLOAD = "upload-task:upload";
|
||||
|
||||
public static final String CANCEL = "upload-task:cancel";
|
||||
|
||||
public static final String DELETE = "upload-task:delete";
|
||||
|
||||
public static final String CLEAR = "upload-task:clear";
|
||||
|
||||
@Override
|
||||
public OperatorType[] types() {
|
||||
return new OperatorType[]{
|
||||
new OperatorType(M, UPLOAD, "批量上传文件 <sb>${count}</sb>个 (${name})"),
|
||||
new OperatorType(M, CANCEL, "取消上传文件 <sb>${name}</sb>"),
|
||||
new OperatorType(H, DELETE, "删除上传记录 <sb>${count}</sb>条"),
|
||||
new OperatorType(H, CLEAR, "清理上传记录 <sb>${count}</sb>条"),
|
||||
};
|
||||
}
|
||||
|
||||
}
|
||||
@@ -61,8 +61,8 @@ public class ExecHostLogDO extends BaseDO {
|
||||
private String parameter;
|
||||
|
||||
@Schema(description = "退出码")
|
||||
@TableField("exit_status")
|
||||
private Integer exitStatus;
|
||||
@TableField("exit_code")
|
||||
private Integer exitCode;
|
||||
|
||||
@Schema(description = "日志路径")
|
||||
@TableField("log_path")
|
||||
|
||||
@@ -1,6 +1,9 @@
|
||||
package com.orion.ops.module.asset.entity.domain;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.*;
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import com.orion.ops.framework.mybatis.core.domain.BaseDO;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.*;
|
||||
|
||||
@@ -1,6 +1,9 @@
|
||||
package com.orion.ops.module.asset.entity.domain;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.*;
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import com.orion.ops.framework.mybatis.core.domain.BaseDO;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.*;
|
||||
|
||||
@@ -0,0 +1,75 @@
|
||||
package com.orion.ops.module.asset.entity.domain;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import com.orion.ops.framework.mybatis.core.domain.BaseDO;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.*;
|
||||
|
||||
import java.util.Date;
|
||||
|
||||
/**
|
||||
* 上传任务 实体对象
|
||||
*
|
||||
* @author Jiahang Li
|
||||
* @version 1.0.7
|
||||
* @since 2024-5-7 22:15
|
||||
*/
|
||||
@Data
|
||||
@Builder
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@TableName(value = "upload_task", autoResultMap = true)
|
||||
@Schema(name = "UploadTaskDO", description = "上传任务 实体对象")
|
||||
public class UploadTaskDO extends BaseDO {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@Schema(description = "id")
|
||||
@TableId(value = "id", type = IdType.AUTO)
|
||||
private Long id;
|
||||
|
||||
@Schema(description = "用户id")
|
||||
@TableField("user_id")
|
||||
private Long userId;
|
||||
|
||||
@Schema(description = "用户名")
|
||||
@TableField("username")
|
||||
private String username;
|
||||
|
||||
@Schema(description = "远程路径")
|
||||
@TableField("remote_path")
|
||||
private String remotePath;
|
||||
|
||||
@Schema(description = "描述")
|
||||
@TableField("description")
|
||||
private String description;
|
||||
|
||||
@Schema(description = "状态")
|
||||
@TableField("status")
|
||||
private String status;
|
||||
|
||||
@Schema(description = "额外信息")
|
||||
@TableField("extra_info")
|
||||
private String extraInfo;
|
||||
|
||||
@Schema(description = "文件数量")
|
||||
@TableField("file_count")
|
||||
private Integer fileCount;
|
||||
|
||||
@Schema(description = "主机数量")
|
||||
@TableField("host_count")
|
||||
private Integer hostCount;
|
||||
|
||||
@Schema(description = "开始时间")
|
||||
@TableField("start_time")
|
||||
private Date startTime;
|
||||
|
||||
@Schema(description = "结束时间")
|
||||
@TableField("end_time")
|
||||
private Date endTime;
|
||||
|
||||
}
|
||||
@@ -0,0 +1,67 @@
|
||||
package com.orion.ops.module.asset.entity.domain;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import com.orion.ops.framework.mybatis.core.domain.BaseDO;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.*;
|
||||
|
||||
import java.util.Date;
|
||||
|
||||
/**
|
||||
* 上传任务文件 实体对象
|
||||
*
|
||||
* @author Jiahang Li
|
||||
* @version 1.0.7
|
||||
* @since 2024-5-8 10:31
|
||||
*/
|
||||
@Data
|
||||
@Builder
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@TableName(value = "upload_task_file", autoResultMap = true)
|
||||
@Schema(name = "UploadTaskFileDO", description = "上传任务文件 实体对象")
|
||||
public class UploadTaskFileDO extends BaseDO {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@Schema(description = "id")
|
||||
@TableId(value = "id", type = IdType.AUTO)
|
||||
private Long id;
|
||||
|
||||
@Schema(description = "用户id")
|
||||
@TableField("task_id")
|
||||
private Long taskId;
|
||||
|
||||
@Schema(description = "主机id")
|
||||
@TableField("host_id")
|
||||
private Long hostId;
|
||||
|
||||
@Schema(description = "文件id")
|
||||
@TableField("file_id")
|
||||
private String fileId;
|
||||
|
||||
@Schema(description = "文件路径")
|
||||
@TableField("file_path")
|
||||
private String filePath;
|
||||
|
||||
@Schema(description = "文件大小")
|
||||
@TableField("file_size")
|
||||
private Long fileSize;
|
||||
|
||||
@Schema(description = "状态")
|
||||
@TableField("status")
|
||||
private String status;
|
||||
|
||||
@Schema(description = "开始时间")
|
||||
@TableField("start_time")
|
||||
private Date startTime;
|
||||
|
||||
@Schema(description = "结束时间")
|
||||
@TableField("end_time")
|
||||
private Date endTime;
|
||||
|
||||
}
|
||||
@@ -8,7 +8,6 @@ import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.Date;
|
||||
|
||||
/**
|
||||
* 主机 缓存对象
|
||||
@@ -36,10 +35,4 @@ public class HostCacheDTO implements LongCacheIdModel, Serializable {
|
||||
@Schema(description = "主机地址")
|
||||
private String address;
|
||||
|
||||
@Schema(description = "创建时间")
|
||||
private Date createTime;
|
||||
|
||||
@Schema(description = "修改时间")
|
||||
private Date updateTime;
|
||||
|
||||
}
|
||||
|
||||
@@ -7,7 +7,7 @@ import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
/**
|
||||
* 主机连接日志推展信息对象
|
||||
* 主机连接日志拓展信息对象
|
||||
*
|
||||
* @author Jiahang Li
|
||||
* @version 1.0.0
|
||||
@@ -17,7 +17,7 @@ import lombok.NoArgsConstructor;
|
||||
@Builder
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
@Schema(name = "HostConnectLogExtraDTO", description = "主机连接日志推展信息对象")
|
||||
@Schema(name = "HostConnectLogExtraDTO", description = "主机连接日志拓展信息对象")
|
||||
public class HostConnectLogExtraDTO {
|
||||
|
||||
@Schema(description = "hostId")
|
||||
|
||||
@@ -8,7 +8,6 @@ import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.Date;
|
||||
|
||||
/**
|
||||
* 主机身份缓存
|
||||
@@ -39,10 +38,4 @@ public class HostIdentityCacheDTO implements LongCacheIdModel, Serializable {
|
||||
@Schema(description = "秘钥id")
|
||||
private Long keyId;
|
||||
|
||||
@Schema(description = "创建时间")
|
||||
private Date createTime;
|
||||
|
||||
@Schema(description = "修改时间")
|
||||
private Date updateTime;
|
||||
|
||||
}
|
||||
|
||||
@@ -8,7 +8,6 @@ import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.Date;
|
||||
|
||||
/**
|
||||
* 主机秘钥缓存
|
||||
@@ -30,10 +29,4 @@ public class HostKeyCacheDTO implements LongCacheIdModel, Serializable {
|
||||
@Schema(description = "名称")
|
||||
private String name;
|
||||
|
||||
@Schema(description = "创建时间")
|
||||
private Date createTime;
|
||||
|
||||
@Schema(description = "修改时间")
|
||||
private Date updateTime;
|
||||
|
||||
}
|
||||
|
||||
@@ -23,6 +23,9 @@ import lombok.NoArgsConstructor;
|
||||
@Schema(name = "HostTerminalConnectDTO", description = "主机终端连接参数")
|
||||
public class HostTerminalConnectDTO {
|
||||
|
||||
@Schema(description = "logId")
|
||||
private Long logId;
|
||||
|
||||
@Schema(description = "连接类型")
|
||||
private String connectType;
|
||||
|
||||
@@ -35,6 +38,9 @@ public class HostTerminalConnectDTO {
|
||||
@Schema(description = "主机地址")
|
||||
private String hostAddress;
|
||||
|
||||
@Schema(description = "系统类型")
|
||||
private String osType;
|
||||
|
||||
@Schema(description = "端口")
|
||||
private Integer port;
|
||||
|
||||
|
||||
@@ -0,0 +1,32 @@
|
||||
package com.orion.ops.module.asset.entity.dto;
|
||||
|
||||
import com.orion.ops.module.asset.entity.vo.HostBaseVO;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 上传任务拓展信息对象
|
||||
*
|
||||
* @author Jiahang Li
|
||||
* @version 1.0.0
|
||||
* @since 2024/5/7 23:45
|
||||
*/
|
||||
@Data
|
||||
@Builder
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
@Schema(name = "UploadTaskExtraDTO", description = "上传任务拓展信息对象")
|
||||
public class UploadTaskExtraDTO {
|
||||
|
||||
@Schema(description = "hostIdList")
|
||||
private List<Long> hostIdList;
|
||||
|
||||
@Schema(description = "主机信息")
|
||||
private List<HostBaseVO> hosts;
|
||||
|
||||
}
|
||||
@@ -7,6 +7,7 @@ import lombok.*;
|
||||
|
||||
import javax.validation.constraints.Size;
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 主机连接日志 查询请求对象
|
||||
@@ -26,6 +27,9 @@ public class HostConnectLogQueryRequest extends PageRequest {
|
||||
@Schema(description = "id")
|
||||
private Long id;
|
||||
|
||||
@Schema(description = "id")
|
||||
private List<Long> idList;
|
||||
|
||||
@Schema(description = "用户id")
|
||||
private Long userId;
|
||||
|
||||
|
||||
@@ -6,9 +6,7 @@ import lombok.Builder;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
import javax.validation.constraints.NotBlank;
|
||||
import javax.validation.constraints.NotNull;
|
||||
import javax.validation.constraints.Size;
|
||||
import java.io.Serializable;
|
||||
import java.util.List;
|
||||
|
||||
|
||||
@@ -0,0 +1,49 @@
|
||||
package com.orion.ops.module.asset.entity.request.upload;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
import javax.validation.Valid;
|
||||
import javax.validation.constraints.NotBlank;
|
||||
import javax.validation.constraints.NotEmpty;
|
||||
import javax.validation.constraints.Size;
|
||||
import java.io.Serializable;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 上传任务 创建请求对象
|
||||
*
|
||||
* @author Jiahang Li
|
||||
* @version 1.0.7
|
||||
* @since 2024-5-7 22:15
|
||||
*/
|
||||
@Data
|
||||
@Builder
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
@Schema(name = "UploadTaskCreateRequest", description = "上传任务 创建请求对象")
|
||||
public class UploadTaskCreateRequest implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@NotBlank
|
||||
@Size(max = 1024)
|
||||
@Schema(description = "远程路径")
|
||||
private String remotePath;
|
||||
|
||||
@Size(max = 128)
|
||||
@Schema(description = "描述")
|
||||
private String description;
|
||||
|
||||
@NotEmpty
|
||||
@Schema(description = "上传主机id")
|
||||
private List<Long> hostIdList;
|
||||
|
||||
@Valid
|
||||
@NotEmpty
|
||||
@Schema(description = "上传文件")
|
||||
private List<UploadTaskFileRequest> files;
|
||||
}
|
||||
@@ -0,0 +1,41 @@
|
||||
package com.orion.ops.module.asset.entity.request.upload;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
import javax.validation.constraints.NotBlank;
|
||||
import javax.validation.constraints.NotNull;
|
||||
import java.io.Serializable;
|
||||
|
||||
/**
|
||||
* 上传任务文件 请求对象
|
||||
*
|
||||
* @author Jiahang Li
|
||||
* @version 1.0.0
|
||||
* @since 2024/5/7 22:54
|
||||
*/
|
||||
@Data
|
||||
@Builder
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
@Schema(name = "UploadTaskFileRequest", description = "上传任务文件 创建请求对象")
|
||||
public class UploadTaskFileRequest implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@NotBlank
|
||||
@Schema(description = "文件id")
|
||||
private String fileId;
|
||||
|
||||
@NotBlank
|
||||
@Schema(description = "文件地址")
|
||||
private String filePath;
|
||||
|
||||
@NotNull
|
||||
@Schema(description = "文件大小")
|
||||
private Long fileSize;
|
||||
|
||||
}
|
||||
@@ -0,0 +1,47 @@
|
||||
package com.orion.ops.module.asset.entity.request.upload;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import com.orion.ops.framework.common.entity.PageRequest;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.*;
|
||||
|
||||
import javax.validation.constraints.Size;
|
||||
import java.util.Date;
|
||||
|
||||
/**
|
||||
* 上传任务 查询请求对象
|
||||
*
|
||||
* @author Jiahang Li
|
||||
* @version 1.0.7
|
||||
* @since 2024-5-7 22:15
|
||||
*/
|
||||
@Data
|
||||
@Builder
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Schema(name = "UploadTaskQueryRequest", description = "上传任务 查询请求对象")
|
||||
public class UploadTaskQueryRequest extends PageRequest {
|
||||
|
||||
@Schema(description = "id")
|
||||
private Long id;
|
||||
|
||||
@Schema(description = "用户id")
|
||||
private Long userId;
|
||||
|
||||
@Size(max = 128)
|
||||
@Schema(description = "描述")
|
||||
private String description;
|
||||
|
||||
@Schema(description = "远程路径")
|
||||
private String remotePath;
|
||||
|
||||
@Size(max = 16)
|
||||
@Schema(description = "状态")
|
||||
private String status;
|
||||
|
||||
@Schema(description = "创建时间-区间")
|
||||
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
|
||||
private Date[] createTimeRange;
|
||||
|
||||
}
|
||||
@@ -0,0 +1,35 @@
|
||||
package com.orion.ops.module.asset.entity.request.upload;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
import javax.validation.constraints.NotNull;
|
||||
import java.io.Serializable;
|
||||
|
||||
/**
|
||||
* 上传任务 请求对象
|
||||
*
|
||||
* @author Jiahang Li
|
||||
* @version 1.0.7
|
||||
* @since 2024-5-7 22:15
|
||||
*/
|
||||
@Data
|
||||
@Builder
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
@Schema(name = "UploadTaskRequest", description = "上传任务 请求对象")
|
||||
public class UploadTaskRequest implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@NotNull
|
||||
@Schema(description = "id")
|
||||
private Long id;
|
||||
|
||||
@Schema(description = "是否失败")
|
||||
private Boolean failed;
|
||||
|
||||
}
|
||||
@@ -50,7 +50,7 @@ public class ExecHostLogVO implements Serializable {
|
||||
private String parameter;
|
||||
|
||||
@Schema(description = "退出码")
|
||||
private Integer exitStatus;
|
||||
private Integer exitCode;
|
||||
|
||||
@Schema(description = "错误信息")
|
||||
private String errorMessage;
|
||||
|
||||
@@ -0,0 +1,39 @@
|
||||
package com.orion.ops.module.asset.entity.vo;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
/**
|
||||
* 主机基本信息 视图响应对象
|
||||
*
|
||||
* @author Jiahang Li
|
||||
* @version 1.0.0
|
||||
* @since 2023-9-11 14:16
|
||||
*/
|
||||
@Data
|
||||
@Builder
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
@Schema(name = "HostBaseVO", description = "主机基本信息 视图响应对象")
|
||||
public class HostBaseVO implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@Schema(description = "id")
|
||||
private Long id;
|
||||
|
||||
@Schema(description = "主机名称")
|
||||
private String name;
|
||||
|
||||
@Schema(description = "主机编码")
|
||||
private String code;
|
||||
|
||||
@Schema(description = "主机地址")
|
||||
private String address;
|
||||
|
||||
}
|
||||
@@ -0,0 +1,33 @@
|
||||
package com.orion.ops.module.asset.entity.vo;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
/**
|
||||
* 上传任务 视图响应对象
|
||||
*
|
||||
* @author Jiahang Li
|
||||
* @version 1.0.7
|
||||
* @since 2024-5-7 22:15
|
||||
*/
|
||||
@Data
|
||||
@Builder
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
@Schema(name = "UploadTaskCreateVO", description = "上传任务创建 视图响应对象")
|
||||
public class UploadTaskCreateVO implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@Schema(description = "id")
|
||||
private Long id;
|
||||
|
||||
@Schema(description = "上传 token")
|
||||
private String token;
|
||||
|
||||
}
|
||||
@@ -0,0 +1,61 @@
|
||||
package com.orion.ops.module.asset.entity.vo;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.Date;
|
||||
|
||||
/**
|
||||
* 上传任务文件 视图响应对象
|
||||
*
|
||||
* @author Jiahang Li
|
||||
* @version 1.0.7
|
||||
* @since 2024-5-8 10:31
|
||||
*/
|
||||
@Data
|
||||
@Builder
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
@Schema(name = "UploadTaskFileVO", description = "上传任务文件 视图响应对象")
|
||||
public class UploadTaskFileVO implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@Schema(description = "id")
|
||||
private Long id;
|
||||
|
||||
@Schema(description = "用户id")
|
||||
private Long taskId;
|
||||
|
||||
@Schema(description = "主机id")
|
||||
private Long hostId;
|
||||
|
||||
@Schema(description = "文件id")
|
||||
private String fileId;
|
||||
|
||||
@Schema(description = "文件路径")
|
||||
private String filePath;
|
||||
|
||||
@Schema(description = "文件大小")
|
||||
private Long fileSize;
|
||||
|
||||
@Schema(description = "额外信息")
|
||||
private String extraInfo;
|
||||
|
||||
@Schema(description = "状态")
|
||||
private String status;
|
||||
|
||||
@Schema(description = "开始时间")
|
||||
private Date startTime;
|
||||
|
||||
@Schema(description = "结束时间")
|
||||
private Date endTime;
|
||||
|
||||
@Schema(description = "传输进度")
|
||||
private Long current;
|
||||
|
||||
}
|
||||
@@ -0,0 +1,43 @@
|
||||
package com.orion.ops.module.asset.entity.vo;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 上传任务主机 视图响应对象
|
||||
*
|
||||
* @author Jiahang Li
|
||||
* @version 1.0.7
|
||||
* @since 2024-5-8 10:31
|
||||
*/
|
||||
@Data
|
||||
@Builder
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
@Schema(name = "UploadTaskHostVO", description = "上传任务主机 视图响应对象")
|
||||
public class UploadTaskHostVO implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@Schema(description = "id")
|
||||
private Long id;
|
||||
|
||||
@Schema(description = "主机名称")
|
||||
private String name;
|
||||
|
||||
@Schema(description = "主机编码")
|
||||
private String code;
|
||||
|
||||
@Schema(description = "主机地址")
|
||||
private String address;
|
||||
|
||||
@Schema(description = "上传文件")
|
||||
private List<UploadTaskFileVO> files;
|
||||
|
||||
}
|
||||
@@ -0,0 +1,44 @@
|
||||
package com.orion.ops.module.asset.entity.vo;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 上传任务状态 视图响应对象
|
||||
*
|
||||
* @author Jiahang Li
|
||||
* @version 1.0.7
|
||||
* @since 2024-5-7 22:15
|
||||
*/
|
||||
@Data
|
||||
@Builder
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
@Schema(name = "UploadTaskStatusVO", description = "上传任务状态 视图响应对象")
|
||||
public class UploadTaskStatusVO implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@Schema(description = "id")
|
||||
private Long id;
|
||||
|
||||
@Schema(description = "状态")
|
||||
private String status;
|
||||
|
||||
@Schema(description = "开始时间")
|
||||
private Date startTime;
|
||||
|
||||
@Schema(description = "结束时间")
|
||||
private Date endTime;
|
||||
|
||||
@Schema(description = "上传文件")
|
||||
private List<UploadTaskFileVO> files;
|
||||
|
||||
}
|
||||
@@ -0,0 +1,68 @@
|
||||
package com.orion.ops.module.asset.entity.vo;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 上传任务 视图响应对象
|
||||
*
|
||||
* @author Jiahang Li
|
||||
* @version 1.0.7
|
||||
* @since 2024-5-7 22:15
|
||||
*/
|
||||
@Data
|
||||
@Builder
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
@Schema(name = "UploadTaskVO", description = "上传任务 视图响应对象")
|
||||
public class UploadTaskVO implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@Schema(description = "id")
|
||||
private Long id;
|
||||
|
||||
@Schema(description = "用户id")
|
||||
private Long userId;
|
||||
|
||||
@Schema(description = "用户名")
|
||||
private String username;
|
||||
|
||||
@Schema(description = "远程路径")
|
||||
private String remotePath;
|
||||
|
||||
@Schema(description = "描述")
|
||||
private String description;
|
||||
|
||||
@Schema(description = "状态")
|
||||
private String status;
|
||||
|
||||
@Schema(description = "额外信息")
|
||||
private String extraInfo;
|
||||
|
||||
@Schema(description = "文件数量")
|
||||
private Integer fileCount;
|
||||
|
||||
@Schema(description = "主机数量")
|
||||
private Integer hostCount;
|
||||
|
||||
@Schema(description = "开始时间")
|
||||
private Date startTime;
|
||||
|
||||
@Schema(description = "结束时间")
|
||||
private Date endTime;
|
||||
|
||||
@Schema(description = "创建时间")
|
||||
private Date createTime;
|
||||
|
||||
@Schema(description = "上传主机及文件")
|
||||
private List<UploadTaskHostVO> hosts;
|
||||
|
||||
}
|
||||
@@ -21,4 +21,16 @@ public enum ExecSourceEnum {
|
||||
|
||||
;
|
||||
|
||||
public static ExecSourceEnum of(String source) {
|
||||
if (source == null) {
|
||||
return null;
|
||||
}
|
||||
for (ExecSourceEnum value : values()) {
|
||||
if (value.name().equals(source)) {
|
||||
return value;
|
||||
}
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -40,5 +40,4 @@ public enum HostSshOsTypeEnum {
|
||||
return null;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
@@ -0,0 +1,51 @@
|
||||
package com.orion.ops.module.asset.enums;
|
||||
|
||||
/**
|
||||
* 上传任务文件状态
|
||||
*
|
||||
* @author Jiahang Li
|
||||
* @version 1.0.0
|
||||
* @since 2024/5/7 22:21
|
||||
*/
|
||||
public enum UploadTaskFileStatusEnum {
|
||||
|
||||
/**
|
||||
* 等待中
|
||||
*/
|
||||
WAITING,
|
||||
|
||||
/**
|
||||
* 上传中
|
||||
*/
|
||||
UPLOADING,
|
||||
|
||||
/**
|
||||
* 已完成
|
||||
*/
|
||||
FINISHED,
|
||||
|
||||
/**
|
||||
* 已失败
|
||||
*/
|
||||
FAILED,
|
||||
|
||||
/**
|
||||
* 已取消
|
||||
*/
|
||||
CANCELED,
|
||||
|
||||
;
|
||||
|
||||
public static UploadTaskFileStatusEnum of(String status) {
|
||||
if (status == null) {
|
||||
return null;
|
||||
}
|
||||
for (UploadTaskFileStatusEnum value : values()) {
|
||||
if (value.name().equals(status)) {
|
||||
return value;
|
||||
}
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,58 @@
|
||||
package com.orion.ops.module.asset.enums;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Getter;
|
||||
|
||||
/**
|
||||
* 上传任务状态
|
||||
*
|
||||
* @author Jiahang Li
|
||||
* @version 1.0.0
|
||||
* @since 2024/5/7 22:21
|
||||
*/
|
||||
@Getter
|
||||
@AllArgsConstructor
|
||||
public enum UploadTaskStatusEnum {
|
||||
|
||||
/**
|
||||
* 等待中
|
||||
*/
|
||||
WAITING(true),
|
||||
|
||||
/**
|
||||
* 上传中
|
||||
*/
|
||||
UPLOADING(true),
|
||||
|
||||
/**
|
||||
* 已完成
|
||||
*/
|
||||
FINISHED(false),
|
||||
|
||||
/**
|
||||
* 已失败
|
||||
*/
|
||||
FAILED(false),
|
||||
|
||||
/**
|
||||
* 已取消
|
||||
*/
|
||||
CANCELED(false),
|
||||
|
||||
;
|
||||
|
||||
private final boolean cancelable;
|
||||
|
||||
public static UploadTaskStatusEnum of(String status) {
|
||||
if (status == null) {
|
||||
return null;
|
||||
}
|
||||
for (UploadTaskStatusEnum value : values()) {
|
||||
if (value.name().equals(status)) {
|
||||
return value;
|
||||
}
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -12,8 +12,8 @@ import com.orion.ops.framework.common.security.PasswordModifier;
|
||||
import com.orion.ops.framework.common.utils.Valid;
|
||||
import com.orion.ops.module.asset.dao.HostIdentityDAO;
|
||||
import com.orion.ops.module.asset.dao.HostKeyDAO;
|
||||
import com.orion.ops.module.asset.enums.HostSshOsTypeEnum;
|
||||
import com.orion.ops.module.asset.enums.HostSshAuthTypeEnum;
|
||||
import com.orion.ops.module.asset.enums.HostSshOsTypeEnum;
|
||||
import com.orion.ops.module.asset.handler.host.config.model.HostSshConfigModel;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
|
||||
@@ -22,7 +22,7 @@ import java.util.List;
|
||||
@Schema(name = "ExecCommandDTO", description = "批量执行启动对象")
|
||||
public class ExecCommandDTO {
|
||||
|
||||
@Schema(description = "hostId")
|
||||
@Schema(description = "logId")
|
||||
private Long logId;
|
||||
|
||||
@Schema(description = "用户id")
|
||||
|
||||
@@ -42,13 +42,13 @@ import java.util.concurrent.TimeUnit;
|
||||
@Slf4j
|
||||
public abstract class BaseExecCommandHandler implements IExecCommandHandler {
|
||||
|
||||
private final FileClient fileClient = SpringHolder.getBean("logsFileClient");
|
||||
private static final FileClient fileClient = SpringHolder.getBean("logsFileClient");
|
||||
|
||||
private final ExecLogManager execLogManager = SpringHolder.getBean(ExecLogManager.class);
|
||||
private static final ExecLogManager execLogManager = SpringHolder.getBean(ExecLogManager.class);
|
||||
|
||||
private final HostTerminalService hostTerminalService = SpringHolder.getBean(HostTerminalService.class);
|
||||
private static final HostTerminalService hostTerminalService = SpringHolder.getBean(HostTerminalService.class);
|
||||
|
||||
private final ExecHostLogDAO execHostLogDAO = SpringHolder.getBean(ExecHostLogDAO.class);
|
||||
private static final ExecHostLogDAO execHostLogDAO = SpringHolder.getBean(ExecHostLogDAO.class);
|
||||
|
||||
protected final ExecCommandDTO execCommand;
|
||||
|
||||
@@ -67,6 +67,9 @@ public abstract class BaseExecCommandHandler implements IExecCommandHandler {
|
||||
|
||||
private CommandExecutor executor;
|
||||
|
||||
@Getter
|
||||
private Integer exitCode;
|
||||
|
||||
private volatile boolean closed;
|
||||
|
||||
private volatile boolean interrupted;
|
||||
@@ -227,7 +230,8 @@ public abstract class BaseExecCommandHandler implements IExecCommandHandler {
|
||||
} else if (ExecHostStatusEnum.COMPLETED.equals(status)) {
|
||||
// 完成
|
||||
updateRecord.setFinishTime(new Date());
|
||||
updateRecord.setExitStatus(executor.getExitCode());
|
||||
updateRecord.setExitCode(executor.getExitCode());
|
||||
this.exitCode = executor.getExitCode();
|
||||
} else if (ExecHostStatusEnum.FAILED.equals(status)) {
|
||||
// 失败
|
||||
updateRecord.setFinishTime(new Date());
|
||||
|
||||
@@ -4,7 +4,6 @@ import com.orion.lang.support.timeout.TimeoutChecker;
|
||||
import com.orion.lang.support.timeout.TimeoutEndpoint;
|
||||
import com.orion.lang.utils.Booleans;
|
||||
import com.orion.lang.utils.ansi.AnsiAppender;
|
||||
import com.orion.lang.utils.ansi.style.AnsiFont;
|
||||
import com.orion.lang.utils.ansi.style.color.AnsiForeground;
|
||||
import com.orion.lang.utils.time.Dates;
|
||||
import com.orion.net.host.ssh.ExitCode;
|
||||
@@ -31,16 +30,16 @@ public class ExecCommandAnsiHandler extends BaseExecCommandHandler {
|
||||
super.initLogOutputStream();
|
||||
// 拼接启动日志
|
||||
AnsiAppender appender = AnsiAppender.create()
|
||||
.append(AnsiForeground.BRIGHT_GREEN.and(AnsiFont.BOLD), "> 准备执行命令 ")
|
||||
.append(AnsiForeground.BRIGHT_GREEN, "> 准备执行命令 ")
|
||||
.append(Dates.current())
|
||||
.newLine()
|
||||
.append(AnsiForeground.BRIGHT_BLUE.and(AnsiFont.BOLD), "执行记录: ")
|
||||
.append(AnsiForeground.BRIGHT_BLUE, "执行记录: ")
|
||||
.append(execCommand.getLogId())
|
||||
.newLine()
|
||||
.append(AnsiForeground.BRIGHT_BLUE.and(AnsiFont.BOLD), "执行描述: ")
|
||||
.append(AnsiForeground.BRIGHT_BLUE, "执行描述: ")
|
||||
.append(execCommand.getDescription())
|
||||
.newLine()
|
||||
.append(AnsiForeground.BRIGHT_BLUE.and(AnsiFont.BOLD), "执行用户: ")
|
||||
.append(AnsiForeground.BRIGHT_BLUE, "执行用户: ")
|
||||
.append(execCommand.getUsername());
|
||||
// 非系统用户执行添加 userId
|
||||
if (Const.SYSTEM_USER_ID.equals(execCommand.getUserId())) {
|
||||
@@ -53,35 +52,35 @@ public class ExecCommandAnsiHandler extends BaseExecCommandHandler {
|
||||
}
|
||||
// 执行序列
|
||||
if (execCommand.getExecSeq() != null) {
|
||||
appender.append(AnsiForeground.BRIGHT_BLUE.and(AnsiFont.BOLD), "执行序列: ")
|
||||
appender.append(AnsiForeground.BRIGHT_BLUE, "执行序列: ")
|
||||
.append('#')
|
||||
.append(execCommand.getExecSeq())
|
||||
.newLine();
|
||||
}
|
||||
appender.append(AnsiForeground.BRIGHT_BLUE.and(AnsiFont.BOLD), "执行主机: ")
|
||||
appender.append(AnsiForeground.BRIGHT_BLUE, "执行主机: ")
|
||||
.append(execHostCommand.getHostName())
|
||||
.append(" (")
|
||||
.append(execHostCommand.getHostId())
|
||||
.append(")")
|
||||
.newLine()
|
||||
.append(AnsiForeground.BRIGHT_BLUE.and(AnsiFont.BOLD), "主机地址: ")
|
||||
.append(AnsiForeground.BRIGHT_BLUE, "主机地址: ")
|
||||
.append(execHostCommand.getHostAddress())
|
||||
.newLine()
|
||||
.append(AnsiForeground.BRIGHT_BLUE.and(AnsiFont.BOLD), "超时时间: ")
|
||||
.append(AnsiForeground.BRIGHT_BLUE, "超时时间: ")
|
||||
.append(execCommand.getTimeout())
|
||||
.newLine()
|
||||
.append(AnsiForeground.BRIGHT_BLUE.and(AnsiFont.BOLD), "脚本执行: ")
|
||||
.append(AnsiForeground.BRIGHT_BLUE, "脚本执行: ")
|
||||
.append(execCommand.getScriptExec())
|
||||
.newLine()
|
||||
.newLine()
|
||||
.append(AnsiForeground.BRIGHT_GREEN.and(AnsiFont.BOLD), "> 执行命令 ")
|
||||
.append(AnsiForeground.BRIGHT_GREEN, "> 执行命令 ")
|
||||
.newLine()
|
||||
.append(execHostCommand.getCommand())
|
||||
.newLine()
|
||||
.newLine();
|
||||
// 非脚本执行拼接开始执行日志
|
||||
if (!Booleans.isTrue(execCommand.getScriptExec())) {
|
||||
appender.append(AnsiForeground.BRIGHT_GREEN.and(AnsiFont.BOLD), "> 开始执行命令 ")
|
||||
appender.append(AnsiForeground.BRIGHT_GREEN, "> 开始执行命令 ")
|
||||
.append(Dates.current())
|
||||
.newLine();
|
||||
}
|
||||
@@ -94,10 +93,10 @@ public class ExecCommandAnsiHandler extends BaseExecCommandHandler {
|
||||
// 拼接上传日志
|
||||
AnsiAppender startAppender = AnsiAppender.create()
|
||||
.newLine()
|
||||
.append(AnsiForeground.BRIGHT_GREEN.and(AnsiFont.BOLD), "> 准备上传脚本 ")
|
||||
.append(AnsiForeground.BRIGHT_GREEN, "> 准备上传脚本 ")
|
||||
.append(Dates.current())
|
||||
.newLine()
|
||||
.append(AnsiForeground.BRIGHT_BLUE.and(AnsiFont.BOLD), "文件路径: ")
|
||||
.append(AnsiForeground.BRIGHT_BLUE, "文件路径: ")
|
||||
.append(execHostCommand.getScriptPath())
|
||||
.newLine();
|
||||
this.appendLog(startAppender);
|
||||
@@ -105,18 +104,18 @@ public class ExecCommandAnsiHandler extends BaseExecCommandHandler {
|
||||
super.uploadScriptFile();
|
||||
// 拼接完成日志
|
||||
AnsiAppender finishAppender = AnsiAppender.create()
|
||||
.append(AnsiForeground.BRIGHT_GREEN.and(AnsiFont.BOLD), "< 脚本上传成功 ")
|
||||
.append(AnsiForeground.BRIGHT_GREEN, "< 脚本上传成功 ")
|
||||
.append(Dates.current())
|
||||
.newLine()
|
||||
.newLine()
|
||||
.append(AnsiForeground.BRIGHT_GREEN.and(AnsiFont.BOLD), "> 开始执行脚本 ")
|
||||
.append(AnsiForeground.BRIGHT_GREEN, "> 开始执行脚本 ")
|
||||
.append(Dates.current())
|
||||
.newLine();
|
||||
this.appendLog(finishAppender);
|
||||
} catch (Exception e) {
|
||||
// 拼接失败日志
|
||||
AnsiAppender errorAppender = AnsiAppender.create()
|
||||
.append(AnsiForeground.BRIGHT_RED.and(AnsiFont.BOLD), "< 脚本上传失败 ")
|
||||
.append(AnsiForeground.BRIGHT_RED, "< 脚本上传失败 ")
|
||||
.append(Dates.current())
|
||||
.newLine();
|
||||
this.appendLog(errorAppender);
|
||||
@@ -133,37 +132,37 @@ public class ExecCommandAnsiHandler extends BaseExecCommandHandler {
|
||||
.newLine();
|
||||
if (this.status == ExecHostStatusEnum.INTERRUPTED) {
|
||||
// 中断执行
|
||||
appender.append(AnsiForeground.BRIGHT_YELLOW.and(AnsiFont.BOLD), "< 命令执行中断 ")
|
||||
appender.append(AnsiForeground.BRIGHT_YELLOW, "< 命令执行中断 ")
|
||||
.append(Dates.current())
|
||||
.newLine();
|
||||
} else if (this.status == ExecHostStatusEnum.FAILED) {
|
||||
// 执行失败
|
||||
appender.append(AnsiForeground.BRIGHT_RED.and(AnsiFont.BOLD), "< 命令执行失败 ")
|
||||
appender.append(AnsiForeground.BRIGHT_RED, "< 命令执行失败 ")
|
||||
.append(Dates.current())
|
||||
.newLine()
|
||||
.append(AnsiForeground.BRIGHT_RED.and(AnsiFont.BOLD), "错误原因: ")
|
||||
.append(AnsiForeground.BRIGHT_RED, "错误原因: ")
|
||||
.append(this.getErrorMessage(e))
|
||||
.newLine();
|
||||
} else if (this.status == ExecHostStatusEnum.TIMEOUT) {
|
||||
// 更新执行超时
|
||||
appender.append(AnsiForeground.BRIGHT_YELLOW.and(AnsiFont.BOLD), "< 命令执行超时 ")
|
||||
appender.append(AnsiForeground.BRIGHT_YELLOW, "< 命令执行超时 ")
|
||||
.append(Dates.current())
|
||||
.newLine();
|
||||
} else {
|
||||
long ms = this.updateRecord.getFinishTime().getTime() - this.updateRecord.getStartTime().getTime();
|
||||
Integer exitStatus = this.updateRecord.getExitStatus();
|
||||
long ms = updateRecord.getFinishTime().getTime() - updateRecord.getStartTime().getTime();
|
||||
Integer exitCode = updateRecord.getExitCode();
|
||||
// 执行完成
|
||||
appender.append(AnsiForeground.BRIGHT_GREEN.and(AnsiFont.BOLD), "< 命令执行完成 ")
|
||||
appender.append(AnsiForeground.BRIGHT_GREEN, "< 命令执行完成 ")
|
||||
.append(Dates.current())
|
||||
.newLine()
|
||||
.append(AnsiForeground.BRIGHT_BLUE.and(AnsiFont.BOLD), "exit: ");
|
||||
if (ExitCode.isSuccess(exitStatus)) {
|
||||
appender.append(AnsiForeground.BRIGHT_GREEN.and(AnsiFont.BOLD), exitStatus);
|
||||
.append(AnsiForeground.BRIGHT_BLUE, "exit: ");
|
||||
if (ExitCode.isSuccess(exitCode)) {
|
||||
appender.append(AnsiForeground.BRIGHT_GREEN, exitCode);
|
||||
} else {
|
||||
appender.append(AnsiForeground.BRIGHT_RED.and(AnsiFont.BOLD), exitStatus);
|
||||
appender.append(AnsiForeground.BRIGHT_RED, exitCode);
|
||||
}
|
||||
appender.newLine()
|
||||
.append(AnsiForeground.BRIGHT_BLUE.and(AnsiFont.BOLD), "used: ")
|
||||
.append(AnsiForeground.BRIGHT_BLUE, "used: ")
|
||||
.append(Dates.interval(ms, false, "d ", "h ", "m ", "s"))
|
||||
.append(" (")
|
||||
.append(ms)
|
||||
|
||||
@@ -7,20 +7,29 @@ import com.orion.lang.utils.Booleans;
|
||||
import com.orion.lang.utils.Threads;
|
||||
import com.orion.lang.utils.collect.Lists;
|
||||
import com.orion.lang.utils.io.Streams;
|
||||
import com.orion.lang.utils.time.Dates;
|
||||
import com.orion.net.host.ssh.ExitCode;
|
||||
import com.orion.ops.framework.common.constant.ExtraFieldConst;
|
||||
import com.orion.ops.module.asset.dao.ExecLogDAO;
|
||||
import com.orion.ops.module.asset.define.AssetThreadPools;
|
||||
import com.orion.ops.module.asset.define.config.AppExecLogConfig;
|
||||
import com.orion.ops.module.asset.define.message.ExecMessageDefine;
|
||||
import com.orion.ops.module.asset.entity.domain.ExecLogDO;
|
||||
import com.orion.ops.module.asset.enums.ExecHostStatusEnum;
|
||||
import com.orion.ops.module.asset.enums.ExecStatusEnum;
|
||||
import com.orion.ops.module.asset.handler.host.exec.command.dto.ExecCommandDTO;
|
||||
import com.orion.ops.module.asset.handler.host.exec.command.dto.ExecCommandHostDTO;
|
||||
import com.orion.ops.module.asset.handler.host.exec.command.manager.ExecTaskManager;
|
||||
import com.orion.ops.module.infra.api.SystemMessageApi;
|
||||
import com.orion.ops.module.infra.entity.dto.message.SystemMessageDTO;
|
||||
import com.orion.spring.SpringHolder;
|
||||
import lombok.Getter;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
|
||||
import java.util.Date;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* 命令执行任务
|
||||
@@ -38,6 +47,8 @@ public class ExecTaskHandler implements IExecTaskHandler {
|
||||
|
||||
private static final AppExecLogConfig appExecLogConfig = SpringHolder.getBean(AppExecLogConfig.class);
|
||||
|
||||
private static final SystemMessageApi systemMessageApi = SpringHolder.getBean(SystemMessageApi.class);
|
||||
|
||||
private final ExecCommandDTO execCommand;
|
||||
|
||||
private TimeoutChecker<TimeoutEndpoint> timeoutChecker;
|
||||
@@ -45,6 +56,8 @@ public class ExecTaskHandler implements IExecTaskHandler {
|
||||
@Getter
|
||||
private final List<IExecCommandHandler> handlers;
|
||||
|
||||
private Date startTime;
|
||||
|
||||
public ExecTaskHandler(ExecCommandDTO execCommand) {
|
||||
this.execCommand = execCommand;
|
||||
this.handlers = Lists.newList();
|
||||
@@ -56,9 +69,9 @@ public class ExecTaskHandler implements IExecTaskHandler {
|
||||
// 添加任务
|
||||
execTaskManager.addTask(id, this);
|
||||
log.info("ExecTaskHandler.run start id: {}", id);
|
||||
// 更新状态
|
||||
this.updateStatus(ExecStatusEnum.RUNNING);
|
||||
try {
|
||||
// 更新状态
|
||||
this.updateStatus(ExecStatusEnum.RUNNING);
|
||||
// 执行命令
|
||||
this.runHostCommand();
|
||||
// 更新状态-执行完成
|
||||
@@ -69,10 +82,12 @@ public class ExecTaskHandler implements IExecTaskHandler {
|
||||
this.updateStatus(ExecStatusEnum.FAILED);
|
||||
log.error("ExecTaskHandler.run error id: {}", id, e);
|
||||
} finally {
|
||||
// 释放资源
|
||||
Streams.close(this);
|
||||
// 检查是否发送消息
|
||||
this.checkSendMessage();
|
||||
// 移除任务
|
||||
execTaskManager.removeTask(id);
|
||||
// 释放资源
|
||||
this.close();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -82,6 +97,13 @@ public class ExecTaskHandler implements IExecTaskHandler {
|
||||
handlers.forEach(IExecCommandHandler::interrupt);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void close() {
|
||||
log.info("ExecTaskHandler-close id: {}", execCommand.getLogId());
|
||||
Streams.close(timeoutChecker);
|
||||
this.handlers.forEach(Streams::close);
|
||||
}
|
||||
|
||||
/**
|
||||
* 执行主机命令
|
||||
*
|
||||
@@ -139,6 +161,7 @@ public class ExecTaskHandler implements IExecTaskHandler {
|
||||
update.setStatus(statusName);
|
||||
if (ExecStatusEnum.RUNNING.equals(status)) {
|
||||
// 执行中
|
||||
this.startTime = new Date();
|
||||
update.setStartTime(new Date());
|
||||
} else if (ExecStatusEnum.COMPLETED.equals(status)) {
|
||||
// 执行完成
|
||||
@@ -151,11 +174,30 @@ public class ExecTaskHandler implements IExecTaskHandler {
|
||||
log.info("ExecTaskHandler-updateStatus finish id: {}, effect: {}", id, effect);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void close() {
|
||||
log.info("ExecTaskHandler-close id: {}", execCommand.getLogId());
|
||||
Streams.close(timeoutChecker);
|
||||
this.handlers.forEach(Streams::close);
|
||||
/**
|
||||
* 检查是否发送消息
|
||||
*/
|
||||
private void checkSendMessage() {
|
||||
// 检查是否执行失败/exitCode
|
||||
boolean hasError = handlers.stream().anyMatch(s ->
|
||||
ExecHostStatusEnum.FAILED.equals(s.getStatus())
|
||||
|| ExecHostStatusEnum.TIMEOUT.equals(s.getStatus())
|
||||
|| !ExitCode.isSuccess(s.getExitCode()));
|
||||
if (!hasError) {
|
||||
return;
|
||||
}
|
||||
// 参数
|
||||
Map<String, Object> params = new HashMap<>();
|
||||
params.put(ExtraFieldConst.ID, execCommand.getLogId());
|
||||
params.put(ExtraFieldConst.TIME, Dates.format(this.startTime, Dates.MD_HM));
|
||||
SystemMessageDTO message = SystemMessageDTO.builder()
|
||||
.receiverId(execCommand.getUserId())
|
||||
.receiverUsername(execCommand.getUsername())
|
||||
.relKey(String.valueOf(execCommand.getLogId()))
|
||||
.params(params)
|
||||
.build();
|
||||
// 发送
|
||||
systemMessageApi.create(ExecMessageDefine.EXEC_FAILED, message);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -31,6 +31,13 @@ public interface IExecCommandHandler extends Runnable, SafeCloseable {
|
||||
*/
|
||||
ExecHostStatusEnum getStatus();
|
||||
|
||||
/**
|
||||
* 获取退出码
|
||||
*
|
||||
* @return exit code
|
||||
*/
|
||||
Integer getExitCode();
|
||||
|
||||
/**
|
||||
* 获取主机 id
|
||||
*
|
||||
|
||||
@@ -65,7 +65,7 @@ public class TerminalMessageDispatcher extends AbstractWebSocketHandler {
|
||||
String id = session.getId();
|
||||
log.info("TerminalMessageDispatcher-afterConnectionClosed id: {}, code: {}, reason: {}", id, status.getCode(), status.getReason());
|
||||
// 关闭会话
|
||||
terminalManager.closeAll(id);
|
||||
terminalManager.closeSession(id);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
package com.orion.ops.module.asset.handler.host.terminal.handler;
|
||||
|
||||
import com.alibaba.fastjson.JSON;
|
||||
import com.orion.lang.utils.Strings;
|
||||
import com.orion.lang.utils.collect.Lists;
|
||||
import com.orion.ops.framework.common.enums.BooleanBit;
|
||||
import com.orion.ops.module.asset.handler.host.terminal.enums.OutputTypeEnum;
|
||||
|
||||
@@ -75,10 +75,12 @@ public class TerminalCheckHandler extends AbstractTerminalHandler<TerminalCheckR
|
||||
log.info("TerminalCheckHandler-handle unknown host userId: {}, hostId: {}, sessionId: {}", userId, hostId, sessionId);
|
||||
return;
|
||||
}
|
||||
HostTerminalConnectDTO connect = null;
|
||||
Exception ex = null;
|
||||
try {
|
||||
// 获取连接信息
|
||||
HostTerminalConnectDTO connect = hostTerminalService.getTerminalConnectInfo(userId, host, connectType);
|
||||
connect = hostTerminalService.getTerminalConnectInfo(userId, host);
|
||||
connect.setConnectType(connectType.name());
|
||||
// 设置到缓存中
|
||||
channel.getAttributes().put(sessionId, connect);
|
||||
log.info("TerminalCheckHandler-handle success userId: {}, hostId: {}, sessionId: {}", userId, hostId, sessionId);
|
||||
@@ -93,7 +95,10 @@ public class TerminalCheckHandler extends AbstractTerminalHandler<TerminalCheckR
|
||||
log.error("TerminalCheckHandler-handle exception userId: {}, hostId: {}, sessionId: {}", userId, hostId, sessionId, e);
|
||||
}
|
||||
// 记录主机日志
|
||||
this.saveHostLog(channel, userId, host, startTime, ex, sessionId, connectType);
|
||||
Long logId = this.saveHostLog(channel, userId, host, startTime, ex, sessionId, connectType);
|
||||
if (connect != null) {
|
||||
connect.setLogId(logId);
|
||||
}
|
||||
// 响应检查结果
|
||||
this.send(channel,
|
||||
OutputTypeEnum.CHECK,
|
||||
@@ -165,8 +170,9 @@ public class TerminalCheckHandler extends AbstractTerminalHandler<TerminalCheckR
|
||||
* @param ex ex
|
||||
* @param sessionId sessionId
|
||||
* @param connectType connectType
|
||||
* @return logId
|
||||
*/
|
||||
private void saveHostLog(WebSocketSession channel,
|
||||
private Long saveHostLog(WebSocketSession channel,
|
||||
Long userId,
|
||||
HostDO host,
|
||||
long startTime,
|
||||
@@ -206,7 +212,7 @@ public class TerminalCheckHandler extends AbstractTerminalHandler<TerminalCheckR
|
||||
extra.put(OperatorLogs.USER_AGENT, logModel.getUserAgent());
|
||||
extra.put(OperatorLogs.ERROR_MESSAGE, logModel.getErrorMessage());
|
||||
// 记录连接日志
|
||||
hostConnectLogService.create(connectType, connectLog);
|
||||
return hostConnectLogService.create(connectType, connectLog);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -78,7 +78,7 @@ public class TerminalConnectHandler extends AbstractTerminalHandler<TerminalConn
|
||||
// 修改连接状态为失败
|
||||
Map<String, Object> extra = Maps.newMap(4);
|
||||
extra.put(ExtraFieldConst.ERROR_MESSAGE, this.getConnectErrorMessage(e));
|
||||
hostConnectLogService.updateStatusByToken(sessionId, HostConnectStatusEnum.FAILED, extra);
|
||||
hostConnectLogService.updateStatusById(connect.getLogId(), HostConnectStatusEnum.FAILED, extra);
|
||||
}
|
||||
// 返回连接状态
|
||||
this.send(channel,
|
||||
@@ -108,6 +108,7 @@ public class TerminalConnectHandler extends AbstractTerminalHandler<TerminalConn
|
||||
try {
|
||||
// 连接配置
|
||||
TerminalConfig config = TerminalConfig.builder()
|
||||
.logId(connect.getLogId())
|
||||
.hostId(connect.getHostId())
|
||||
.hostName(connect.getHostName())
|
||||
.address(connect.getHostAddress())
|
||||
|
||||
@@ -34,7 +34,20 @@ public class TerminalManager {
|
||||
}
|
||||
|
||||
/**
|
||||
* 关闭会话
|
||||
* 通过 channel 关闭会话
|
||||
*
|
||||
* @param channelId channelId
|
||||
*/
|
||||
public void closeSession(String channelId) {
|
||||
// 获取并移除
|
||||
ConcurrentHashMap<String, ITerminalSession> session = channelSessions.remove(channelId);
|
||||
if (!Maps.isEmpty(session)) {
|
||||
session.values().forEach(Streams::close);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 通过 channel + sessionId 关闭会话
|
||||
*
|
||||
* @param channelId channelId
|
||||
* @param sessionId sessionId
|
||||
@@ -71,16 +84,12 @@ public class TerminalManager {
|
||||
}
|
||||
|
||||
/**
|
||||
* 关闭全部会话
|
||||
* 获取全部会话
|
||||
*
|
||||
* @param channelId channelId
|
||||
* @return session
|
||||
*/
|
||||
public void closeAll(String channelId) {
|
||||
// 获取并移除
|
||||
ConcurrentHashMap<String, ITerminalSession> session = channelSessions.remove(channelId);
|
||||
if (!Maps.isEmpty(session)) {
|
||||
session.values().forEach(Streams::close);
|
||||
}
|
||||
public MultiConcurrentHashMap<String, String, ITerminalSession> getChannelSessions() {
|
||||
return channelSessions;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -22,6 +22,9 @@ import lombok.NoArgsConstructor;
|
||||
@Schema(name = "TerminalConfig", description = "主机终端连接参数")
|
||||
public class TerminalConfig {
|
||||
|
||||
@Schema(description = "logId")
|
||||
private Long logId;
|
||||
|
||||
@Schema(description = "主机id")
|
||||
private Long hostId;
|
||||
|
||||
|
||||
@@ -43,4 +43,11 @@ public interface ITerminalSession extends SafeCloseable {
|
||||
*/
|
||||
void forceOffline();
|
||||
|
||||
/**
|
||||
* 是否已关闭
|
||||
*
|
||||
* @return closed
|
||||
*/
|
||||
boolean isClosed();
|
||||
|
||||
}
|
||||
|
||||
@@ -128,7 +128,6 @@ public class SftpSession extends TerminalSession implements ISftpSession {
|
||||
} catch (Exception e) {
|
||||
throw Exceptions.ioRuntime(e);
|
||||
} finally {
|
||||
// 同关闭 transfer downloader
|
||||
// 关闭 inputStream 可能会被阻塞 ???...??? 只能关闭 executor
|
||||
Streams.close(this.executor);
|
||||
this.connect();
|
||||
|
||||
@@ -31,6 +31,7 @@ public abstract class TerminalSession implements ITerminalSession {
|
||||
@Getter
|
||||
protected final TerminalConfig config;
|
||||
|
||||
@Getter
|
||||
protected volatile boolean closed;
|
||||
|
||||
protected volatile boolean forceOffline;
|
||||
@@ -68,7 +69,7 @@ public abstract class TerminalSession implements ITerminalSession {
|
||||
if (this.checkAndClose()) {
|
||||
// 修改状态
|
||||
SpringHolder.getBean(HostConnectLogService.class)
|
||||
.updateStatusByToken(sessionId, HostConnectStatusEnum.COMPLETE, null);
|
||||
.updateStatusById(config.getLogId(), HostConnectStatusEnum.COMPLETE, null);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -7,7 +7,6 @@ import com.orion.ops.framework.common.constant.ErrorMessage;
|
||||
import com.orion.ops.framework.common.constant.ExtraFieldConst;
|
||||
import com.orion.ops.framework.websocket.core.utils.WebSockets;
|
||||
import com.orion.ops.module.asset.entity.dto.HostTerminalConnectDTO;
|
||||
import com.orion.ops.module.asset.enums.HostConnectTypeEnum;
|
||||
import com.orion.ops.module.asset.handler.host.transfer.enums.TransferOperatorType;
|
||||
import com.orion.ops.module.asset.handler.host.transfer.enums.TransferReceiverType;
|
||||
import com.orion.ops.module.asset.handler.host.transfer.model.TransferOperatorRequest;
|
||||
@@ -107,7 +106,7 @@ public class TransferHandler implements ITransferHandler {
|
||||
ITransferHostSession session = sessions.get(sessionKey);
|
||||
if (session == null) {
|
||||
// 获取主机信息
|
||||
HostTerminalConnectDTO connectInfo = hostTerminalService.getTerminalConnectInfo(this.userId, hostId, HostConnectTypeEnum.SFTP);
|
||||
HostTerminalConnectDTO connectInfo = hostTerminalService.getTerminalConnectInfo(this.userId, hostId);
|
||||
SessionStore sessionStore = hostTerminalService.openSessionStore(connectInfo);
|
||||
// 打开会话并初始化
|
||||
if (TransferOperatorType.UPLOAD.equals(type.getOperator())) {
|
||||
|
||||
@@ -2,9 +2,9 @@ package com.orion.ops.module.asset.handler.host.transfer.model;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
import lombok.experimental.SuperBuilder;
|
||||
|
||||
/**
|
||||
* 文件操作请求 实体对象
|
||||
@@ -14,7 +14,7 @@ import lombok.experimental.SuperBuilder;
|
||||
* @since 2024/2/21 21:01
|
||||
*/
|
||||
@Data
|
||||
@SuperBuilder
|
||||
@Builder
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
@Schema(name = "FileOperatorRequest", description = "文件操作请求 实体对象")
|
||||
|
||||
@@ -2,9 +2,9 @@ package com.orion.ops.module.asset.handler.host.transfer.model;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
import lombok.experimental.SuperBuilder;
|
||||
|
||||
/**
|
||||
* 文件操作响应 实体对象
|
||||
@@ -14,7 +14,7 @@ import lombok.experimental.SuperBuilder;
|
||||
* @since 2024/2/21 22:38
|
||||
*/
|
||||
@Data
|
||||
@SuperBuilder
|
||||
@Builder
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
@Schema(name = "FileOperatorResponse", description = "文件操作响应 实体对象")
|
||||
|
||||
@@ -1,20 +1,15 @@
|
||||
package com.orion.ops.module.asset.handler.host.transfer.session;
|
||||
|
||||
import com.alibaba.fastjson.JSON;
|
||||
import com.orion.lang.utils.Booleans;
|
||||
import com.orion.lang.utils.Strings;
|
||||
import com.orion.lang.utils.collect.Maps;
|
||||
import com.orion.lang.utils.io.Streams;
|
||||
import com.orion.net.host.SessionStore;
|
||||
import com.orion.net.host.sftp.SftpExecutor;
|
||||
import com.orion.net.host.sftp.SftpFile;
|
||||
import com.orion.ops.framework.biz.operator.log.core.model.OperatorLogModel;
|
||||
import com.orion.ops.framework.biz.operator.log.core.service.OperatorLogFrameworkService;
|
||||
import com.orion.ops.framework.biz.operator.log.core.utils.OperatorLogs;
|
||||
import com.orion.ops.module.asset.define.config.AppSftpConfig;
|
||||
import com.orion.ops.module.asset.entity.dto.HostTerminalConnectDTO;
|
||||
import com.orion.ops.module.asset.handler.host.terminal.utils.TerminalUtils;
|
||||
import com.orion.ops.module.asset.handler.host.transfer.model.SftpFileBackupParams;
|
||||
import com.orion.spring.SpringHolder;
|
||||
import org.springframework.web.socket.WebSocketSession;
|
||||
|
||||
@@ -59,27 +54,6 @@ public abstract class TransferHostSession implements ITransferHostSession {
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 检查文件是否存在 并且执行响应策略
|
||||
*
|
||||
* @param path path
|
||||
*/
|
||||
protected void doCheckFilePresent(String path) {
|
||||
// 重复不备份
|
||||
if (!Booleans.isTrue(SFTP_CONFIG.getUploadPresentBackup())) {
|
||||
return;
|
||||
}
|
||||
// 检查文件是否存在
|
||||
SftpFile file = executor.getFile(path);
|
||||
if (file != null) {
|
||||
// 文件存在则备份
|
||||
SftpFileBackupParams backupParams = new SftpFileBackupParams(file.getName(), System.currentTimeMillis());
|
||||
String target = Strings.format(SFTP_CONFIG.getBackupFileName(), JSON.parseObject(JSON.toJSONString(backupParams)));
|
||||
// 移动
|
||||
executor.move(path, target);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 保存操作日志
|
||||
*
|
||||
|
||||
@@ -7,6 +7,7 @@ import com.orion.ops.module.asset.define.operator.HostTerminalOperatorType;
|
||||
import com.orion.ops.module.asset.entity.dto.HostTerminalConnectDTO;
|
||||
import com.orion.ops.module.asset.handler.host.transfer.enums.TransferReceiverType;
|
||||
import com.orion.ops.module.asset.handler.host.transfer.utils.TransferUtils;
|
||||
import com.orion.ops.module.asset.utils.SftpUtils;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.web.socket.WebSocketSession;
|
||||
|
||||
@@ -39,7 +40,7 @@ public class UploadSession extends TransferHostSession implements IUploadSession
|
||||
// 检查连接
|
||||
this.init();
|
||||
// 检查文件是否存在
|
||||
this.doCheckFilePresent(path);
|
||||
SftpUtils.checkUploadFilePresent(SFTP_CONFIG, executor, path);
|
||||
// 打开输出流
|
||||
this.outputStream = executor.openOutputStream(path);
|
||||
// 响应结果
|
||||
|
||||
@@ -0,0 +1,27 @@
|
||||
package com.orion.ops.module.asset.handler.host.upload;
|
||||
|
||||
import com.orion.ops.module.asset.define.AssetThreadPools;
|
||||
import com.orion.ops.module.asset.handler.host.upload.task.FileUploadTask;
|
||||
|
||||
/**
|
||||
* 批量上传执行器
|
||||
*
|
||||
* @author Jiahang Li
|
||||
* @version 1.0.0
|
||||
* @since 2024/5/8 17:23
|
||||
*/
|
||||
public class FileUploadTasks {
|
||||
|
||||
private FileUploadTasks() {
|
||||
}
|
||||
|
||||
/**
|
||||
* 上传
|
||||
*
|
||||
* @param taskId taskId
|
||||
*/
|
||||
public static void start(Long taskId) {
|
||||
AssetThreadPools.UPLOAD_TASK.execute(new FileUploadTask(taskId));
|
||||
}
|
||||
|
||||
}
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user