Compare commits

...

138 Commits

Author SHA1 Message Date
李佳航
b3daacbd8f Merge pull request #141 from dromara/dev
🚀 升级版本.
2025-10-08 10:00:02 +08:00
lijiahangmax
37fc271741 🚀 升级版本. 2025-10-08 09:59:30 +08:00
李佳航
bd76eb255d Merge pull request #140 from dromara/dev
Dev
2025-10-08 09:56:44 +08:00
lijiahangmax
0810de23ea 🔨 设置 ulimits. 2025-10-08 09:51:29 +08:00
lijiahangmax
9f2e4582cc Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	orion-visor-ui/src/api/monitor/monitor-host.ts
2025-10-08 09:44:24 +08:00
lijiahangmax
8e52631b46 🔨 修改前端逻辑. 2025-10-08 09:39:28 +08:00
lijiahangmax
7cd885a050 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	sql/init-4-data.sql
2025-10-07 22:25:16 +08:00
lijiahangmax
3045512320 🚀 升级版本. 2025-10-07 22:24:50 +08:00
lijiahangmax
55c2199c3f 🔨 修改 sql 脚本. 2025-10-07 22:23:37 +08:00
lijiahangmax
963cd0b227 🔨 修改标签查询逻辑. 2025-10-07 16:06:00 +08:00
lijiahangmax
1d5c579e64 🔨 修改文本描述. 2025-10-07 15:46:53 +08:00
lijiahangmax
773d95207f 🔨 统一前端卡片风格. 2025-10-07 14:27:19 +08:00
lijiahangmax
2103698417 🔨 优化标签查询逻辑. 2025-10-07 14:26:40 +08:00
lijiahangmax
25082b9ea1 🔨 线程池配置化. 2025-10-07 00:28:49 +08:00
lijiahangmax
cb20d56a7b 🚀 修复告警引擎初始化异常的问题. 2025-10-07 00:28:34 +08:00
lijiahangmax
d58d46ca8c 🔨 修改 influx 查询语句. 2025-10-06 16:18:20 +08:00
lijiahangmax
29e6db75ca 🔨 登录失败提示. 2025-10-04 21:31:03 +08:00
lijiahangmax
86abf4f634 🔨 告警记录. 2025-09-29 13:35:47 +08:00
李佳航
876e763fcc Merge pull request #139 from dromara/dev
Dev
2025-09-27 19:35:47 +08:00
lijiahangmax
32d60a4d43 🚀 升级版本. 2025-09-27 19:32:22 +08:00
lijiahangmax
6ffc5d27b5 🔨 修改样式. 2025-09-25 21:57:52 +08:00
lijiahangmax
ac412b0dde 🔨 修改代码生成器模板. 2025-09-25 14:43:07 +08:00
lijiahangmax
4bdb61870a 🔨 修改配置. 2025-09-25 12:20:32 +08:00
lijiahangmax
24ad1f64df 🔨 修改配置. 2025-09-25 11:31:57 +08:00
李佳航
6774376418 Merge pull request #138 from dromara/dev
🔨 修改样式.
2025-09-25 01:40:40 +08:00
lijiahangmax
364120c143 🔨 修改样式. 2025-09-25 01:37:48 +08:00
李佳航
cb59390fed Merge pull request #137 from dromara/dev
Dev
2025-09-25 00:59:39 +08:00
lijiahangmax
69bc5b859f 🔨 nginx 修改. 2025-09-25 00:51:44 +08:00
lijiahangmax
c420747c6f 🔨 sql 升级脚本. 2025-09-24 23:38:44 +08:00
lijiahangmax
1881086e98 🔨 监控模块. 2025-09-24 23:09:58 +08:00
lijiahangmax
eb8d618c2a 🔨 修改配置. 2025-09-24 18:37:22 +08:00
lijiahangmax
8aa8cda677 🔨 前端升级. 2025-09-24 15:54:01 +08:00
lijiahangmax
e67ee60361 Merge remote-tracking branch 'origin/dev' into dev 2025-09-16 00:17:39 +08:00
lijiahangmax
29fcdd311e 🔨 添加 logo. 2025-09-16 00:17:25 +08:00
lijiahangmax
bb243cf195 🔨 修改配置. 2025-09-12 17:33:41 +08:00
李佳航
670e40f6f0 Merge pull request #135 from dromara/dev
✏️ 修改 issues 模板.
2025-09-11 23:22:05 +08:00
lijiahangmax
feb379f85f ✏️ 修改 issues 模板. 2025-09-11 23:10:39 +08:00
李佳航
a8de5ab713 Merge pull request #134 from dromara/dev
🚑 修改 docker 配置.
2025-09-11 21:30:29 +08:00
lijiahangmax
4b0c91f106 🚑 修改 docker 配置. 2025-09-11 21:24:16 +08:00
李佳航
8d46e1d44d Merge pull request #133 from dromara/dev
🔨 修改 tsc.
2025-09-11 20:44:36 +08:00
lijiahangmax
b3c045aa46 🔨 修改 tsc. 2025-09-11 20:44:03 +08:00
李佳航
ca4ec20e49 Merge pull request #132 from dromara/dev
Dev
2025-09-11 20:38:27 +08:00
lijiahangmax
8db2986dfc 🔖 升级版本. 2025-09-11 01:09:37 +08:00
lijiahangmax
3156ae1dff ✏️ 添加切图. 2025-09-10 21:53:53 +08:00
lijiahangmax
697d29c6f2 🔨 修改配置. 2025-09-10 18:11:54 +08:00
lijiahangmax
bf4b1f9702 🔖 修改版本. 2025-09-10 01:44:58 +08:00
lijiahangmax
d2703661c8 🐳 修改 docker 配置. 2025-09-10 01:43:11 +08:00
lijiahangmax
df78fc5977 🔨 修改配置文件. 2025-09-09 23:46:02 +08:00
lijiahangmax
5e03810295 🔨 sql 脚本. 2025-09-09 23:10:03 +08:00
lijiahangmax
6b44e193f5 🔨 修改文档. 2025-09-09 22:45:23 +08:00
lijiahangmax
919e8383bf 🔨 修改插件包名. 2025-09-09 22:27:51 +08:00
lijiahangmax
0b7faa038a 🔨 监控逻辑. 2025-09-09 21:25:44 +08:00
lijiahangmax
3c75aedcec 🔨 优化锁逻辑. 2025-08-23 15:05:03 +08:00
lijiahangmax
393286d309 🔨 修改项目加密模块. 2025-08-23 14:11:15 +08:00
lijiahangmax
8501e900c7 🔨 修改代码生成器模板. 2025-08-13 00:00:45 +08:00
lijiahangmax
c53042a4b5 🔨 修改代码生成器模板. 2025-08-12 23:28:30 +08:00
lijiahangmax
c661d34a79 🔨 修改主机配置字段. 2025-08-10 19:29:57 +08:00
lijiahangmax
a3476596dd 🔨 修改额外配置字段名称. 2025-08-10 19:26:33 +08:00
lijiahangmax
8a4176bc9e Merge remote-tracking branch 'origin/dev' into dev 2025-08-02 14:46:57 +08:00
lijiahangmax
a0a7240191 Merge remote-tracking branch 'origin/main' 2025-08-01 12:29:14 +08:00
lijiahangmax
2b52697cdc merge dev into main
merge

Created-by: lijiahangmax
Commit-by: lijiahangmax;2022521971;autoscope;qq_23961285;hailan1024;muzi_teacher;haobo96
Merged-by: lijiahangmax
Description: update: 更新文件 README.md
update: 更新文件 README.md
merge dev into dev
update: 更新文件 README.md
merge dev into dev
...

See merge request: dromara/orion-visor!24
2025-08-01 12:25:53 +08:00
lijiahangmax
63d82b5a19 Merge remote-tracking branch 'origin/dev' into dev 2025-08-01 11:24:49 +08:00
lijiahangmax
af23e56f03 merge dev into dev
✏️ 修改文档.

Created-by: 2022521971
Commit-by: 2022521971
Merged-by: lijiahangmax
Description: ✏️ 修改文档.

See merge request: dromara/orion-visor!23
2025-08-01 11:19:02 +08:00
2022521971
cecd71c42a ✏️ 修改文档.
Signed-off-by: 2022521971 <202252197@qq.com>
2025-08-01 11:15:33 +08:00
lijiahangmax
3ed9df8788 Merge remote-tracking branch 'origin/dev' into dev 2025-08-01 11:04:40 +08:00
lijiahangmax
7a89858790 merge dev into dev
🐳 添加 docker 参数.

Created-by: autoscope
Commit-by: autoscope
Merged-by: lijiahangmax
Description: 🐳 添加 docker 参数.

See merge request: dromara/orion-visor!22
2025-07-30 18:09:06 +08:00
autoscope
a548413358 🐳 添加 docker 参数.
Signed-off-by: autoscope <autoscope@noreply.gitcode.com>
2025-07-30 18:04:19 +08:00
lijiahangmax
c859225908 merge dev into dev
✏️ 修改文档.

Created-by: qq_23961285
Commit-by: qq_23961285
Merged-by: lijiahangmax
Description: ✏️ 修改文档.

See merge request: dromara/orion-visor!21
2025-07-30 17:50:38 +08:00
qq_23961285
b097836ec8 ✏️ 修改文档.
Signed-off-by: qq_23961285 <qq_23961285@noreply.gitcode.com>
2025-07-30 17:49:11 +08:00
lijiahangmax
9e0cfef4da merge dev into dev
🔨 更新文件 git-pull.sh

Created-by: hailan1024
Commit-by: hailan1024
Merged-by: lijiahangmax
Description: 🔨 更新文件 git-pull.sh

See merge request: dromara/orion-visor!20
2025-07-30 17:04:09 +08:00
hailan1024
a76a7d4150 🔨 更新文件 git-pull.sh
Signed-off-by: hailan1024 <hailan1024@noreply.gitcode.com>
2025-07-30 17:00:52 +08:00
lijiahangmax
2920504023 merge dev into dev
update: 更新文件 README.md

Created-by: muzi_teacher
Commit-by: muzi_teacher
Merged-by: lijiahangmax
Description: update: 更新文件 README.md

See merge request: dromara/orion-visor!19
2025-07-30 16:37:16 +08:00
muzi_teacher
c32b590bb4 update: 更新文件 README.md
Signed-off-by: muzi_teacher <muzi_teacher@noreply.gitcode.com>
2025-07-30 16:36:34 +08:00
lijiahangmax
612d7f1166 merge dev into dev
update: 更新文件 README.md

Created-by: haobo96
Commit-by: haobo96
Merged-by: lijiahangmax
Description: update: 更新文件 README.md

See merge request: dromara/orion-visor!18
2025-07-30 16:35:45 +08:00
haobo96
b7c4fbcab8 update: 更新文件 README.md 2025-07-30 16:34:17 +08:00
haobo96
a3f84e799c update: 更新文件 README.md 2025-07-30 16:29:47 +08:00
李佳航
5ab3f168d8 Merge pull request #129 from dromara/dev
✏️ 修改文档.
2025-07-19 18:52:13 +08:00
lijiahangmax
402e183d2f ✏️ 修改文档. 2025-07-14 19:06:36 +08:00
lijiahangmax
d3e5e08f6c ✏️ 修改文档. 2025-07-14 19:02:16 +08:00
李佳航
e214fbde5c Merge pull request #128 from dromara/dev
Dev
2025-07-13 18:32:17 +08:00
lijiahangmax
2f7b4bd5ea ✏️ 修改文档. 2025-07-13 18:24:02 +08:00
lijiahangmax
8bba423ff3 ✏️ 修改文档. 2025-07-13 18:06:07 +08:00
李佳航
0d0eadc3bf Merge pull request #127 from dromara/dev
🐳 修改 docker 配置.
2025-07-10 15:17:18 +08:00
lijiahangmax
ab430d8934 🐳 修改 docker 配置. 2025-07-10 15:16:29 +08:00
李佳航
edcc2cf0c8 Merge pull request #126 from dromara/dev
🐳 修改 docker 配置.
2025-07-10 14:51:48 +08:00
lijiahangmax
2913ddb2e0 🐳 修改 docker 配置. 2025-07-10 14:50:36 +08:00
李佳航
7d35f839df Merge pull request #125 from dromara/dev
🐳 修改 docker 配置.
2025-07-10 14:30:21 +08:00
lijiahangmax
ef9c34f7d9 🐳 修改 docker 配置. 2025-07-10 14:28:45 +08:00
李佳航
f1a4e049ca Merge pull request #124 from dromara/dev
Dev
2025-07-10 03:50:05 +08:00
lijiahangmax
8ee1e6acf1 🐳 修改 docker 配置. 2025-07-10 03:43:56 +08:00
lijiahangmax
d0eddf1e15 升级版本. 2025-07-10 03:34:23 +08:00
lijiahangmax
b42645b0ce 🐛 修复会话打开黑屏. 2025-07-10 03:32:45 +08:00
李佳航
3895476ff8 Merge pull request #123 from dromara/dev
🚀 优化 CI 速度.
2025-07-09 16:55:41 +08:00
lijiahangmax
d2cba947b3 🚀 优化 CI 速度. 2025-07-09 16:54:27 +08:00
李佳航
964c1daa2c Merge pull request #122 from dromara/dev
🚀 优化 CI 速度.
2025-07-09 16:51:47 +08:00
lijiahangmax
d496dcd9f5 🚀 优化 CI 速度. 2025-07-09 16:50:38 +08:00
李佳航
9d06f0ae87 Merge pull request #121 from dromara/dev
Dev
2025-07-09 16:32:33 +08:00
lijiahangmax
9f379546cb 升级版本. 2025-07-09 16:31:05 +08:00
lijiahangmax
3123a89d13 升级版本. 2025-07-09 16:06:23 +08:00
lijiahangmax
8ebc3ee3b2 🐳 修改脚本逻辑. 2025-07-09 16:04:28 +08:00
lijiahangmax
7a3580936f 🐳 修改脚本逻辑. 2025-07-09 11:43:17 +08:00
lijiahangmax
2e36d0f44b 升级版本. 2025-07-09 00:26:55 +08:00
lijiahangmax
abada92907 🔨 优化会话工具栏. 2025-07-09 00:19:17 +08:00
lijiahangmax
0224e2f19a 🔨 优化卡片右键菜单. 2025-07-09 00:18:42 +08:00
lijiahangmax
bf04e8eace 🔨 添加长按操作. 2025-07-08 17:27:35 +08:00
lijiahangmax
ef146cdaef 🔨 去除测试连接. 2025-07-08 01:06:48 +08:00
lijiahangmax
bfde435071 🔨 添加工具栏功能. 2025-07-08 00:45:23 +08:00
lijiahangmax
fc151216f1 🔨 优化配置保存逻辑. 2025-07-08 00:34:30 +08:00
lijiahangmax
dd0237a83a 🐛 修复文件路径不正确的问题. 2025-07-08 00:32:37 +08:00
lijiahangmax
f34dc75f41 🔨 添加 vnc 会话. 2025-07-07 14:48:34 +08:00
lijiahangmax
1abc47bb56 🔨 添加 vnc 会话. 2025-07-07 14:47:18 +08:00
lijiahangmax
4643c37a5a 🔨 添加个性化配置. 2025-07-07 14:42:54 +08:00
lijiahangmax
aed5d10eed 🔨 添加 vnc 会话. 2025-07-07 00:04:29 +08:00
lijiahangmax
4b25de3811 🔨 添加 vnc 配置. 2025-07-07 00:03:45 +08:00
lijiahangmax
e72a9d97cd 🐳 修改 docker 构建逻辑. 2025-07-06 23:35:35 +08:00
lijiahangmax
97dddf01a7 🐳 修改 docker 构建逻辑. 2025-07-05 23:43:46 +08:00
lijiahangmax
01d53dadd7 🐳 修改 docker 构建逻辑. 2025-07-05 19:50:00 +08:00
lijiahangmax
5c119deaf4 🐳 修改 docker 构建逻辑. 2025-07-05 18:14:55 +08:00
lijiahangmax
4dc1364b11 🐳 修改 docker 构建逻辑. 2025-07-05 17:45:24 +08:00
lijiahangmax
65771f0b41 🐳 修改 docker 构建逻辑. 2025-07-05 17:44:33 +08:00
lijiahangmax
47a14dec6a 🐳 修改 docker 构建逻辑. 2025-07-05 01:22:59 +08:00
lijiahangmax
6f0f6da07c 🐳 修改 docker 构建逻辑. 2025-07-05 01:13:28 +08:00
李佳航
eb64e80d06 Merge pull request #119 from vicnoah/main
添加github action用于构建并推送docker镜像到dockerhub以及github cr
2025-07-04 20:45:34 +08:00
lijiahangmax
ca8c5b53d2 修改脚本. 2025-07-04 17:44:17 +08:00
lijiahangmax
9e9c390baf 🔨 配置 vnc 资产. 2025-07-04 17:43:59 +08:00
lijiahangmax
a546827432 🔨 配置 vnc 资产. 2025-07-04 17:36:45 +08:00
wwg
5c03784f9c feat(docker) 重构Docker构建流程,使用多阶段构建并优化CI配置 2025-07-03 01:01:59 +08:00
lijiahangmax
6fa2d65e18 🔨 优化页面加载逻辑. 2025-07-03 00:01:41 +08:00
lijiahangmax
0b4e42ee89 🔨 修改无缓存配置. 2025-07-02 23:50:27 +08:00
lijiahangmax
2175a9fb40 🔨 添加缓存数据版本. 2025-07-02 23:43:01 +08:00
lijiahangmax
2e98060573 🚀 升级 orion-kit 版本. 2025-07-02 23:35:46 +08:00
vicnoah
4ee4333bfe Create docker-publish.yml 2025-07-02 22:39:21 +08:00
vicnoah
1c8c1596f9 Update Dockerfile 2025-07-02 22:35:11 +08:00
vicnoah
a59f2c5bf6 Update Dockerfile 2025-07-02 22:34:57 +08:00
vicnoah
f8707ebce0 Update Dockerfile 2025-07-02 22:34:43 +08:00
vicnoah
28d793b84d Update Dockerfile 2025-07-02 22:34:28 +08:00
vicnoah
8963ca64d2 Update Dockerfile 2025-07-02 22:34:13 +08:00
vicnoah
fef11850dd Update Dockerfile 2025-07-02 22:33:52 +08:00
723 changed files with 36307 additions and 3109 deletions

