Compare commits

...

131 Commits

Author SHA1 Message Date
李佳航
f79d89def9 Merge pull request #101 from dromara/dev
Dev
2025-04-06 21:44:08 +08:00
lijiahangmax
fd535f00c8 🔨 优化前端逻辑. 2025-04-06 21:41:41 +08:00
lijiahangmax
2c07551b88 🐛 修复修改主机配置报错. 2025-04-06 21:17:50 +08:00
lijiahangmax
86914321a6 🔖 修改 sql 脚本. 2025-04-06 11:11:39 +08:00
lijiahangmax
f64c15a01b 🔖 升级版本. 2025-04-06 10:56:28 +08:00
李佳航
8265cc3cfd Merge pull request #100 from dromara/dev
Dev
2025-04-03 14:55:55 +08:00
lijiahangmax
84c8bc98af 🔖 修改 sql 脚本. 2025-04-03 14:34:14 +08:00
lijiahangmax
858ca1becc 🔖 升级版本. 2025-04-03 01:43:30 +08:00
lijiahangmax
0e0c9cc628 🔨 添加 SN. 2025-04-03 01:38:37 +08:00
lijiahangmax
cdc3c88507 🔨 优化前端逻辑. 2025-04-02 13:33:21 +08:00
lijiahangmax
10624b42c4 🔨 优化代码逻辑. 2025-03-31 21:00:31 +08:00
lijiahang
6479694b4b 🔨 添加主机配置逻辑. 2025-03-28 16:07:15 +08:00
lijiahang
d2e72aea56 🔨 修改基础查询. 2025-03-28 15:32:08 +08:00
lijiahang
986f0974db 🔨 优化主机逻辑. 2025-03-28 14:34:51 +08:00
lijiahang
6b5c7fd409 Merge remote-tracking branch 'origin/dev' into dev 2025-03-26 15:27:32 +08:00
lijiahang
ca803e4e5a 添加系统架构枚举. 2025-03-26 15:27:16 +08:00
lijiahang
5de22e4b41 🐳 修改 e2e 配置. 2025-03-26 15:26:30 +08:00
lijiahangmax
b8e81ee100 修改文件过滤规则. 2025-03-26 01:42:14 +08:00
李佳航
0b53924dbd Merge pull request #97 from dromara/dev
Dev
2025-03-24 09:57:29 +08:00
lijiahangmax
3359d163fb 🐳 修改 docker 配置. 2025-03-23 22:05:59 +08:00
lijiahangmax
2ef1517338 🔖 升级版本. 2025-03-23 21:39:49 +08:00
lijiahangmax
a5bee66afa 🔖 升级版本. 2025-03-23 13:23:10 +08:00
lijiahangmax
88fd0e31e0 🔖 升级版本. 2025-03-23 13:03:48 +08:00
lijiahangmax
226dfb2c25 🔖 升级版本. 2025-03-23 11:41:13 +08:00
lijiahangmax
94ed071897 🔨 表格字段. 2025-03-22 00:58:15 +08:00
lijiahangmax
4efd2b5ec2 🔨 表格字段. 2025-03-22 00:11:30 +08:00
lijiahangmax
76e766367f 🔨 查询字段. 2025-03-22 00:00:41 +08:00
lijiahangmax
b3009bb65e 🔨 查询字段. 2025-03-21 00:05:04 +08:00
lijiahangmax
819520ef73 🔨 添加排序字段. 2025-03-20 00:39:49 +08:00
lijiahangmax
a2acbc0c3a 🔨 排序字段. 2025-03-20 00:08:23 +08:00
lijiahangmax
2e8a7c40d9 🔨 添加排序字段. 2025-03-19 23:37:13 +08:00
lijiahangmax
94c0b6a785 🔨 添加排序字段. 2025-03-19 23:24:08 +08:00
lijiahangmax
9752dfa680 🐳 分离 docker 镜像. 2025-03-17 21:27:48 +08:00
lijiahangmax
bc776e4186 Merge remote-tracking branch 'origin/dev' into dev 2025-03-16 00:31:40 +08:00
lijiahangmax
cdce5a0dc1 🔨 优化导包. 2025-03-16 00:30:43 +08:00
lijiahangmax
0db732fc19 🔨 优化主机逻辑. 2025-03-16 00:20:18 +08:00
lijiahang
69f331c048 修改路由规则. 2025-03-11 15:36:41 +08:00
李佳航
032f1763f6 Merge pull request #95 from dromara/dev
Dev
2025-03-10 11:02:45 +08:00
lijiahangmax
d071ef64d8 🔨 编译问题. 2025-03-09 20:11:21 +08:00
lijiahangmax
c820443a3b 升级版本. 2025-03-09 20:00:10 +08:00
lijiahangmax
14c4e77445 修改终端提示. 2025-03-09 19:58:10 +08:00
lijiahangmax
79d9f69ed4 修改终端提示. 2025-03-08 12:44:33 +08:00
lijiahangmax
6c9065072d Merge remote-tracking branch 'origin/dev' into dev 2025-03-07 22:03:52 +08:00
lijiahang
05bc6c1fbb 修改路由规则. 2025-03-07 15:50:26 +08:00
lijiahang
a1dd9eec01 优化单元测试. 2025-03-07 14:57:26 +08:00
lijiahangmax
660df7c110 Merge remote-tracking branch 'origin/dev' into dev 2025-03-06 23:29:28 +08:00
lijiahang
093501a400 🐛 代码生成器未能读取到环境变量. 2025-03-06 10:17:48 +08:00
lijiahang
7943deb924 优化终端会话管理器. 2025-03-05 10:20:20 +08:00
lijiahangmax
490167e649 Merge remote-tracking branch 'origin/dev' into dev 2025-03-04 21:46:00 +08:00
lijiahang
8635f6bb05 🔨 修改静态资源匿名处理策略. 2025-03-04 10:27:55 +08:00
李佳航
9e31d820e0 Merge pull request #94 from dromara/dev
Dev
2025-03-03 11:25:03 +08:00
lijiahang
92353d859a 初始化 sql. 2025-03-03 11:13:42 +08:00
lijiahang
bef8d69e59 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	sql/init-4-data.sql
2025-03-03 09:46:24 +08:00
lijiahangmax
ac46dd6703 🎨 优化统计样式. 2025-03-02 20:16:09 +08:00
lijiahangmax
b3ab78e063 🔖 升级版本. 2025-03-02 13:28:41 +08:00
lijiahangmax
95d2c6cb65 🔨 修改 sql 脚本. 2025-03-01 23:23:52 +08:00
lijiahang
7017c7502b 修改创建人逻辑. 2025-02-21 17:57:35 +08:00
李佳航
c14055ba8c Merge pull request #91 from dromara/dev
Dev
2025-02-19 10:17:03 +08:00
lijiahangmax
04aa6c9680 ✏️ 修改文档. 2025-02-18 23:35:48 +08:00
lijiahang
397bbb2657 🔖 升级版本. 2025-02-18 10:56:41 +08:00
lijiahang
9a68282127 🐛 修复计划任务日志无权限. 2025-02-18 10:54:10 +08:00
lijiahang
dcd02acc61 删除冗余配置. 2025-02-14 12:07:39 +08:00
李佳航
1025688e9b Merge pull request #88 from dromara/dev
Dev
2025-02-11 09:42:16 +08:00
lijiahangmax
26eeb26a75 ✏️ 修改文档. 2025-02-10 22:59:41 +08:00
lijiahang
7f76325284 🔖 升级版本. 2025-02-10 10:08:55 +08:00
lijiahang
de9a921c49 🔨 修改日志查看逻辑. 2025-02-10 09:51:53 +08:00
lijiahang
a9ac9d0f79 🔨 优化执行日志查看. 2025-02-08 10:03:07 +08:00
lijiahang
a14b28de6a 修改连接记录字段. 2025-02-07 10:07:45 +08:00
lijiahang
ccd7430b8f 🔨 自动清理任务使用系统配置. 2025-02-06 09:56:12 +08:00
lijiahang
6791ea5770 🔨 登录使用系统配置. 2025-02-06 09:55:37 +08:00
lijiahang
2d5835b150 修改文件预览逻辑. 2025-02-05 10:45:16 +08:00
lijiahang
cec11ce8c3 🔨 设置执行参数逻辑. 2025-02-05 10:18:22 +08:00
lijiahang
972103841c 🔨 优化执行日志查看逻辑. 2025-02-05 10:16:12 +08:00
lijiahang
89f6d2cd1c 🔨 优化执行日志查看逻辑. 2025-02-05 10:14:07 +08:00
lijiahang
d13008ce0c 🔨 添加修改密码时间. 2025-02-05 10:08:30 +08:00
lijiahang
abf384dd3c 🔨 修改系统设置逻辑. 2025-01-23 10:13:54 +08:00
李佳航
0abd4a893b Merge pull request #87 from dromara/hotfix
Hotfix
2025-01-22 23:17:36 +08:00
李佳航
d0710fb52b Merge branch 'dev' into hotfix 2025-01-22 23:12:47 +08:00
李佳航
534fe83ac2 Merge pull request #86 from dromara/hotfix
merge
2025-01-22 22:59:57 +08:00
lijiahangmax
d95d958de0 🔖 升级版本. 2025-01-22 22:40:28 +08:00
lijiahangmax
4e5730f31f 🐛 修复加密失败的问题. 2025-01-22 22:32:10 +08:00
lijiahang
81b9bacb96 🔨 添加日志系统设置. 2025-01-21 10:05:36 +08:00
lijiahang
dc42a31711 🔨 修改系统设置逻辑. 2025-01-20 10:24:40 +08:00
lijiahang
27e3e65ea1 🔨 使用系统配置替代配置文件. 2025-01-20 10:21:41 +08:00
lijiahang
a001ab3f16 🔨 优化批量执行模块. 2025-01-20 09:59:45 +08:00
李佳航
aeb161a482 Merge pull request #84 from dromara/dev
Dev
2025-01-20 09:47:44 +08:00
lijiahangmax
5ecb476be5 🔖 升级版本. 2025-01-19 18:56:02 +08:00
lijiahang
5389334304 ✏️ 修改 sql 脚本. 2025-01-17 10:02:57 +08:00
lijiahang
56ece9c854 🔨 添加描述字段. 2025-01-17 09:56:30 +08:00
lijiahang
a217b95783 🔨 无 redis 测试配置. 2025-01-17 09:51:21 +08:00
lijiahang
ffcdd80996 🔨 添加描述字段. 2025-01-16 10:03:38 +08:00
lijiahang
f804dc0338 🔨 添加描述字段. 2025-01-16 10:00:12 +08:00
lijiahangmax
25359f0f66 🎨 修改页面大小. 2025-01-15 23:44:54 +08:00
lijiahang
932bdb86ad 🎨 添加终端聚焦样式. 2025-01-15 10:21:01 +08:00
lijiahang
0e14e55c5a 🔨 修改系统设置逻辑. 2025-01-15 10:18:08 +08:00
lijiahang
e2a645d1e1 🔨 优化配置中心逻辑. 2025-01-15 10:16:36 +08:00
lijiahang
51392e09e2 🎨 修改系统设置样式. 2025-01-14 12:26:34 +08:00
lijiahang
8d71d64d49 ⬆️ 升级 axios 版本. 2025-01-14 10:09:07 +08:00
lijiahang
956c34176d 🔨 添加系统加密配置. 2025-01-14 10:05:01 +08:00
lijiahang
f65aa89421 🔨 加密参数. 2025-01-13 15:48:33 +08:00
lijiahang
c481cb0ae4 🔨 优化偏好处理逻辑. 2025-01-13 11:01:11 +08:00
lijiahang
a734ec40ec 🔨 优化偏好处理逻辑. 2025-01-13 09:43:43 +08:00
lijiahang
2a5bda3d00 🔨 系统设置模块优化. 2025-01-10 10:44:45 +08:00
lijiahang
72579c7e83 🎨 优化项目模块. 2025-01-09 10:02:22 +08:00
lijiahang
41797e41d2 🔨 添加配置及加密模块. 2025-01-08 11:40:42 +08:00
lijiahang
35733e80eb 🎨 优化项目模块. 2025-01-08 10:52:36 +08:00
lijiahang
4119dbad6a 🎨 优化项目模块. 2025-01-07 18:23:39 +08:00
lijiahang
c0122079c1 🎨 优化项目模块. 2025-01-07 17:55:22 +08:00
李佳航
c793ebf394 Merge pull request #79 from dromara/dev
Dev
2025-01-07 09:58:05 +08:00
lijiahangmax
45b3e0746a ✏️ 修改文档. 2025-01-07 00:08:33 +08:00
lijiahang
aaf18d79bf 🔨 修改构建错误. 2025-01-06 15:25:15 +08:00
lijiahangmax
4e3f548ac8 🔖 升级版本. 2025-01-05 18:33:38 +08:00
lijiahangmax
cbe1eeec74 🐛 修复刷新页面无参数的问题. 2024-12-30 22:50:11 +08:00
lijiahang
0557c41454 🎨 优化主机分组授权显示. 2024-12-30 15:54:07 +08:00
lijiahangmax
c2311f0682 优化缓存策略. 2024-12-29 23:58:44 +08:00
lijiahangmax
3b89e9bf29 🔨 优化会话连接逻辑. 2024-12-29 15:14:19 +08:00
lijiahangmax
6b14c2ef9c 🎨 优化策略定义逻辑. 2024-12-29 13:11:09 +08:00
lijiahangmax
6606d2ca76 🔨 工作台. 2024-12-28 23:28:23 +08:00
lijiahang
1846a496c1 🔨 资产模块统计. 2024-12-27 14:44:59 +08:00
lijiahang
7996ae5b63 🔨 基础模块统计. 2024-12-27 13:54:45 +08:00
lijiahang
cb5657c685 📝 工作台前端. 2024-12-27 11:19:52 +08:00
lijiahangmax
95759adf91 🐛 终端设置无法滚动的问题. 2024-12-27 01:11:18 +08:00
lijiahangmax
4d08a18548 🔨 添加连接操作. 2024-12-26 22:19:30 +08:00
lijiahang
8f1e976c2f 🔨 添加执行用户条件. 2024-12-26 14:03:47 +08:00
lijiahang
5ee18436b8 Merge remote-tracking branch 'origin/dev' into dev 2024-12-26 13:52:06 +08:00
lijiahang
00ea709f9e 🎨 修改代码规范. 2024-12-26 13:51:41 +08:00
lijiahangmax
4873d2cc91 📝 修改文档. 2024-12-25 20:48:39 +08:00
lijiahangmax
4c306fb4f8 🔨 修改为 latest 版本. 2024-12-25 20:19:32 +08:00
lijiahang
9017ada3aa 📝 修改文档. 2024-12-24 10:55:18 +08:00
李佳航
00c4484184 Merge pull request #75 from dromara/dev
 修改 E2E 测试样例.