View File

@@ -1,11 +1,17 @@
VOLUME_BASE=/data/orion-visor-space/docker-volumes
DEMO_MODE=false
SERVICE_PORT=1081
SPRING_PROFILES_ACTIVE=prod
DEMO_MODE=false
API_CORS=true
API_EXPOSE_TOKEN=pmqeHOyZaumHm0Wt
SECRET_KEY=uQeacXV8b3isvKLK
NGINX_SERVICE_HOST=service
NGINX_SERVICE_PORT=9200
MYSQL_HOST=mysql
MYSQL_PORT=3306
MYSQL_DATABASE=orion_visor
@@ -15,7 +21,21 @@ MYSQL_ROOT_PASSWORD=Data@123456
REDIS_HOST=redis
REDIS_PASSWORD=Data@123456
REDIS_DATABASE=0
REDIS_DATA_VERSION=1
GUACD_HOST=guacd
GUACD_PORT=4822
GUACD_SSH_PORT=22
GUACD_SSH_USERNAME=guacd
GUACD_SSH_PASSWORD=guacd
GUACD_DRIVE_PATH=/drive
INFLUXDB_ENABLED=true
INFLUXDB_HOST=influxdb
INFLUXDB_PORT=8086
INFLUXDB_ORG=orion-visor
INFLUXDB_BUCKET=metrics
INFLUXDB_TOKEN=Data@123456
INFLUXDB_ADMIN_USERNAME=admin
INFLUXDB_ADMIN_PASSWORD=Data@123456

View File

@@ -0,0 +1,10 @@
### *当前使用版本 (必填)
### 问题描述
### 该问题是如何引起的
### 重现步骤
### 报错信息

View File

@@ -0,0 +1,8 @@
### 修改描述
### 关联的 Issue
### 测试用例
### 修复效果的截屏

50
.github/ISSUE_TEMPLATE/bug_report.yaml vendored Normal file
View File