2024-12-24 10:35:23 +08:00
lijiahang
5a6b1bfafd 修改 E2E 测试样例. 2024-12-24 10:34:26 +08:00
1254 changed files with 19001 additions and 10243 deletions

View File

@@ -1,6 +1,9 @@
SERVICE_PORT=1081
VOLUME_BASE=/data/orion-visor-space/docker-volumes
SERVICE_PORT=1081
SPRING_PROFILES_ACTIVE=prod
SECRET_KEY=uQeacXV8b3isvKLK
MYSQL_HOST=mysql
MYSQL_PORT=3306
MYSQL_DATABASE=orion_visor
@@ -11,5 +14,4 @@ MYSQL_ROOT_PASSWORD=Data@123456
REDIS_HOST=redis
REDIS_PASSWORD=Data@123456
SECRET_KEY=uQeacXV8b3isvKLK
DEMO_MODE=false

View File

@@ -3,7 +3,7 @@
<p align="center">
<a target="_blank"
style="text-decoration: none !important;"
href="https://app.codacy.com/gh/orionsec/orion-visor/dashboard?utm_source=gh&utm_medium=referral&utm_content=&utm_campaign=Badge_grade">
href="https://app.codacy.com/gh/lijiahangmax/orion-visor/dashboard?utm_source=gh&utm_medium=referral&utm_content=&utm_campaign=Badge_grade">
<img src="https://app.codacy.com/project/badge/Grade/49eaab3a9a474af3b87e1d21ffec71c4" alt="quality" />
</a>
<a target="_blank"
@@ -36,6 +36,11 @@
href="https://github.com/dromara/orion-visor">
<img src="https://img.shields.io/github/forks/dromara/orion-visor" alt="star" />
</a>
<a target="_blank"
style="text-decoration: none !important;"
href="https://gitcode.com/dromara/orion-visor">
<img src="https://gitcode.com/dromara/orion-visor/star/badge.svg" alt="star"/>
</a>
</p>
------------------------------
@@ -54,11 +59,12 @@
* 🔗 演示地址: [https://dv.orionsec.cn/](https://dv.orionsec.cn/)
* 🔏 演示账号: admin/admin
* ⭐ 体验后可以点一下 `star`
这对我很重要! [github](https://github.com/dromara/orion-visor) [gitee](https://gitee.com/dromara/orion-visor) [gitcode](https://gitcode.com/dromara/orion-visor/overview)
这对我很重要! [github](https://github.com/dromara/orion-visor) [gitee](https://gitee.com/dromara/orion-visor) [gitcode](https://gitcode.com/dromara/orion-visor)
* 🌈 如果本项目对你有帮助请帮忙推广一下 让更多的人知道此项目!
* 🎭 演示环境部分功能不可用, 完整功能请本地部署!
* 📛 演示环境请不要随便删除数据!
* 📧 如果演示环境不可用请联系我!
* 📨 **作者已被毕(cai)业(yuan) 寻java高级内推 望京/5号/10号线 有坑位的联系我哦** 微信: `ljh1553488`
## 快速开始
@@ -81,11 +87,11 @@ docker compose up -d
## 技术栈
* SpringBoot 2.7.+
* Mysql 8.0.+
* Redis 6.0.+
* Vue3 3.2.+
* Arco Design 2.55.+
* SpringBoot 2.7+
* Mysql 8+
* Redis 6+
* Vue3 3+
* Arco Design 2+
## 主要功能预览
@@ -140,6 +146,6 @@ QQ群: 755242157
本项目遵循 [Apache-2.0](https://github.com/dromara/orion-visor/blob/main/LICENSE) 开源许可证。
## Gite 最有价值开源项目 GVP
## Gitee 最有价值开源项目 GVP
![GVP](https://bjuimg.obs.cn-north-4.myhuaweicloud.com/images/2024/10/24/8dd98b8d-9de5-44e6-86d3-04e27ec66123.jpg "GVP")

View File

@@ -1,11 +1,13 @@
version: '3.3'
services:
service:
image: registry.cn-hangzhou.aliyuncs.com/orionsec/orion-visor-service:2.2.2
image: registry.cn-hangzhou.aliyuncs.com/orionsec/orion-visor-service:latest
privileged: true
ports:
- 1081:80
- 9200:9200
environment:
- SPRING_PROFILES_ACTIVE=prod
- MYSQL_HOST=mysql
- MYSQL_PORT=3306
- MYSQL_DATABASE=orion_visor
@@ -19,20 +21,20 @@ services:
- /data/orion-visor-space/docker-volumes/service/root-orion:/root/orion
healthcheck:
test: [ "CMD", "curl", "http://127.0.0.1:9200/orion-visor/api/server/bootstrap/health" ]
interval: 3s
timeout: 300s
retries: 200
start_period: 3s
interval: 15s
timeout: 5s
retries: 10
start_period: 15s
depends_on:
mysql:
condition: service_healthy
redis:
condition: service_healthy
links:
- mysql
- redis
networks:
- orion-visor-net
mysql:
image: registry.cn-hangzhou.aliyuncs.com/orionsec/orion-visor-mysql:2.2.2
image: registry.cn-hangzhou.aliyuncs.com/orionsec/orion-visor-mysql:latest
privileged: true
ports:
- 3307:3306
@@ -44,15 +46,17 @@ services:
volumes:
- /data/orion-visor-space/docker-volumes/mysql/var-lib-mysql:/var/lib/mysql
- /data/orion-visor-space/docker-volumes/mysql/var-lib-mysql-files:/var/lib/mysql-files
- /data/orion-visor-space/docker-volumes/mysql/etc-mysql:/etc/mysql
healthcheck:
test: [ "CMD", "bash", "-c", "cat < /dev/null > /dev/tcp/127.0.0.1/3306" ]
interval: 3s
timeout: 60s
interval: 15s
timeout: 5s
retries: 10
start_period: 3s
start_period: 5s
networks:
- orion-visor-net
redis:
image: registry.cn-hangzhou.aliyuncs.com/orionsec/orion-visor-redis:2.2.2
image: registry.cn-hangzhou.aliyuncs.com/orionsec/orion-visor-redis:latest
privileged: true
ports:
- 6380:6379
@@ -63,17 +67,24 @@ services:
command: sh -c "redis-server /usr/local/redis.conf --requirepass $${REDIS_PASSWORD}"
healthcheck:
test: [ "CMD", "redis-cli", "--raw", "incr", "ping" ]
interval: 3s
timeout: 60s
interval: 15s
timeout: 5s
retries: 10
start_period: 3s
start_period: 5s
networks:
- orion-visor-net
testing:
build:
context: ./docker/e2e
environment:
SERVER: http://service:80
SERVER: http://service:9200
depends_on:
service:
condition: service_healthy
links:
- service
networks:
- orion-visor-net
networks:
orion-visor-net:
driver: bridge

View File

@@ -1,11 +1,24 @@
version: '3.3'
services:
service:
image: registry.cn-hangzhou.aliyuncs.com/orionsec/orion-visor-service:2.2.2
privileged: true
ui:
image: registry.cn-hangzhou.aliyuncs.com/orionsec/orion-visor-ui:latest
ports:
- ${SERVICE_PORT:-1081}:80
restart: unless-stopped
depends_on:
service:
condition: service_healthy
networks:
- orion-visor-net
service:
image: registry.cn-hangzhou.aliyuncs.com/orionsec/orion-visor-service:latest
privileged: true
ports:
- 9200:9200
environment:
- SPRING_PROFILES_ACTIVE=${SPRING_PROFILES_ACTIVE:-prod}
- MYSQL_HOST=${MYSQL_HOST:-mysql}
- MYSQL_PORT=${MYSQL_PORT:-3306}
- MYSQL_DATABASE=${MYSQL_DATABASE:-orion_visor}
@@ -17,22 +30,23 @@ services:
- DEMO_MODE=${DEMO_MODE:-false}
volumes:
- ${VOLUME_BASE:-/data/orion-visor-space/docker-volumes}/service/root-orion:/root/orion
restart: unless-stopped
healthcheck:
test: [ "CMD", "curl", "http://127.0.0.1:9200/orion-visor/api/server/bootstrap/health" ]
interval: 15s
timeout: 300s
timeout: 5s
retries: 15
start_period: 3s
start_period: 30s
depends_on:
mysql:
condition: service_healthy
redis:
condition: service_healthy
links:
- mysql
- redis
networks:
- orion-visor-net
mysql:
image: registry.cn-hangzhou.aliyuncs.com/orionsec/orion-visor-mysql:2.2.2
image: registry.cn-hangzhou.aliyuncs.com/orionsec/orion-visor-mysql:latest
privileged: true
ports:
- 3307:3306
@@ -44,15 +58,18 @@ services:
volumes:
- ${VOLUME_BASE:-/data/orion-visor-space/docker-volumes}/mysql/var-lib-mysql:/var/lib/mysql
- ${VOLUME_BASE:-/data/orion-visor-space/docker-volumes}/mysql/var-lib-mysql-files:/var/lib/mysql-files
- ${VOLUME_BASE:-/data/orion-visor-space/docker-volumes}/mysql/etc-mysql:/etc/mysql
restart: unless-stopped
healthcheck:
test: [ "CMD", "bash", "-c", "cat < /dev/null > /dev/tcp/127.0.0.1/3306" ]
interval: 15s
timeout: 60s
retries: 15
start_period: 3s
timeout: 5s
retries: 10
start_period: 10s
networks:
- orion-visor-net
redis:
image: registry.cn-hangzhou.aliyuncs.com/orionsec/orion-visor-redis:2.2.2
image: registry.cn-hangzhou.aliyuncs.com/orionsec/orion-visor-redis:latest
privileged: true
ports:
- 6380:6379
@@ -61,18 +78,28 @@ services:
volumes:
- ${VOLUME_BASE:-/data/orion-visor-space/docker-volumes}/redis/data:/data
command: sh -c "redis-server /usr/local/redis.conf --requirepass $${REDIS_PASSWORD}"
restart: unless-stopped
healthcheck:
test: [ "CMD", "redis-cli", "--raw", "incr", "ping" ]
interval: 15s
timeout: 60s
retries: 15
start_period: 3s
timeout: 5s
retries: 10
start_period: 10s
networks:
- orion-visor-net
adminer:
image: registry.cn-hangzhou.aliyuncs.com/orionsec/orion-visor-adminer:2.2.2
image: registry.cn-hangzhou.aliyuncs.com/orionsec/orion-visor-adminer:latest
ports:
- 8081:8080
environment:
- ADMINER_DEFAULT_SERVER=${MYSQL_HOST:-mysql}
depends_on:
mysql:
condition: service_healthy
links:
- mysql
networks:
- orion-visor-net
networks:
orion-visor-net:
driver: bridge

View File

@@ -1,4 +1,6 @@
#/bin/bash
version=2.2.2
set -e
version=2.3.8
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

@@ -2,7 +2,7 @@
# yaml-language-server: $schema=https://linuxsuren.github.io/api-testing/api-testing-schema.json
name: orion-visor
api: |
{{default "http://orion-visor-service:80" (env "SERVER")}}
{{default "http://service:9200" (env "SERVER")}}
items:
- name: login
request:
@@ -15,9 +15,9 @@ items:
expect:
bodyFieldsExpect:
code: 200
- name: userPermission
- name: user
request:
api: /orion-visor/api/infra/user-permission/user
api: /orion-visor/api/infra/user-aggregate/user
header:
Authorization: Bearer {{.login.data.token}}
expect:
@@ -26,7 +26,7 @@ items:
msg: "success"
- name: menu
request:
api: /orion-visor/api/infra/user-permission/menu
api: /orion-visor/api/infra/user-aggregate/menu
header:
Authorization: Bearer {{.login.data.token}}
expect:

View File

@@ -1,6 +1,8 @@
#/bin/bash
version=2.2.2
set -e
version=2.3.8
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

View File

@@ -12,7 +12,7 @@ socket=/var/run/mysqld/mysqld.sock
# 数据目录
datadir=/var/lib/mysql
# 不区分大小 0区分 1不区分
lower_case_table_names=1
lower_case_table_names=0
# 服务器时区
default-time_zone='+8:00'
# 服务端字符集

View File

@@ -1,6 +1,13 @@
#/bin/bash
version=2.2.2
set -e
version=2.3.8
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-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-service:latest
docker push registry.cn-hangzhou.aliyuncs.com/orionsec/orion-visor-ui:latest

View File

@@ -1,4 +1,6 @@
#/bin/bash
version=2.2.2
set -e
version=2.3.8
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,4 +1,4 @@
FROM nginx:alpine
FROM openjdk:8-jdk-alpine
USER root
WORKDIR /app
# 系统时区
@@ -7,18 +7,14 @@ 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 && \
apk add openjdk8
apk add dmidecode
# 设置时区
RUN ln -sf /usr/share/zoneinfo/${TZ} /etc/localtime && \
echo '${TZ}' > /etc/timezone
# 删除原 nginx 配置
RUN rm -rf /etc/nginx/conf.d/*
# 复制包
COPY ./orion-visor-launch.jar /app/app.jar
COPY ./dist /usr/share/nginx/html
COPY ./entrypoint.sh /app/entrypoint.sh
COPY ./nginx.conf /etc/nginx/conf.d
# 启动
ENTRYPOINT [ "sh", "/app/entrypoint.sh" ]
CMD ["java", "-jar", "/app/app.jar"]

View File

@@ -1,8 +1,8 @@
#/bin/bash
version=2.2.2
set -e
version=2.3.8
mv ../../orion-visor-launch/target/orion-visor-launch.jar ./orion-visor-launch.jar
mv ../../orion-visor-ui/dist ./dist
docker build --no-cache -t orion-visor-service:${version} .
docker build -t orion-visor-service:${version} .
rm -rf ./orion-visor-launch.jar
rm -rf ./dist
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

@@ -1,4 +0,0 @@
#!/bin/bash
cd /app
nohup java -jar app.jar --spring.profiles.active=prod 2>&1 &
nginx -g 'daemon off;'

18
docker/ui/Dockerfile Normal file
View File

@@ -0,0 +1,18 @@
FROM 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
# 启动
CMD ["nginx", "-g", "daemon off;"]

9
docker/ui/build.sh Normal file
View File

@@ -0,0 +1,9 @@
#/bin/bash
set -e
version=2.3.8
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

View File

@@ -19,7 +19,7 @@ server {
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-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
@@ -27,7 +27,7 @@ server {
}
location /orion-visor/api {
proxy_pass http://localhost:9200/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;
@@ -35,7 +35,7 @@ server {
}
location /orion-visor/keep-alive {
proxy_pass http://localhost:9200/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";

View File

@@ -4,12 +4,12 @@
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>
<artifactId>orion-visor</artifactId>
<version>${revision}</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>orion-visor-framework-common</artifactId>
<artifactId>orion-visor-common</artifactId>
<name>${project.artifactId}</name>
<packaging>jar</packaging>

View File

@@ -20,52 +20,61 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.dromara.visor.module.infra.define.config;
package org.dromara.visor.common.config;
import lombok.Data;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.stereotype.Component;
import lombok.extern.slf4j.Slf4j;
import java.util.function.BiConsumer;
import java.util.function.Function;
/**
* 应用认证配置
* 配置引用
*
* @author Jiahang Li
* @version 1.0.0
* @since 2024/3/5 18:26
* @since 2025/1/6 18:01
*/
@Data
@Component
@ConfigurationProperties("app.authentication")
public class AppAuthenticationConfig {
@Slf4j
public abstract class ConfigRef<T> {
public final String key;
public T value;
protected final Function<String, T> convert;
public ConfigRef(String key, Function<String, T> convert) {
this.key = key;
this.convert = convert;
}
/**
* 是否允许多端登录
* 覆盖配置
*
* @param value value
*/
private Boolean allowMultiDevice;
public abstract void override(String value);
/**
* 是否允许凭证续签
* 修改配置
*
* @param value value
*/
private Boolean allowRefresh;
public abstract void set(T value);
/**
* 凭证续签最大次数
* 获取配置
*
* @return value
*/
private Integer maxRefreshCount;
public abstract T get();
/**
* 登录失败发送站内信阈值
* 修改回调
*
* @param changeEvent changeEvent
* @return this
*/
private Integer loginFailedSendThreshold;
/**
* 登录失败锁定次数
*/
private Integer loginFailedLockCount;
/**
* 登录失败锁定时间 ()
*/
private Integer loginFailedLockTime;
public abstract ConfigRef<T> onChange(BiConsumer<T, T> changeEvent);
}

View File

@@ -0,0 +1,265 @@
/*
* 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.config;
import java.util.function.Function;
/**
* 配置中心
*
* @author Jiahang Li
* @version 1.0.0
* @since 2025/1/5 21:30
*/
public interface ConfigStore {
/**
* 获取 string 配置
*
* @param key key
* @return config
*/
String getString(String key);
/**
* 获取 string 配置
*
* @param key key
* @param defaultValue defaultValue
* @return config
*/
String getString(String key, String defaultValue);
/**
* 获取 int 配置
*
* @param key key
* @return config
*/
Integer getInteger(String key);
/**
* 获取 int 配置
*
* @param key key
* @param defaultValue defaultValue
* @return config
*/
Integer getInteger(String key, Integer defaultValue);
/**
* 获取 long 配置
*
* @param key key
* @return config
*/
Long getLong(String key);
/**
* 获取 long 配置
*
* @param key key
* @param defaultValue defaultValue
* @return config
*/
Long getLong(String key, Long defaultValue);
/**
* 获取 double 配置
*
* @param key key
* @return config
*/
Double getDouble(String key);
/**
* 获取 double 配置
*
* @param key key
* @param defaultValue defaultValue
* @return config
*/
Double getDouble(String key, Double defaultValue);
/**
* 获取 boolean 配置
*
* @param key key
* @return config
*/
Boolean getBoolean(String key);
/**
* 获取 boolean 配置
*
* @param key key
* @param defaultValue defaultValue
* @return config
*/
Boolean getBoolean(String key, Boolean defaultValue);
/**
* 获取配置
*
* @param key key
* @return conf
*/
String getConfig(String key);
/**
* 获取配置
*
* @param key key
* @param defaultValue defaultValue
* @return conf
*/
String getConfig(String key, String defaultValue);
/**
* 获取配置
*
* @param key key
* @param convert convert
* @param <T> T
* @return conf
*/
<T> T getConfig(String key, Function<String, T> convert);
/**
* 获取配置
*
* @param key key
* @param convert convert
* @param defaultValue defaultValue
* @param <T> T
* @return conf
*/
<T> T getConfig(String key, Function<String, T> convert, T defaultValue);
/**
* 获取 string 配置
*
* @param key key
* @return ref
*/
ConfigRef<String> string(String key);
/**
* 获取 string 配置
*
* @param key key
* @param defaultValue defaultValue
* @return ref
*/
ConfigRef<String> string(String key, String defaultValue);
/**
* 获取 int 配置
*
* @param key key
* @return ref
*/
ConfigRef<Integer> int32(String key);
/**
* 获取 int 配置
*
* @param key key
* @param defaultValue defaultValue
* @return ref
*/
ConfigRef<Integer> int32(String key, Integer defaultValue);
/**
* 获取 long 配置
*
* @param key key
* @return ref
*/
ConfigRef<Long> int64(String key);
/**
* 获取 long 配置
*
* @param key key
* @param defaultValue defaultValue
* @return ref
*/
ConfigRef<Long> int64(String key, Long defaultValue);
/**
* 获取 double 配置
*
* @param key key
* @return ref
*/
ConfigRef<Double> float64(String key);
/**
* 获取 double 配置
*
* @param key key
* @param defaultValue defaultValue
* @return ref
*/
ConfigRef<Double> float64(String key, Double defaultValue);
/**
* 获取 boolean 配置
*
* @param key key
* @return ref
*/
ConfigRef<Boolean> bool(String key);
/**
* 获取 boolean 配置
*
* @param key key
* @param defaultValue defaultValue
* @return ref
*/
ConfigRef<Boolean> bool(String key, Boolean defaultValue);
/**
* 获取配置
*
* @param key key
* @param convert convert
* @param <T> T
* @return ref
*/
<T> ConfigRef<T> ref(String key, Function<String, T> convert);
/**
* 获取配置
*
* @param key key
* @param convert convert
* @param defaultValue defaultValue
* @param <T> T
* @return ref
*/
<T> ConfigRef<T> ref(String key, Function<String, T> convert, T defaultValue);
}

View File

@@ -20,31 +20,28 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.dromara.visor.module.asset.define.config;
package org.dromara.visor.common.configuration;
import lombok.Data;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.stereotype.Component;
import cn.orionsec.kit.spring.SpringHolder;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
/**
* 应用执行日志配置
* spring 配置
*
* @author Jiahang Li
* @version 1.0.0
* @since 2024/4/25 13:36
* @since 2023/6/20 10:34
*/
@Data
@Component
@ConfigurationProperties(prefix = "app.exec-log")
public class AppExecLogConfig {
@Configuration
public class SpringConfiguration {
/**
* 是否拼接 ansi 执行状态日志
* @return spring 容器工具类
*/
private Boolean appendAnsi;
public AppExecLogConfig() {
this.appendAnsi = true;
@Bean
public SpringHolder.ApplicationContextAwareStore springHolderAware() {
return new SpringHolder.ApplicationContextAwareStore();
}
}

View File

@@ -20,7 +20,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.dromara.visor.framework.common.constant;
package org.dromara.visor.common.constant;
import cn.orionsec.kit.lang.constant.OrionConst;
@@ -36,7 +36,7 @@ public interface AppConst extends OrionConst {
/**
* ${orion.version} 迭代时候需要手动更改
*/
String VERSION = "2.2.2";
String VERSION = "2.3.8";
/**
* ${spring.application.name}

View File

@@ -20,7 +20,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.dromara.visor.framework.common.constant;
package org.dromara.visor.common.constant;
/**
* 自动装配排序常量
@@ -33,14 +33,10 @@ package org.dromara.visor.framework.common.constant;
*/
public interface AutoConfigureOrderConst {
int FRAMEWORK_COMMON = Integer.MIN_VALUE + 1000;
int FRAMEWORK_WEB = Integer.MIN_VALUE + 1100;
int FRAMEWORK_SECURITY = Integer.MIN_VALUE + 1200;
int FRAMEWORK_SECURITY_CRYPTO = Integer.MIN_VALUE + 1250;
int FRAMEWORK_WEBSOCKET = Integer.MIN_VALUE + 1300;
int FRAMEWORK_DESENSITIZE = Integer.MIN_VALUE + 1400;
@@ -55,17 +51,23 @@ public interface AutoConfigureOrderConst {
int FRAMEWORK_REDIS = Integer.MIN_VALUE + 1900;
int FRAMEWORK_REDIS_CACHE = Integer.MIN_VALUE + 1950;
int FRAMEWORK_REDIS_CACHE = Integer.MIN_VALUE + 2000;
int FRAMEWORK_STORAGE = Integer.MIN_VALUE + 2000;
int FRAMEWORK_CONFIG = Integer.MIN_VALUE + 2100;
int FRAMEWORK_JOB = Integer.MIN_VALUE + 2100;
int FRAMEWORK_ENCRYPT = Integer.MIN_VALUE + 2200;
int FRAMEWORK_JOB_QUARTZ = Integer.MIN_VALUE + 2150;
int FRAMEWORK_STORAGE = Integer.MIN_VALUE + 2300;
int FRAMEWORK_MONITOR = Integer.MIN_VALUE + 2200;
int FRAMEWORK_JOB = Integer.MIN_VALUE + 2400;
int FRAMEWORK_BIZ_OPERATOR_LOG = Integer.MIN_VALUE + 3000;
int FRAMEWORK_JOB_QUARTZ = Integer.MIN_VALUE + 2500;
int FRAMEWORK_JOB_ASYNC = Integer.MIN_VALUE + 2600;
int FRAMEWORK_MONITOR = Integer.MIN_VALUE + 2700;
int FRAMEWORK_BIZ_OPERATOR_LOG = Integer.MIN_VALUE + 2800;
int FRAMEWORK_BANNER = Integer.MIN_VALUE + 10000;

View File

@@ -20,7 +20,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.dromara.visor.framework.common.constant;
package org.dromara.visor.common.constant;
/**
* bean 排序常量

View File

@@ -20,7 +20,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.dromara.visor.framework.common.constant;
package org.dromara.visor.common.constant;
/**
* 常量 - 中文

View File

@@ -0,0 +1,149 @@
/*
* 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.constant;
/**
* 配置项常量
*
* @author Jiahang Li
* @version 1.0.0
* @since 2025/1/14 16:15
*/
public interface ConfigKeys {
/**
* SFTP 文件预览大小
*/
String SFTP_PREVIEW_SIZE = "sftp_previewSize";
/**
* SFTP 重复文件备份
*/
String SFTP_UPLOAD_PRESENT_BACKUP = "sftp_uploadPresentBackup";
/**
* SFTP 备份文件名称
*/
String SFTP_UPLOAD_BACKUP_FILE_NAME = "sftp_uploadBackupFileName";
/**
* 加密公钥
*/
String ENCRYPT_PUBLIC_KEY = "encrypt_publicKey";
/**
* 加密私钥
*/
String ENCRYPT_PRIVATE_KEY = "encrypt_privateKey";
/**
* 日志前端显示行数
*/
String LOG_WEB_SCROLL_LINES = "log_webScrollLines";
/**
* 日志加载偏移行
*/
String LOG_TRACKER_LOAD_LINES = "log_trackerLoadLines";
/**
* 日志加载间隔毫秒
*/
String LOG_TRACKER_LOAD_INTERVAL = "log_trackerLoadInterval";
/**
* 是否生成详细的执行日志
*/
String LOG_EXEC_DETAIL_LOG = "log_execDetailLog";
/**
* 凭证有效期分
*/
String LOGIN_LOGIN_SESSION_TIME = "login_loginSessionTime";
/**
* 允许多端登录
*/
String LOGIN_ALLOW_MULTI_DEVICE = "login_allowMultiDevice";
/**
* 允许凭证续签
*/
String LOGIN_ALLOW_REFRESH = "login_allowRefresh";
/**
* 凭证续签最大次数
*/
String LOGIN_MAX_REFRESH_COUNT = "login_maxRefreshCount";
/**
* 凭证续签间隔分
*/
String LOGIN_REFRESH_INTERVAL = "login_refreshInterval";
/**
* 登录失败锁定
*/
String LOGIN_LOGIN_FAILED_LOCK = "login_loginFailedLock";
/**
* 登录失败锁定阈值分
*/
String LOGIN_LOGIN_FAILED_LOCK_THRESHOLD = "login_loginFailedLockThreshold";
/**
* 登录失败锁定时间分
*/
String LOGIN_LOGIN_FAILED_LOCK_TIME = "login_loginFailedLockTime";
/**
* 登录失败发信
*/
String LOGIN_LOGIN_FAILED_SEND = "login_loginFailedSend";
/**
* 登录失败发信阈值
*/
String LOGIN_LOGIN_FAILED_SEND_THRESHOLD = "login_loginFailedSendThreshold";
/**
* 是否开启自动清理命令记录
*/
String AUTO_CLEAR_EXEC_LOG_ENABLED = "autoClear_execLogEnabled";
/**
* 自动清理命令记录保留天数
*/
String AUTO_CLEAR_EXEC_LOG_KEEP_DAYS = "autoClear_execLogKeepDays";
/**
* 是否开启自动清理终端连接记录
*/
String AUTO_CLEAR_TERMINAL_LOG_ENABLED = "autoClear_terminalLogEnabled";
/**
* 自动清理终端连接记录保留天数
*/
String AUTO_CLEAR_TERMINAL_LOG_KEEP_DAYS = "autoClear_terminalLogKeepDays";
}

View File

@@ -20,7 +20,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.dromara.visor.framework.common.constant;
package org.dromara.visor.common.constant;
/**
* 常量

View File

@@ -20,7 +20,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.dromara.visor.framework.common.constant;
package org.dromara.visor.common.constant;
import cn.orionsec.kit.lang.define.wrapper.CodeInfo;
import cn.orionsec.kit.lang.define.wrapper.HttpWrapper;

View File

@@ -20,7 +20,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.dromara.visor.framework.common.constant;
package org.dromara.visor.common.constant;
import cn.orionsec.kit.lang.exception.ApplicationException;
import cn.orionsec.kit.lang.exception.argument.InvalidArgumentException;
@@ -90,10 +90,14 @@ public interface ErrorMessage {
String HOST_NOT_ENABLED = "主机未启用";
String CONFIG_NOT_ENABLED = "配置未启用";
String UNABLE_OPERATE_ADMIN_ROLE = "无法操作管理员账号";
String UNSUPPORTED_CHARSET = "不支持的编码 [{}]";
String DECRYPT_ERROR = "数据解密失败";
String PASSWORD_MISSING = "请输入密码";
String BEFORE_PASSWORD_ERROR = "原密码错误";

View File

@@ -20,7 +20,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.dromara.visor.framework.common.constant;
package org.dromara.visor.common.constant;
/**
* 额外字段常量

View File

@@ -20,7 +20,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.dromara.visor.framework.common.constant;
package org.dromara.visor.common.constant;
/**
* 字段常量
@@ -105,4 +105,6 @@ public interface FieldConst {
String ALL = "all";
String CONFIG = "config";
}

View File

@@ -20,7 +20,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.dromara.visor.framework.common.constant;
package org.dromara.visor.common.constant;
/**
* 文件常量

View File

@@ -20,7 +20,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.dromara.visor.framework.common.constant;
package org.dromara.visor.common.constant;
/**
* 过滤器排序常量

View File

@@ -20,7 +20,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.dromara.visor.framework.common.constant;
package org.dromara.visor.common.constant;
/**
* 验证常量

View File

@@ -20,7 +20,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.dromara.visor.framework.common.entity;
package org.dromara.visor.common.entity;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;

View File

@@ -20,26 +20,26 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.dromara.visor.framework.common.entity;
package org.dromara.visor.common.entity;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.dromara.visor.framework.common.validator.group.Page;
import org.dromara.visor.common.validator.group.Page;
import javax.validation.constraints.Max;
import javax.validation.constraints.Min;
import javax.validation.constraints.NotNull;
/**
* 公共页码请求
* 基本查询请求
*
* @author Jiahang Li
* @version 1.0.0
* @since 2023/7/12 23:14
*/
@Data
@Schema(name = "PageRequest", description = "公共页码请求")
public class PageRequest {
@Schema(name = "BaseQueryRequest", description = "基本查询请求")
public class BaseQueryRequest implements IPageRequest, IOrderRequest {
@NotNull(groups = Page.class)
@Min(value = 1, groups = Page.class)
@@ -53,4 +53,7 @@ public class PageRequest {
@Schema(description = "大小")
private Integer limit;
@Schema(description = "查询排序")
private Integer order;
}

View File

@@ -20,7 +20,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.dromara.visor.framework.common.entity;
package org.dromara.visor.common.entity;
/**
* 数据清理请求 定义

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.common.entity;
/**
* 查询排序请求
*
* @author Jiahang Li
* @version 1.0.0
* @since 2025/3/17 22:04
*/
public interface IOrderRequest {
/**
* 查询排序
*
* @return sort 0DESC 1ASC 其他不排序
*/
Integer getOrder();
}

View File

@@ -20,28 +20,29 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.dromara.visor.framework.security.core.crypto;
import lombok.Data;
package org.dromara.visor.common.entity;
/**
* 加密配置
* 页码请求
*
* @author Jiahang Li
* @version 1.0.0
* @since 2023/7/8 0:14
* @since 2025/3/17 22:02
*/
@Data
public class CryptoConfig {
public interface IPageRequest {
/**
* 是否为默认加密器
* 页码
*
* @return page
*/
protected boolean primary;
Integer getPage();
/**
* 是否启用
* 大小
*
* @return limit
*/
protected boolean enabled;
Integer getLimit();
}

View File

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

View File

@@ -20,7 +20,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.dromara.visor.framework.common.entity;
package org.dromara.visor.common.entity;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;

View File

@@ -0,0 +1,148 @@
/*
* 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 cn.orionsec.kit.lang.utils.collect.Lists;
import cn.orionsec.kit.lang.utils.time.DateStream;
import cn.orionsec.kit.lang.utils.time.Dates;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;
/**
* 统计区间枚举
*
* @author Jiahang Li
* @version 1.0.0
* @since 2024/12/23 14:02
*/
public enum StatisticsRange {
/**
* 当天
*/
TODAY {
@Override
public Date getRangeEndTime(Date startTime) {
return DateStream.of(startTime)
.dayEnd()
.date();
}
@Override
public List<String> getDateRanges(Date startTime) {
return Lists.singleton(Dates.format(startTime, Dates.YMD));
}
},
/**
* 日视图
*/
DAY {
@Override
public Date getRangeEndTime(Date startTime) {
return DateStream.of(startTime)
.dayEnd()
.date();
}
@Override
public List<String> getDateRanges(Date startTime) {
return Lists.singleton(Dates.format(startTime, Dates.YMD));
}
},
/**
* 周视图
*/
WEEK {
@Override
public Date getRangeEndTime(Date startTime) {
return DateStream.of(startTime)
.addDay(7)
.dayEnd()
.date();
}
@Override
public List<String> getDateRanges(Date startTime) {
return Arrays.stream(Dates.getIncrementDayDates(startTime, 1, 7))
.map(s -> Dates.format(s, Dates.YMD))
.collect(Collectors.toList());
}
},
/**
* 月视图
*/
MONTH {
@Override
public Date getRangeEndTime(Date startTime) {
return DateStream.of(startTime)
.addMonth(1)
.dayEnd()
.date();
}
@Override
public List<String> getDateRanges(Date startTime) {
int monthLastDay = Dates.getMonthLastDay(startTime);
return Arrays.stream(Dates.getIncrementDayDates(startTime, 1, monthLastDay - 1))
.map(s -> Dates.format(s, Dates.YMD))
.collect(Collectors.toList());
}
},
;
/**
* 获取区间结束时间
*
* @param startTime startTime
* @return end
*/
public abstract Date getRangeEndTime(Date startTime);
/**
* 获取时间区间
*
* @param startTime startTime
* @return ranges
*/
public abstract List<String> getDateRanges(Date startTime);
public static StatisticsRange of(String type) {
if (type == null) {
return TODAY;
}
for (StatisticsRange value : values()) {
if (value.name().equals(type)) {
return value;
}
}
return TODAY;
}
}

View File

@@ -20,7 +20,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.dromara.visor.framework.common.entity;
package org.dromara.visor.common.entity;
import java.util.List;

View File

@@ -0,0 +1,50 @@
/*
* 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.Map;
/**
* 柱状图图单系列数据
*
* @author Jiahang Li
* @version 1.0.0
* @since 2024/12/23 13:42
*/
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
@Schema(name = "BarSingleChartData", description = "柱状图图单系列数据")
public class BarSingleChartData {
@Schema(description = "数据")
private Map<String, Integer> 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.module.asset.entity.request.exec;
package org.dromara.visor.common.entity.chart;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.AllArgsConstructor;
@@ -28,31 +28,27 @@ import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import javax.validation.constraints.NotNull;
import java.util.List;
import java.util.Map;
/**
* 执行日志查看 请求对象
* 折线图多系列数据
*
* @author Jiahang Li
* @version 1.0.0
* @since 2024/3/11 11:46
* @since 2024/12/23 13:41
*/
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
@Schema(name = "ExecLogTailRequest", description = "执行日志查看 请求对象")
public class ExecLogTailRequest {
@Schema(name = "LineChartData", description = "折线图多系列数据")
public class LineChartData {
@Schema(description = "执行来源")
private String source;
@Schema(description = "x轴")
private List<String> x;
@NotNull
@Schema(description = "执行id")
private Long execId;
@Schema(description = "执行主机id")
private List<Long> hostExecIdList;
@Schema(description = "数据")
private Map<String, List<Integer>> data;
}

View File

@@ -0,0 +1,53 @@
/*
* 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;
/**
* 折线图单系列数据
*
* @author Jiahang Li
* @version 1.0.0
* @since 2024/12/23 13:42
*/
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
@Schema(name = "LineSingleChartData", description = "折线图单系列数据")
public class LineSingleChartData {
@Schema(description = "x轴")
private List<String> x;
@Schema(description = "数据")
private List<Integer> data;
}

View File

@@ -20,30 +20,31 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.dromara.visor.module.infra.handler.setting.model;
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 org.dromara.visor.framework.common.handler.data.model.GenericsDataModel;
import java.util.Map;
/**
* SFTP 系统配置模型
* 饼图数据
*
* @author Jiahang Li
* @version 1.0.0
* @since 2024/10/9 11:45
* @since 2024/12/23 13:42
*/
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class SftpSystemSettingModel implements GenericsDataModel {
@Schema(name = "PieChartData", description = "饼图数据")
public class PieChartData {
/**
* 预览大小
*/
private Integer previewSize;
@Schema(description = "数据")
private Map<String, Integer> 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.framework.common.enums;
package org.dromara.visor.common.enums;
import lombok.AllArgsConstructor;
import lombok.Getter;

View File

@@ -20,7 +20,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.dromara.visor.framework.common.enums;
package org.dromara.visor.common.enums;
import lombok.AllArgsConstructor;
import lombok.Getter;

View File

@@ -20,7 +20,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.dromara.visor.framework.common.enums;
package org.dromara.visor.common.enums;
import cn.orionsec.kit.lang.utils.Strings;
import lombok.AllArgsConstructor;

View File

@@ -20,7 +20,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.dromara.visor.framework.common.enums;
package org.dromara.visor.common.enums;
import lombok.AllArgsConstructor;
import lombok.Getter;

View File

@@ -20,11 +20,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.dromara.visor.framework.common.handler.data;
package org.dromara.visor.common.handler.data;
import cn.orionsec.kit.spring.SpringHolder;
import org.dromara.visor.framework.common.handler.data.model.GenericsDataModel;
import org.dromara.visor.framework.common.handler.data.strategy.GenericsDataStrategy;
import org.dromara.visor.common.handler.data.model.GenericsDataModel;
import org.dromara.visor.common.handler.data.strategy.GenericsDataStrategy;
/**
* 标准数据定义
@@ -34,7 +34,7 @@ import org.dromara.visor.framework.common.handler.data.strategy.GenericsDataStra
* @since 2023/12/21 0:07
*/
@SuppressWarnings("unchecked")
public interface GenericsDataDefinition {
public interface GenericsStrategyDefinition {
/**
* 获取数据处理策略
@@ -54,12 +54,32 @@ public interface GenericsDataDefinition {
return (S) SpringHolder.getBean(this.getStrategyClass());
}
/**
* 获取默认值
*
* @param <M> model
* @return model
*/
default <M extends GenericsDataModel> M getDefault() {
return (M) this.getStrategy().getDefault();
}
/**
* 执行完整验证链
*
* @param beforeModel beforeModel
* @param afterModel afterModel
*/
default void doValid(GenericsDataModel beforeModel, GenericsDataModel afterModel) {
this.getStrategy().doValid(beforeModel, afterModel);
}
/**
* 反序列化对象
*
* @param serialModel serialModel
* @param <M> Model
* @return object
* @param <M> model
* @return model
*/
default <M extends GenericsDataModel> M parse(String serialModel) {
return (M) this.getStrategy().parse(serialModel);
@@ -69,14 +89,11 @@ public interface GenericsDataDefinition {
* 转为视图对象
*
* @param serialModel serialModel
* @param <M> Model
* @param <M> model
* @return viewModel
*/
default <M extends GenericsDataModel> M toView(String serialModel) {
GenericsDataStrategy<GenericsDataModel> strategy = this.getStrategy();
GenericsDataModel model = strategy.parse(serialModel);
strategy.toView(model);
return (M) model;
return (M) this.getStrategy().toView(serialModel);
}
}

View File

@@ -20,7 +20,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.dromara.visor.framework.common.handler.data.model;
package org.dromara.visor.common.handler.data.model;
import com.alibaba.fastjson.JSON;

View File

@@ -20,10 +20,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.dromara.visor.framework.common.handler.data.strategy;
package org.dromara.visor.common.handler.data.strategy;
import com.alibaba.fastjson.JSON;
import org.dromara.visor.framework.common.handler.data.model.GenericsDataModel;
import org.dromara.visor.common.handler.data.model.GenericsDataModel;
/**
* 标准数据处理策略 基类
@@ -84,4 +84,13 @@ public abstract class AbstractGenericsDataStrategy<M extends GenericsDataModel>
public void toView(M model) {
}
@Override
public M toView(String serialModel) {
// 解析
M parse = this.parse(serialModel);
// 转为视图对象
this.toView(parse);
return parse;
}
}

View File

@@ -20,9 +20,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.dromara.visor.framework.common.handler.data.strategy;
package org.dromara.visor.common.handler.data.strategy;
import org.dromara.visor.framework.common.handler.data.model.GenericsDataModel;
import org.dromara.visor.common.handler.data.model.GenericsDataModel;
/**
* 标准数据处理策略
@@ -65,4 +65,12 @@ public interface GenericsDataStrategy<M extends GenericsDataModel> {
*/
void toView(M model);
/**
* 转为视图配置
*
* @param serialModel serialModel
* @return model
*/
M toView(String serialModel);
}

View File

@@ -20,24 +20,19 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.dromara.visor.framework.common.crypto;
package org.dromara.visor.common.interfaces;
import cn.orionsec.kit.lang.utils.codec.Base62s;
import cn.orionsec.kit.lang.utils.crypto.symmetric.SymmetricCrypto;
/**
* 数据加密器
* aes 加密器
*
* @author Jiahang Li
* @version 1.0.0
* @since 2023/7/8 0:20
*/
public interface ValueCrypto extends SymmetricCrypto {
/**
* 初始化
*/
void init();
public interface AesEncryptor extends SymmetricCrypto {
/**
* 加密后 base62 编码

View File

@@ -20,7 +20,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.dromara.visor.framework.common.file;
package org.dromara.visor.common.interfaces;
import java.io.InputStream;
import java.io.OutputStream;
@@ -114,6 +114,25 @@ public interface FileClient {
*/
byte[] getContent(String path) throws Exception;
/**
* 获取文件内容
*
* @param path path
* @return content
* @throws Exception Exception
*/
String getContentAsString(String path) throws Exception;
/**
* 获取文件内容
*
* @param path path
* @param charset charset
* @return content
* @throws Exception Exception
*/
String getContentAsString(String path, String charset) throws Exception;
/**
* 获取文件输入流
*

View File

@@ -20,7 +20,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.dromara.visor.framework.common.lock;
package org.dromara.visor.common.interfaces;
import java.util.function.Supplier;

View File

@@ -0,0 +1,42 @@
/*
* 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.interfaces;
/**
* rsa 解密器
*
* @author Jiahang Li
* @version 1.0.0
* @since 2025/1/5 20:58
*/
public interface RsaDecryptor {
/**
* 解密
*
* @param value value
* @return value
*/
String decrypt(String value);
}

View File

@@ -20,7 +20,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.dromara.visor.framework.common.json.filter;
package org.dromara.visor.common.json;
import cn.orionsec.kit.lang.utils.Desensitizes;
import cn.orionsec.kit.lang.utils.Objects1;

View File

@@ -20,7 +20,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.dromara.visor.framework.common.json.filter;
package org.dromara.visor.common.json;
import cn.orionsec.kit.lang.utils.collect.Lists;
import com.alibaba.fastjson.serializer.PropertyFilter;

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.common.mapstruct;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
/**
* json 转换器
*
* @author Jiahang Li
* @version 1.0.0
* @since 2025/3/7 17:43
*/
public class JsonConversion {
private JsonConversion() {
}
/**
* JSONString > JSONObject
*
* @param json json
* @return JSONObject
*/
public static JSONObject stringToJsonObject(String json) {
return json != null ? JSON.parseObject(json) : null;
}
/**
* JSONString > JSONArray.
*
* @param json json
* @return JSONArray
*/
public static JSONArray stringToJsonArray(String json) {
return json != null ? JSON.parseArray(json) : null;
}
/**
* JSONObject > JSONString.
*
* @param jsonObject JSONObject
* @return JSONString
*/
public static String jsonObjectToString(JSONObject jsonObject) {
return jsonObject != null ? jsonObject.toJSONString() : null;
}
/**
* JSONArray > JSONString.
*
* @param jsonArray JSONArray
* @return JSONString
*/
public static String jsonArrayToString(JSONArray jsonArray) {
return jsonArray != null ? jsonArray.toJSONString() : null;
}
}

View File

@@ -0,0 +1,128 @@
/*
* 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.mapstruct;
import cn.orionsec.kit.lang.utils.Strings;
import cn.orionsec.kit.lang.utils.collect.Lists;
import org.dromara.visor.common.constant.Const;
import java.util.Arrays;
import java.util.List;
import java.util.stream.Collectors;
/**
* string 转换器
*
* @author Jiahang Li
* @version 1.0.0
* @since 2025/3/7 17:35
*/
public class StringConversion {
private StringConversion() {
}
/**
* String > List<Integer>
*
* @param str str
* @return list
*/
public static List<Integer> stringToIntegerList(String str) {
if (Strings.isBlank(str)) {
return Lists.newList();
}
return Arrays.stream(str.split(Const.COMMA))
.map(Integer::valueOf)
.collect(Collectors.toList());
}
/**
* String > List<String>
*
* @param str str
* @return list
*/
public static List<Long> stringToLongList(String str) {
if (Strings.isBlank(str)) {
return Lists.newList();
}
return Arrays.stream(str.split(Const.COMMA))
.map(Long::valueOf)
.collect(Collectors.toList());
}
/**
* String > List<String>
*
* @param str str
* @return list
*/
public static List<String> stringToStringList(String str) {
if (Strings.isBlank(str)) {
return Lists.newList();
}
return Lists.of(str.split(Const.COMMA));
}
/**
* List<Integer> String
*
* @param list list
* @return str
*/
public static String integerListToString(List<Integer> list) {
if (list != null) {
return list.stream()
.map(String::valueOf)
.collect(Collectors.joining(Const.COMMA));
}
return null;
}
/**
* List<Long> String
*
* @param list list
* @return str
*/
public static String longListToString(List<Long> list) {
if (list != null) {
return list.stream()
.map(String::valueOf)
.collect(Collectors.joining(Const.COMMA));
}
return null;
}
/**
* List<String> String
*
* @param list list
* @return str
*/
public static String stringListToString(List<String> list) {
return list != null ? String.join(Const.COMMA, list) : null;
}
}

View File

@@ -20,7 +20,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.dromara.visor.framework.common.security;
package org.dromara.visor.common.security;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;

View File

@@ -20,12 +20,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.dromara.visor.framework.common.security;
package org.dromara.visor.common.security;
import cn.orionsec.kit.lang.utils.Booleans;
import cn.orionsec.kit.lang.utils.Strings;
import org.dromara.visor.framework.common.constant.Const;
import org.dromara.visor.framework.common.utils.CryptoUtils;
import org.dromara.visor.common.constant.Const;
import org.dromara.visor.common.utils.AesEncryptUtils;
/**
* 密码修改器
@@ -52,7 +52,7 @@ public class PasswordModifier {
if (Strings.isBlank(password)) {
return Const.EMPTY;
} else {
return CryptoUtils.encryptAsString(password);
return AesEncryptUtils.encryptAsString(password);
}
} else {
return null;

View File

@@ -20,7 +20,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.dromara.visor.framework.common.security;
package org.dromara.visor.common.security;
/**
* SecurityUtils bean 对象
@@ -45,4 +45,11 @@ public interface SecurityHolder {
*/
Long getLoginUserId();
/**
* 获取当前用户名
*
* @return username
*/
String getLoginUsername();
}

View File

@@ -20,7 +20,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.dromara.visor.framework.common.security;
package org.dromara.visor.common.security;
import java.io.Serializable;
@@ -47,4 +47,11 @@ public interface UpdatePasswordAction extends Serializable {
*/
String getPassword();
/**
* 设置密码
*
* @param password password
*/
void setPassword(String password);
}

View File

@@ -20,7 +20,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.dromara.visor.framework.common.security;
package org.dromara.visor.common.security;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;

View File

@@ -20,9 +20,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.dromara.visor.framework.common.thread;
package org.dromara.visor.common.thread;
import org.dromara.visor.framework.common.utils.ThreadMdcUtils;
import org.dromara.visor.common.utils.ThreadMdcUtils;
import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
import java.util.concurrent.Callable;

View File

@@ -20,7 +20,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.dromara.visor.framework.common.meta;
package org.dromara.visor.common.trace;
import cn.orionsec.kit.lang.id.UUIds;
import com.alibaba.ttl.TransmittableThreadLocal;

View File

@@ -20,25 +20,23 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.dromara.visor.framework.common.utils;
package org.dromara.visor.common.utils;
import cn.orionsec.kit.lang.utils.Exceptions;
import org.dromara.visor.framework.common.crypto.ValueCrypto;
import org.dromara.visor.common.interfaces.AesEncryptor;
/**
* 加密工具类
* <p>
* PrimaryValueCrypto 代理类工具
* aes 数据加密工具类
*
* @author Jiahang Li
* @version 1.0.0
* @since 2023/7/8 0:05
*/
public class CryptoUtils {
public class AesEncryptUtils {
private static ValueCrypto delegate;
private static AesEncryptor delegate;
private CryptoUtils() {
private AesEncryptUtils() {
}
/**
@@ -163,12 +161,12 @@ public class CryptoUtils {
return delegate.decryptBase62(text);
}
public static void setDelegate(ValueCrypto delegate) {
if (CryptoUtils.delegate != null) {
public static void setDelegate(AesEncryptor delegate) {
if (AesEncryptUtils.delegate != null) {
// unmodified
throw Exceptions.state();
}
CryptoUtils.delegate = delegate;
AesEncryptUtils.delegate = delegate;
}
}

View File

@@ -20,7 +20,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.dromara.visor.framework.common.utils;
package org.dromara.visor.common.utils;
import cn.orionsec.kit.lang.constant.Const;

View File

@@ -20,10 +20,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.dromara.visor.framework.common.utils;
package org.dromara.visor.common.utils;
import cn.orionsec.kit.lang.utils.time.Dates;
import org.dromara.visor.framework.common.constant.Const;
import org.dromara.visor.common.constant.Const;
/**
* 文件名称

View File

@@ -20,12 +20,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.dromara.visor.framework.common.utils;
package org.dromara.visor.common.utils;
import cn.orionsec.kit.ext.location.Region;
import cn.orionsec.kit.ext.location.region.LocationRegions;
import cn.orionsec.kit.web.servlet.web.Servlets;
import org.dromara.visor.framework.common.constant.Const;
import org.dromara.visor.common.constant.Const;
import javax.servlet.http.HttpServletRequest;
import java.util.HashMap;

View File

@@ -20,11 +20,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.dromara.visor.framework.common.utils;
package org.dromara.visor.common.utils;
import cn.orionsec.kit.lang.utils.Exceptions;
import lombok.extern.slf4j.Slf4j;
import org.dromara.visor.framework.common.lock.Locker;
import org.dromara.visor.common.interfaces.Locker;
import java.util.function.Supplier;

View File

@@ -20,13 +20,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.dromara.visor.framework.common.utils;
package org.dromara.visor.common.utils;
import cn.orionsec.kit.lang.utils.Objects1;
import cn.orionsec.kit.lang.utils.Systems;
import cn.orionsec.kit.lang.utils.io.Files1;
import org.dromara.visor.framework.common.constant.AppConst;
import org.dromara.visor.framework.common.constant.Const;
import org.dromara.visor.common.constant.AppConst;
import org.dromara.visor.common.constant.Const;
/**
* 路径工具类

View File

@@ -20,11 +20,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.dromara.visor.framework.common.utils;
package org.dromara.visor.common.utils;
import cn.orionsec.kit.web.servlet.web.Servlets;
import org.dromara.visor.framework.common.entity.RequestIdentity;
import org.dromara.visor.framework.common.entity.RequestIdentityModel;
import org.dromara.visor.common.entity.RequestIdentity;
import org.dromara.visor.common.entity.RequestIdentityModel;
import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;

View File

@@ -20,42 +20,41 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.dromara.visor.framework.security.core.crypto;
package org.dromara.visor.common.utils;
import cn.orionsec.kit.lang.utils.Exceptions;
import org.dromara.visor.framework.common.crypto.ValueCrypto;
import org.dromara.visor.common.interfaces.RsaDecryptor;
/**
* 默认加密器
* rsa 参数解密工具类
*
* @author Jiahang Li
* @version 1.0.0
* @since 2023/7/21 12:11
* @since 2025/1/5 21:13
*/
public class PrimaryValueCrypto implements ValueCrypto {
public class RsaParamDecryptUtils {
private static ValueCrypto delegate;
private static RsaDecryptor delegate;
@Override
public void init() {
private RsaParamDecryptUtils() {
}
@Override
public byte[] encrypt(byte[] plain) {
return delegate.encrypt(plain);
/**
* 解密
*
* @param value value
* @return value
*/
public static String decrypt(String value) {
return delegate.decrypt(value);
}
@Override
public byte[] decrypt(byte[] text) {
return delegate.decrypt(text);
}
protected static void setDelegate(ValueCrypto delegate) {
if (PrimaryValueCrypto.delegate != null) {
public static void setDelegate(RsaDecryptor delegate) {
if (RsaParamDecryptUtils.delegate != null) {
// unmodified
throw Exceptions.state();
}
PrimaryValueCrypto.delegate = delegate;
RsaParamDecryptUtils.delegate = delegate;
}
}

View File

@@ -20,9 +20,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.dromara.visor.framework.common.utils;
package org.dromara.visor.common.utils;
import org.dromara.visor.framework.common.constant.Const;
import org.dromara.visor.common.constant.Const;
/**
* sql 工具类

View File

@@ -20,12 +20,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.dromara.visor.framework.common.utils;
package org.dromara.visor.common.utils;
import cn.orionsec.kit.lang.utils.collect.Maps;
import cn.orionsec.kit.lang.utils.reflect.Annotations;
import io.swagger.v3.oas.annotations.Operation;
import org.dromara.visor.framework.common.constant.Const;
import org.dromara.visor.common.constant.Const;
import java.lang.reflect.Method;
import java.util.Map;

View File

@@ -20,9 +20,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.dromara.visor.framework.common.utils;
package org.dromara.visor.common.utils;
import org.dromara.visor.framework.common.meta.TraceIdHolder;
import org.dromara.visor.common.trace.TraceIdHolder;
import org.slf4j.MDC;
import java.util.Map;

View File

@@ -20,11 +20,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.dromara.visor.framework.common.utils;
package org.dromara.visor.common.utils;
import cn.orionsec.kit.lang.utils.collect.Lists;
import org.dromara.visor.framework.common.constant.Const;
import org.dromara.visor.framework.common.entity.TreeNode;
import org.dromara.visor.common.constant.Const;
import org.dromara.visor.common.entity.TreeNode;
import java.util.Comparator;
import java.util.List;

View File

@@ -20,12 +20,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.dromara.visor.framework.common.utils;
package org.dromara.visor.common.utils;
import cn.orionsec.kit.lang.utils.Arrays1;
import cn.orionsec.kit.lang.utils.io.Files1;
import cn.orionsec.kit.spring.SpringHolder;
import org.dromara.visor.framework.common.constant.ErrorMessage;
import org.dromara.visor.common.constant.ErrorMessage;
import javax.validation.ConstraintViolation;
import javax.validation.ConstraintViolationException;

View File

@@ -20,7 +20,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.dromara.visor.framework.common.validator.group;
package org.dromara.visor.common.validator.group;
/**
* 批量验证分组

View File

@@ -20,7 +20,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.dromara.visor.framework.common.validator.group;
package org.dromara.visor.common.validator.group;
/**
* 清理验证分组

View File

@@ -20,7 +20,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.dromara.visor.framework.common.validator.group;
package org.dromara.visor.common.validator.group;
/**
* 导出验证分组

View File

@@ -20,7 +20,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.dromara.visor.framework.common.validator.group;
package org.dromara.visor.common.validator.group;
/**
* 分页验证分组

View File

@@ -20,7 +20,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.dromara.visor.framework.common.validator.group;
package org.dromara.visor.common.validator.group;
/**
* 导出验证分组

View File

@@ -20,7 +20,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.dromara.visor.framework.common.validator.group;
package org.dromara.visor.common.validator.group;
/**
* 分页验证分组

View File

@@ -20,7 +20,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.dromara.visor.framework.common.web.filter;
package org.dromara.visor.common.web;
import org.springframework.boot.web.servlet.FilterRegistrationBean;
@@ -33,9 +33,9 @@ import javax.servlet.Filter;
* @version 1.0.0
* @since 2023/6/25 15:05
*/
public class FilterCreator {
public class WebFilterCreator {
private FilterCreator() {
private WebFilterCreator() {
}
/**

View File

@@ -14,7 +14,7 @@
<url>https://github.com/dromara/orion-visor</url>
<properties>
<revision>2.2.2</revision>
<revision>2.3.8</revision>
<spring.boot.version>2.7.17</spring.boot.version>
<spring.boot.admin.version>2.7.15</spring.boot.admin.version>
<flatten.maven.plugin.version>1.5.0</flatten.maven.plugin.version>
@@ -62,7 +62,7 @@
<!-- orion-visor-starter -->
<dependency>
<groupId>org.dromara.visor</groupId>
<artifactId>orion-visor-framework-common</artifactId>
<artifactId>orion-visor-common</artifactId>
<version>${revision}</version>
</dependency>
<dependency>
@@ -75,6 +75,11 @@
<artifactId>orion-visor-spring-boot-starter-web</artifactId>
<version>${revision}</version>
</dependency>
<dependency>
<groupId>org.dromara.visor</groupId>
<artifactId>orion-visor-spring-boot-starter-config</artifactId>
<version>${revision}</version>
</dependency>
<dependency>
<groupId>org.dromara.visor</groupId>
<artifactId>orion-visor-spring-boot-starter-swagger</artifactId>
@@ -110,6 +115,11 @@
<artifactId>orion-visor-spring-boot-starter-desensitize</artifactId>
<version>${revision}</version>
</dependency>
<dependency>
<groupId>org.dromara.visor</groupId>
<artifactId>orion-visor-spring-boot-starter-encrypt</artifactId>
<version>${revision}</version>
</dependency>
<dependency>
<groupId>org.dromara.visor</groupId>
<artifactId>orion-visor-spring-boot-starter-log</artifactId>

View File

@@ -1,205 +0,0 @@
/*
* 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.common.utils;
import cn.orionsec.kit.lang.utils.Exceptions;
import org.dromara.visor.framework.common.file.FileClient;
import java.io.InputStream;
import java.io.OutputStream;
/**
* 文件客户端工具
* <p>
* PrimaryFileClient 代理类工具
*
* @author Jiahang Li
* @version 1.0.0
* @since 2023/7/21 12:05
*/
public class FileClientUtils {
private static FileClient delegate;
private FileClientUtils() {
}
/**
* 上传文件
*
* @param path 文件路径
* @param content 文件内容
* @return 路径
* @throws Exception Exception
*/
public static String upload(String path, byte[] content) throws Exception {
return delegate.upload(path, content);
}
/**
* 上传文件
*
* @param path 文件路径
* @param content 文件内容
* @param overrideIfExist 文件存在是否覆盖
* @return 路径
* @throws Exception Exception
*/
public static String upload(String path, byte[] content, boolean overrideIfExist) throws Exception {
return delegate.upload(path, content, overrideIfExist);
}
/**
* 上传文件
*
* @param path 文件路径
* @param in in
* @return 路径
* @throws Exception Exception
*/
public static String upload(String path, InputStream in) throws Exception {
return delegate.upload(path, in);
}
/**
* 上传文件
*
* @param path 文件路径
* @param in in
* @param autoClose autoClose
* @return 路径
* @throws Exception Exception
*/
public static String upload(String path, InputStream in, boolean autoClose) throws Exception {
return delegate.upload(path, in, autoClose);
}
/**
* 上传文件
*
* @param path 文件路径
* @param in in
* @param autoClose autoClose
* @param overrideIfExist 文件存在是否覆盖
* @return 路径
* @throws Exception Exception
*/
public static String upload(String path, InputStream in, boolean autoClose, boolean overrideIfExist) throws Exception {
return delegate.upload(path, in, autoClose, overrideIfExist);
}
/**
* 检查文件是否存在
*
* @param path path
* @return 是否存在
*/
public static boolean isExists(String path) {
return delegate.isExists(path);
}
/**
* 删除文件
*
* @param path 路径
* @return 是否删除
* @throws Exception Exception
*/
public static boolean delete(String path) throws Exception {
return delegate.delete(path);
}
/**
* 获取文件内容
*
* @param path path
* @return bytes
* @throws Exception Exception
*/
public static byte[] getContent(String path) throws Exception {
return delegate.getContent(path);
}
/**
* 获取文件输入流
*
* @param path path
* @return stream
* @throws Exception Exception
*/
public static InputStream getContentInputStream(String path) throws Exception {
return delegate.getContentInputStream(path);
}
/**
* 获取文件输出流
*
* @param path path
* @return stream
* @throws Exception Exception
*/
public static OutputStream getContentOutputStream(String path) throws Exception {
return delegate.getContentOutputStream(path);
}
/**
* 获取文件输出流
*
* @param path path
* @param append append
* @return stream
* @throws Exception Exception
*/
public static OutputStream getContentOutputStream(String path, boolean append) throws Exception {
return delegate.getContentOutputStream(path, append);
}
/**
* 获取返回路径 用于客户端返回
*
* @param path path
* @return returnPath
*/
public static String getReturnPath(String path) {
return delegate.getReturnPath(path);
}
/**
* 获取实际存储路径 用于服务端的存储
*
* @param returnPath returnPath
* @return absolutePath
*/
public static String getAbsolutePath(String returnPath) {
return delegate.getAbsolutePath(returnPath);
}
public static void setDelegate(FileClient delegate) {
if (FileClientUtils.delegate != null) {
// unmodified
throw Exceptions.state();
}
FileClientUtils.delegate = delegate;
}
}

View File

@@ -1 +0,0 @@
org.dromara.visor.framework.common.configuration.OrionCommonAutoConfiguration

View File

@@ -19,7 +19,7 @@
<dependencies>
<dependency>
<groupId>org.dromara.visor</groupId>
<artifactId>orion-visor-framework-common</artifactId>
<artifactId>orion-visor-common</artifactId>
</dependency>
<dependency>

View File

@@ -22,8 +22,8 @@
*/
package org.dromara.visor.framework.banner.configuration;
import org.dromara.visor.common.constant.AutoConfigureOrderConst;
import org.dromara.visor.framework.banner.core.runner.BannerApplicationRunner;
import org.dromara.visor.framework.common.constant.AutoConfigureOrderConst;
import org.springframework.boot.autoconfigure.AutoConfiguration;
import org.springframework.boot.autoconfigure.AutoConfigureOrder;
import org.springframework.context.annotation.Bean;

View File

@@ -19,7 +19,7 @@
<dependencies>
<dependency>
<groupId>org.dromara.visor</groupId>
<artifactId>orion-visor-framework-common</artifactId>
<artifactId>orion-visor-common</artifactId>
</dependency>
<dependency>

View File

@@ -24,15 +24,15 @@ package org.dromara.visor.framework.biz.operator.log.configuration;
import com.alibaba.fastjson.serializer.SerializeFilter;
import com.alibaba.fastjson.serializer.ValueFilter;
import org.dromara.visor.common.constant.AutoConfigureOrderConst;
import org.dromara.visor.common.json.FieldDesensitizeFilter;
import org.dromara.visor.common.json.FieldIgnoreFilter;
import org.dromara.visor.framework.biz.operator.log.configuration.config.OperatorLogConfig;
import org.dromara.visor.framework.biz.operator.log.core.aspect.OperatorLogAspect;
import org.dromara.visor.framework.biz.operator.log.core.service.OperatorLogFrameworkService;
import org.dromara.visor.framework.biz.operator.log.core.service.OperatorLogFrameworkServiceDelegate;
import org.dromara.visor.framework.biz.operator.log.core.utils.OperatorLogFiller;
import org.dromara.visor.framework.biz.operator.log.core.utils.OperatorLogs;
import org.dromara.visor.framework.common.constant.AutoConfigureOrderConst;
import org.dromara.visor.framework.common.json.filter.FieldDesensitizeFilter;
import org.dromara.visor.framework.common.json.filter.FieldIgnoreFilter;
import org.springframework.boot.autoconfigure.AutoConfiguration;
import org.springframework.boot.autoconfigure.AutoConfigureOrder;
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;

View File

@@ -23,7 +23,7 @@
package org.dromara.visor.framework.biz.operator.log.configuration.config;
import lombok.Data;
import org.dromara.visor.framework.common.utils.ConfigUtils;
import org.dromara.visor.common.utils.ConfigUtils;
import org.springframework.boot.context.properties.ConfigurationProperties;
import java.util.List;

View File

@@ -30,6 +30,9 @@ import org.aspectj.lang.ProceedingJoinPoint;
import org.aspectj.lang.annotation.Around;
import org.aspectj.lang.annotation.Aspect;
import org.aspectj.lang.reflect.MethodSignature;
import org.dromara.visor.common.constant.BeanOrderConst;
import org.dromara.visor.common.security.LoginUser;
import org.dromara.visor.common.security.SecurityHolder;
import org.dromara.visor.framework.biz.operator.log.core.annotation.IgnoreParameter;
import org.dromara.visor.framework.biz.operator.log.core.annotation.OperatorLog;
import org.dromara.visor.framework.biz.operator.log.core.factory.OperatorTypeHolder;
@@ -38,9 +41,6 @@ import org.dromara.visor.framework.biz.operator.log.core.model.OperatorType;
import org.dromara.visor.framework.biz.operator.log.core.service.OperatorLogFrameworkService;
import org.dromara.visor.framework.biz.operator.log.core.utils.OperatorLogFiller;
import org.dromara.visor.framework.biz.operator.log.core.utils.OperatorLogs;
import org.dromara.visor.framework.common.constant.BeanOrderConst;
import org.dromara.visor.framework.common.security.LoginUser;
import org.dromara.visor.framework.common.security.SecurityHolder;
import org.springframework.core.annotation.Order;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;

View File

@@ -23,7 +23,7 @@
package org.dromara.visor.framework.biz.operator.log.core.model;
import lombok.Data;
import org.dromara.visor.framework.common.entity.RequestIdentity;
import org.dromara.visor.common.entity.RequestIdentity;
import java.util.Date;

View File

@@ -29,16 +29,16 @@ import cn.orionsec.kit.lang.utils.Strings;
import cn.orionsec.kit.lang.utils.json.matcher.ReplacementFormatters;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.serializer.SerializeFilter;
import org.dromara.visor.common.entity.RequestIdentity;
import org.dromara.visor.common.enums.BooleanBit;
import org.dromara.visor.common.trace.TraceIdHolder;
import org.dromara.visor.common.security.LoginUser;
import org.dromara.visor.common.utils.Requests;
import org.dromara.visor.framework.biz.operator.log.configuration.config.OperatorLogConfig;
import org.dromara.visor.framework.biz.operator.log.core.enums.ReturnType;
import org.dromara.visor.framework.biz.operator.log.core.factory.OperatorTypeHolder;
import org.dromara.visor.framework.biz.operator.log.core.model.OperatorLogModel;
import org.dromara.visor.framework.biz.operator.log.core.model.OperatorType;
import org.dromara.visor.framework.common.entity.RequestIdentity;
import org.dromara.visor.framework.common.enums.BooleanBit;
import org.dromara.visor.framework.common.meta.TraceIdHolder;
import org.dromara.visor.framework.common.security.LoginUser;
import org.dromara.visor.framework.common.utils.Requests;
import java.util.Date;
import java.util.Map;

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