@@ -0,0 +1,50 @@
name: 错误报告
description: File a bug report.
title: "[错误报告]: "
labels: [ "" ]
body:
- type: checkboxes
id: confirm
attributes:
label: 确认
description: 在提交 issue 之前, 请确认你已经阅读并确认以下内容
options:
- label: 我使用的是最新版本 [最新版](https://github.com/dromara/orion-visor/releases)
required: true
- label: 我使用官方文档进行部署 [安装文档](https://visor.orionsec.cn/quickstart/docker.html)
required: true
- label: 我已检查了 [常见问题](https://visor.orionsec.cn/support/faq.html) 并没有找到解决方法
required: true
- label: 我已搜索 [issue](https://github.com/dromara/orion-visor/issues) 并没有找到相关问题
required: true
- type: input
id: version
attributes:
label: 当前程序版本
description: 遇到问题时程序所在的版本号
validations:
required: true
- type: dropdown
id: install
attributes:
label: 安装方式
options:
- Docker
- 普通安装
- 其他
validations:
required: true
- type: textarea
id: what-happened
attributes:
label: 问题描述
description: 请详细描述你碰到的问题
placeholder: "问题描述"
validations:
required: true
- type: textarea
id: logs
attributes:
label: 详细日志
description: 问题出现时的程序日志
render: bash

5
.github/ISSUE_TEMPLATE/config.yaml vendored Normal file
View File

@@ -0,0 +1,5 @@
blank_issues_enabled: false
contact_links:
- name: 官网
url: https://visor.orionsec.cn/
about: document.

View File

@@ -0,0 +1,35 @@
name: 功能改进
description: 提出新功能建议 (请提交到需求收集帖)
title: "[功能建议]: "
labels: [ "" ]
body:
- type: markdown
attributes:
value: |
所有功能建议请统一提交到需求收集帖: 🔗 [#83 需求收集](https://github.com/dromara/orion-visor/issues/83)
在提交前请确认:
- ✅ 使用的是[最新版本](https://github.com/dromara/orion-visor/releases)
- ✅ 已搜索[已有 issue](https://github.com/dromara/orion-visor/issues) 和 需求收集帖避免重复
- ✅ 定制化需求请联系作者
---
### 如何提交高质量建议?
1. **功能描述**: 你希望增加什么?
2. **使用场景**: 你在什么情况下需要它?
4. **参考实现**: 开源项目中的类似功能(**禁止引用商业闭源软件**
- type: textarea
id: feature
attributes:
label: 功能改进
description: 请详细描述需要改进或者添加的功能。
placeholder: "功能改进"
validations:
required: true
- type: textarea
id: references
attributes:
label: 参考资料
description: 可以列举一些参考资料, 但是不要引用同类但商业化软件的任何内容。
placeholder: "参考资料"

53
.github/settings/maven-settings.xml vendored Normal file
View File

@@ -0,0 +1,53 @@
<?xml version="1.0" encoding="UTF-8"?>
<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd">
<mirrors>
<mirror>
<id>public-mirror</id>
<mirrorOf>public</mirrorOf>
<name>Maven Central Repository</name>
<url>https://repo.maven.apache.org/maven2/</url>
</mirror>
</mirrors>
<profiles>
<profile>
<id>repos</id>
<repositories>
<repository>
<id>centra</id>
<url>https://repo.maven.apache.org/maven2</url>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<id>central</id>
<name>Maven Central Plugin Repository</name>
<url>https://repo.maven.apache.org/maven2</url>
<layout>default</layout>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
</pluginRepository>
</pluginRepositories>
</profile>
</profiles>
<activeProfiles>
<activeProfile>repos</activeProfile>
</activeProfiles>
</settings>

139
.github/workflows/docker-publish.yaml vendored Normal file
View File

@@ -0,0 +1,139 @@
name: Docker Publish
on:
push:
tags:
- 'v*'
workflow_dispatch:
jobs:
build-project:
runs-on: ubuntu-latest
permissions:
contents: read
packages: write
steps:
- name: 🌱 Checkout repository
uses: actions/checkout@v4
- name: ⚙️ Set up JDK 8
uses: actions/setup-java@v4
with:
java-version: '8'
distribution: 'temurin'
cache: 'maven'
- name: ⚙️ Set up Node.js 18
uses: actions/setup-node@v4
with:
node-version: '18'
- name: 🔧 Install pnpm
run: npm i -g pnpm
- name: 📦 Build Java
run: mvn -U clean install -DskipTests --settings=.github/settings/maven-settings.xml
- name: 📦️ Build UI
working-directory: ./orion-visor-ui
run: |
pnpm install
pnpm build
- name: 📦️ Download instance-agent
working-directory: ./docker/service
run: wget https://github.com/lijiahangmax/orion-visor-agent/releases/latest/download/instance-agent-release.tar.gz -O instance-agent-release.tar.gz
- name: 📁 Prepare build context
run: |
cp -r ./sql ./docker/mysql/sql
cp -r ./orion-visor-ui/dist ./docker/ui/dist
cp ./orion-visor-launch/target/orion-visor-launch.jar ./docker/service/orion-visor-launch.jar
- name: 📤 Upload build context
uses: actions/upload-artifact@v4
with:
name: docker-context
path: docker
build-and-push:
needs: build-project
runs-on: ubuntu-latest
permissions:
contents: read
packages: write
strategy:
matrix:
service: [ adminer, guacd, mysql, redis, influxdb, service, ui ]
env:
GITHUB_REGISTRY: ghcr.io
ALIYUN_REGISTRY: registry.cn-hangzhou.aliyuncs.com
ALIYUN_NAMESPACE: ${{ vars.ALIYUN_NAMESPACE }}
DOCKERHUB_NAMESPACE: ${{ vars.DOCKERHUB_NAMESPACE }}
steps:
- name: 📥 Download build context
uses: actions/download-artifact@v4
with:
name: docker-context
path: docker
- name: ⚙️ Set up QEMU
uses: docker/setup-qemu-action@v3
- name: 🔧 Set up Docker Buildx
uses: docker/setup-buildx-action@v3
- name: 🐳 Login to Docker Hub
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
- name: 🐳 Login to GitHub Container Registry
uses: docker/login-action@v3
with:
registry: ${{ env.GITHUB_REGISTRY }}
username: ${{ github.repository_owner }}
password: ${{ secrets.GITHUB_TOKEN }}
- name: 🐳 Login to Aliyun Registry
uses: docker/login-action@v3
with:
registry: ${{ env.ALIYUN_REGISTRY }}
username: ${{ secrets.ALIYUN_USERNAME }}
password: ${{ secrets.ALIYUN_TOKEN }}
- name: 📦 Extract Docker metadata
id: meta
uses: docker/metadata-action@v5
with:
images: |
${{ env.DOCKERHUB_NAMESPACE }}/orion-visor-${{ matrix.service }}
${{ env.GITHUB_REGISTRY }}/${{ github.repository_owner }}/orion-visor-${{ matrix.service }}
${{ env.ALIYUN_REGISTRY }}/${{ env.ALIYUN_NAMESPACE }}/orion-visor-${{ matrix.service }}
tags: |
type=semver,pattern={{version}}
type=semver,pattern={{major}}.{{minor}}
type=semver,pattern={{major}}
- name: 🛠️ Build and push Docker image for orion-visor-${{ matrix.service }}
uses: docker/build-push-action@v6
with:
context: ./docker
file: ./docker/${{ matrix.service }}/Dockerfile
push: true
cache-from: type=gha
cache-to: type=gha,mode=max
platforms: linux/amd64,linux/arm64
labels: ${{ steps.meta.outputs.labels }}
tags: |
${{ env.DOCKERHUB_NAMESPACE }}/orion-visor-${{ matrix.service }}:${{ steps.meta.outputs.version }}
${{ env.DOCKERHUB_NAMESPACE }}/orion-visor-${{ matrix.service }}:latest
${{ env.GITHUB_REGISTRY }}/${{ github.repository_owner }}/orion-visor-${{ matrix.service }}:${{ steps.meta.outputs.version }}
${{ env.GITHUB_REGISTRY }}/${{ github.repository_owner }}/orion-visor-${{ matrix.service }}:latest
${{ env.ALIYUN_REGISTRY }}/${{ env.ALIYUN_NAMESPACE }}/orion-visor-${{ matrix.service }}:${{ steps.meta.outputs.version }}
${{ env.ALIYUN_REGISTRY }}/${{ env.ALIYUN_NAMESPACE }}/orion-visor-${{ matrix.service }}:latest

View File

@@ -1,9 +1,10 @@
name: E2E
on:
pull_request:
branches:
- main
workflow_dispatch:
# pull_request:
# branches:
# - main
concurrency:
group: ${{github.workflow}} - ${{github.ref}}
@@ -18,4 +19,4 @@ jobs:
run: |
sudo curl -L https://github.com/docker/compose/releases/download/v2.23.0/docker-compose-linux-x86_64 -o /usr/local/bin/docker-compose
sudo chmod u+x /usr/local/bin/docker-compose
docker compose -f docker-compose-testing.yml up --build testing --exit-code-from testing --remove-orphans
docker compose -f docker-compose-testing.yaml up --build testing --exit-code-from testing --remove-orphans

3
.gitignore vendored
View File

@@ -16,7 +16,8 @@ target/
.sts4-cache
### IntelliJ IDEA ###
.idea
**/.idea/*
!**/.idea/icon.png
*.iws
*.iml
*.ipr

BIN
.idea/icon.png generated Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.8 KiB

2
NOTICE
View File

@@ -5,5 +5,5 @@
1. 禁止修改或删除 LICENSE 文件。
2. 禁止修改或删除源码头部的版权声明。
3. 本项目可免费商业使用,商业使用请保留项目源码、出处、描述文件和作者声明等。
4. 分发源码时候,请注明软件出处 https://visor.dromara.org/
4. 分发源码时候,请注明软件出处 https://visor.orionsec.cn/
5. 不可二次开发或参与同类竞品的开发。

View File

@@ -48,10 +48,11 @@
**`orion-visor`** 提供一站式自动化运维解决方案。
* **资产管理**:支持对资产进行分组,实现对主机、密钥和身份的统一管理和授权。
* **在线终端**:提供在线终端 SSH/RDP 等多种协议,支持快捷命令、自定义快捷键和主题风格。
* **在线终端**:提供在线终端 SSH/RDP/VNC 等多种协议,支持快捷命令、自定义快捷键和主题风格。
* **文件管理**:支持远程主机 SFTP 大文件的批量上传、下载和在线编辑等操作。
* **批量操作**:支持批量执行主机命令、多主机文件分发等功能。
* **计划任务**:支持配置 cron 表达式,定时执行主机命令。
* **系统监控**:支持对主机 CPU、内存、磁盘、网络等系统指标的监控和告警。
* **安全可靠**:动态配置权限,记录用户操作日志,提供简单的审计功能。
## 演示环境
@@ -62,9 +63,6 @@
这对我很重要! [github](https://github.com/dromara/orion-visor) [gitee](https://gitee.com/dromara/orion-visor) [gitcode](https://gitcode.com/dromara/orion-visor)
* 🌈 如果本项目对你有帮助请帮忙推广一下 让更多的人知道此项目!
* 🎭 演示环境部分功能不可用, 完整功能请本地部署!
* 📛 演示环境请不要随便删除数据!
* 📧 如果演示环境不可用请联系我!
* 📨 **作者随缘寻java高级/资深内推 望京/5号/10号线 有坑位的联系我哦** 微信: `ljh1553488`
## 快速开始
@@ -79,18 +77,19 @@ docker compose up -d
## 项目文档
* [文档地址](https://visor.dromara.org/)
* [安装文档](https://visor.dromara.org/quickstart/docker.html)
* [更新日志](https://visor.dromara.org/update/change-log.html)
* [操作手册](https://visor.dromara.org/operator/asset.html)
* [常见问题](https://visor.dromara.org/support/faq.html)
* [文档地址](https://visor.orionsec.cn/)
* [安装文档](https://visor.orionsec.cn/quickstart/docker.html)
* [更新日志](https://visor.orionsec.cn/update/change-log.html)
* [操作手册](https://visor.orionsec.cn/operator/asset.html)
* [常见问题](https://visor.orionsec.cn/support/faq.html)
## 技术栈
* SpringBoot 2.7.17
* SpringBoot 2.7+
* Mysql 8.0+
* Redis 6.0+
* Vue3 3.5+
* InfluxDB 2.7+
* Vue 3.5+
* Arco Design 2.56+
## 主要功能预览
@@ -111,6 +110,13 @@ docker compose up -d
![主机列表](docs/assets/screenshot/host-list.png?time=20250627 "主机列表")
#### 主机监控
![主机监控](docs/assets/screenshot/monitor-list.png?time=20250627 "主机监控")
![监控概览](docs/assets/screenshot/monitor-override.png?time=20250627 "监控概览")
![监控详情](docs/assets/screenshot/monitor-chart.png?time=20250627 "监控表格")
![告警通知](docs/assets/screenshot/monitor-alarm.png?time=20250627 "告警通知")
#### 批量执行
![批量执行](docs/assets/screenshot/exec-command.png?time=20250627 "批量执行")
@@ -130,7 +136,8 @@ docker compose up -d
## 关于我
本人专注于使用 Java 和 Vue 进行全栈开发, 并在系统自动化运维方面拥有丰富开发的经验。如果您在这些领域有需求或遇到痛点, 请随时联系我, 并备注“合作”。
本人专注于使用 Java 和 Vue 进行全栈开发, 并在系统自动化运维方面拥有丰富开发的经验, 并提供企业级的解决方案。如果您在这些领域有需求或遇到痛点, 请随时联系我,
并备注“合作”。
## 联系我
@@ -156,6 +163,10 @@ QQ群: 755242157
本项目遵循 [Apache-2.0](https://github.com/dromara/orion-visor/blob/main/LICENSE) 开源许可证。
## 贡献者
[![Contributors](https://contri.buzz/api/wall?repo=dromara/orion-visor)](https://github.com/dromara/orion-visor, "Contributors")
## Gitee 最有价值的开源项目 GVP
![GVP](docs/assets/gvp.jpg?time=20250627 "GVP")

View File

@@ -5,7 +5,7 @@ services:
image: registry.cn-hangzhou.aliyuncs.com/orionsec/orion-visor-service:latest
privileged: true
ports:
- 9200:9200
- "9200:9200"
environment:
SPRING_PROFILES_ACTIVE: prod
MYSQL_HOST: mysql
@@ -19,6 +19,10 @@ services:
DEMO_MODE: false
volumes:
- /data/orion-visor-space/docker-volumes/service/root-orion:/root/orion
ulimits:
nofile:
soft: 65536
hard: 65536
healthcheck:
test: [ "CMD", "curl", "http://127.0.0.1:9200/orion-visor/api/server/bootstrap/health" ]
interval: 15s
@@ -37,7 +41,7 @@ services:
image: registry.cn-hangzhou.aliyuncs.com/orionsec/orion-visor-mysql:latest
privileged: true
ports:
- 3307:3306
- "3307:3306"
environment:
MYSQL_DATABASE: orion_visor
MYSQL_USER: orion
@@ -59,7 +63,7 @@ services:
image: registry.cn-hangzhou.aliyuncs.com/orionsec/orion-visor-redis:latest
privileged: true
ports:
- 6380:6379
- "6380:6379"
environment:
REDIS_PASSWORD: Data@123456
volumes:
@@ -87,4 +91,4 @@ services:
networks:
orion-visor-net:
driver: bridge
driver: bridge

View File

@@ -1,11 +1,20 @@
version: '3.3'
# latest = 2.4.1
# latest = 2.5.3
# 支持以下源
# lijiahangmax/*
# ghcr.io/dromara/*
# registry.cn-hangzhou.aliyuncs.com/orionsec/*
services:
ui:
image: registry.cn-hangzhou.aliyuncs.com/orionsec/orion-visor-ui:latest
ports:
- ${SERVICE_PORT:-1081}:80
environment:
NGINX_SERVICE_HOST: ${NGINX_SERVICE_HOST:-service}
NGINX_SERVICE_PORT: ${NGINX_SERVICE_PORT:-9200}
restart: unless-stopped
depends_on:
service:
@@ -17,7 +26,7 @@ services:
image: registry.cn-hangzhou.aliyuncs.com/orionsec/orion-visor-service:latest
privileged: true
ports:
- 9200:9200
- "9200:9200"
environment:
SPRING_PROFILES_ACTIVE: ${SPRING_PROFILES_ACTIVE:-prod}
MYSQL_HOST: ${MYSQL_HOST:-mysql}
@@ -27,13 +36,27 @@ services:
MYSQL_PASSWORD: ${MYSQL_PASSWORD:-Data@123456}
REDIS_HOST: ${REDIS_HOST:-redis}
REDIS_PASSWORD: ${REDIS_PASSWORD:-Data@123456}
REDIS_DATABASE: ${REDIS_DATABASE:-0}
REDIS_DATA_VERSION: ${REDIS_DATA_VERSION:-1}
INFLUXDB_ENABLED: ${INFLUXDB_ENABLED:-true}
INFLUXDB_HOST: ${INFLUXDB_HOST:-influxdb}
INFLUXDB_PORT: ${INFLUXDB_PORT:-8086}
INFLUXDB_ORG: ${INFLUXDB_ORG:-orion-visor}
INFLUXDB_BUCKET: ${INFLUXDB_BUCKET:-metrics}
INFLUXDB_TOKEN: ${INFLUXDB_TOKEN:-Data@123456}
GUACD_HOST: ${GUACD_HOST:-guacd}
GUACD_PORT: ${GUACD_PORT:-4822}
GUACD_DRIVE_PATH: ${GUACD_DRIVE_PATH:-/drive}
SECRET_KEY: ${SECRET_KEY:-uQeacXV8b3isvKLK}
API_EXPOSE_TOKEN: ${API_EXPOSE_TOKEN:-pmqeHOyZaumHm0Wt}
API_CORS: ${API_CORS:-true}
DEMO_MODE: ${DEMO_MODE:-false}
volumes:
- ${VOLUME_BASE:-/data/orion-visor-space/docker-volumes}/service/root-orion:/root/orion
ulimits:
nofile:
soft: 65536
hard: 65536
restart: unless-stopped
healthcheck:
test: [ "CMD", "curl", "http://127.0.0.1:9200/orion-visor/api/server/bootstrap/health" ]
@@ -46,6 +69,8 @@ services:
condition: service_healthy
redis:
condition: service_healthy
influxdb:
condition: service_healthy
networks:
- orion-visor-net
@@ -53,7 +78,7 @@ services:
image: registry.cn-hangzhou.aliyuncs.com/orionsec/orion-visor-mysql:latest
privileged: true
ports:
- 3307:3306
- "3307:3306"
environment:
MYSQL_DATABASE: ${MYSQL_DATABASE:-orion_visor}
MYSQL_USER: ${MYSQL_USER:-orion}
@@ -76,7 +101,7 @@ services:
image: registry.cn-hangzhou.aliyuncs.com/orionsec/orion-visor-redis:latest
privileged: true
ports:
- 6380:6379
- "6380:6379"
environment:
REDIS_PASSWORD: ${REDIS_PASSWORD:-Data@123456}
volumes:
@@ -92,10 +117,35 @@ services:
networks:
- orion-visor-net
influxdb:
image: registry.cn-hangzhou.aliyuncs.com/orionsec/orion-visor-influxdb:latest
privileged: true
ports:
- "8086:8086"
environment:
DOCKER_INFLUXDB_INIT_MODE: setup
DOCKER_INFLUXDB_INIT_USERNAME: ${INFLUXDB_ADMIN_USERNAME:-admin}
DOCKER_INFLUXDB_INIT_PASSWORD: ${INFLUXDB_ADMIN_PASSWORD:-Data@123456}
DOCKER_INFLUXDB_INIT_ADMIN_TOKEN: ${INFLUXDB_TOKEN:-Data@123456}
DOCKER_INFLUXDB_INIT_ORG: ${INFLUXDB_ORG:-orion-visor}
DOCKER_INFLUXDB_INIT_BUCKET: ${INFLUXDB_BUCKET:-metrics}
volumes:
- ${VOLUME_BASE:-/data/orion-visor-space/docker-volumes}/influxdb/data:/var/lib/influxdb2
- ${VOLUME_BASE:-/data/orion-visor-space/docker-volumes}/influxdb/config:/etc/influxdb2
restart: unless-stopped
healthcheck:
test: [ "CMD", "bash", "-c", "cat < /dev/null > /dev/tcp/127.0.0.1/8086" ]
interval: 15s
timeout: 5s
retries: 10
start_period: 10s
networks:
- orion-visor-net
guacd:
image: registry.cn-hangzhou.aliyuncs.com/orionsec/orion-visor-guacd:latest
ports:
- 4822:4822
- "4822:4822"
environment:
GUACD_LOG_LEVEL: info
GUACD_LOG_FILE: /var/log/guacd.log
@@ -117,7 +167,7 @@ services:
adminer:
image: registry.cn-hangzhou.aliyuncs.com/orionsec/orion-visor-adminer:latest
ports:
- 8081:8080
- "8081:8080"
environment:
ADMINER_DEFAULT_SERVER: ${MYSQL_HOST:-mysql}
depends_on:
@@ -128,4 +178,4 @@ services:
networks:
orion-visor-net:
driver: bridge
driver: bridge

View File

@@ -1,16 +1,51 @@
#!/bin/bash
# 停止并移除现有容器
docker compose down --remove-orphans
# 初始化标志变量
PULL_IMAGES=false
DEMO_MODE=false
if [ "$1" == "demo" ]; then
# 设置 DEMO_MODE 环境变量为 true
# 解析命令行参数
for arg in "$@"
do
case $arg in
--pull)
PULL_IMAGES=true
shift
;;
--demo)
DEMO_MODE=true
shift
;;
*)
echo "Unknown argument: $arg"
exit 1
;;
esac
done
# 停止并移除现有容器
echo "Stopping all services..."
docker compose down --remove-orphans
echo "Stopped all services..."
# 拉取镜像
if [ "$PULL_IMAGES" = true ]; then
echo "Pulling latest images..."
docker compose pull
echo "Pulled latest images..."
fi
if [ "$DEMO_MODE" = true ]; then
# 启用 demo 模式
export DEMO_MODE=true
echo "Starting services for demo mode..."
# 启动指定的服务
docker compose up -d --remove-orphans mysql redis ui service adminer
docker compose up -d --remove-orphans mysql redis ui service guacd influxdb adminer
echo "Started services for demo mode..."
else
# 启动所有服务
echo "Starting all services..."
# 正常启动所有服务
docker compose up -d --remove-orphans
echo "Started all services..."
fi

View File

@@ -1 +1 @@
FROM adminer:latest
FROM --platform=$TARGETPLATFORM adminer:latest

View File

@@ -1,6 +0,0 @@
#/bin/bash
set -e
version=2.4.1
docker build -t orion-visor-adminer:${version} .
docker tag orion-visor-adminer:${version} registry.cn-hangzhou.aliyuncs.com/orionsec/orion-visor-adminer:${version}
docker tag orion-visor-adminer:${version} registry.cn-hangzhou.aliyuncs.com/orionsec/orion-visor-adminer:latest

View File

@@ -0,0 +1,17 @@
#FROM --platform=$BUILDPLATFORM maven:3.9-amazoncorretto-8 AS builder
FROM maven:3.9-amazoncorretto-8 AS builder
# 设置阿里云镜像加速
RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories
# 拷贝 settings.xml
COPY ./docker/builder/maven-settings.xml /root/.m2/settings.xml
WORKDIR /build
COPY . .
# 复制 POM 文件先进行依赖下载 (利用 Docker 缓存)
RUN mvn dependency:go-offline --settings=/root/.m2/settings.xml
# 构建
RUN mvn clean package -DskipTests --settings=/root/.m2/settings.xml

View File

@@ -0,0 +1,26 @@
#FROM --platform=$BUILDPLATFORM node:18-alpine AS builder
FROM node:18-alpine AS builder
# 设置阿里云镜像加速
RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories
# 安装 pnpm
RUN corepack enable && corepack prepare pnpm@latest --activate
WORKDIR /build
# 设置 pnpm 使用指定的 registry
ARG REGISTRY_URL=https://registry.npmmirror.com
RUN pnpm config set registry $REGISTRY_URL
# 复制项目文件
COPY ./orion-visor-ui/package.json ./orion-visor-ui/pnpm-lock.yaml* ./
# 安装依赖 (利用 Docker 缓存层)
RUN pnpm install --frozen-lockfile
# 复制源代码
COPY ./orion-visor-ui/ .
# 构建项目
RUN pnpm build

View File

@@ -0,0 +1,55 @@
<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd">
<profiles>
<profile>
<id>repos</id>
<repositories>
<!-- 阿里云 Maven 公共仓库 -->
<repository>
<id>aliyun</id>
<name>Aliyun Repository</name>
<url>https://maven.aliyun.com/repository/public</url>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
</repository>
<!-- Maven 中央仓库 -->
<repository>
<id>central</id>
<name>Maven Central Repository</name>
<url>https://repo.maven.apache.org/maven2</url>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<id>aliyun-plugin</id>
<url>https://maven.aliyun.com/repository/public</url>
</pluginRepository>
<pluginRepository>
<id>central-plugin</id>
<url>https://repo.maven.apache.org/maven2</url>
</pluginRepository>
</pluginRepositories>
</profile>
</profiles>
<!-- 激活 profile -->
<activeProfiles>
<activeProfile>repos</activeProfile>
</activeProfiles>
</settings>

233
docker/docker-build.sh Normal file
View File

@@ -0,0 +1,233 @@
#!/bin/bash
set -e
# DockerContext: orion-visor/docker
# 加载项目构建
source ./project-build.sh "$@"
# 版本号
version=2.5.3
# 是否推送镜像
push_image=false
# 是否构建 latest
latest_image=false
# 是否本地构建
locally_build=false
# 备份后缀
backup_suffix=".bak"
# 镜像命名空间
namespace="registry.cn-hangzhou.aliyuncs.com/orionsec"
# 解析命令行参数
while [[ $# -gt 0 ]]; do
case "$1" in
-l|--locally)
locally_build=true
shift
;;
-latest|--latest-image)
latest_image=true
shift
;;
-push|--push-image)
push_image=true
shift
;;
*)
shift
;;
esac
done
# 要处理的 Dockerfile 列表及对应的镜像名称
declare -A images=(
["./ui/Dockerfile"]="orion-visor-ui"
["./service/Dockerfile"]="orion-visor-service"
["./mysql/Dockerfile"]="orion-visor-mysql"
["./redis/Dockerfile"]="orion-visor-redis"
["./influxdb/Dockerfile"]="orion-visor-influxdb"
["./adminer/Dockerfile"]="orion-visor-adminer"
["./guacd/Dockerfile"]="orion-visor-guacd"
)
# 准备 service jar
function prepare_app_jar() {
local source_file="../orion-visor-launch/target/orion-visor-launch.jar"
local target_file="./service/orion-visor-launch.jar"
if [ ! -f "$target_file" ]; then
echo "警告: $target_file 不存在, 正在尝试从 $source_file 复制..."
if [ -f "$source_file" ]; then
cp "$source_file" "$target_file"
echo "已成功复制 $source_file$target_file"
else
echo "错误: $source_file 不存在, 无法继续构建."
exit 1
fi
else
echo "$target_file 已存在, 无需复制."
fi
}
# 准备 instance-agent
function prepare_instance_agent() {
local target_file="./service/instance-agent-release.tar.gz"
if [ ! -f "$target_file" ]; then
echo "警告: $target_file 不存在, 正在尝试从 Github Release 下载..."
# 尝试从 GitHub Release 下载
if curl -L --fail \
--connect-timeout 30 --max-time 30 \
https://github.com/lijiahangmax/orion-visor-agent/releases/latest/download/instance-agent-release.tar.gz \
-o "$target_file"; then
echo "已成功下载到 $target_file"
fi
# 如果下载失败, 提示用户手动下载
echo "错误: 无法从 Release 获取 instance-agent-release.tar.gz"
echo "请手动从以下地址下载, 并放置到 $target_file"
echo " 1) https://github.com/lijiahangmax/orion-visor-agent/raw/main/instance-agent-release.tar.gz"
echo " 2) https://gitee.com/lijiahangmax/orion-visor-agent/raw/main/instance-agent-release.tar.gz"
exit 1
else
echo "$target_file 已存在, 无需下载."
fi
}
# 准备前端 dist 目录
function prepare_dist_directory() {
local source_dir="../orion-visor-ui/dist"
local target_dir="./ui/dist"
if [ ! -d "$target_dir" ]; then
echo "警告: $target_dir 不存在, 正在尝试从 $source_dir 复制..."
if [ -d "$source_dir" ]; then
cp -r "$source_dir" "$target_dir"
echo "已成功复制 $source_dir$target_dir"
else
echo "错误: $source_dir 不存在, 无法继续构建."
exit 1
fi
else
echo "$target_dir 已存在, 无需复制."
fi
}
# 准备 mysql sql 目录
function prepare_sql_directory() {
local source_dir="../sql"
local target_dir="./mysql/sql"
if [ ! -d "$target_dir" ]; then
echo "警告: $target_dir 不存在, 正在尝试从 $source_dir 复制..."
if [ -d $source_dir ]; then
cp -r $source_dir "$target_dir"
echo "已成功复制 ../sql 至 $target_dir"
else
echo "错误: $source_dir 不存在!根据预期它应该存在, 请确认路径或项目结构是否正确"
exit 1
fi
else
echo "$target_dir 已存在, 无需复制."
fi
}
# 修改 Dockerfile 前的备份
function modify_dockerfiles() {
if [ "$locally_build" = false ]; then
echo "跳过 Dockerfile 修改"
return
fi
echo "正在备份并修改 Dockerfile..."
for file in "${!images[@]}"; do
if [ -f "$file" ]; then
echo "备份并修改: $file"
cp "$file" "$file$backup_suffix"
sed -i 's/--platform=\TARGETPLATFORM//g' "$file"
else
echo "文件不存在 -> $file"
fi
done
}
# 恢复原始 Dockerfile
function restore_dockerfiles() {
if [ "$locally_build" = false ]; then
return
fi
echo "开始恢复 Dockerfile"
for file in "${!images[@]}"; do
if [ -f "$file$backup_suffix" ]; then
echo "恢复: $file"
rm -rf "$file"
mv "$file$backup_suffix" "$file"
fi
done
echo "Dockerfile 已恢复为原始版本"
}
# 构建镜像
function build_images() {
echo "构建镜像开始..."
for dockerfile in "${!images[@]}"; do
image_name="${images[$dockerfile]}"
echo "Building $image_name with version $version."
# 构建 Docker 镜像
docker build -f "$dockerfile" -t "${image_name}:${version}" -t "${namespace}/${image_name}:${version}" .
# 添加 latest 标签
if [ "$latest_image" = true ]; then
echo "Tag $image_name with latest version."
docker tag "${image_name}:${version}" "${image_name}:latest"
docker tag "${namespace}/${image_name}:${version}" "${namespace}/${image_name}:latest"
fi
done
echo "构建镜像结束..."
}
# 推送镜像
function push_image_to_registry() {
if [ "$push_image" = true ]; then
echo "推送镜像开始..."
for image_name in "${images[@]}"; do
# 推送版本
docker push "${namespace}/${image_name}:${version}"
# 推送 latest
if [ "latest_image" = true ]; then
docker push "${namespace}/${image_name}:latest"
fi
done
echo "推送镜像结束..."
fi
}
# 构建项目-service
if [ "$build_service" = true ]; then
run_build_service
fi
# 构建项目-ui
if [ "$build_ui" = true ]; then
run_build_ui
fi
# 检查资源
echo "正在检查并准备必要的构建资源..."
prepare_app_jar
prepare_instance_agent
prepare_dist_directory
prepare_sql_directory
echo "所有前置资源已准备完毕"
# 修改镜像文件
modify_dockerfiles
# 设置异常捕获, 确保失败时恢复 Dockerfile
trap 'restore_dockerfiles; echo "构建失败, 已恢复原始 Dockerfile"; exit 1' ERR INT
# 构建镜像
build_images
# 推送镜像
push_image_to_registry
# 恢复原始 Dockerfile
restore_dockerfiles
trap - ERR INT
echo "构建完成"

View File

@@ -1,10 +1,17 @@
FROM guacamole/guacd:1.6.0
FROM --platform=$TARGETPLATFORM guacamole/guacd:1.6.0
USER root
# 系统时区
ARG TZ=Asia/Shanghai
# 设置时区
RUN ln -sf /usr/share/zoneinfo/${TZ} /etc/localtime && \
echo '${TZ}' > /etc/timezone
# 添加包 & 设置时区
RUN \
sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories && \
apk update && \
apk add --no-cache tzdata && \
ln -sf /usr/share/zoneinfo/${TZ} /etc/localtime && \
echo "${TZ}" > /etc/timezone
# 创建所需目录
RUN mkdir -p /home/guacd/drive /usr/share/guacd/drive

View File

@@ -1,6 +0,0 @@
#/bin/bash
set -e
version=2.4.1
docker build -t orion-visor-guacd:${version} .
docker tag orion-visor-guacd:${version} registry.cn-hangzhou.aliyuncs.com/orionsec/orion-visor-guacd:${version}
docker tag orion-visor-guacd:${version} registry.cn-hangzhou.aliyuncs.com/orionsec/orion-visor-guacd:latest

View File

@@ -0,0 +1,8 @@
FROM --platform=$TARGETPLATFORM influxdb:2
# 系统时区
ARG TZ=Asia/Shanghai
# 设置时区
RUN ln -sf /usr/share/zoneinfo/${TZ} /etc/localtime && \
echo "${TZ}" > /etc/timezone

View File

@@ -1,19 +1,18 @@
FROM mysql:8.0.28
FROM --platform=$TARGETPLATFORM mysql:8.0.39
# 系统时区
ARG TZ=Asia/Shanghai
# 设置时区
RUN ln -sf /usr/share/zoneinfo/${TZ} /etc/localtime && \
echo '${TZ}' > /etc/timezone
# 复制配置
COPY ./my.cnf /etc/mysql/conf.d/my.cnf
echo "${TZ}" > /etc/timezone
# 复制配置文件
COPY ./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
# 设置初始化脚本
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 && \
cat /tmp/init-4-data.sql >> /tmp/init.sql && \
cp /tmp/init.sql /docker-entrypoint-initdb.d
COPY ./mysql/sql/init-*.sql /docker-entrypoint-initdb.d/
# 心跳检测
HEALTHCHECK --interval=10s --timeout=3s --start-period=3s --retries=3 \
CMD mysqladmin ping -h localhost -u root --password=${MYSQL_ROOT_PASSWORD} || exit 1

View File

@@ -1,8 +0,0 @@
#/bin/bash
set -e
version=2.4.1
cp -r ../../sql ./sql
docker build -t orion-visor-mysql:${version} .
rm -rf ./sql
docker tag orion-visor-mysql:${version} registry.cn-hangzhou.aliyuncs.com/orionsec/orion-visor-mysql:${version}
docker tag orion-visor-mysql:${version} registry.cn-hangzhou.aliyuncs.com/orionsec/orion-visor-mysql:latest

125
docker/project-build.sh Normal file
View File

@@ -0,0 +1,125 @@
#!/bin/bash
set -e
# DockerContext: orion-visor
# 版本号
version=2.5.3
# 是否构建 service
export build_service=false
# 是否构建 ui
export build_ui=false
# 解析命令行参数
for arg in "$@"; do
case "$arg" in
-service|--build-service)
export build_service=true
;;
-ui|--build-ui)
export build_ui=true
;;
esac
done
# 执行构建 service
function run_build_service() {
echo "开始执行 service 构建流程..."
local builder_dockerfile="./builder/Dockerfile.service"
local builder_image="orion-visor-service-builder"
local builder_container="orion-visor-service-builder-ctn"
local builder_output="/build/orion-visor-launch/target/orion-visor-launch.jar"
local target_dir="../orion-visor-launch/target"
local target_jar="$target_dir/orion-visor-launch.jar"
# 确保目标目录存在
if [ ! -d "$target_dir" ]; then
echo "创建目标目录: $target_dir"
mkdir -p "$target_dir"
else
# 如果 jar 已存在, 先删除
if [ -f "$target_jar" ]; then
echo "删除已有文件: $target_jar"
rm -f "$target_jar"
fi
fi
# 清理旧容器
local container_id=$(docker ps -a -f "name=$builder_container" --format "{{.ID}}")
if [ -n "$container_id" ]; then
echo "删除旧容器: $builder_container"
docker rm -f "$container_id"
fi
# 构建构建镜像
echo "正在构建 service builder image..."
docker build \
-f "$builder_dockerfile" \
-t "$builder_image:$version" ../
# 创建一个临时容器用于拷贝文件
echo "创建临时容器以提取 jar 文件..."
docker create --name "$builder_container" "$builder_image:$version" > /dev/null
# 拷贝构建好的 jar 文件到目标路径
echo "正在从容器中拷贝 jar 文件..."
docker cp "$builder_container:$builder_output" "$target_jar"
# 清理临时容器
docker rm -f "$builder_container" > /dev/null
echo "后端构建完成, jar 文件已保存至: $target_jar"
}
# 执行构建 ui
function run_build_ui() {
echo "开始执行 ui 构建流程..."
local builder_dockerfile="./builder/Dockerfile.ui"
local builder_image="orion-visor-ui-builder"
local builder_container="orion-visor-ui-builder-ctn"
local builder_output="/build/dist"
local target_dir="../orion-visor-ui/dist"
# 如果 dist 已存在, 先删除
if [ -d "$target_dir" ]; then
echo "删除已有目录: $target_dir"
rm -rf "$target_dir"
fi
# 清理旧容器
local container_id=$(docker ps -a -f "name=$builder_container" --format "{{.ID}}")
if [ -n "$container_id" ]; then
echo "删除旧容器: $builder_container"
docker rm -f "$container_id"
fi
# 构建前端镜像
echo "正在构建 ui builder image..."
docker build \
-f "$builder_dockerfile" \
-t "$builder_image:$version" ../
# 创建临时容器用于拷贝文件
echo "创建临时容器以提取 dist 文件..."
docker create --name "$builder_container" "$builder_image:$version" > /dev/null
# 拷贝 dist 目录
echo "正在从容器中拷贝 dist 文件..."
docker cp "$builder_container:$builder_output" "$target_dir"
# 清理临时容器
docker rm "$builder_container" > /dev/null
echo "前端构建完成, dist 已保存至: $target_dir"
}
# 构建项目-service
if [ "$build_service" = true ]; then
run_build_service
fi
# 构建项目-ui
if [ "$build_ui" = true ]; then
run_build_ui
fi

View File

@@ -1,15 +0,0 @@
#/bin/bash
set -e
version=2.4.1
docker push registry.cn-hangzhou.aliyuncs.com/orionsec/orion-visor-adminer:${version}
docker push registry.cn-hangzhou.aliyuncs.com/orionsec/orion-visor-mysql:${version}
docker push registry.cn-hangzhou.aliyuncs.com/orionsec/orion-visor-redis:${version}
docker push registry.cn-hangzhou.aliyuncs.com/orionsec/orion-visor-guacd:${version}
docker push registry.cn-hangzhou.aliyuncs.com/orionsec/orion-visor-service:${version}
docker push registry.cn-hangzhou.aliyuncs.com/orionsec/orion-visor-ui:${version}
docker push registry.cn-hangzhou.aliyuncs.com/orionsec/orion-visor-adminer:latest
docker push registry.cn-hangzhou.aliyuncs.com/orionsec/orion-visor-mysql:latest
docker push registry.cn-hangzhou.aliyuncs.com/orionsec/orion-visor-redis:latest
docker push registry.cn-hangzhou.aliyuncs.com/orionsec/orion-visor-guacd:latest
docker push registry.cn-hangzhou.aliyuncs.com/orionsec/orion-visor-service:latest
docker push registry.cn-hangzhou.aliyuncs.com/orionsec/orion-visor-ui:latest

View File

@@ -1,15 +1,22 @@
FROM redis:6.0.16-alpine
FROM --platform=$TARGETPLATFORM redis:6.0.16-alpine
WORKDIR /data
# 系统时区
ARG TZ=Asia/Shanghai
# 添加包
# 添加包 & 设置时区
RUN \
sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories && \
apk update && \
apk add tzdata
# 设置时区
RUN ln -sf /usr/share/zoneinfo/${TZ} /etc/localtime && \
echo '${TZ}' > /etc/timezone
# redis 配置
COPY ./redis.conf /tmp
RUN cat /tmp/redis.conf > /usr/local/redis.conf
apk add --no-cache tzdata && \
ln -sf /usr/share/zoneinfo/${TZ} /etc/localtime && \
echo "${TZ}" > /etc/timezone && \
rm -rf /var/cache/apk/* && \
rm -f /usr/local/redis.conf
# 复制配置文件
COPY ./redis/redis.conf /usr/local/redis.conf
# 启动 Redis 并加载自定义配置
CMD ["redis-server", "/usr/local/redis.conf"]

View File

@@ -1,6 +0,0 @@
#/bin/bash
set -e
version=2.4.1
docker build -t orion-visor-redis:${version} .
docker tag orion-visor-redis:${version} registry.cn-hangzhou.aliyuncs.com/orionsec/orion-visor-redis:${version}
docker tag orion-visor-redis:${version} registry.cn-hangzhou.aliyuncs.com/orionsec/orion-visor-redis:latest

View File

@@ -1,20 +1,35 @@
FROM openjdk:8-jdk-alpine
FROM --platform=$TARGETPLATFORM openjdk:8-jdk-alpine
USER root
WORKDIR /app
# 系统时区
ARG TZ=Asia/Shanghai
# 添加包
# 添加包 & 设置时区
RUN \
sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories && \
apk update && \
apk add curl && \
apk add udev && \
apk add tzdata && \
apk add dmidecode
# 设置时区
RUN ln -sf /usr/share/zoneinfo/${TZ} /etc/localtime && \
echo '${TZ}' > /etc/timezone
# 复制包
COPY ./orion-visor-launch.jar /app/app.jar
ln -sf /usr/share/zoneinfo/${TZ} /etc/localtime && \
echo "${TZ}" > /etc/timezone
# 复制启动脚本
COPY ./service/entrypoint.sh /app/entrypoint.sh
RUN chmod +x /app/entrypoint.sh
# 复制 jar 包
COPY ./service/orion-visor-launch.jar /app/app.jar
# 复制探针包
ADD ./service/instance-agent-release.tar.gz /app/instance-agent-release
# 启动检测
HEALTHCHECK --interval=15s --timeout=5s --retries=5 --start-period=10s \
CMD wget -T5 -qO- http://127.0.0.1:9200/orion-visor/api/server/bootstrap/health | grep ok || exit 1
# 启动
ENTRYPOINT ["/app/entrypoint.sh"]
CMD ["java", "-jar", "/app/app.jar"]

View File

@@ -1,8 +0,0 @@
#/bin/bash
set -e
version=2.4.1
mv ../../orion-visor-launch/target/orion-visor-launch.jar ./orion-visor-launch.jar
docker build -t orion-visor-service:${version} .
rm -rf ./orion-visor-launch.jar
docker tag orion-visor-service:${version} registry.cn-hangzhou.aliyuncs.com/orionsec/orion-visor-service:${version}
docker tag orion-visor-service:${version} registry.cn-hangzhou.aliyuncs.com/orionsec/orion-visor-service:latest

View File

@@ -0,0 +1,23 @@
#!/bin/sh
AGENT_RELEASE_DIR="/root/orion/orion-visor/instance-agent-release"
DEFAULT_AGENT_DIR="/app/instance-agent-release"
# 确保父目录存在
mkdir -p "$(dirname "$AGENT_RELEASE_DIR")"
# 加载探针
if [ -d "$AGENT_RELEASE_DIR" ] && [ -n "$(ls -A "$AGENT_RELEASE_DIR" 2>/dev/null)" ]; then
echo "Using mounted agent release: $AGENT_RELEASE_DIR"
else
echo "Using default agent release: $DEFAULT_AGENT_DIR"
# 复制探针
cp -rf "$DEFAULT_AGENT_DIR" "$AGENT_RELEASE_DIR"
fi
# 打印探针版本信息
if [ -f "$AGENT_RELEASE_DIR/.version" ]; then
echo "Agent version: $(cat "$AGENT_RELEASE_DIR/.version")"
fi
exec "$@"

View File

@@ -1,18 +1,30 @@
FROM nginx:alpine
FROM --platform=$TARGETPLATFORM nginx:alpine
# 系统时区
ARG TZ=Asia/Shanghai
# 添加包
# 添加包 & 设置时区
RUN \
sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories && \
apk update && \
apk add tzdata
# 设置时区
RUN ln -sf /usr/share/zoneinfo/${TZ} /etc/localtime && \
echo '${TZ}' > /etc/timezone
# 删除原 nginx 配置
RUN rm -rf /etc/nginx/conf.d/*
# 复制包
COPY ./dist /usr/share/nginx/html
COPY ./nginx.conf /etc/nginx/conf.d
apk add --no-cache tzdata && \
ln -sf /usr/share/zoneinfo/${TZ} /etc/localtime && \
echo "${TZ}" > /etc/timezone && \
rm -rf /var/cache/apk/* && \
rm -rf /etc/nginx/nginx.conf && \
rm -rf /etc/nginx/conf.d/*
# 复制前端静态文件
COPY ./ui/dist /usr/share/nginx/html
# 复制配置
COPY ./ui/nginx.conf /etc/nginx
COPY ./ui/service.conf /etc/nginx/conf.d
# 复制启动脚本
COPY ./ui/entrypoint.sh /entrypoint.sh
RUN chmod +x /entrypoint.sh
# 启动
CMD ["nginx", "-g", "daemon off;"]
ENTRYPOINT ["/entrypoint.sh"]
CMD ["nginx", "-g", "daemon off;"]

View File

@@ -1,9 +0,0 @@
#/bin/bash
set -e
version=2.4.1
mv ../../orion-visor-ui/dist ./dist
docker build -t orion-visor-ui:${version} .
rm -rf ./orion-visor-launch.jar
rm -rf ./dist
docker tag orion-visor-ui:${version} registry.cn-hangzhou.aliyuncs.com/orionsec/orion-visor-ui:${version}
docker tag orion-visor-ui:${version} registry.cn-hangzhou.aliyuncs.com/orionsec/orion-visor-ui:latest

11
docker/ui/entrypoint.sh Normal file
View File

@@ -0,0 +1,11 @@
#!/bin/sh
# 设置环境变量
NGINX_SERVICE_HOST="${NGINX_SERVICE_HOST:-service}"
NGINX_SERVICE_PORT="${NGINX_SERVICE_PORT:-9200}"
# 替换环境变量
sed -i "s|\${NGINX_SERVICE_HOST}|${NGINX_SERVICE_HOST}|g" /etc/nginx/conf.d/service.conf
sed -i "s|\${NGINX_SERVICE_PORT}|${NGINX_SERVICE_PORT}|g" /etc/nginx/conf.d/service.conf
exec "$@"

View File

@@ -1,56 +1,30 @@
server {
listen 80;
server_name localhost;
client_max_body_size 1024m;
user nginx;
worker_processes auto;
# 是否启动 gzip 压缩
gzip on;
# 需要压缩的常见静态资源
gzip_types text/plain application/javascript application/x-javascript text/css application/xml text/javascript application/x-httpd-php image/jpeg image/gif image/png;
# 如果文件大于 1k 就启动压缩
gzip_min_length 1k;
# 缓冲区
gzip_buffers 4 16k;
# 压缩的等级
gzip_comp_level 2;
# access_log /var/log/nginx/host.access.log main;
location / {
root /usr/share/nginx/html;
index index.html index.htm;
proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto $scheme;
# web history 模式 404
try_files $uri $uri/ /index.html;
}
location /orion-visor/api {
proxy_pass http://service:9200/orion-visor/api;
proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto $scheme;
}
location /orion-visor/keep-alive {
proxy_pass http://service:9200/orion-visor/keep-alive;
proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "upgrade";
proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto $scheme;
proxy_read_timeout 3600s;
proxy_send_timeout 3600s;
}
error_page 500 502 503 504 /50x.html;
location = /50x.html {
root /usr/share/nginx/html;
}
error_log /var/log/nginx/error.log notice;
pid /run/nginx.pid;
events {
worker_connections 1024;
}
http {
include /etc/nginx/mime.types;
default_type application/octet-stream;
server_tokens off;
log_format main '$remote_addr - $remote_user [$time_local] "$request" '
'$status $body_bytes_sent "$http_referer" '
'"$http_user_agent" "$http_x_forwarded_for"';
access_log /var/log/nginx/access.log main;
sendfile on;
#tcp_nopush on;
keepalive_timeout 65;
#gzip on;
include /etc/nginx/conf.d/*.conf;
}

56
docker/ui/service.conf Normal file
View File

@@ -0,0 +1,56 @@
server {
listen 80;
server_name localhost;
client_max_body_size 1024m;
# 是否启动 gzip 压缩
gzip on;
# 需要压缩的常见静态资源
gzip_types text/plain application/javascript application/x-javascript text/css application/xml text/javascript application/x-httpd-php image/jpeg image/gif image/png;
# 如果文件大于 1k 就启动压缩
gzip_min_length 1k;
# 缓冲区
gzip_buffers 4 16k;
# 压缩的等级
gzip_comp_level 2;
# access_log /var/log/nginx/host.access.log main;
location / {
root /usr/share/nginx/html;
index index.html index.htm;
proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto $scheme;
# web history 模式 404
try_files $uri $uri/ /index.html;
}
location /orion-visor/api {
proxy_pass http://${NGINX_SERVICE_HOST}:${NGINX_SERVICE_PORT}/orion-visor/api;
proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto $scheme;
}
location /orion-visor/keep-alive {
proxy_pass http://${NGINX_SERVICE_HOST}:${NGINX_SERVICE_PORT}/orion-visor/keep-alive;
proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "upgrade";
proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto $scheme;
proxy_read_timeout 3600s;
proxy_send_timeout 3600s;
}
error_page 500 502 503 504 /50x.html;
location = /50x.html {
root /usr/share/nginx/html;
}
}

5
docs/README.md Normal file
View File

@@ -0,0 +1,5 @@
## 文档已迁移至在线文档
* https://visor.dromara.org
* https://visor.dromara.org.cn
* https://visor.orionsec.cn

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 232 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 153 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 201 KiB

9
git-pull.sh Normal file
View File

@@ -0,0 +1,9 @@
#!/bin/bash
# 清空
git clean -df
# 切换到 HEAD
git reset --hard HEAD
# 拉取远程
git pull
# 查看日志
git log -n 1

View File

@@ -20,7 +20,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.dromara.visor.common.interfaces;
package org.dromara.visor.common.cipher;
import cn.orionsec.kit.lang.utils.codec.Base62s;
import cn.orionsec.kit.lang.utils.crypto.symmetric.SymmetricCrypto;

View File

@@ -20,7 +20,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.dromara.visor.common.interfaces;
package org.dromara.visor.common.cipher;
/**
* rsa 解密器

View File

@@ -36,7 +36,7 @@ public interface AppConst extends OrionConst {
/**
* 同 ${orion.version} 迭代时候需要手动更改
*/
String VERSION = "2.4.1";
String VERSION = "2.5.3";
/**
* 同 ${spring.application.name}

View File

@@ -33,6 +33,8 @@ package org.dromara.visor.common.constant;
*/
public interface AutoConfigureOrderConst {
int FRAMEWORK_EXECUTOR = Integer.MIN_VALUE + 1000;
int FRAMEWORK_WEB = Integer.MIN_VALUE + 1100;
int FRAMEWORK_SECURITY = Integer.MIN_VALUE + 1200;
@@ -53,21 +55,23 @@ public interface AutoConfigureOrderConst {
int FRAMEWORK_REDIS_CACHE = Integer.MIN_VALUE + 2000;
int FRAMEWORK_CONFIG = Integer.MIN_VALUE + 2100;
int FRAMEWORK_INFLUXDB = Integer.MIN_VALUE + 2100;
int FRAMEWORK_ENCRYPT = Integer.MIN_VALUE + 2200;
int FRAMEWORK_CONFIG = Integer.MIN_VALUE + 2300;
int FRAMEWORK_STORAGE = Integer.MIN_VALUE + 2300;
int FRAMEWORK_CYPHER = Integer.MIN_VALUE + 2400;
int FRAMEWORK_JOB = Integer.MIN_VALUE + 2400;
int FRAMEWORK_STORAGE = Integer.MIN_VALUE + 2500;
int FRAMEWORK_JOB_QUARTZ = Integer.MIN_VALUE + 2500;
int FRAMEWORK_JOB = Integer.MIN_VALUE + 2600;
int FRAMEWORK_JOB_ASYNC = Integer.MIN_VALUE + 2600;
int FRAMEWORK_JOB_QUARTZ = Integer.MIN_VALUE + 2610;
int FRAMEWORK_MONITOR = Integer.MIN_VALUE + 2700;
int FRAMEWORK_BIZ_PUSH = Integer.MIN_VALUE + 2700;
int FRAMEWORK_BIZ_OPERATOR_LOG = Integer.MIN_VALUE + 2800;
int FRAMEWORK_BIZ_OPERATOR_LOG = Integer.MIN_VALUE + 7000;
int FRAMEWORK_MONITOR = Integer.MIN_VALUE + 9000;
int FRAMEWORK_BANNER = Integer.MIN_VALUE + 10000;

View File

@@ -31,24 +31,29 @@ package org.dromara.visor.common.constant;
*/
public interface BeanOrderConst {
/**
* 公共返回值包装处理器
*/
int RESPONSE_ADVICE_WRAPPER = Integer.MIN_VALUE + 1000;
/**
* 演示模式切面
*/
int DEMO_DISABLE_API_ASPECT = Integer.MIN_VALUE + 10;
int DEMO_DISABLE_API_ASPECT = Integer.MIN_VALUE + 100;
/**
* 全局日志打印
*/
int LOG_PRINT_ASPECT = Integer.MIN_VALUE + 20;
int LOG_PRINT_ASPECT = Integer.MIN_VALUE + 200;
/**
* 暴露接口切面
*/
int EXPOSE_API_ASPECT = Integer.MIN_VALUE + 300;
/**
* 操作日志切面
*/
int OPERATOR_LOG_ASPECT = Integer.MIN_VALUE + 30;
int OPERATOR_LOG_ASPECT = Integer.MIN_VALUE + 400;
/**
* 公共返回值包装处理器
*/
int RESPONSE_ADVICE_WRAPPER = Integer.MIN_VALUE + 1000;
}

View File

@@ -51,9 +51,6 @@ public interface Const extends cn.orionsec.kit.lang.constant.Const, FieldConst,
String SYSTEM_USERNAME = "system";
// FIXME KIT
String ADMINISTRATOR = "Administrator";
Long ALL_HOST_ID = -1L;
int BATCH_COUNT = 500;

View File

@@ -22,17 +22,19 @@
*/
package org.dromara.visor.common.constant;
import cn.orionsec.kit.lang.constant.StandardHttpHeader;
/**
* http 请求头
* 自定义请求头
*
* @author Jiahang Li
* @version 1.0.0
* @since 2025/7/1 1:02
*/
public interface HttpHeaderConst extends StandardHttpHeader {
public interface CustomHeaderConst {
String APP_VERSION = "X-App-Version";
String AGENT_KEY_HEADER = "X-Agent-Key";
String AGENT_VERSION_HEADER = "X-Agent-Version";
}

View File

@@ -48,6 +48,8 @@ public enum ErrorCode implements CodeInfo {
UNAUTHORIZED(401, "当前认证信息已失效, 请重新登录"),
EXPOSE_UNAUTHORIZED(401, "当前认证信息错误, 请检查后重试"),
FORBIDDEN(403, "无操作权限"),
NOT_FOUND(404, "未找到该资源"),

View File

@@ -100,9 +100,15 @@ public interface ErrorMessage {
String GROUP_ABSENT = "分组不存在";
String METRICS_ABSENT = "指标不存在";
String RULE_ABSENT = "规则不存在";
String ALARM_POLICY_ABSENT = "告警策略不存在";
String HOST_TYPE_ERROR = "主机类型错误";
String HOST_NOT_ENABLED = "主机未启用";
String HOST_NOT_ENABLED = "{} 主机未启用";
String CONFIG_NOT_ENABLED = "配置未启用";
@@ -132,6 +138,8 @@ public interface ErrorMessage {
String CURRENT_USER_UNSUPPORTED_OPT = "当前" + USER_UNSUPPORTED_OPT;
String PUSH_USER_NOT_EMPTY = "推送用户不能为空";
String PATH_NOT_NORMALIZE = "路径不合法";
String OPERATE_ERROR = "操作失败";
@@ -140,12 +148,16 @@ public interface ErrorMessage {
String DECRYPT_ERROR = "数据解密失败";
String GET_REQUEST_URL_ERROR = "获取请求路径失败";
String UNKNOWN_TYPE = "未知类型";
String ERROR_TYPE = "错误的类型";
String FILE_ABSENT = "文件不存在";
String FILE_EXTENSION_TYPE = "文件类型不正确";
String FILE_ABSENT_CLEAR = "文件不存在 (可能已被清理)";
String LOG_ABSENT = "日志不存在";
@@ -158,6 +170,8 @@ public interface ErrorMessage {
String FILE_UPLOAD_ERROR = "文件上传失败";
String CALC_SIGN_FAILED = "计算签名失败";
String SCRIPT_UPLOAD_ERROR = "脚本上传失败";
String EXEC_ERROR = "执行失败";
@@ -182,6 +196,8 @@ public interface ErrorMessage {
String COMPRESS_FILE_ABSENT = "压缩文件不存在";
String DECOMPRESS_FILE_ABSENT = "压缩文件不存在";
String UNABLE_DOWNLOAD_FOLDER = "无法下载文件夹";
String VALID_ERROR = "验证失败";
@@ -209,6 +225,27 @@ public interface ErrorMessage {
|| ex instanceof ApplicationException;
}
/**
* 获取错误信息
*
* @param ex ex
* @return message
*/
static String getErrorMessage(Exception ex) {
return getErrorMessage(ex, ErrorMessage.EXEC_ERROR, 0);
}
/**
* 获取错误信息
*
* @param ex ex
* @param len len
* @return message
*/
static String getErrorMessage(Exception ex, int len) {
return getErrorMessage(ex, ErrorMessage.EXEC_ERROR, len);
}
/**
* 获取错误信息
*
@@ -217,6 +254,18 @@ public interface ErrorMessage {
* @return message
*/
static String getErrorMessage(Exception ex, String defaultMsg) {
return getErrorMessage(ex, defaultMsg, 0);
}
/**
* 获取错误信息
*
* @param ex ex
* @param defaultMsg defaultMsg
* @param len len
* @return message
*/
static String getErrorMessage(Exception ex, String defaultMsg, int len) {
if (ex == null) {
return null;
}
@@ -226,7 +275,11 @@ public interface ErrorMessage {
}
// 业务异常
if (isBizException(ex)) {
return message;
if (len > 0) {
return Strings.retain(message, len);
} else {
return message;
}
}
return defaultMsg;
}

View File

@@ -35,6 +35,8 @@ public interface ExtraFieldConst extends FieldConst {
String TRACE_ID = "traceId";
String TASK_ID = "taskId";
String IDENTITY = "identity";
String GROUP_NAME = "groupName";
@@ -69,4 +71,6 @@ public interface ExtraFieldConst extends FieldConst {
String DARK = "dark";
String AGENT_KEY = "agentKey";
}

View File

@@ -45,12 +45,18 @@ public interface FieldConst {
String LABEL = "label";
String FIELD = "field";
String TYPE = "type";
String COLOR = "color";
String LOADING = "loading";
String STATUS = "status";
String SWITCH = "switch";
String INFO = "info";
String EXTRA = "extra";
@@ -71,6 +77,8 @@ public interface FieldConst {
String SEQ = "seq";
String START = "start";
String PATH = "path";
String ADDRESS = "address";
@@ -119,4 +127,12 @@ public interface FieldConst {
String CONFIG = "config";
String VERSION = "version";
String SYNCED = "synced";
String SIGN = "sign";
String SIGN_SHORT = "signShort";
}

View File

@@ -37,4 +37,20 @@ public interface FileConst {
String SCRIPT = "script";
String INSTANCE_AGENT_PATH = "instance-agent";
String INSTANCE_AGENT_NAME = "instance_agent";
String INSTANCE_AGENT_FILE_FORMAT = "instance_agent_{}_{}{}";
String INSTANCE_AGENT_RELEASE = "instance-agent-release";
String INSTANCE_AGENT_RELEASE_TEMP = "instance-agent-release-temp";
String INSTANCE_AGENT_RELEASE_TAR_GZ = "instance-agent-release.tar.gz";
String VERSION = ".version";
String CONFIG_YAML = "config.yaml";
}

View File

@@ -0,0 +1,62 @@
/*
* Copyright (c) 2023 - present Dromara, All rights reserved.
*
* https://visor.dromara.org
* https://visor.dromara.org.cn
* https://visor.orionsec.cn
*
* Members:
* Jiahang Li - ljh1553488six@139.com - author
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.dromara.visor.common.entity;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import javax.validation.constraints.NotNull;
import java.io.Serializable;
/**
* 推送用户
*
* @author Jiahang Li
* @version 1.0.0
* @since 2025/9/18 21:46
*/
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
@Schema(name = "PushUser", description = "推送用户")
public class PushUser implements Serializable {
@NotNull
@Schema(description = "用户id")
private Long id;
@NotNull
@Schema(description = "用户名")
private String username;
@Schema(description = "花名")
private String nickname;
@Schema(description = "手机号")
private String mobile;
}

View File

@@ -0,0 +1,60 @@
/*
* Copyright (c) 2023 - present Dromara, All rights reserved.
*
* https://visor.dromara.org
* https://visor.dromara.org.cn
* https://visor.orionsec.cn
*
* Members:
* Jiahang Li - ljh1553488six@139.com - author
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.dromara.visor.common.entity.chart;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.List;
import java.util.Map;
/**
* 时序图系列
*
* @author Jiahang Li
* @version 1.0.0
* @since 2025/9/3 21:08
*/
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
@Schema(name = "TimeChartSeries", description = "时序图系列")
public class TimeChartSeries {
@Schema(description = "name")
private String name;
@Schema(description = "颜色")
private String color;
@Schema(description = "tags")
private Map<String, Object> tags;
@Schema(description = "数据 [0]timestampMills [1]value")
private List<List<Object>> data;
}

View File

@@ -20,7 +20,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.dromara.visor.common.interfaces;
package org.dromara.visor.common.file;
import java.io.InputStream;
import java.io.OutputStream;

View File

@@ -0,0 +1,80 @@
/*
* Copyright (c) 2023 - present Dromara, All rights reserved.
*
* https://visor.dromara.org
* https://visor.dromara.org.cn
* https://visor.orionsec.cn
*
* Members:
* Jiahang Li - ljh1553488six@139.com - author
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.dromara.visor.common.lock;
import cn.orionsec.kit.lang.able.Executable;
import java.util.function.Supplier;
/**
* 空实现的锁
*
* @author Jiahang Li
* @version 1.0.0
* @since 2025/8/23 13:59
*/
public class EmptyLocker implements Locker {
@Override
public boolean tryLockExecute(String key, Executable executable) {
executable.exec();
return true;
}
@Override
public boolean tryLockExecute(String key, long timeout, Executable executable) {
executable.exec();
return true;
}
@Override
public <T> T tryLockExecute(String key, Supplier<T> callable) {
return callable.get();
}
@Override
public <T> T tryLockExecute(String key, long timeout, Supplier<T> callable) {
return callable.get();
}
@Override
public void lockExecute(String key, Executable executable) {
executable.exec();
}
@Override
public void lockExecute(String key, long timeout, Executable executable) {
executable.exec();
}
@Override
public <T> T lockExecute(String key, Supplier<T> callable) {
return callable.get();
}
@Override
public <T> T lockExecute(String key, long timeout, Supplier<T> callable) {
return callable.get();
}
}

View File

@@ -0,0 +1,116 @@
/*
* Copyright (c) 2023 - present Dromara, All rights reserved.
*
* https://visor.dromara.org
* https://visor.dromara.org.cn
* https://visor.orionsec.cn
*
* Members:
* Jiahang Li - ljh1553488six@139.com - author
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.dromara.visor.common.lock;
import cn.orionsec.kit.lang.able.Executable;
import java.util.function.Supplier;
/**
* 分布式锁
*
* @author Jiahang Li
* @version 1.0.0
* @since 2024/5/16 12:24
*/
public interface Locker {
/**
* 尝试获取锁并执行
*
* @param key key
* @param executable exec
* @return 是否获取到锁
*/
boolean tryLockExecute(String key, Executable executable);
/**
* 尝试获取锁并执行
*
* @param key key
* @param timeout timeout
* @param executable exec
* @return 是否获取到锁
*/
boolean tryLockExecute(String key, long timeout, Executable executable);
/**
* 尝试获取锁并执行 未获取到锁则抛出异常
*
* @param key key
* @param callable callable
* @param <T> T
* @return 执行结果
*/
<T> T tryLockExecute(String key, Supplier<T> callable);
/**
* 尝试获取锁并执行 未获取到锁则抛出异常
*
* @param key key
* @param timeout timeout
* @param callable callable
* @param <T> T
* @return 执行结果
*/
<T> T tryLockExecute(String key, long timeout, Supplier<T> callable);
/**
* 阻塞获取锁并执行
*
* @param key key
* @param executable exec
*/
void lockExecute(String key, Executable executable);
/**
* 阻塞获取锁并执行
*
* @param key key
* @param timeout timeout
* @param executable exec
*/
void lockExecute(String key, long timeout, Executable executable);
/**
* 阻塞获取锁并执行
*
* @param key key
* @param callable callable
* @param <T> T
* @return 执行结果
*/
<T> T lockExecute(String key, Supplier<T> callable);
/**
* 阻塞获取锁并执行
*
* @param key key
* @param timeout timeout
* @param callable callable
* @param <T> T
* @return 执行结果
*/
<T> T lockExecute(String key, long timeout, Supplier<T> callable);
}

View File

@@ -63,6 +63,9 @@ public class BaseConnectConfig implements IBaseConnectConfig {
@Schema(description = "主机端口")
private Integer hostPort;
@Schema(description = "agentKey")
private String agentKey;
@Schema(description = "用户名")
private String username;

View File

@@ -61,6 +61,10 @@ public interface IBaseConnectConfig {
void setHostPort(Integer hostPort);
String getAgentKey();
void setAgentKey(String agentKey);
String getUsername();
void setUsername(String username);

View File

@@ -0,0 +1,59 @@
/*
* Copyright (c) 2023 - present Dromara, All rights reserved.
*
* https://visor.dromara.org
* https://visor.dromara.org.cn
* https://visor.orionsec.cn
*
* Members:
* Jiahang Li - ljh1553488six@139.com - author
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.dromara.visor.common.session.config;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import lombok.experimental.SuperBuilder;
/**
* VNC 连接参数
*
* @author Jiahang Li
* @version 1.0.0
* @since 2025/4/1 16:57
*/
@Data
@SuperBuilder
@NoArgsConstructor
@AllArgsConstructor
@EqualsAndHashCode(callSuper = true)
@Schema(name = "VncConnectConfig", description = "VNC 连接参数")
public class VncConnectConfig extends BaseConnectConfig {
@Schema(description = "低带宽模式")
private Boolean lowBandwidthMode;
@Schema(description = "交换红蓝")
private Boolean swapRedBlue;
@Schema(description = "时区")
private String timezone;
@Schema(description = "剪切板编码")
private String clipboardEncoding;
}

View File

@@ -110,7 +110,10 @@ public class SessionStores {
}
}
// 超时时间
session.timeout(config.getTimeout());
Integer timeout = config.getTimeout();
if (timeout != null) {
session.timeout(timeout);
}
return session;
}

View File

@@ -23,7 +23,7 @@
package org.dromara.visor.common.utils;
import cn.orionsec.kit.lang.utils.Exceptions;
import org.dromara.visor.common.interfaces.AesEncryptor;
import org.dromara.visor.common.cipher.AesEncryptor;
/**
* aes 数据加密工具类

View File

@@ -37,13 +37,13 @@ import java.util.Set;
import java.util.function.Function;
/**
* 验证器
* 断言
*
* @author Jiahang Li
* @version 1.0.0
* @since 2023/7/18 11:23
*/
public class Valid extends cn.orionsec.kit.lang.utils.Valid {
public class Assert extends cn.orionsec.kit.lang.utils.Assert {
private static final Validator validator = SpringHolder.getBean(Validator.class);
@@ -155,8 +155,8 @@ public class Valid extends cn.orionsec.kit.lang.utils.Valid {
* @param path path
*/
public static String checkNormalize(String path) {
Valid.notBlank(path);
Valid.isTrue(Files1.isNormalize(path), ErrorMessage.PATH_NOT_NORMALIZE);
Assert.notBlank(path);
Assert.isTrue(Files1.isNormalize(path), ErrorMessage.PATH_NOT_NORMALIZE);
return Files1.getPath(path);
}
@@ -168,8 +168,8 @@ public class Valid extends cn.orionsec.kit.lang.utils.Valid {
* @return file
*/
public static String checkSuffix(String file, String suffix) {
Valid.notBlank(file);
Valid.isTrue(file.toLowerCase().endsWith(Const.DOT + suffix), ErrorMessage.PLEASE_SELECT_SUFFIX_FILE, suffix);
Assert.notBlank(file);
Assert.isTrue(file.toLowerCase().endsWith(Const.DOT + suffix), ErrorMessage.PLEASE_SELECT_SUFFIX_FILE, suffix);
return file;
}

View File

@@ -22,9 +22,10 @@
*/
package org.dromara.visor.common.utils;
import cn.orionsec.kit.lang.able.Executable;
import cn.orionsec.kit.lang.utils.Exceptions;
import lombok.extern.slf4j.Slf4j;
import org.dromara.visor.common.interfaces.Locker;
import org.dromara.visor.common.lock.Locker;
import java.util.function.Supplier;
@@ -44,26 +45,97 @@ public class LockerUtils {
}
/**
* 尝试获取锁
* 尝试获取锁并执行
*
* @param key key
* @param run run
* @param key key
* @param executable exec
* @return 是否获取到锁
*/
public static boolean tryLock(String key, Runnable run) {
return delegate.tryLock(key, run);
public static boolean tryLockExecute(String key, Executable executable) {
return delegate.tryLockExecute(key, executable);
}
/**
* 尝试获取锁
* 尝试获取锁并执行
*
* @param key key
* @param call call
* @param <T> T
* @param key key
* @param timeout timeout
* @param executable exec
* @return 是否获取到锁
*/
public static boolean tryLockExecute(String key, long timeout, Executable executable) {
return delegate.tryLockExecute(key, timeout, executable);
}
/**
* 尝试获取锁并执行 未获取到锁则抛出异常
*
* @param key key
* @param callable callable
* @param <T> T
* @return 执行结果
*/
public static <T> T tryLock(String key, Supplier<T> call) {
return delegate.tryLock(key, call);
public static <T> T tryLockExecute(String key, Supplier<T> callable) {
return delegate.tryLockExecute(key, callable);
}
/**
* 尝试获取锁并执行 未获取到锁则抛出异常
*
* @param key key
* @param timeout timeout
* @param callable callable
* @param <T> T
* @return 执行结果
*/
public static <T> T tryLockExecute(String key, long timeout, Supplier<T> callable) {
return delegate.tryLockExecute(key, timeout, callable);
}
/**
* 阻塞获取锁并执行
*
* @param key key
* @param executable exec
*/
public static void lockExecute(String key, Executable executable) {
delegate.lockExecute(key, executable);
}
/**
* 阻塞获取锁并执行
*
* @param key key
* @param timeout timeout
* @param executable exec
*/
public static void lockExecute(String key, long timeout, Executable executable) {
delegate.lockExecute(key, timeout, executable);
}
/**
* 阻塞获取锁并执行
*
* @param key key
* @param callable callable
* @param <T> T
* @return 执行结果
*/
public static <T> T lockExecute(String key, Supplier<T> callable) {
return delegate.lockExecute(key, callable);
}
/**
* 阻塞获取锁并执行
*
* @param key key
* @param timeout timeout
* @param callable callable
* @param <T> T
* @return 执行结果
*/
public static <T> T lockExecute(String key, long timeout, Supplier<T> callable) {
return delegate.lockExecute(key, timeout, callable);
}
public static void setDelegate(Locker delegate) {

View File

@@ -23,7 +23,7 @@
package org.dromara.visor.common.utils;
import cn.orionsec.kit.lang.utils.Exceptions;
import org.dromara.visor.common.interfaces.RsaDecryptor;
import org.dromara.visor.common.cipher.RsaDecryptor;
/**
* rsa 参数解密工具类

View File

@@ -23,7 +23,7 @@
package org.dromara.visor.common.validator.group;
/**
* 分页验证分组
* id 验证分组
*
* @author Jiahang Li
* @version 1.0.0

View File

@@ -0,0 +1,33 @@
/*
* Copyright (c) 2023 - present Dromara, All rights reserved.
*
* https://visor.dromara.org
* https://visor.dromara.org.cn
* https://visor.orionsec.cn
*
* Members:
* Jiahang Li - ljh1553488six@139.com - author
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.dromara.visor.common.validator.group;
/**
* key 验证分组
*
* @author Jiahang Li
* @version 1.0.0
* @since 2023/9/1 19:13
*/
public interface Key {
}

View File

@@ -14,11 +14,11 @@
<url>https://github.com/dromara/orion-visor</url>
<properties>
<revision>2.4.1</revision>
<revision>2.5.3</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>
<orion.kit.version>2.0.1</orion.kit.version>
<orion.kit.version>2.0.4</orion.kit.version>
<aspectj.version>1.9.7</aspectj.version>
<lombok.version>1.18.26</lombok.version>
<springdoc.version>1.6.15</springdoc.version>
@@ -31,6 +31,7 @@
<druid.version>1.2.16</druid.version>
<redisson.version>3.18.0</redisson.version>
<transmittable.thread.local.version>2.14.2</transmittable.thread.local.version>
<influxdb.client.version>6.6.0</influxdb.client.version>
<mockito.inline.version>4.11.0</mockito.inline.version>
<jedis.mock.version>1.0.7</jedis.mock.version>
<podam.version>7.2.11.RELEASE</podam.version>
@@ -54,8 +55,12 @@
<version>${orion.kit.version}</version>
<exclusions>
<exclusion>
<artifactId>orion-log</artifactId>
<groupId>cn.orionsec.kit</groupId>
<artifactId>orion-log</artifactId>
</exclusion>
<exclusion>
<groupId>cn.orionsec.kit</groupId>
<artifactId>orion-generator</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -101,6 +106,11 @@
<artifactId>orion-visor-spring-boot-starter-job</artifactId>
<version>${revision}</version>
</dependency>
<dependency>
<groupId>org.dromara.visor</groupId>
<artifactId>orion-visor-spring-boot-starter-executor</artifactId>
<version>${revision}</version>
</dependency>
<dependency>
<groupId>org.dromara.visor</groupId>
<artifactId>orion-visor-spring-boot-starter-websocket</artifactId>
@@ -118,7 +128,7 @@
</dependency>
<dependency>
<groupId>org.dromara.visor</groupId>
<artifactId>orion-visor-spring-boot-starter-encrypt</artifactId>
<artifactId>orion-visor-spring-boot-starter-cipher</artifactId>
<version>${revision}</version>
</dependency>
<dependency>
@@ -146,6 +156,16 @@
<artifactId>orion-visor-spring-boot-starter-test</artifactId>
<version>${revision}</version>
</dependency>
<dependency>
<groupId>org.dromara.visor</groupId>
<artifactId>orion-visor-spring-boot-starter-influxdb</artifactId>
<version>${revision}</version>
</dependency>
<dependency>
<groupId>org.dromara.visor</groupId>
<artifactId>orion-visor-spring-boot-starter-biz-push</artifactId>
<version>${revision}</version>
</dependency>
<dependency>
<groupId>org.dromara.visor</groupId>
<artifactId>orion-visor-spring-boot-starter-biz-operator-log</artifactId>
@@ -272,6 +292,13 @@
<version>${transmittable.thread.local.version}</version>
</dependency>
<!-- influxdb -->
<dependency>
<groupId>com.influxdb</groupId>
<artifactId>influxdb-client-java</artifactId>
<version>${influxdb.client.version}</version>
</dependency>
<!-- test -->
<dependency>
<groupId>org.springframework.boot</groupId>

View File

@@ -73,7 +73,6 @@ public class OperatorLogAspect {
.maxPoolSize(1)
.useLinkedBlockingQueue()
.allowCoreThreadTimeout()
.useLinkedBlockingQueue()
.build();
private final OperatorLogFrameworkService operatorLogFrameworkService;

View File

@@ -23,8 +23,11 @@
package org.dromara.visor.framework.biz.operator.log.core.factory;
import cn.orionsec.kit.lang.utils.Arrays1;
import cn.orionsec.kit.spring.SpringHolder;
import org.dromara.visor.framework.biz.operator.log.core.annotation.Module;
import org.dromara.visor.framework.biz.operator.log.core.model.OperatorType;
import org.springframework.beans.factory.BeanNameAware;
import org.springframework.beans.factory.support.BeanDefinitionRegistry;
import javax.annotation.PostConstruct;
@@ -35,7 +38,14 @@ import javax.annotation.PostConstruct;
* @version 1.0.0
* @since 2023/10/13 17:45
*/
public abstract class InitializingOperatorTypes implements OperatorTypeDefinition {
public abstract class InitializingOperatorTypes implements OperatorTypeDefinition, BeanNameAware {
private String beanName;
@Override
public void setBeanName(String name) {
this.beanName = name;
}
@PostConstruct
public void init() {
@@ -55,6 +65,8 @@ public abstract class InitializingOperatorTypes implements OperatorTypeDefinitio
type.setModule(module);
OperatorTypeHolder.set(type);
}
// 自动销毁
((BeanDefinitionRegistry) SpringHolder.getBeanFactory()).removeBeanDefinition(beanName);
}
}

View File

@@ -0,0 +1,37 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>org.dromara.visor</groupId>
<artifactId>orion-visor-framework</artifactId>
<version>${revision}</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>orion-visor-spring-boot-starter-biz-push</artifactId>
<name>${project.artifactId}</name>
<packaging>jar</packaging>
<description>项目业务推送包</description>
<url>https://github.com/dromara/orion-visor</url>
<dependencies>
<dependency>
<groupId>org.dromara.visor</groupId>
<artifactId>orion-visor-common</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter</artifactId>
</dependency>
<!-- web -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
</project>

View File

@@ -0,0 +1,121 @@
/*
* Copyright (c) 2023 - present Dromara, All rights reserved.
*
* https://visor.dromara.org
* https://visor.dromara.org.cn
* https://visor.orionsec.cn
*
* Members:
* Jiahang Li - ljh1553488six@139.com - author
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.dromara.visor.framework.biz.push.configuration;
import cn.orionsec.kit.lang.function.Functions;
import org.dromara.visor.common.constant.AutoConfigureOrderConst;
import org.dromara.visor.framework.biz.push.core.enums.PushChannelEnum;
import org.dromara.visor.framework.biz.push.core.framework.service.PushTemplateFrameworkService;
import org.dromara.visor.framework.biz.push.core.framework.service.PushTemplateFrameworkServiceDelegate;
import org.dromara.visor.framework.biz.push.core.framework.service.WebsiteMessageFrameworkService;
import org.dromara.visor.framework.biz.push.core.listener.PushMessageEventListener;
import org.dromara.visor.framework.biz.push.core.message.PushMessage;
import org.dromara.visor.framework.biz.push.core.service.*;
import org.dromara.visor.framework.biz.push.core.utils.MessageChannelUtils;
import org.dromara.visor.framework.biz.push.core.utils.PushUtils;
import org.springframework.boot.autoconfigure.AutoConfiguration;
import org.springframework.boot.autoconfigure.AutoConfigureOrder;
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Primary;
import java.util.List;
import java.util.Map;
import java.util.function.Function;
import java.util.stream.Collectors;
/**
* 推送自动配置类
*
* @author Shihao Lv
* @version 1.0.0
* @since 2025/9/17 23:04
*/
@AutoConfiguration
@AutoConfigureOrder(AutoConfigureOrderConst.FRAMEWORK_BIZ_PUSH)
public class OrionPushAutoConfiguration {
/**
* @return 钉钉推送服务
*/
@Bean
public DingPushService dingPushService() {
return new DingPushService();
}
/**
* @return 飞书推送服务
*/
@Bean
public FeiShuPushService feiShuPushService() {
return new FeiShuPushService();
}
/**
* @return 企业微信推送服务
*/
@Bean
public WeComPushService weComPushService() {
return new WeComPushService();
}
/**
* @param websiteMessageFrameworkService websiteMessageFrameworkService
* @return 站内信推送服务
*/
@Bean
public WebsitePushService websitePushService(WebsiteMessageFrameworkService websiteMessageFrameworkService) {
return new WebsitePushService(websiteMessageFrameworkService);
}
/**
* @param impl impl
* @return 推送模板服务
*/
@Bean
@Primary
@ConditionalOnBean(PushTemplateFrameworkService.class)
public PushTemplateFrameworkService pushTemplateFrameworkService(PushTemplateFrameworkService impl) {
PushTemplateFrameworkServiceDelegate delegate = new PushTemplateFrameworkServiceDelegate(impl);
// 设置到工具类
PushUtils.setPushTemplateFrameworkService(delegate);
return delegate;
}
/**
* @param pushServices 推送服务
* @return 消息推送事件监听器
*/
@Bean
public PushMessageEventListener pushMessageEventListener(List<IPushService<? extends PushMessage>> pushServices) {
// 服务列表
Map<PushChannelEnum, IPushService<? extends PushMessage>> serviceMap = pushServices.stream()
.collect(Collectors.toMap(
MessageChannelUtils::getPushChannel,
Function.identity(),
Functions.right()));
// 创建监听器
return new PushMessageEventListener(serviceMap);
}
}

View File

@@ -0,0 +1,48 @@
/*
* Copyright (c) 2023 - present Dromara, All rights reserved.
*
* https://visor.dromara.org
* https://visor.dromara.org.cn
* https://visor.orionsec.cn
*
* Members:
* Jiahang Li - ljh1553488six@139.com - author
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.dromara.visor.framework.biz.push.core.annotation;
import org.dromara.visor.framework.biz.push.core.enums.PushChannelEnum;
import java.lang.annotation.*;
/**
* 消息渠道
*
* @author Jiahang Li
* @version 1.0.0
* @since 2025/9/18 21:58
*/
@Target({ElementType.TYPE})
@Retention(RetentionPolicy.RUNTIME)
@Documented
public @interface MessageChannel {
/**
* 消息渠道
*
* @return channel
*/
PushChannelEnum value();
}

View File

@@ -0,0 +1,104 @@
/*
* Copyright (c) 2023 - present Dromara, All rights reserved.
*
* https://visor.dromara.org
* https://visor.dromara.org.cn
* https://visor.orionsec.cn
*
* Members:
* Jiahang Li - ljh1553488six@139.com - author
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.dromara.visor.framework.biz.push.core.entity;
import cn.orionsec.kit.lang.able.IJsonObject;
import com.alibaba.fastjson.annotation.JSONField;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
import java.util.List;
/**
* 钉钉请求体
*
* @author Jiahang Li
* @version 1.0.0
* @since 2025/9/18 18:41
*/
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class DingRequestBody implements Serializable, IJsonObject {
/**
* 消息类型
*/
@JSONField(name = "msgtype")
private String msgType;
/**
* markdown 内容
*/
private DingRequestBody.MarkdownPayload markdown;
/**
* at 配置
*/
private DingRequestBody.AtPayload at;
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public static class MarkdownPayload implements Serializable {
/**
* 标题
*/
private String title;
/**
* 内容
*/
private String text;
}
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public static class AtPayload implements Serializable {
/**
* 被 at 的手机号
*/
private List<String> atMobiles;
/**
* 被 at 的 userId
*/
private List<String> atUserIds;
/**
* 是否 at 所有人
*/
private Boolean isAtAll;
}
}

View File

@@ -0,0 +1,58 @@
/*
* Copyright (c) 2023 - present Dromara, All rights reserved.
*
* https://visor.dromara.org
* https://visor.dromara.org.cn
* https://visor.orionsec.cn
*
* Members:
* Jiahang Li - ljh1553488six@139.com - author
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.dromara.visor.framework.biz.push.core.entity;
import com.alibaba.fastjson.annotation.JSONField;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
/**
* 钉钉响应体
*
* @author Jiahang Li
* @version 1.0.0
* @since 2025/9/18 18:41
*/
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class DingResponseBody implements Serializable {
/**
* 错误码值
*/
@JSONField(name = "errcode")
private Integer errCode;
/**
* 错误码描述
*/
@JSONField(name = "errmsg")
private String errMsg;
}

View File

@@ -0,0 +1,81 @@
/*
* Copyright (c) 2023 - present Dromara, All rights reserved.
*
* https://visor.dromara.org
* https://visor.dromara.org.cn
* https://visor.orionsec.cn
*
* Members:
* Jiahang Li - ljh1553488six@139.com - author
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.dromara.visor.framework.biz.push.core.entity;
import cn.orionsec.kit.lang.able.IJsonObject;
import com.alibaba.fastjson.annotation.JSONField;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
/**
* 飞书请求体
*
* @author Jiahang Li
* @version 1.0.0
* @since 2025/9/18 18:41
*/
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class FeiShuRequestBody implements Serializable, IJsonObject {
/**
* 时间戳
*/
private Long timestamp;
/**
* 签名
*/
private String sign;
/**
* 消息类型
*/
@JSONField(name = "msg_type")
private String msgType;
/**
* text 内容
*/
private TextPayload content;
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public static class TextPayload implements Serializable {
/**
* 内容
*/
private String text;
}
}

View File

@@ -20,36 +20,36 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.dromara.visor.common.interfaces;
package org.dromara.visor.framework.biz.push.core.entity;
import java.util.function.Supplier;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
/**
* 分布式锁
* 飞书响应体
*
* @author Jiahang Li
* @version 1.0.0
* @since 2024/5/16 12:24
* @since 2025/9/18 18:41
*/
public interface Locker {
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class FeiShuResponseBody implements Serializable {
/**
* 尝试获取锁
*
* @param key key
* @param run run
* @return 是否获取到锁
* code
*/
boolean tryLock(String key, Runnable run);
private Integer code;
/**
* 尝试获取锁
*
* @param key key
* @param call call
* @param <T> T
* @return 执行结果
* msg
*/
<T> T tryLock(String key, Supplier<T> call);
private String msg;
}

View File

@@ -0,0 +1,78 @@
/*
* Copyright (c) 2023 - present Dromara, All rights reserved.
*
* https://visor.dromara.org
* https://visor.dromara.org.cn
* https://visor.orionsec.cn
*
* Members:
* Jiahang Li - ljh1553488six@139.com - author
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.dromara.visor.framework.biz.push.core.entity;
import cn.orionsec.kit.lang.able.IJsonObject;
import com.alibaba.fastjson.annotation.JSONField;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
import java.util.List;
/**
* 企业微信请求体
*
* @author Jiahang Li
* @version 1.0.0
* @since 2025/9/18 18:41
*/
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class WeComRequestBody implements Serializable, IJsonObject {
/**
* 消息类型
*/
@JSONField(name = "msgtype")
private String msgType;
/**
* markdown 内容
*/
private MarkdownPayload markdown;
/**
* 被 at 的 userId
*/
@JSONField(name = "mentioned_list")
private List<String> mentionedList;
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public static class MarkdownPayload implements Serializable {
/**
* 内容
*/
private String content;
}
}

View File

@@ -0,0 +1,58 @@
/*
* Copyright (c) 2023 - present Dromara, All rights reserved.
*
* https://visor.dromara.org
* https://visor.dromara.org.cn
* https://visor.orionsec.cn
*
* Members:
* Jiahang Li - ljh1553488six@139.com - author
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.dromara.visor.framework.biz.push.core.entity;
import com.alibaba.fastjson.annotation.JSONField;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
/**
* 企业微信响应体
*
* @author Jiahang Li
* @version 1.0.0
* @since 2025/9/18 18:41
*/
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class WeComResponseBody implements Serializable {
/**
* 错误码值
*/
@JSONField(name = "errcode")
private Integer errCode;
/**
* 错误码描述
*/
@JSONField(name = "errmsg")
private String errMsg;
}

View File

@@ -0,0 +1,89 @@
/*
* Copyright (c) 2023 - present Dromara, All rights reserved.
*
* https://visor.dromara.org
* https://visor.dromara.org.cn
* https://visor.orionsec.cn
*
* Members:
* Jiahang Li - ljh1553488six@139.com - author
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.dromara.visor.framework.biz.push.core.enums;
import com.alibaba.fastjson.JSON;
import lombok.AllArgsConstructor;
import lombok.Getter;
import org.dromara.visor.framework.biz.push.core.message.*;
/**
* 通知模板类型枚举
*
* @author Shihao Lv
* @version 1.0.0
* @since 2025/9/15 23:20
*/
@Getter
@AllArgsConstructor
public enum PushChannelEnum {
/**
* 站内信
*/
WEBSITE(WebsiteMessage.class),
/**
* 钉钉
*/
DING(DingPushMessage.class),
/**
* 飞书
*/
FEI_SHU(FeiShuPushMessage.class),
/**
* 企业微信
*/
WE_COM(WeComPushMessage.class),
;
public final Class<?> messageClass;
@SuppressWarnings("unchecked")
public <T extends PushMessage> T createMessage(String config) {
try {
return (T) JSON.parseObject(config, messageClass);
} catch (Exception e) {
return null;
}
}
/**
* 根据渠道名称获取枚举
*
* @param channel 渠道名称
* @return 枚举
*/
public static PushChannelEnum of(String channel) {
for (PushChannelEnum value : values()) {
if (value.name().equalsIgnoreCase(channel)) {
return value;
}
}
return WEBSITE;
}
}

View File

@@ -0,0 +1,41 @@
/*
* Copyright (c) 2023 - present Dromara, All rights reserved.
*
* https://visor.dromara.org
* https://visor.dromara.org.cn
* https://visor.orionsec.cn
*
* Members:
* Jiahang Li - ljh1553488six@139.com - author
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.dromara.visor.framework.biz.push.core.event;
import org.dromara.visor.framework.biz.push.core.message.PushMessage;
import org.springframework.context.ApplicationEvent;
/**
* 消息推送事件
*
* @author Shihao Lv
* @version 1.0.0
* @since 2025/1/15
*/
public class PushMessageEvent extends ApplicationEvent {
public PushMessageEvent(PushMessage message) {
super(message);
}
}

View File

@@ -0,0 +1,44 @@
/*
* Copyright (c) 2023 - present Dromara, All rights reserved.
*
* https://visor.dromara.org
* https://visor.dromara.org.cn
* https://visor.orionsec.cn
*
* Members:
* Jiahang Li - ljh1553488six@139.com - author
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.dromara.visor.framework.biz.push.core.framework.service;
import org.dromara.visor.framework.biz.push.core.message.PushMessage;
/**
* 推送消息模板框架服务
*
* @author Jiahang Li
* @version 1.0.0
* @since 2025/9/21 16:26
*/
public interface PushTemplateFrameworkService {
/**
* 根据 templateId 获取消息
*
* @param templateId templateId
* @return message
*/
PushMessage getPushMessageByTemplateId(Long templateId);
}

View File

@@ -0,0 +1,47 @@
/*
* Copyright (c) 2023 - present Dromara, All rights reserved.
*
* https://visor.dromara.org
* https://visor.dromara.org.cn
* https://visor.orionsec.cn
*
* Members:
* Jiahang Li - ljh1553488six@139.com - author
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.dromara.visor.framework.biz.push.core.framework.service;
import org.dromara.visor.framework.biz.push.core.message.PushMessage;
/**
* 推送消息模板框架服务委托类
*
* @author Jiahang Li
* @version 1.0.0
* @since 2025/9/21 16:26
*/
public class PushTemplateFrameworkServiceDelegate implements PushTemplateFrameworkService {
private final PushTemplateFrameworkService delegate;
public PushTemplateFrameworkServiceDelegate(PushTemplateFrameworkService delegate) {
this.delegate = delegate;
}
@Override
public PushMessage getPushMessageByTemplateId(Long templateId) {
return delegate.getPushMessageByTemplateId(templateId);
}
}

View File

@@ -0,0 +1,43 @@
/*
* Copyright (c) 2023 - present Dromara, All rights reserved.
*
* https://visor.dromara.org
* https://visor.dromara.org.cn
* https://visor.orionsec.cn
*
* Members:
* Jiahang Li - ljh1553488six@139.com - author
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.dromara.visor.framework.biz.push.core.framework.service;
import org.dromara.visor.framework.biz.push.core.message.WebsiteMessage;
/**
* 发送站内信框架服务
*
* @author Jiahang Li
* @version 1.0.0
* @since 2025/9/18 22:09
*/
public interface WebsiteMessageFrameworkService {
/**
* 发送站内信
*
* @param message message
*/
void push(WebsiteMessage message);
}

View File

@@ -0,0 +1,70 @@
/*
* Copyright (c) 2023 - present Dromara, All rights reserved.
*
* https://visor.dromara.org
* https://visor.dromara.org.cn
* https://visor.orionsec.cn
*
* Members:
* Jiahang Li - ljh1553488six@139.com - author
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.dromara.visor.framework.biz.push.core.listener;
import lombok.extern.slf4j.Slf4j;
import org.dromara.visor.framework.biz.push.core.enums.PushChannelEnum;
import org.dromara.visor.framework.biz.push.core.event.PushMessageEvent;
import org.dromara.visor.framework.biz.push.core.message.PushMessage;
import org.dromara.visor.framework.biz.push.core.service.IPushService;
import org.springframework.context.ApplicationListener;
import org.springframework.scheduling.annotation.Async;
import java.util.Map;
/**
* 消息推送事件监听器
*
* @author Shihao Lv
* @version 1.0.0
* @since 2025/1/15
*/
@Slf4j
public class PushMessageEventListener implements ApplicationListener<PushMessageEvent> {
private final Map<PushChannelEnum, IPushService<? extends PushMessage>> pushServiceMap;
public PushMessageEventListener(Map<PushChannelEnum, IPushService<? extends PushMessage>> pushServiceMap) {
this.pushServiceMap = pushServiceMap;
}
@Async("pushExecutor")
@Override
public void onApplicationEvent(PushMessageEvent event) {
try {
// 获取消息
PushMessage message = (PushMessage) event.getSource();
// 发送消息
this.getPushService(message).push(message);
log.info("PushMessageEventListener push success");
} catch (Exception e) {
log.error("PushMessageEventListener push error", e);
}
}
@SuppressWarnings("unchecked")
private <T extends PushMessage> IPushService<T> getPushService(PushMessage message) {
return (IPushService<T>) pushServiceMap.get(message.getChannel());
}
}

View File

@@ -0,0 +1,63 @@
/*
* Copyright (c) 2023 - present Dromara, All rights reserved.
*
* https://visor.dromara.org
* https://visor.dromara.org.cn
* https://visor.orionsec.cn
*
* Members:
* Jiahang Li - ljh1553488six@139.com - author
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.dromara.visor.framework.biz.push.core.message;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.experimental.SuperBuilder;
import org.dromara.visor.common.entity.PushUser;
import javax.validation.Valid;
import javax.validation.constraints.NotBlank;
import java.io.Serializable;
import java.util.List;
import java.util.Map;
/**
* 推送消息基类
*
* @author Shihao Lv
* @version 1.0.0
* @since 2025/9/15 23:28
*/
@Data
@SuperBuilder
@NoArgsConstructor
@AllArgsConstructor
@Schema(name = "BasePushMessage", description = "推送消息基类")
public abstract class BasePushMessage implements PushMessage, Serializable {
@NotBlank
@Schema(description = "消息模板")
private String template;
@Schema(description = "消息参数")
private Map<String, Object> params;
@Valid
@Schema(description = "推送用户")
private List<PushUser> pushUsers;
}

View File

@@ -0,0 +1,66 @@
/*
* Copyright (c) 2023 - present Dromara, All rights reserved.
*
* https://visor.dromara.org
* https://visor.dromara.org.cn
* https://visor.orionsec.cn
*
* Members:
* Jiahang Li - ljh1553488six@139.com - author
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.dromara.visor.framework.biz.push.core.message;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import lombok.experimental.SuperBuilder;
import org.dromara.visor.framework.biz.push.core.enums.PushChannelEnum;
import javax.validation.constraints.NotBlank;
/**
* 钉钉推送消息
*
* @author Shihao Lv
* @version 1.0.0
* @since 2025/9/15 23:29
*/
@Data
@SuperBuilder
@NoArgsConstructor
@AllArgsConstructor
@EqualsAndHashCode(callSuper = true)
@Schema(name = "DingPushMessage", description = "钉钉推送消息")
public class DingPushMessage extends BasePushMessage {
@NotBlank
@Schema(description = "webhook")
private String webhook;
@Schema(description = "密钥")
private String secret;
@NotBlank
@Schema(description = "推送标题")
private String title;
@Override
public PushChannelEnum getChannel() {
return PushChannelEnum.DING;
}
}

View File

@@ -0,0 +1,62 @@
/*
* Copyright (c) 2023 - present Dromara, All rights reserved.
*
* https://visor.dromara.org
* https://visor.dromara.org.cn
* https://visor.orionsec.cn
*
* Members:
* Jiahang Li - ljh1553488six@139.com - author
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.dromara.visor.framework.biz.push.core.message;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import lombok.experimental.SuperBuilder;
import org.dromara.visor.framework.biz.push.core.enums.PushChannelEnum;
import javax.validation.constraints.NotBlank;
/**
* 飞书推送消息
*
* @author Shihao Lv
* @version 1.0.0
* @since 2025/9/16 00:26
*/
@Data
@SuperBuilder
@NoArgsConstructor
@AllArgsConstructor
@EqualsAndHashCode(callSuper = true)
@Schema(name = "FeiShuPushMessage", description = "飞书推送消息")
public class FeiShuPushMessage extends BasePushMessage {
@NotBlank
@Schema(description = "webhook")
private String webhook;
@Schema(description = "密钥")
private String secret;
@Override
public PushChannelEnum getChannel() {
return PushChannelEnum.FEI_SHU;
}
}

View File

@@ -0,0 +1,90 @@
/*
* Copyright (c) 2023 - present Dromara, All rights reserved.
*
* https://visor.dromara.org
* https://visor.dromara.org.cn
* https://visor.orionsec.cn
*
* Members:
* Jiahang Li - ljh1553488six@139.com - author
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.dromara.visor.framework.biz.push.core.message;
import org.dromara.visor.common.entity.PushUser;
import org.dromara.visor.framework.biz.push.core.enums.PushChannelEnum;
import java.io.Serializable;
import java.util.List;
import java.util.Map;
/**
* 推送消息接口
*
* @author Jiahang Li
* @version 1.0.0
* @since 2025/9/18 18:42
*/
public interface PushMessage extends Serializable {
/**
* 获取模板
*
* @return 模板
*/
String getTemplate();
/**
* 设置模板
*
* @param template template
*/
void setTemplate(String template);
/**
* 获取参数
*
* @return 参数
*/
Map<String, Object> getParams();
/**
* 设置参数
*
* @param params params
*/
void setParams(Map<String, Object> params);
/**
* 获取推送用户
*
* @return 推送用户
*/
List<PushUser> getPushUsers();
/**
* 设置推送用户列表
*
* @param pushUsers pushUsers
*/
void setPushUsers(List<PushUser> pushUsers);
/**
* 获取推送渠道
*
* @return 推送渠道
*/
PushChannelEnum getChannel();
}

View File

@@ -0,0 +1,59 @@
/*
* Copyright (c) 2023 - present Dromara, All rights reserved.
*
* https://visor.dromara.org
* https://visor.dromara.org.cn
* https://visor.orionsec.cn
*
* Members:
* Jiahang Li - ljh1553488six@139.com - author
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.dromara.visor.framework.biz.push.core.message;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import lombok.experimental.SuperBuilder;
import org.dromara.visor.framework.biz.push.core.enums.PushChannelEnum;
import javax.validation.constraints.NotBlank;
/**
* 企业微信推送消息
*
* @author Shihao Lv
* @version 1.0.0
* @since 2025/9/15 23:30
*/
@Data
@SuperBuilder
@NoArgsConstructor
@AllArgsConstructor
@EqualsAndHashCode(callSuper = true)
@Schema(name = "WeComPushMessage", description = "企业微信推送消息")
public class WeComPushMessage extends BasePushMessage {
@NotBlank
@Schema(description = "webhook")
private String webhook;
@Override
public PushChannelEnum getChannel() {
return PushChannelEnum.WE_COM;
}
}

View File

@@ -0,0 +1,74 @@
/*
* Copyright (c) 2023 - present Dromara, All rights reserved.
*
* https://visor.dromara.org
* https://visor.dromara.org.cn
* https://visor.orionsec.cn
*
* Members:
* Jiahang Li - ljh1553488six@139.com - author
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.dromara.visor.framework.biz.push.core.message;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import lombok.experimental.SuperBuilder;
import org.dromara.visor.framework.biz.push.core.enums.PushChannelEnum;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Size;
/**
* 站内信推送
*
* @author Jiahang Li
* @version 1.0.0
* @since 2025/9/18 19:56
*/
@Data
@SuperBuilder
@NoArgsConstructor
@AllArgsConstructor
@EqualsAndHashCode(callSuper = true)
@Schema(name = "WebsiteMessage", description = "站内信消息")
public class WebsiteMessage extends BasePushMessage {
@NotBlank
@Size(max = 10)
@Schema(description = "消息分类")
private String messageClassify;
@NotBlank
@Size(max = 32)
@Schema(description = "消息类型")
private String messageType;
@Schema(description = "消息关联")
private String relKey;
@NotBlank
@Size(max = 128)
@Schema(description = "标题")
private String title;
@Override
public PushChannelEnum getChannel() {
return PushChannelEnum.WEBSITE;
}
}

View File

@@ -0,0 +1,126 @@
/*
* Copyright (c) 2023 - present Dromara, All rights reserved.
*
* https://visor.dromara.org
* https://visor.dromara.org.cn
* https://visor.orionsec.cn
*
* Members:
* Jiahang Li - ljh1553488six@139.com - author
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.dromara.visor.framework.biz.push.core.service;
import cn.orionsec.kit.lang.utils.Strings;
import cn.orionsec.kit.lang.utils.collect.Lists;
import com.alibaba.fastjson.JSON;
import lombok.extern.slf4j.Slf4j;
import org.dromara.visor.common.constant.Const;
import org.dromara.visor.common.entity.PushUser;
import org.dromara.visor.common.utils.Assert;
import org.dromara.visor.framework.biz.push.core.message.PushMessage;
import java.util.stream.Collectors;
/**
* 消息推送抽象服务
*
* @author Jiahang Li
* @version 1.0.0
* @since 2025/9/18 18:51
*/
@Slf4j
public abstract class BasePushService<Message extends PushMessage> implements IPushService<Message> {
@Override
public void push(Message message) {
try {
// 验证消息
this.validateMessage(message);
} catch (Exception e) {
log.error("BasePushService validateMessage message: {}", JSON.toJSONString(message), e);
return;
}
// 请求路径
String url = this.buildRequestUrl(message);
// 构建请求体
String body = this.buildRequestBody(message);
// 发送请求
this.sendRequest(message, url, body);
}
/**
* 验证消息
*
* @param message message
*/
protected void validateMessage(Message message) {
// 验证消息
Assert.valid(message);
}
/**
* 构建请求 url
*
* @param message message
* @return url
*/
protected abstract String buildRequestUrl(Message message);
/**
* 构建请求体
*
* @param message message
* @return body
*/
protected abstract String buildRequestBody(Message message);
/**
* 发送请求
*
* @param message message
* @param url url
* @param body body
*/
protected abstract void sendRequest(Message message, String url, String body);
/**
* 追加 at 用户
*
* @param message message
* @param content content
* @return content
*/
protected String appendAtUsers(Message message, String content) {
if (Lists.isEmpty(message.getPushUsers())) {
return content;
}
return content + Const.LF + this.getAtUsers(message);
}
/**
* 获取 @ 的用户
*
* @param message message
* @return users
*/
protected String getAtUsers(Message message) {
return Lists.stream(message.getPushUsers())
.map(PushUser::getNickname)
.filter(Strings::isNotBlank)
.map(s -> Const.AT + s)
.collect(Collectors.joining(Const.SPACE));
}
}

View File

@@ -0,0 +1,114 @@
/*
* Copyright (c) 2023 - present Dromara, All rights reserved.
*
* https://visor.dromara.org
* https://visor.dromara.org.cn
* https://visor.orionsec.cn
*
* Members:
* Jiahang Li - ljh1553488six@139.com - author
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.dromara.visor.framework.biz.push.core.service;
import cn.orionsec.kit.http.ok.OkRequests;
import cn.orionsec.kit.http.ok.OkResponse;
import cn.orionsec.kit.lang.constant.StandardContentType;
import cn.orionsec.kit.lang.utils.Assert;
import cn.orionsec.kit.lang.utils.Exceptions;
import cn.orionsec.kit.lang.utils.Strings;
import cn.orionsec.kit.lang.utils.codec.Base64s;
import cn.orionsec.kit.lang.utils.crypto.Signatures;
import cn.orionsec.kit.lang.utils.math.Hex;
import com.alibaba.fastjson.JSON;
import lombok.extern.slf4j.Slf4j;
import org.dromara.visor.common.constant.ErrorMessage;
import org.dromara.visor.framework.biz.push.core.annotation.MessageChannel;
import org.dromara.visor.framework.biz.push.core.entity.DingRequestBody;
import org.dromara.visor.framework.biz.push.core.entity.DingResponseBody;
import org.dromara.visor.framework.biz.push.core.enums.PushChannelEnum;
import org.dromara.visor.framework.biz.push.core.message.DingPushMessage;
import org.dromara.visor.framework.biz.push.core.utils.MessageUtils;
/**
* 钉钉推送服务类
* <p>
* <a href="https://open.dingtalk.com/document/dingstart/obtain-the-webhook-address-of-a-custom-robot">doc</a>
*
* @author Shihao Lv
* @version 1.0.0
* @since 2025/9/17 23:13
*/
@Slf4j
@MessageChannel(value = PushChannelEnum.DING)
public class DingPushService extends BasePushService<DingPushMessage> {
private static final String MARKDOWN = "markdown";
private static final Integer SUCCESS_CODE = 0;
@Override
protected String buildRequestUrl(DingPushMessage message) {
String secret = message.getSecret();
if (Strings.isBlank(secret)) {
return message.getWebhook();
}
// 加签
try {
long timestamp = System.currentTimeMillis();
String plainText = timestamp + "\n" + secret;
String hexSign = Signatures.hmacSha256(plainText, secret);
if (hexSign == null) {
log.error("DingPushService-sign error plain: {}", plainText);
throw Exceptions.argument(ErrorMessage.GET_REQUEST_URL_ERROR);
}
byte[] signData = Hex.hexToBytes(hexSign);
String sign = Base64s.encodeToString(signData);
// 实际请求地址
return message.getWebhook() + "&timestamp=" + timestamp + "&sign=" + sign;
} catch (Exception e) {
log.error("DingPushService-buildRequestUrl error", e);
throw e;
}
}
@Override
protected String buildRequestBody(DingPushMessage message) {
// 格式化内容
String formattedContent = MessageUtils.format(message.getTemplate(), message.getParams());
String formattedTitle = MessageUtils.format(message.getTitle(), message.getParams());
// at 用户
formattedContent = this.appendAtUsers(message, formattedContent);
// 构建请求体
return DingRequestBody.builder()
.msgType(MARKDOWN)
.markdown(DingRequestBody.MarkdownPayload.builder()
.title(formattedTitle)
.text(formattedContent)
.build())
.build()
.toJsonString();
}
@Override
protected void sendRequest(DingPushMessage message, String url, String body) {
// 发送请求
OkResponse response = OkRequests.post(url, StandardContentType.APPLICATION_JSON_UTF8, body);
DingResponseBody responseBody = JSON.parseObject(response.getBodyString(), DingResponseBody.class);
// 验证发送结果
Assert.eq(responseBody.getErrCode(), SUCCESS_CODE, responseBody.getErrMsg());
}
}

View File

@@ -0,0 +1,118 @@
/*
* Copyright (c) 2023 - present Dromara, All rights reserved.
*
* https://visor.dromara.org
* https://visor.dromara.org.cn
* https://visor.orionsec.cn
*
* Members:
* Jiahang Li - ljh1553488six@139.com - author
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.dromara.visor.framework.biz.push.core.service;
import cn.orionsec.kit.http.ok.OkRequests;
import cn.orionsec.kit.http.ok.OkResponse;
import cn.orionsec.kit.lang.constant.Const;
import cn.orionsec.kit.lang.constant.StandardContentType;
import cn.orionsec.kit.lang.utils.Strings;
import cn.orionsec.kit.lang.utils.codec.Base64s;
import cn.orionsec.kit.lang.utils.crypto.Signatures;
import cn.orionsec.kit.lang.utils.crypto.enums.SecretKeySpecMode;
import com.alibaba.fastjson.JSON;
import lombok.extern.slf4j.Slf4j;
import org.dromara.visor.common.utils.Assert;
import org.dromara.visor.framework.biz.push.core.annotation.MessageChannel;
import org.dromara.visor.framework.biz.push.core.entity.FeiShuRequestBody;
import org.dromara.visor.framework.biz.push.core.entity.FeiShuResponseBody;
import org.dromara.visor.framework.biz.push.core.enums.PushChannelEnum;
import org.dromara.visor.framework.biz.push.core.message.FeiShuPushMessage;
import org.dromara.visor.framework.biz.push.core.utils.MessageUtils;
/**
* 飞书推送服务类
* <p>
* <a href="https://open.feishu.cn/document/client-docs/bot-v3/add-custom-bot?lang=zh-CN">doc</a>
*
* @author Shihao Lv
* @version 1.0.0
* @since 2025/9/17 23:13
*/
@Slf4j
@MessageChannel(value = PushChannelEnum.FEI_SHU)
public class FeiShuPushService extends BasePushService<FeiShuPushMessage> {
private static final String TEXT = "text";
private static final Integer SUCCESS_CODE = 0;
@Override
protected String buildRequestUrl(FeiShuPushMessage message) {
return message.getWebhook();
}
/**
* 生成签名
*
* @param message message
* @param timestamp timestamp
* @return sign
*/
protected String buildSign(FeiShuPushMessage message, long timestamp) {
String secret = message.getSecret();
if (Strings.isBlank(secret)) {
return null;
}
// 加签
try {
String stringToSign = timestamp + "\n" + secret;
byte[] signData = Signatures.hmacHashSignBytes(new byte[]{}, Strings.bytes(stringToSign), SecretKeySpecMode.HMAC_SHA256);
return Base64s.encodeToString(signData);
} catch (Exception e) {
log.error("FeiShuPushService-buildSign error", e);
return null;
}
}
@Override
protected String buildRequestBody(FeiShuPushMessage message) {
long timestamp = System.currentTimeMillis() / Const.MS_S_1;
// 加签
String sign = this.buildSign(message, timestamp);
// 格式化内容
String formattedContent = MessageUtils.format(message.getTemplate(), message.getParams());
// at 的用户
formattedContent = this.appendAtUsers(message, formattedContent);
// 构建请求体
return FeiShuRequestBody.builder()
.timestamp(timestamp)
.sign(sign)
.msgType(TEXT)
.content(FeiShuRequestBody.TextPayload.builder()
.text(formattedContent)
.build())
.build()
.toJsonString();
}
@Override
protected void sendRequest(FeiShuPushMessage message, String url, String body) {
// 发送请求
OkResponse response = OkRequests.post(url, StandardContentType.APPLICATION_JSON_UTF8, body);
FeiShuResponseBody responseBody = JSON.parseObject(response.getBodyString(), FeiShuResponseBody.class);
// 验证发送结果
Assert.eq(responseBody.getCode(), SUCCESS_CODE, responseBody.getMsg());
}
}

View File

@@ -0,0 +1,43 @@
/*
* Copyright (c) 2023 - present Dromara, All rights reserved.
*
* https://visor.dromara.org
* https://visor.dromara.org.cn
* https://visor.orionsec.cn
*
* Members:
* Jiahang Li - ljh1553488six@139.com - author
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.dromara.visor.framework.biz.push.core.service;
import org.dromara.visor.framework.biz.push.core.message.PushMessage;
/**
* 消息推送服务
*
* @author Jiahang Li
* @version 1.0.0
* @since 2025/9/17 17:17
*/
public interface IPushService<Message extends PushMessage> {
/**
* 推送消息
*
* @param message message
*/
void push(Message message);
}

Some files were not shown because too many files have changed in this diff Show More