Merge pull request #23 from lijiahangmax/dev

🐛 登录后提示系统异常.

README.md

@@ -1,4 +1,4 @@
-<div align="center"><img src="https://bjuimg.obs.cn-north-4.myhuaweicloud.com/images/2024/2/27/8c687ef1-5711-4a93-9db0-79c010af7902.png" alt="logo" width="32" /></div>
+<div align="center"><img src="https://bjuimg.obs.cn-north-4.myhuaweicloud.com/images/2024/5/29/cec03bbd-0eab-464d-9caf-d0b5a7ffc5a6.png" alt="logo" width="32" /></div>
 <p style="margin-top: 12px" align="center"><b>一款高颜值、现代化的智能运维&轻量堡垒机平台。</b></p>
 <p align="center">
     <a target="_blank"
@@ -43,27 +43,40 @@
 **`orion-visor`** 提供一站式服务器运维解决方案。
 
 * **资产管理**：支持对资产进行分组，实现对主机、密钥和身份的统一管理和授权。
-* **在线终端**：提供在线 Terminal 服务，支持快捷命令、大文件上传、在线编辑等操作。
+* **在线终端**：提供在线终端 SSH 服务，支持快捷命令、自定义快捷键和主题风格。
+* **文件管理**：支持远程主机 SFTP 大文件的批量上传、下载和在线编辑等操作。
 * **批量操作**：支持批量执行主机命令、多主机文件分发等功能。
 * **计划任务**：支持配置 cron 表达式，定时执行主机命令。
 * **安全可靠**：动态配置权限，记录用户操作日志，提供简单的审计功能。
 
 ## 演示环境
 
-演示地址: http://101.43.254.243:1081/   
+* 🔗 演示地址: http://101.43.254.243:1081/
-演示账号: admin/admin
+* 🔏 演示账号: admin/admin
-
+* ⭐ 体验后可以点一下 `star` 这对我很重要! [github](https://github.com/lijiahangmax/orion-visor) [gitee](https://gitee.com/lijiahangmax/orion-visor)
-⭐ 体验后可以点一下 `star` 这对我很重要!  
+* 🌈 如果本项目对你有帮助请帮忙推广一下 让更多的人知道此项目!
-🌈 如果本项目对你有帮助请帮忙推广一下 让更多的人知道此项目!
+* 🎭 演示环境部分功能不可用, 完整功能请本地部署!
+* 📛 演示环境请不要随便删除数据!
+* 📧 如果演示环境不可用请联系我!
 
 ## 快速开始
 
-* [文档地址](https://lijiahangmax.github.io/orion-visor/#/)
+```bash
-* [docker安装](https://lijiahangmax.github.io/orion-visor/#/quickstart/docker-install)
+# clone
-* [普通安装](https://lijiahangmax.github.io/orion-visor/#/quickstart/install)
+git clone https://github.com/lijiahangmax/orion-visor
-* [更新日志](https://lijiahangmax.github.io/orion-visor/#/about/change-log)
+cd orion-visor
-* [操作手册](https://lijiahangmax.github.io/orion-visor/#/operator/asset)
+# 启动
-* [常见问题](https://lijiahangmax.github.io/orion-visor/#/quickstart/faq)
+docker compose up -d
+# 等待后端服务启动后 (2min±) 访问 http://localhost:1081/
+```
+
+## 项目文档
+
+* [文档地址](https://lijiahangmax.github.io/open-orion/orion-visor/)
+* [安装文档](https://lijiahangmax.github.io/open-orion/orion-visor/quickstart/docker.html)
+* [更新日志](https://lijiahangmax.github.io/open-orion/orion-visor/update/change-log.html)
+* [操作手册](https://lijiahangmax.github.io/open-orion/orion-visor/operator/asset.html)
+* [常见问题](https://lijiahangmax.github.io/open-orion/orion-visor/support/faq.html)
 
 ## 技术栈
 
@@ -77,22 +90,22 @@
 
 #### 主机终端
 
-![新建连接](https://bjuimg.obs.cn-north-4.myhuaweicloud.com/images/2024/5/17/19288b64-cdb2-4073-8df9-ecd642d4077f.png "新建连接")
+![新建连接](https://bjuimg.obs.cn-north-4.myhuaweicloud.com/images/2024/5/29/aa7efb14-f2cc-4a6f-b96b-a47964ed8f79.png "新建连接")
-![主机终端](https://bjuimg.obs.cn-north-4.myhuaweicloud.com/images/2024/5/17/41d9deb5-aede-48a5-a6f3-5522cfff9a9f.png "主机终端")
+![主机终端](https://bjuimg.obs.cn-north-4.myhuaweicloud.com/images/2024/5/29/66f121de-69b6-49f6-adc4-701a22d481c4.png "主机终端")
-![sftp](https://bjuimg.obs.cn-north-4.myhuaweicloud.com/images/2024/5/17/366db511-0c1d-4680-9200-4da8f22b028b.png "sftp")
+![sftp](https://bjuimg.obs.cn-north-4.myhuaweicloud.com/images/2024/5/29/f7a0d141-0ee0-484e-8ddb-24cad9ed2c03.png "sftp")
-![主题设置](https://bjuimg.obs.cn-north-4.myhuaweicloud.com/images/2024/5/17/a3e4c2fb-11f5-4387-998e-6f454e336472.png "主题设置")
+![主题设置](https://bjuimg.obs.cn-north-4.myhuaweicloud.com/images/2024/5/29/d6f37ab3-62d2-4c5e-a503-e76a1d5ddc8e.png "主题设置")
 
 #### 批量执行
 
-![批量执行](https://bjuimg.obs.cn-north-4.myhuaweicloud.com/images/2024/5/17/99839bab-9f0e-45ea-b03d-a4c992203e95.png "批量执行")
+![批量执行](https://bjuimg.obs.cn-north-4.myhuaweicloud.com/images/2024/5/29/3effc2fc-56a5-498d-8dfb-0f4f3b8a4056.png "批量执行")
 
 #### 批量上传
 
-![批量上传任务](https://bjuimg.obs.cn-north-4.myhuaweicloud.com/images/2024/5/17/04ccd627-8a46-43a1-acd9-740f75dbf386.png "批量上传任务")
+![批量上传任务](https://bjuimg.obs.cn-north-4.myhuaweicloud.com/images/2024/5/29/98240fa9-4056-4520-9034-290d1aa47d80.png "批量上传任务")
 
 #### 计划任务
 
-![计划任务详情](https://bjuimg.obs.cn-north-4.myhuaweicloud.com/images/2024/5/17/0c4342fc-9fde-4fc1-b886-104a4d22c0b2.png "计划任务详情")
+![计划任务详情](https://bjuimg.obs.cn-north-4.myhuaweicloud.com/images/2024/5/29/d5ee6f04-7b2c-42ba-a3b3-642587f40cce.png "计划任务详情")
 
 ## Star History
 

docker-compose.yml

@@ -1,7 +1,7 @@
 version: '3.3'
 services:
   orion-visor-service:
-    image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-service:2.0.0
+    image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-service:2.0.7
     ports:
       - 1081:80
     environment:
@@ -13,13 +13,14 @@ services:
       - REDIS_HOST=orion-visor-redis
       - REDIS_PASSWORD=Data@123456
       - SECRET_KEY=uQeacXV8b3isvKLK
+      - DEMO_MODE=false
     volumes:
       - /data/orion-visor-space/docker-volumes/orion-visor-service/root-orion:/root/orion
     depends_on:
       - orion-visor-mysql
       - orion-visor-redis
   orion-visor-mysql:
-    image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-mysql:2.0.0
+    image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-mysql:2.0.7
     privileged: true
     ports:
       - 3307:3306
@@ -33,7 +34,7 @@ services:
       - /data/orion-visor-space/docker-volumes/orion-visor-mysql/var-lib-mysql-files:/var/lib/mysql-files
       - /data/orion-visor-space/docker-volumes/orion-visor-mysql/etc-mysql:/etc/mysql
   orion-visor-redis:
-    image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-redis:2.0.0
+    image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-redis:2.0.7
     privileged: true
     ports:
       - 6380:6379

docker-upgrade.sh

@@ -1,4 +1,8 @@
 #/bin/bash
 docker compose down
 sh ./pull.sh
+# demo 启动
+if [ "$1" == "demo" ]; then
+    sed -i 's/DEMO_MODE=false/DEMO_MODE=true/g' docker-compose.yml
+fi
 docker compose up -d

docker/orion-visor-mysql/Dockerfile

@@ -1,9 +1,17 @@
 FROM mysql:8.0.28
+# 系统时区
+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
+# 复制初始化脚本
 COPY ./sql/init-1-schema-databases.sql /tmp
 COPY ./sql/init-2-schema-tables.sql /tmp
 COPY ./sql/init-3-schema-quartz.sql /tmp
 COPY ./sql/init-4-data.sql /tmp
-COPY ./my.cnf /etc/mysql/conf.d/my.cnf
+# 设置初始化脚本
 RUN cat /tmp/init-1-schema-databases.sql >> /tmp/init.sql && \
     cat /tmp/init-2-schema-tables.sql >> /tmp/init.sql && \
     cat /tmp/init-3-schema-quartz.sql >> /tmp/init.sql && \

docker/orion-visor-mysql/build.sh

@@ -1,5 +1,5 @@
 #/bin/bash
-version=2.0.0
+version=2.0.7
 cp -r ../../sql ./sql
 docker build -t orion-visor-mysql:${version} .
 rm -rf ./sql

docker/orion-visor-redis/Dockerfile

@@ -1,4 +1,15 @@
 FROM 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

docker/orion-visor-redis/build.sh

@@ -1,5 +1,5 @@
 #/bin/bash
-version=2.0.0
+version=2.0.7
 docker build -t orion-visor-redis:${version} .
 docker tag orion-visor-redis:${version} registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-redis:${version}
 docker push registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-redis:${version}

docker/orion-visor-service/Dockerfile

@@ -1,15 +1,23 @@
 FROM nginx:alpine
 USER root
-RUN \
-  echo "" > /etc/apk/repositories && \
-  echo "http://mirrors.aliyun.com/alpine/v3.8/main" >> /etc/apk/repositories &&\
-  echo "http://mirrors.aliyun.com/alpine/v3.8/community" >> /etc/apk/repositories && \
-  apk update
-RUN apk add openjdk8
-RUN rm -rf /etc/nginx/conf.d/*
 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 tzdata && \
+  apk add openjdk8
+# 设置时区
+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" ]

docker/orion-visor-service/build.sh

@@ -1,9 +1,9 @@
 #/bin/bash
-version=2.0.0
+version=2.0.7
 mv ../../orion-visor-launch/target/orion-visor-launch.jar ./orion-visor-launch.jar
 mv ../../orion-visor-ui/dist ./dist
 docker build -t orion-visor-service:${version} .
-rm -f ./orion-visor-launch.jar
+rm -rf ./orion-visor-launch.jar
 rm -rf ./dist
 docker tag orion-visor-service:${version} registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-service:${version}
 docker push registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-service:${version}

docs/README.md

@@ -40,10 +40,17 @@
 
 ------------------------------
 
+<p><b>⛔⛔此页面已不再维护, 请跳转至 
+<a target="_blank" href="https://lijiahangmax.github.io/open-orion/orion-visor">这里</a> 
+查看最新文档 ❗</b></p>
+
+------------------------------
+
 **`orion-visor`** 提供一站式服务器运维解决方案。
 
 * **资产管理**：支持对资产进行分组，实现对主机、密钥和身份的统一管理和授权。
-* **在线终端**：提供在线 Terminal 服务，支持快捷命令、大文件上传、在线编辑等操作。
+* **在线终端**：提供在线终端 SSH 服务，支持快捷命令、自定义快捷键和主题风格。
+* **文件管理**：支持远程主机 SFTP 大文件的批量上传、下载和在线编辑等操作。
 * **批量操作**：支持批量执行主机命令、多主机文件分发等功能。
 * **计划任务**：支持配置 cron 表达式，定时执行主机命令。
 * **安全可靠**：动态配置权限，记录用户操作日志，提供简单的审计功能。
@@ -55,12 +62,22 @@
 
 ⭐ 体验后可以点一下 `star` 这对我很重要!  
 🌈 如果本项目对你有帮助请帮忙推广一下 让更多的人知道此项目!
+[github](https://github.com/lijiahangmax/orion-visor) [gitee](https://gitee.com/lijiahangmax/orion-visor)
 
 ## 快速开始
 
-* [文档地址](https://lijiahangmax.github.io/orion-visor/#/)
+```bash
-* [docker安装](/quickstart/docker-install)
+# clone
-* [普通安装](/quickstart/install)
+git clone https://github.com/lijiahangmax/orion-visor
+cd orion-visor
+# 启动
+docker compose up -d
+```
+
+## 项目文档
+
+* [文档地址](/)
+* [安装文档](/quickstart/docker-install)
 * [更新日志](/about/change-log)
 * [操作手册](/operator/asset)
 * [常见问题](/quickstart/faq)

docs/_coverpage.md

@@ -1,6 +1,6 @@
-# orion-visor <small>2.0.0</small>
+# orion-visor
 
-> 一款开箱即用的运维平台。
+> 一款高颜值、现代化的智能运维&轻量堡垒机平台。
 
 - 友好 易用
 - 安全 稳定

docs/about/change-log.md

@@ -14,6 +14,32 @@
 * 执行 升级的 `bash` 脚本
 * 进入 代码目录执行 `sh docker-upgrade.sh` 进行容器升级 `down` > `pull` > `up -d`
 
+### v2.0.3
+
+`2024-05-29` `release`
+
+* 🐞 修复 部分 ui 显示错误
+* 🐞 修复 计划任务编辑时报错
+* 🐞 修复 计划任务手动触发时报错
+* 🩰 修改 logo
+* 🔨 修改 docker 时区
+
+### v2.0.2
+
+`2024-05-24` `release`
+
+* 🐞 修复 资产授权密钥时间显示错误
+* 🌈 添加 演示模式
+* ⭐ 支持 Chrome PWA
+
+### v2.0.1
+
+`2024-05-21` `release`
+
+* ⭐ 添加 cron 组件
+* 🐞 修复 批量执行后日志偶尔不展示的问题
+* 🐞 修复 批量上传进度条显示异常的问题
+
 ### v2.0.0
 
 `2024-05-17` `release`

docs/about/roadmap.md

@@ -2,12 +2,10 @@
 
 * 终端背景图片
 * 资产授权 UI 改版
-* RDP 远程桌面
 * 接入 config 后端动态配置
 * 文档中巡检模板
 * 导入快捷命令
 * 导入命令模板
-* 使用 vite press 开发文档
 
 ## 已知问题
 

docs/assert/logo.svg

@@ -1,17 +1,22 @@
-<svg id="图层_1" data-name="图层 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32">
+<?xml version="1.0" encoding="utf-8"?>
-    <defs>
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-        <style>.cls-1{fill:url(#未命名的渐变_4);}.cls-2{fill:url(#未命名的渐变_6);}</style>
+	 viewBox="0 0 32 32" style="enable-background:new 0 0 32 32;" xml:space="preserve">
-        <linearGradient id="未命名的渐变_4" x1="0.32" y1="15.03" x2="20.16" y2="15.03" gradientUnits="userSpaceOnUse">
+<style type="text/css">
-            <stop offset="0" stop-color="#23b6b6"/>
+	.st0{fill:url(#SVGID_1_);}
-            <stop offset="1" stop-color="#189c98"/>
+	.st1{fill:#3B28CC;}
-        </linearGradient>
+</style>
-        <linearGradient id="未命名的渐变_6" x1="11.84" y1="16.97" x2="31.68" y2="16.97" gradientUnits="userSpaceOnUse">
+<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="27.1802" y1="7.7935" x2="15.2269" y2="25.137">
-            <stop offset="0" stop-color="#08589b"/>
+	<stop  offset="0" style="stop-color:#ADD7F6"/>
-            <stop offset="1" stop-color="#2167b2"/>
+	<stop  offset="0.2512" style="stop-color:#AAD5F6"/>
-        </linearGradient>
+	<stop  offset="0.4195" style="stop-color:#A1CDF7"/>
-    </defs>
+	<stop  offset="0.5636" style="stop-color:#92C1F8"/>
-    <path class="cls-1"
+	<stop  offset="0.694" style="stop-color:#7DAFF9"/>
-          d="M20,17.37a1.56,1.56,0,0,0-2.13-.65l-7.56,4.07A4.65,4.65,0,0,1,4,18.91H4a4.65,4.65,0,0,1,1.88-6.3L13.6,8.44a1.56,1.56,0,0,0,.64-2.1h0a1.56,1.56,0,0,0-2.13-.65l-8,4.3a7.24,7.24,0,0,0-2.94,9.82l.51.94a7.24,7.24,0,0,0,9.82,2.94l7.81-4.22a1.56,1.56,0,0,0,.65-2.1Z"/>
+	<stop  offset="0.8152" style="stop-color:#6198FB"/>
-    <path class="cls-2"
+	<stop  offset="0.9279" style="stop-color:#407CFD"/>
-          d="M12,14.63a1.56,1.56,0,0,0,2.13.65l7.56-4.07A4.65,4.65,0,0,1,28,13.09h0a4.65,4.65,0,0,1-1.88,6.3L18.4,23.56a1.56,1.56,0,0,0-.64,2.1h0a1.56,1.56,0,0,0,2.13.65l8-4.3a7.24,7.24,0,0,0,2.94-9.82l-.51-.94a7.24,7.24,0,0,0-9.82-2.94l-7.81,4.22a1.56,1.56,0,0,0-.65,2.1Z"/>
+	<stop  offset="1" style="stop-color:#2667FF"/>
+</linearGradient>
+<path class="st0" d="M31.41,4.01h-8.04c-0.27,0-0.51,0.18-0.57,0.44c-0.64,2.56-4.19,15.45-11.86,20.81c0,0,9.5,13.77,21.03-20.47
+	C32.1,4.4,31.81,4.01,31.41,4.01z"/>
+<path class="st1" d="M0.62,3.98h8.02c0.28,0,0.52,0.18,0.59,0.45c0.69,2.58,4.47,15.52,12.14,20.88c0,0-10.88,13.73-21.34-20.54
+	C-0.09,4.37,0.2,3.98,0.62,3.98z"/>
 </svg>

docs/index.html

@@ -2,10 +2,10 @@
 <html lang="en">
 <head>
     <meta charset="UTF-8">
-    <title>关于 orion-visor</title>
+    <title>orion-visor</title>
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"/>
     <meta name="description" content="Description">
-    <link rel="icon" href="./assert/logo.svg">
+    <link rel="icon" href="./assert/favicon.ico">
     <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0">
     <!-- Theme: Defaults -->
     <link rel="stylesheet" href="./assert/font.css">

docs/operator/asset.md

@@ -34,7 +34,3 @@
 ### 资产授权
 
 给用户/角色授权资产数据, 若无授权则无法访问资产。
-
-给用户授权时: 若当前选择的用户有管理员角色(admin)则无需配置, 管理员拥有全部权限。  
-给角色授权时: 无需给管理员(admin)配置, 管理员拥有全部权限。  
-

docs/operator/exec.md

@@ -21,7 +21,7 @@
 * 命令: 查看执行时的命令
 * 参数: 查看执行时的参数
 * 中断: 中断命令执行
-* 日志: 查看执行日志, ctrl + 左键点击会用新页面打开
+* 日志: 查看执行日志 `ctrl + 左键` 点击会用新页面打开
 * 下载: 下载执行日志
 
 ### 批量上传
@@ -65,14 +65,14 @@
 ### 日志面板快捷键
 
 * 回车: `Enter`
-* 向上滚动一行: `↑`
-* 向上滚动一页: `Home`
-* 向下滚动一行: `↓`
-* 向下滚动一页: `End`
 * 全选: `ctrl` `A`
 * 复制: `ctrl` `C`
 * 搜索: `ctrl` `F`
 * 清空: `ctrl` `L`
+* 向上滚动一行: `↑`
+* 向上滚动一页: `Home`
+* 向下滚动一行: `↓`
+* 向下滚动一页: `End`
 
 ### 命令内置参数
 

docs/operator/host-ops.md

@@ -24,6 +24,7 @@
 > 右侧状态栏
 
 * 命令片段: 自定义快速执行的命令片段, 双击直接执行
+* 路径书签: 自定义快速进入的目录
 * 传输列表: 打开文件传输列表, 当前会话下, 所有的文件上传下载传输都会显示在这里
 * 截图: 截屏终端并且自动下载
 

docs/operator/job.md

@@ -1,6 +1,6 @@
 ### 任务列表
 
-⚡ 内置参数同 `批量执行 > 命令执行` [查看](/operator/exec.md?id=命令内置参数)
+⚡ 内置参数同 `批量执行` > `命令执行` [查看](/operator/exec.md?id=命令内置参数)
 
 维护计划任务, 定时执行命令。
 
@@ -22,5 +22,5 @@
 * 命令: 查看执行时的命令
 * 参数: 查看执行时的参数
 * 中断: 中断命令执行
-* 日志: 查看执行日志, ctrl + 左键点击会用新页面打开
+* 日志: 查看执行日志 `ctrl + 左键` 点击会用新页面打开
 * 下载: 下载执行日志

docs/operator/system.md

@@ -13,7 +13,7 @@
 
 * 新增: 添加一个字典项
 * 刷新缓存: 强制刷新服务器缓存, 一般是手动修改了数据库后需要点击此按钮
-* 查看: 查看字典值的json
+* 查看: 查看字典值的 json
 * 修改: 修改字典项
 * 删除: 删除字典项以及字典值
 

docs/quickstart/dev.md

@@ -1,17 +1,17 @@
 ### 所需环境
 
-* JDK 1.8
+* jdk 1.8
-* Mysql 8.0(+)
+* mysql 8.0.+
-* Redis 5.0.5(+)
+* redis 6.0.+
-* Node 16.16.0(+)
+* maven 3.5.+
-* Maven 3.5.4(+)
+* node 18.12.+
+* pnpm 9.1.+
 
 ⚡ maven 推荐使用阿里云 mirror   
 ⚡ npm 建议使用淘宝镜像 `npm config set registry https://registry.npmmirror.com/`  
+⚡ pnpm 建议使用淘宝镜像 `pnpm config set registry https://registry.npmmirror.com/`
 
-### 配置
+### 拉取代码
-
-1. 拉取代码
 
 ```
 # github
@@ -20,7 +20,7 @@ git clone https://github.com/lijiahangmax/orion-visor
 git clone https://gitee.com/lijiahangmax/orion-visor
 ```
 
-2. 初始化数据库
+### 初始化数据库
 
 ```
 # 执行脚本
@@ -30,7 +30,7 @@ orion-visor/sql/init-3-schema-quartz.sql
 orion-visor/sql/init-4-data.sql
 ```
 
-3. 修改后端配置
+### 修改后端配置
 
 ```
 # 修改配置文件 (mysql, redis, secret-key)
@@ -44,9 +44,9 @@ mvn -U clean install -DskipTests
 com.orion.visor.launch.LaunchApplication
 ```
 
-4. 修改前端配置
+### 修改前端配置
 
-```
+```shell
 # 进入代码目录
 cd orion-visor/orion-visor-ui
 # 下载 pnpm

docs/quickstart/docker-install.md

@@ -19,7 +19,7 @@ Dashboard 修改)
 
 ### 拉取代码
 
-```
+```shell
 # github
 git clone https://github.com/lijiahangmax/orion-visor
 # gitee
@@ -37,24 +37,22 @@ cd orion-visor
     # MYSQL_ROOT_PASSWORD mysql root 密码
     # REDIS_PASSWORD      redis 密码
     # SECRET_KEY          加密密钥
-# 构建
-docker compose build
 ```
 
 ### 启动
 
-```
+```shell
 docker compose up -d
 ```
 
-### 连接 mysql (如果需要在 navicat 中连接)
+### 修改加密方式
 
 ```
 访问 adminer: http://localhost:8081
 服务器: orion-visor-mysql
 用户名: root
-密码: Data@123456
+密  码: Data@123456
-数据库: orion-visor
+数据库: orion_visor
 
 点击左侧 SQL命令 输入:
 ALTER USER 'root'@'%' IDENTIFIED WITH mysql_native_password BY 'Data@123456';
@@ -64,5 +62,5 @@ ALTER USER 'root'@'%' IDENTIFIED WITH mysql_native_password BY 'Data@123456';
 ### 测试访问
 
 在浏览器中输入 http://localhost:1081/ 访问  
-账号: admin  
+账号: `admin`  
-密码: admin  
+密码: `admin`  

docs/quickstart/faq.md

@@ -1,27 +1,42 @@
-> ##### 1. 数据误删除怎么办?
+### 日志文件在哪?
+
+```shell
+# 宿主机
+tail -f -n 200 /data/orion-visor-space/docker-volumes/orion-visor-service/root-orion/logs/orion-visor/app.log
+# 容器内
+tail -f -n 200 /root/orion/logs/orion-visor/app.log
+# 滚动日志 .../logs/orion-visor/rolling/*
+```
+
+### 数据误删除怎么办?
 
 数据库的数据都采用了逻辑删除, 可以将已删除的数据中的 `deleted` 字段改为 `0`   
 如果不知道数据是哪一条, 可以查询用户操作日志, 点击 `参数` 寻找操作的id
 
-> ##### 2. 执行命令时为什么会找不到环境变量?
+### 执行命令时为什么会找不到环境变量?
 
 可以在执行命令的第一行设置 `source /etc/profile` 来加载环境变量
 
-> ##### 3. 命令中途执行失败如何设置中断执行?
+### 命令中途执行失败如何设置中断执行?
 
 可以在执行命令的第一行设置 `set -e`  
 作用是: 当执行出现意料之外的情况时, 立即退出
 
-> ##### 4. 在调度任务、批量执行 命令执行成功的依据是什么?
+### 在调度任务、批量执行 命令执行成功的依据是什么?
 
 是获取命令的 `exitcode` 判断是否为 `0` 如果非0则代表命令执行失败  
 同理, 在命令的最后一行设置 `exit 1` 结果将会是失败, 可以用此来中断后续流程
 
-> ##### 5. 调度任务、批量执行 的日志文件中如何只保存原始输出?
+### 调度任务、批量执行 的日志文件中如何只保存原始输出?
 
 修改 `application.yaml` `app.exec-log.append-ansi` 为 `false`
 
-> ##### 6. 为什么使用密钥认证还是无法连接机器?
+### SFTP 为什么有些文件无法编辑?
+
+只有普通文件可以在线编辑, 也就是 attr 为 `-` 开头的文件, 且文件大小不超过 `2MB` (默认)  
+修改 `.env.production` `VITE_SFTP_PREVIEW_MB` 改为一个合适的大小(MB) 重新构建
+
+### 为什么使用密钥认证还是无法连接机器?
 
 ```
 # 升级 openssh
@@ -41,9 +56,3 @@ AuthorizedKeysFile .ssh/authorized_keys
 # 重启 sshd 服务
 service sshd restart
 ```
-
-<br/>
-
-⚡ 详细使用请参考操作手册~
-
-<br/>

docs/quickstart/install.md

@@ -1,18 +1,18 @@
 ### 所需环境
 
-* JDK 1.8
+* jdk 1.8
-* Mysql 8.0(+)
+* mysql 8.0.+
-* Redis 5.0.5(+)
+* redis 6.0.+
-* Node 16.16.0(+)
+* maven 3.5.+
-* Maven 3.5.4(+)
+* node 18.12.+
-* Nginx
+* pnpm 9.1.+
+* nginx
 
 ⚡ maven 推荐使用阿里云 mirror   
-⚡ npm 建议使用淘宝镜像 `npm config set registry https://registry.npmmirror.com/`
+⚡ npm 建议使用淘宝镜像 `npm config set registry https://registry.npmmirror.com/`  
+⚡ pnpm 建议使用淘宝镜像 `pnpm config set registry https://registry.npmmirror.com/`
 
-### 构建
+### 拉取代码
-
-1. 拉取代码
 
 ```
 # github
@@ -21,7 +21,7 @@ git clone https://github.com/lijiahangmax/orion-visor
 git clone https://gitee.com/lijiahangmax/orion-visor
 ```
 
-2. 初始化数据库
+### 初始化数据库
 
 ```
 # 执行脚本
@@ -31,7 +31,7 @@ orion-visor/sql/init-3-schema-quartz.sql
 orion-visor/sql/init-4-data.sql
 ```
 
-3. 构建后端代码
+### 构建后端代码
 
 ```
 # 修改配置文件 (mysql, redis, secret-key)
@@ -43,7 +43,7 @@ cd orion-visor
 mvn -U clean install -DskipTests
 ```   
 
-4. 构建前端代码
+### 构建前端代码
 
 ```
 # 进入代码目录
@@ -120,7 +120,7 @@ server {
 
 ```
 复制 orion-visor/orion-visor-ui/dist 到 /usr/share/nginx/html
-复制 orion-visor/orion-visor-launch/target/orion-visor-launch.jar 到 /data/orion
+复制 orion-visor/orion-visor-launch/target/orion-visor-launch.jar 到 /data/orion-visor-space
 # 启动后台服务
 nohup java -jar orion-visor-launch.jar --spring.profiles.active=prod 2>&1 &
 # 启动 nginx

docs/update/v1.0.0.md

@@ -1,6 +1,6 @@
-## v1.0.0
+### v1.0.0
 
-> sql 脚本 - DML
+### sql 脚本 - DML
 
 ```sql
 -- 字典配置项

docs/update/v1.0.1.md

@@ -1,13 +1,13 @@
-## v1.0.1
+### v1.0.1
 
-> sql 脚本 - DDL
+### sql 脚本 - DDL
 
 ```sql
 DROP TABLE IF EXISTS `command_template`;
 ALTER TABLE `operator_log` ADD INDEX `idx_type`(`type`);
 ```
 
-> sql 脚本 - DML
+### sql 脚本 - DML
 
 ```sql
 -- 菜单配置

docs/update/v1.0.2.md

@@ -1,6 +1,6 @@
-## v1.0.2
+### v1.0.2
 
-> sql 脚本 - DDL
+### sql 脚本 - DDL
 
 ```sql
 ALTER TABLE `host_connect_log` 
@@ -83,7 +83,7 @@ CREATE TABLE `exec_template`
   ROW_FORMAT = Dynamic;
 ```
 
-> sql 脚本 - DML
+### sql 脚本 - DML
 
 ```sql
 -- 菜单配置

docs/update/v1.0.3.md

@@ -1,6 +1,6 @@
-## v1.0.3
+### v1.0.3
 
-> sql 脚本 - DML
+### sql 脚本 - DML
 
 ```sql
 DELETE FROM preference WHERE type = 'TERMINAL';

docs/update/v1.0.4.md

@@ -1,6 +1,6 @@
-## v1.0.4
+### v1.0.4
 
-> sql 脚本 - DDL
+### sql 脚本 - DDL
 
 ```sql
 -- 修改字段
@@ -260,7 +260,7 @@ CREATE TABLE `QRTZ_SCHEDULER_STATE`
   ROW_FORMAT = Dynamic;
 ```
 
-> sql 脚本 - DML
+### sql 脚本 - DML
 
 ```sql
 -- 操作日志修改

docs/update/v1.0.5.md

@@ -1,6 +1,6 @@
-## v1.0.5
+### v1.0.5
 
-> sql 脚本 - DDL
+### sql 脚本 - DDL
 
 ```sql
 ALTER TABLE `system_user` 
@@ -22,7 +22,7 @@ ALTER TABLE `exec_host_log`
 ADD COLUMN `script_path` varchar(512) NULL COMMENT '脚本路径' AFTER `log_path`;
 ```
 
-> sql 脚本 - DML
+### sql 脚本 - DML
 
 ```sql
 -- 初始化主机身份类型

docs/update/v1.0.6.md

@@ -1,6 +1,6 @@
-## v1.0.6
+### v1.0.6
 
-> sql 脚本 - DDL
+### sql 脚本 - DDL
 
 ```sql
 -- 数据分组添加 userId
@@ -58,10 +58,9 @@ CREATE TABLE `path_bookmark`
   CHARACTER SET = utf8mb4
   COLLATE = utf8mb4_general_ci COMMENT = '路径书签'
   ROW_FORMAT = Dynamic;
-
 ```
 
-> sql 脚本 - DML
+### sql 脚本 - DML
 
 ```sql
 -- 设置数据分组 user_id
@@ -88,7 +87,7 @@ INSERT INTO `dict_value` VALUES (274, 39, 'pathBookmarkType', 'FILE', '文件',
 INSERT INTO `dict_value` VALUES (275, 39, 'pathBookmarkType', 'DIR', '文件夹', '{}', 20, '2024-04-24 13:43:39', '2024-04-24 13:43:39', '1', '1', 0);
 ```
 
-> sql 脚本 - 命令分组初始化
+### sql 脚本 - 命令分组初始化
 
 ```sql
 -- 插入命令片段分组

docs/update/v1.0.7.md

@@ -1,6 +1,6 @@
-## v1.0.7
+### v1.0.7
 
-> sql 脚本 - DDL
+### sql 脚本 - DDL
 
 ```sql
 ALTER TABLE `data_permission` COMMENT = '数据权限表';
@@ -57,7 +57,7 @@ CREATE TABLE `upload_task_file`
   ROW_FORMAT = Dynamic;
 ```
 
-> sql 脚本 - DML
+### sql 脚本 - DML
 
 ```sql
 -- 字典项

docs/update/v1.0.8.md

@@ -1,6 +1,6 @@
-## v1.0.8
+### v1.0.8
 
-> sql 脚本 - DDL
+### sql 脚本 - DDL
 
 ```sql
 -- 修改字段名称
@@ -32,7 +32,7 @@ CREATE TABLE `system_message`
   ROW_FORMAT = Dynamic;
 ```
 
-> sql 脚本 - DML
+### sql 脚本 - DML
 
 ```sql
 -- 菜单

docs/update/v2.0.0.md

@@ -1,22 +1,20 @@
-## v2.0.0
+### v2.0.0
 
 ### ⚡ **本次升级提示 本次更新较大 请仔细查阅** ⚡
 
-##### 本次升级思路:
-
 * 先执行以下 **`7`** 个脚本
 * 容器下线 `docker compose down`
 * 删除原代码目录 `rm -rf orion-ops-pro`
 * 克隆改名后的项目 `git clone https://github.com/lijiahangmax/orion-visor.git` or `gitee`
 * 启动容器 `docker compose up -d`
 
-```readme
+```text
 sql 在 adminer/navicat 中执行, bash 脚本直接修改后粘贴执行 不要保存为文件执行否则会出错
 本次升级包含数据库重命名操作。#3 创建新数据库, #4 进行数据迁移, #5 删除旧数据库。
 [不推荐] 如果不想重命名可以修改 docker-compose.yml, 将 MYSQL_DATABASE 改为 orion-ops-pro 并且跳过步骤 #3 #4 #5 
 ```
 
-> #1 sql 脚本 - DDL
+### 1. sql 脚本 - DDL
 
 ```sql
 -- 修改默认值
@@ -29,7 +27,7 @@ MODIFY COLUMN `key_id` bigint(0) NULL DEFAULT NULL COMMENT '密钥id' AFTER `pas
 ALTER TABLE `host_key` COMMENT = '主机密钥';
 ```
 
-> #2 sql 脚本 - DML
+### 2. sql 脚本 - DML
 
 ```sql
 -- 删除 quartz 配置
@@ -70,14 +68,14 @@ INSERT INTO `dict_value` VALUES (174, 26, 'hostExtraSshAuthType', 'CUSTOM_KEY',
 INSERT INTO `dict_value` VALUES (271, 37, 'hostIdentityType', 'KEY', '密钥', '{\"color\": \"arcoblue\"}', 20, '2024-04-16 17:18:12', '2024-05-17 12:49:16', '2', '2', 0);
 ```
 
-> #3 sql 脚本 - 创建数据库 orion_visor
+### 3. sql 脚本 - 创建数据库 orion_visor
 
 ```sql
 -- 创建数据库
 CREATE DATABASE IF NOT EXISTS `orion_visor` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;
 ```
 
-> #4 bash 脚本 - 数据迁移
+### 4. bash 脚本 - 数据迁移
 
 ```bash
 # 可以使用 navicat 的数据迁移功能, 下面描述的是 bash 中执行, 注意下面的变量替换
@@ -97,14 +95,14 @@ rm -f /tmp/orion-ops-pro_dump.sql
 exit
 ```
 
-> #5 sql 脚本 - 删除数据库
+### 5. sql 脚本 - 删除数据库
 
 ```sql
 -- 删除数据库
 DROP DATABASE `orion-ops-pro`;
 ```
 
-> #6 bash 脚本 - 修改 nginx 配置
+### 6. bash 脚本 - 修改 nginx 配置
 
 ```bash
 pro_container_id=41dfd6aff736;
@@ -118,7 +116,7 @@ nginx -s reload
 exit
 ```
 
-> #7 bash 脚本 - 工作空间迁移
+### 7. bash 脚本 - 工作空间迁移
 
 ```bash
 # 迁移工作空间

docs/update/v2.0.1.md

@@ -1,11 +0,0 @@
-## v2.0.1
-
-> sql 脚本 - DDL
-
-```sql
-```
-
-> sql 脚本 - DML
-
-```sql
-```

docs/update/v2.0.2.md

@@ -1,11 +0,0 @@
-## v2.0.2
-
-> sql 脚本 - DDL
-
-```sql
-```
-
-> sql 脚本 - DML
-
-```sql
-```

docs/update/v2.0.x.md

@@ -0,0 +1,11 @@
+### v2.0.x
+
+### sql 脚本 - DDL
+
+```sql
+```
+
+### sql 脚本 - DML
+
+```sql
+```

orion-visor-dependencies/pom.xml

@@ -14,11 +14,11 @@
     <url>https://github.com/lijiahangmax/orion-visor</url>
 
     <properties>
-        <revision>2.0.0</revision>
+        <revision>2.0.7</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.revision>1.0.7</orion.kit.revision>
+        <orion.kit.version>1.0.7</orion.kit.version>
         <aspectj.version>1.9.7</aspectj.version>
         <lombok.version>1.18.26</lombok.version>
         <springdoc.version>1.6.15</springdoc.version>
@@ -50,7 +50,7 @@
             <dependency>
                 <groupId>io.github.lijiahangmax</groupId>
                 <artifactId>orion-all</artifactId>
-                <version>${orion.kit.revision}</version>
+                <version>${orion.kit.version}</version>
                 <exclusions>
                     <exclusion>
                         <artifactId>orion-log</artifactId>

orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/annotation/Keep.java

@@ -0,0 +1,17 @@
+package com.orion.visor.framework.common.annotation;
+
+import java.lang.annotation.*;
+
+/**
+ * 保留
+ *
+ * @author Jiahang Li
+ * @version 1.0.0
+ * @since 2024/6/6 15:26
+ */
+@Target({ElementType.TYPE, ElementType.FIELD, ElementType.METHOD})
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+public @interface Keep {
+
+}

orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/constant/AppConst.java

@@ -14,7 +14,7 @@ public interface AppConst extends OrionConst {
     /**
      * 同 ${orion.version} 迭代时候需要手动更改
      */
-    String VERSION = "2.0.0";
+    String VERSION = "2.0.7";
 
     String ORION_VISOR = "orion-visor";
 

orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/constant/BeanOrderConst.java

@@ -0,0 +1,32 @@
+package com.orion.visor.framework.common.constant;
+
+/**
+ * bean 排序常量
+ *
+ * @author Jiahang Li
+ * @version 1.0.0
+ * @since 2023/6/29 16:09
+ */
+public interface BeanOrderConst {
+
+    /**
+     * 公共返回值包装处理器
+     */
+    int RESPONSE_ADVICE_WRAPPER = Integer.MIN_VALUE + 1000;
+
+    /**
+     * 演示模式切面
+     */
+    int DEMO_DISABLE_API_ASPECT = Integer.MIN_VALUE + 10;
+
+    /**
+     * 全局日志打印
+     */
+    int LOG_PRINT_ASPECT = Integer.MIN_VALUE + 20;
+
+    /**
+     * 操作日志切面
+     */
+    int OPERATOR_LOG_ASPECT = Integer.MIN_VALUE + 30;
+
+}

orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/constant/Const.java

@@ -25,8 +25,6 @@ public interface Const extends com.orion.lang.constant.Const, FieldConst, CnCons
 
     Integer DEFAULT_SORT = 10;
 
-    int LOGIN_HISTORY_COUNT = 30;
-
     Long NONE_ID = -1L;
 
     Integer DEFAULT_VERSION = 1;

orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/constant/ErrorCode.java

@@ -86,6 +86,8 @@ public enum ErrorCode implements CodeInfo {
 
     UNSUPPOETED(915, "不支持此操作"),
 
+    DEMO_DISABLE_API(916, "演示模式不支持此功能"),
+
     ;
 
     ErrorCode(int code, String message) {

orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/constant/ErrorMessage.java

@@ -97,4 +97,6 @@ public interface ErrorMessage {
 
     String PLEASE_CHECK_HOST_SSH = "请检查主机 {} 是否存在/权限/SSH配置";
 
+    String CLIENT_ABORT = "手动中断";
+
 }

orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/constant/InterceptorOrderConst.java

@@ -1,14 +0,0 @@
-package com.orion.visor.framework.common.constant;
-
-/**
- * 拦截器排序常量
- *
- * @author Jiahang Li
- * @version 1.0.0
- * @since 2023/6/16 18:15
- */
-public interface InterceptorOrderConst {
-
-    int LOG_FILTER = Integer.MIN_VALUE;
-
-}

orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/constant/ResponseAdviceOrderConst.java

@@ -1,14 +0,0 @@
-package com.orion.visor.framework.common.constant;
-
-/**
- * 结果增强器 排序常量
- *
- * @author Jiahang Li
- * @version 1.0.0
- * @since 2023/6/29 16:09
- */
-public interface ResponseAdviceOrderConst {
-
-    int WRAPPER = Integer.MIN_VALUE + 1000;
-
-}

orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/enums/MovePosition.java

@@ -14,13 +14,19 @@ import lombok.Getter;
 @AllArgsConstructor
 public enum MovePosition {
 
-    // 拖拽到目标元素上
+    /**
+     * 拖拽到目标元素上
+     */
     TOP(-1),
 
-    // 拖拽到目标元素中
+    /**
+     * 拖拽到目标元素中
+     */
     IN(0),
 
-    // 拖拽到目标元素下
+    /**
+     * 拖拽到目标元素下
+     */
     BOTTOM(1),
 
     ;

orion-visor-framework/orion-visor-spring-boot-starter-banner/src/main/java/com/orion/visor/framework/banner/core/runner/BannerApplicationRunner.java

@@ -36,24 +36,47 @@ public class BannerApplicationRunner implements ApplicationRunner {
     @Value("${management.endpoints.web.base-path:''}")
     private String managementEndpoints;
 
+    @Value("${springdoc.api-docs.enabled}")
+    private Boolean apiDocsEnabled;
+
+    @Value("${spring.datasource.druid.stat-view-servlet.enabled}")
+    private Boolean druidConsoleEnabled;
+
+    @Value("#{'${management.endpoints.web.exposure.include}' != 'shutdown'}")
+    private Boolean springBootActuatorEnabled;
+
+    @Value("${spring.boot.admin.client.enabled}")
+    private Boolean springBootAdminClientEnabled;
+
     @Override
     public void run(ApplicationArguments args) {
-        String line = AnsiAppender.create()
+        AnsiAppender appender = AnsiAppender.create()
-                .append(AnsiForeground.BRIGHT_GREEN, ":: orion-visor-launch v" + version + " 服务已启动(" + env + ") ::\n")
+                .append(AnsiForeground.BRIGHT_GREEN, ":: orion-visor-launch v" + version + " 服务已启动(" + env + ") ::\n");
-                .append(AnsiForeground.BRIGHT_GREEN, ":: swagger 文档       ")
+        // swagger 地址
-                .append(AnsiForeground.BRIGHT_BLUE, "http://127.0.0.1:" + port + "/doc.html\n")
+        if (apiDocsEnabled) {
-                .append(AnsiForeground.BRIGHT_GREEN, ":: druid console     ")
+            appender.append(AnsiForeground.BRIGHT_GREEN, ":: swagger 文档       ")
-                .append(AnsiForeground.BRIGHT_BLUE, "http://127.0.0.1:" + port + "/druid/index.html\n")
+                    .append(AnsiForeground.BRIGHT_BLUE, "http://127.0.0.1:" + port + "/doc.html\n");
-                .append(AnsiForeground.BRIGHT_GREEN, ":: actuator endpoint ")
+        }
-                .append(AnsiForeground.BRIGHT_BLUE, "http://127.0.0.1:" + port + managementEndpoints + "\n")
+        // druid 控制台
-                .append(AnsiForeground.BRIGHT_GREEN, ":: admin console     ")
+        if (druidConsoleEnabled) {
-                .append(AnsiForeground.BRIGHT_BLUE, "http://127.0.0.1:" + port + adminSeverContextPath + "\n")
+            appender.append(AnsiForeground.BRIGHT_GREEN, ":: druid console     ")
-                .append(AnsiForeground.BRIGHT_GREEN, ":: server 健康检测    ")
+                    .append(AnsiForeground.BRIGHT_BLUE, "http://127.0.0.1:" + port + "/druid/index.html\n");
-                .append(AnsiForeground.BRIGHT_BLUE, "curl -X GET --location \"http://127.0.0.1:" + port + apiPrefix + "/server/bootstrap/health\"")
+        }
-                .toString();
+        // admin actuator 端点
+        if (springBootActuatorEnabled) {
+            appender.append(AnsiForeground.BRIGHT_GREEN, ":: actuator endpoint ")
+                    .append(AnsiForeground.BRIGHT_BLUE, "http://127.0.0.1:" + port + managementEndpoints + "\n");
+        }
+        // admin server 控制台
+        if (springBootAdminClientEnabled) {
+            appender.append(AnsiForeground.BRIGHT_GREEN, ":: admin console     ")
+                    .append(AnsiForeground.BRIGHT_BLUE, "http://127.0.0.1:" + port + adminSeverContextPath + "\n");
+        }
+        appender.append(AnsiForeground.BRIGHT_GREEN, ":: server 健康检测    ")
+                .append(AnsiForeground.BRIGHT_BLUE, "curl -X GET --location \"http://127.0.0.1:" + port + apiPrefix + "/server/bootstrap/health\"");
         Threads.start(() -> {
             Threads.sleep(1000L);
-            System.out.println(line);
+            System.out.println(appender);
         });
     }
 

orion-visor-framework/orion-visor-spring-boot-starter-banner/src/main/resources/banner.txt

@@ -8,4 +8,5 @@ ${AnsiColor.BRIGHT_GREEN}:: Application Name     ${AnsiColor.BLUE}${spring.appli
 ${AnsiColor.BRIGHT_GREEN}:: Application Version  ${AnsiColor.BLUE}${orion.version}
 ${AnsiColor.BRIGHT_GREEN}:: SpringBoot Version   ${AnsiColor.BLUE}${spring-boot.version}
 ${AnsiColor.BRIGHT_GREEN}:: Active Profile       ${AnsiColor.BLUE}${spring.profiles.active}
+${AnsiColor.BRIGHT_GREEN}:: Demo Mode            ${AnsiColor.BLUE}${orion.demo}
 ${AnsiColor.DEFAULT}

orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/java/com/orion/visor/framework/biz/operator/log/configuration/OrionOperatorLogAutoConfiguration.java

@@ -72,7 +72,7 @@ public class OrionOperatorLogAutoConfiguration {
         OperatorLogs.setSerializeFilters(serializeFilters);
         OperatorLogFiller.setSerializeFilters(serializeFilters);
         OperatorLogFiller.setOperatorLogConfig(operatorLogConfig);
-        return new OperatorLogAspect(operatorLogConfig, service, serializeFilters);
+        return new OperatorLogAspect(service);
     }
 
 }

orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/java/com/orion/visor/framework/biz/operator/log/core/aspect/OperatorLogAspect.java

@@ -1,10 +1,8 @@
 package com.orion.visor.framework.biz.operator.log.core.aspect;
 
-import com.alibaba.fastjson.serializer.SerializeFilter;
 import com.orion.lang.define.thread.ExecutorBuilder;
 import com.orion.lang.utils.Arrays1;
 import com.orion.lang.utils.Strings;
-import com.orion.visor.framework.biz.operator.log.configuration.config.OperatorLogConfig;
 import com.orion.visor.framework.biz.operator.log.core.annotation.IgnoreParameter;
 import com.orion.visor.framework.biz.operator.log.core.annotation.OperatorLog;
 import com.orion.visor.framework.biz.operator.log.core.factory.OperatorTypeHolder;
@@ -13,6 +11,7 @@ import com.orion.visor.framework.biz.operator.log.core.model.OperatorType;
 import com.orion.visor.framework.biz.operator.log.core.service.OperatorLogFrameworkService;
 import com.orion.visor.framework.biz.operator.log.core.utils.OperatorLogFiller;
 import com.orion.visor.framework.biz.operator.log.core.utils.OperatorLogs;
+import com.orion.visor.framework.common.constant.BeanOrderConst;
 import com.orion.visor.framework.common.security.LoginUser;
 import com.orion.visor.framework.common.security.SecurityHolder;
 import lombok.extern.slf4j.Slf4j;
@@ -20,6 +19,7 @@ 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.springframework.core.annotation.Order;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestHeader;
@@ -43,6 +43,7 @@ import java.util.concurrent.ExecutorService;
  */
 @Aspect
 @Slf4j
+@Order(BeanOrderConst.OPERATOR_LOG_ASPECT)
 public class OperatorLogAspect {
 
     private static final ExecutorService LOG_SAVER = ExecutorBuilder.create()
@@ -53,21 +54,13 @@ public class OperatorLogAspect {
             .useLinkedBlockingQueue()
             .build();
 
-    private final OperatorLogConfig operatorLogConfig;
-
     private final OperatorLogFrameworkService operatorLogFrameworkService;
 
-    private final SerializeFilter[] serializeFilters;
-
     @Resource
     private SecurityHolder securityHolder;
 
-    public OperatorLogAspect(OperatorLogConfig operatorLogConfig,
+    public OperatorLogAspect(OperatorLogFrameworkService operatorLogFrameworkService) {
-                             OperatorLogFrameworkService operatorLogFrameworkService,
-                             SerializeFilter[] serializeFilters) {
-        this.operatorLogConfig = operatorLogConfig;
         this.operatorLogFrameworkService = operatorLogFrameworkService;
-        this.serializeFilters = serializeFilters;
     }
 
     @Around("@annotation(o)")

orion-visor-framework/orion-visor-spring-boot-starter-log/src/main/java/com/orion/visor/framework/log/configuration/OrionLogPrinterConfiguration.java

@@ -1,7 +1,7 @@
 package com.orion.visor.framework.log.configuration;
 
 import com.orion.visor.framework.common.constant.AutoConfigureOrderConst;
-import com.orion.visor.framework.common.constant.InterceptorOrderConst;
+import com.orion.visor.framework.common.constant.BeanOrderConst;
 import com.orion.visor.framework.log.configuration.config.LogPrinterConfig;
 import com.orion.visor.framework.log.core.interceptor.LogPrinterInterceptor;
 import com.orion.visor.framework.log.core.interceptor.PrettyLogPrinterInterceptor;
@@ -59,7 +59,7 @@ public class OrionLogPrinterConfiguration {
         AspectJExpressionPointcutAdvisor advisor = new AspectJExpressionPointcutAdvisor();
         advisor.setExpression(config.getExpression());
         advisor.setAdvice(logPrinterInterceptor);
-        advisor.setOrder(InterceptorOrderConst.LOG_FILTER);
+        advisor.setOrder(BeanOrderConst.LOG_PRINT_ASPECT);
         return advisor;
     }
 

orion-visor-framework/orion-visor-spring-boot-starter-log/src/main/java/com/orion/visor/framework/log/core/interceptor/PrettyLogPrinterInterceptor.java

@@ -72,9 +72,9 @@ public class PrettyLogPrinterInterceptor extends AbstractLogPrinterInterceptor {
         }
         Method method = invocation.getMethod();
         // 方法签名
-        requestLog.append("\tmethodSign: ").append(method.getDeclaringClass().getName()).append('#')
+        // requestLog.append("\tmethodSign: ").append(method.getDeclaringClass().getName()).append('#')
-                .append(method.getName()).append("\n");
+        //         .append(method.getName()).append("\n");
-        // 参数
+        // 方法参数
         requestLog.append("\tparameter: ").append(this.requestToString(method, invocation.getArguments()));
         log.info(requestLog.toString());
     }

orion-visor-framework/orion-visor-spring-boot-starter-log/src/main/java/com/orion/visor/framework/log/core/interceptor/RowLogPrinterInterceptor.java

@@ -73,8 +73,8 @@ public class RowLogPrinterInterceptor extends AbstractLogPrinterInterceptor impl
         }
         Method method = invocation.getMethod();
         // 方法签名
-        fields.put(METHOD_SIGN, method.getDeclaringClass().getName() + "#" + method.getName());
+        // fields.put(METHOD_SIGN, method.getDeclaringClass().getName() + "#" + method.getName());
-        // 参数
+        // 方法参数
         fields.put(PARAMETER, this.requestToString(method, invocation.getArguments()));
         log.info("api请求-开始 {}", JSON.toJSONString(fields));
         fields.clear();

orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/com/orion/visor/framework/mybatis/core/generator/core/CustomFileFilter.java

@@ -62,10 +62,6 @@ public class CustomFileFilter {
         if (!table.isEnableCache()) {
             files.removeIf(file -> isServerCacheFile(file.getTemplatePath()));
         }
-        // 不生成导出文件
-        if (!table.isEnableExport()) {
-            files.removeIf(file -> isExportFile(file.getTemplatePath()));
-        }
         // 不生成操作日志文件
         if (!table.isEnableOperatorLog()) {
             files.removeIf(file -> isOperatorLogFile(file.getTemplatePath()));

orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/com/orion/visor/framework/mybatis/core/generator/template/ServerTemplate.java

@@ -27,6 +27,7 @@ public class ServerTemplate extends Template {
         table.bizPackage = bizPackage;
         table.enableUnitTest = true;
         table.enableOperatorLog = true;
+        table.enableDemoApi = true;
     }
 
     /**
@@ -72,16 +73,6 @@ public class ServerTemplate extends Template {
         return this;
     }
 
-    // /**
-    //  * 生成导出
-    //  *
-    //  * @return this
-    //  */
-    // public ServerTemplate enableExport() {
-    //     table.enableExport = true;
-    //     return this;
-    // }
-
     /**
      * 不生成单元测试
      *
@@ -102,6 +93,16 @@ public class ServerTemplate extends Template {
         return this;
     }
 
+    /**
+     * 是否生成演示模式 api 注解
+     *
+     * @return this
+     */
+    public ServerTemplate disableDemoApi() {
+        table.enableDemoApi = false;
+        return this;
+    }
+
     /**
      * 设置 cache
      *

orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/com/orion/visor/framework/mybatis/core/generator/template/Table.java

@@ -43,11 +43,6 @@ public class Table {
      */
     protected boolean enableUnitTest;
 
-    /**
-     * 是否生成导出
-     */
-    protected boolean enableExport;
-
     /**
      * 是否可缓存
      */
@@ -58,6 +53,11 @@ public class Table {
      */
     protected boolean enableOperatorLog;
 
+    /**
+     * 是否生成演示模式 api 注解
+     */
+    protected boolean enableDemoApi;
+
     /**
      * 缓存的 key
      */

orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/com/orion/visor/framework/mybatis/core/generator/template/VueTemplate.java

@@ -17,6 +17,7 @@ public class VueTemplate extends Template {
     public VueTemplate(Table table, String module, String feature) {
         super(table);
         table.enableVue = true;
+        table.enableRowSelection = true;
         table.module = module;
         table.feature = feature;
     }
@@ -54,12 +55,12 @@ public class VueTemplate extends Template {
     }
 
     /**
-     * 列表可多选
+     * 关闭列表可多选
      *
      * @return this
      */
-    public VueTemplate enableRowSelection() {
+    public VueTemplate disableRowSelection() {
-        table.enableRowSelection = true;
+        table.enableRowSelection = false;
         return this;
     }
 

orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-module-controller.http.vm

@@ -68,19 +68,5 @@ Authorization: {{token}}
 ${httpComment} ${apiComment.batchDelete}
 DELETE {{baseUrl}}/${package.ModuleName}/${typeHyphen}/batch-delete?idList=1,2,3
 Authorization: {{token}}
-#if($meta.enableExport)
-
-
-${httpComment} ${apiComment.export}
-POST {{baseUrl}}/${package.ModuleName}/${typeHyphen}/export
-Content-Type: application/json
-Authorization: {{token}}
-
-{
-  #foreach($field in ${table.fields})
-  "${field.propertyName}": ""#if($foreach.hasNext),#end
-  #end
-}
-#end
 
 ${httpComment}

orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-module-controller.java.vm

@@ -6,6 +6,9 @@ import com.orion.visor.framework.biz.operator.log.core.annotation.OperatorLog;
 #end
 import com.orion.visor.framework.common.validator.group.Page;
 import com.orion.visor.framework.log.core.annotation.IgnoreLog;
+#if($meta.enableDemoApi)
+import com.orion.visor.framework.web.core.annotation.DemoDisableApi;
+#end
 import com.orion.visor.framework.log.core.enums.IgnoreLogMode;
 import com.orion.visor.framework.web.core.annotation.RestWrapper;
 import ${package.Service}.*;
@@ -51,6 +54,9 @@ public class ${table.controllerName} {
     @Resource
     private ${type}Service ${typeLower}Service;
 
+    #if($meta.enableDemoApi)
+    @DemoDisableApi
+    #end
     #if($meta.enableOperatorLog)
     @OperatorLog(${type}OperatorType.CREATE)
     #end
@@ -61,6 +67,9 @@ public class ${table.controllerName} {
         return ${typeLower}Service.create${type}(request);
     }
 
+    #if($meta.enableDemoApi)
+    @DemoDisableApi
+    #end
     #if($meta.enableOperatorLog)
     @OperatorLog(${type}OperatorType.UPDATE)
     #end
@@ -105,6 +114,9 @@ public class ${table.controllerName} {
         return ${typeLower}Service.get${type}Page(request);
     }
 
+    #if($meta.enableDemoApi)
+    @DemoDisableApi
+    #end
     #if($meta.enableOperatorLog)
     @OperatorLog(${type}OperatorType.DELETE)
     #end
@@ -116,6 +128,9 @@ public class ${table.controllerName} {
         return ${typeLower}Service.delete${type}ById(id);
     }
 
+    #if($meta.enableDemoApi)
+    @DemoDisableApi
+    #end
     #if($meta.enableOperatorLog)
     @OperatorLog(${type}OperatorType.DELETE)
     #end
@@ -126,19 +141,6 @@ public class ${table.controllerName} {
     public Integer batchDelete${type}(@RequestParam("idList") List<Long> idList) {
         return ${typeLower}Service.delete${type}ByIdList(idList);
     }
-    #if($meta.enableExport)
-
-    #if($meta.enableOperatorLog)
-    @OperatorLog(${type}OperatorType.EXPORT)
-    #end
-    @PostMapping("/export")
-    @Operation(summary = "${apiComment.export}")
-    @PreAuthorize("@ss.hasPermission('${package.ModuleName}:${typeHyphen}:export')")
-    public void export${type}(@Validated @RequestBody ${type}QueryRequest request,
-                              HttpServletResponse response) throws IOException {
-        ${typeLower}Service.export${type}(request, response);
-    }
-    #end
 
 }
 

orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-module-convert.java.vm

@@ -28,10 +28,6 @@ public interface ${type}Convert {
     ${type}DO to(${type}QueryRequest request);
 
     ${type}VO to(${type}DO domain);
-    #if($meta.enableExport)
-
-    ${type}Export toExport(${type}DO domain);
-    #end
 
     List<${type}VO> to(List<${type}DO> list);
 

orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-module-operator-key-define.java.vm

@@ -21,10 +21,6 @@ public class ${type}OperatorType extends InitializingOperatorTypes {
     public static final String UPDATE = "${typeHyphen}:update";
 
     public static final String DELETE = "${typeHyphen}:delete";
-    #if($meta.enableExport)
-
-    public static final String EXPORT = "${typeHyphen}:export";
-    #end
 
     @Override
     public OperatorType[] types() {
@@ -32,9 +28,6 @@ public class ${type}OperatorType extends InitializingOperatorTypes {
                 new OperatorType(L, CREATE, "创建$!{table.comment}"),
                 new OperatorType(M, UPDATE, "更新$!{table.comment}"),
                 new OperatorType(H, DELETE, "删除$!{table.comment}"),
-                #if($meta.enableExport)
-                new OperatorType(M, EXPORT, "导出$!{table.comment}"),
-                #end
         };
     }
 

orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-module-service-impl.java.vm

@@ -5,13 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.orion.lang.define.wrapper.DataGrid;
 import com.orion.lang.utils.Strings;
 import com.orion.lang.utils.collect.Lists;
-#if($meta.enableExport)
-import com.orion.office.excel.writer.exporting.ExcelExport;
-#end
 import com.orion.visor.framework.common.constant.ErrorMessage;
-#if($meta.enableExport)
-import com.orion.visor.framework.common.utils.FileNames;
-#end
 import com.orion.visor.framework.common.utils.Valid;
 #if($meta.enableCache)
 import com.orion.visor.framework.redis.core.utils.RedisMaps;
@@ -23,18 +17,11 @@ import ${pkg}.*;
 import ${package.Entity}.${entity};
 import ${package.Mapper}.${table.mapperName};
 import ${package.Service}.${table.serviceName};
-#if($meta.enableExport)
-import com.orion.web.servlet.web.Servlets;
-#end
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
-#if($meta.enableExport)
-import javax.servlet.http.HttpServletResponse;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-#end
 import java.util.Comparator;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -54,6 +41,7 @@ public class ${table.serviceImplName} implements ${table.serviceName} {
     private ${type}DAO ${typeLower}DAO;
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Long create${type}(${type}CreateRequest request) {
         log.info("${type}Service-create${type} request: {}", JSON.toJSONString(request));
         // 转换
@@ -72,6 +60,7 @@ public class ${table.serviceImplName} implements ${table.serviceName} {
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Integer update${type}ById(${type}UpdateRequest request) {
         Long id = Valid.notNull(request.getId(), ErrorMessage.ID_MISSING);
         log.info("${type}Service-update${type}ById id: {}, request: {}", id, JSON.toJSONString(request));
@@ -93,6 +82,7 @@ public class ${table.serviceImplName} implements ${table.serviceName} {
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Integer update${type}(${type}QueryRequest query, ${type}UpdateRequest update) {
         log.info("${type}Service.update${type} query: {}, update: {}", JSON.toJSONString(query), JSON.toJSONString(update));
         // 条件
@@ -179,6 +169,7 @@ public class ${table.serviceImplName} implements ${table.serviceName} {
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Integer delete${type}ById(Long id) {
         log.info("${type}Service-delete${type}ById id: {}", id);
         // 检查数据是否存在
@@ -195,6 +186,7 @@ public class ${table.serviceImplName} implements ${table.serviceName} {
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Integer delete${type}ByIdList(List<Long> idList) {
         log.info("${type}Service-delete${type}ByIdList idList: {}", idList);
         int effect = ${typeLower}DAO.deleteBatchIds(idList);
@@ -207,6 +199,7 @@ public class ${table.serviceImplName} implements ${table.serviceName} {
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Integer delete${type}(${type}QueryRequest request) {
         log.info("${type}Service.delete${type} request: {}", JSON.toJSONString(request));
         // 条件
@@ -220,26 +213,6 @@ public class ${table.serviceImplName} implements ${table.serviceName} {
         #end
         return effect;
     }
-    #if($meta.enableExport)
-
-    @Override
-    public void export${type}(${type}QueryRequest request, HttpServletResponse response) throws IOException {
-        log.info("${type}Service.export${type} request: {}", JSON.toJSONString(request));
-        // 条件
-        LambdaQueryWrapper<${type}DO> wrapper = this.buildQueryWrapper(request);
-        // 查询
-        List<${type}Export> rows = ${typeLower}DAO.of(wrapper).list(${type}Convert.MAPPER::toExport);
-        log.info("${type}Service.export${type} size: {}", rows.size());
-        // 导出
-        ByteArrayOutputStream out = new ByteArrayOutputStream();
-        ExcelExport.create(${type}Export.class)
-                .addRows(rows)
-                .write(out)
-                .close();
-        // 传输
-        Servlets.transfer(response, out.toByteArray(), FileNames.exportName(${type}Export.TITLE));
-    }
-    #end
 
     /**
      * 检查对象是否存在

orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-module-service.java.vm

@@ -115,16 +115,5 @@ public interface ${table.serviceName} {
      * @return effect
      */
     Integer delete${type}(${type}QueryRequest request);
-    #if($meta.enableExport)
-
-    /**
-     * ${apiComment.export}
-     *
-     * @param request  request
-     * @param response response
-     * @throws IOException IOException
-     */
-    void export${type}(${type}QueryRequest request, HttpServletResponse response) throws IOException;
-    #end
 
 }

orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-sql-dict.sql.vm

@@ -14,12 +14,7 @@ VALUES
   (@MODULE_KEY_ID, 'operatorLogModule', '${package.ModuleName}:${typeHyphen}', '$!{table.comment}', '{}', @MODULE_KEY_MAX_SORT + 10, now(), now(), '1', '1', 0),
   (@TYPE_KEY_ID, 'operatorLogType', '${typeHyphen}:create', '创建$!{table.comment}', '{}', 10, now(), now(), '1', '1', 0),
   (@TYPE_KEY_ID, 'operatorLogType', '${typeHyphen}:update', '更新$!{table.comment}', '{}', 20, now(), now(), '1', '1', 0),
-  #if($meta.enableExport)
-  (@TYPE_KEY_ID, 'operatorLogType', '${typeHyphen}:delete', '删除$!{table.comment}', '{}', 30, now(), now(), '1', '1', 0),
-  (@TYPE_KEY_ID, 'operatorLogType', '${typeHyphen}:export', '导出$!{table.comment}', '{}', 40, now(), now(), '1', '1', 0);
-  #else
   (@TYPE_KEY_ID, 'operatorLogType', '${typeHyphen}:delete', '删除$!{table.comment}', '{}', 30, now(), now(), '1', '1', 0);
-  #end
 #end
 
 #if($dictMap.entrySet().size() > 0)

orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-vue-api.ts.vm

@@ -133,12 +133,4 @@ export function batchDelete${vue.featureEntity}(idList: Array<number>) {
     }
   });
 }
-#if($meta.enableExport)
 
-/**
- * $apiComment.export
- */
-export function export${vue.featureEntity}(request: ${vue.featureEntity}QueryRequest) {
-  return axios.post('/${package.ModuleName}/${typeHyphen}/export', request);
-}
-#end

orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-vue-views-components-form-drawer.vue.vm

@@ -8,7 +8,7 @@
             :cancel-button-props="{ disabled: loading }"
             :on-before-ok="handlerOk"
             @cancel="handleClose">
-    <a-spin class="full modal-form-small" :loading="loading">
+    <a-spin class="full drawer-form-small" :loading="loading">
       <a-form :model="formModel"
               ref="formRef"
               label-align="right"

orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-vue-views-components-table.vue.vm

@@ -79,12 +79,16 @@
       </div>
     </template>
     <!-- table -->
+    #if($vue.enableRowSelection)
+    <a-table v-model:selected-keys="selectedKeys"
+             row-key="id"
+    #else
     <a-table row-key="id"
+    #end
              ref="tableRef"
              :loading="loading"
              :columns="columns"
              #if($vue.enableRowSelection)
-             v-model:selected-keys="selectedKeys"
              :row-selection="rowSelection"
              #end
              :data="tableRenderData"

orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-vue-views-types-table.columns.ts.vm

@@ -6,7 +6,7 @@ const columns = [
     title: 'id',
     dataIndex: 'id',
     slotName: 'id',
-    width: 70,
+    width: 100,
     align: 'left',
     fixed: 'left',
   }, #foreach($field in ${table.fields})#if("$!field.propertyName" != "id"){

orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/java/com/orion/visor/framework/redis/configuration/OrionRedisAutoConfiguration.java

@@ -7,6 +7,7 @@ import com.orion.visor.framework.redis.configuration.config.RedissonConfig;
 import com.orion.visor.framework.redis.core.lock.RedisLocker;
 import com.orion.visor.framework.redis.core.utils.RedisUtils;
 import org.redisson.api.RedissonClient;
+import org.redisson.config.SingleServerConfig;
 import org.redisson.spring.starter.RedissonAutoConfigurationCustomizer;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.AutoConfigureOrder;
@@ -14,6 +15,7 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Lazy;
+import org.springframework.context.annotation.Primary;
 import org.springframework.data.redis.connection.RedisConnectionFactory;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.data.redis.serializer.RedisSerializer;
@@ -35,6 +37,7 @@ public class OrionRedisAutoConfiguration {
      * @param redisConnectionFactory factory
      * @return RedisTemplate
      */
+    @Primary
     @Bean
     public RedisTemplate<String, String> redisTemplate(RedisConnectionFactory redisConnectionFactory) {
         RedisTemplate<String, String> redisTemplate = new RedisTemplate<>();
@@ -58,6 +61,9 @@ public class OrionRedisAutoConfiguration {
         return config -> {
             config.setThreads(redissonConfig.getThreads());
             config.setNettyThreads(redissonConfig.getNettyThreads());
+            // 单机配置
+            SingleServerConfig single = config.useSingleServer();
+            single.setConnectionMinimumIdleSize(redissonConfig.getMinimumIdleSize());
         };
     }
 

orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/java/com/orion/visor/framework/redis/configuration/config/RedissonConfig.java

@@ -24,9 +24,15 @@ public class RedissonConfig {
      */
     private Integer nettyThreads;
 
+    /**
+     * 最小空闲连接数
+     */
+    private Integer minimumIdleSize;
+
     public RedissonConfig() {
         this.threads = 16;
         this.nettyThreads = 16;
+        this.minimumIdleSize = 16;
     }
 
 }

orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/resources/META-INF/spring-configuration-metadata.json

@@ -18,6 +18,12 @@
       "type": "java.lang.Integer",
       "description": "netty 线程数.",
       "defaultValue": "16"
+    },
+    {
+      "name": "spring.redisson.minimum-idle-size",
+      "type": "java.lang.Integer",
+      "description": "最小空闲连接数.",
+      "defaultValue": "16"
     }
   ]
 }

orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/com/orion/visor/framework/security/configuration/OrionSecurityAutoConfiguration.java

@@ -126,9 +126,11 @@ public class OrionSecurityAutoConfiguration {
     }
 
     /**
-     * @return security holder 代理用于内部 framework 调用
-     * <p>
      * - mybatis fill
+     * - operator log
+     * - log printer
+     *
+     * @return security holder 代理用于内部 framework 调用
      */
     @Bean
     public SecurityHolderDelegate securityHolder() {

orion-visor-framework/orion-visor-spring-boot-starter-swagger/src/main/java/com/orion/visor/framework/swagger/configuration/OrionSwaggerAutoConfiguration.java

@@ -23,7 +23,6 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Profile;
 import org.springframework.http.HttpHeaders;
 
 import java.util.HashMap;
@@ -38,10 +37,9 @@ import java.util.Optional;
  * @version 1.0.0
  * @since 2022/6/21 11:22
  */
-@Profile({"dev"})
 @ConditionalOnClass({OpenAPI.class})
 @EnableConfigurationProperties(SwaggerConfig.class)
-@ConditionalOnProperty(prefix = "springdoc.api-docs", name = "enabled", havingValue = "true", matchIfMissing = true)
+@ConditionalOnProperty(name = "springdoc.api-docs.enabled", havingValue = "true")
 @AutoConfiguration
 @AutoConfigureOrder(AutoConfigureOrderConst.FRAMEWORK_SWAGGER)
 public class OrionSwaggerAutoConfiguration {

orion-visor-framework/orion-visor-spring-boot-starter-web/src/main/java/com/orion/visor/framework/web/configuration/OrionWebAutoConfiguration.java

@@ -6,6 +6,7 @@ import com.orion.lang.utils.collect.Lists;
 import com.orion.visor.framework.common.constant.AutoConfigureOrderConst;
 import com.orion.visor.framework.common.constant.FilterOrderConst;
 import com.orion.visor.framework.common.web.filter.FilterCreator;
+import com.orion.visor.framework.web.core.aspect.DemoDisableApiAspect;
 import com.orion.visor.framework.web.core.filter.TraceIdFilter;
 import com.orion.visor.framework.web.core.handler.GlobalExceptionHandler;
 import com.orion.visor.framework.web.core.handler.WrapperResultHandler;
@@ -139,4 +140,13 @@ public class OrionWebAutoConfiguration implements WebMvcConfigurer {
         return FilterCreator.create(new TraceIdFilter(), FilterOrderConst.TRICE_ID_FILTER);
     }
 
+    /**
+     * @return 演示模式禁用 api 切面
+     */
+    @Bean
+    @ConditionalOnProperty(value = "orion.demo", havingValue = "true")
+    public DemoDisableApiAspect demoDisableApiAspect() {
+        return new DemoDisableApiAspect();
+    }
+
 }

orion-visor-framework/orion-visor-spring-boot-starter-web/src/main/java/com/orion/visor/framework/web/core/annotation/DemoDisableApi.java

@@ -0,0 +1,16 @@
+package com.orion.visor.framework.web.core.annotation;
+
+import java.lang.annotation.*;
+
+/**
+ * 演示模式禁用 api
+ *
+ * @author Jiahang Li
+ * @version 1.0.0
+ * @since 2024/5/21 16:44
+ */
+@Target({ElementType.METHOD})
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+public @interface DemoDisableApi {
+}

orion-visor-framework/orion-visor-spring-boot-starter-web/src/main/java/com/orion/visor/framework/web/core/aspect/DemoDisableApiAspect.java

@@ -0,0 +1,33 @@
+package com.orion.visor.framework.web.core.aspect;
+
+import com.orion.visor.framework.common.constant.BeanOrderConst;
+import com.orion.visor.framework.common.constant.ErrorCode;
+import com.orion.visor.framework.web.core.annotation.DemoDisableApi;
+import lombok.extern.slf4j.Slf4j;
+import org.aspectj.lang.annotation.Aspect;
+import org.aspectj.lang.annotation.Before;
+import org.aspectj.lang.annotation.Pointcut;
+import org.springframework.core.annotation.Order;
+
+/**
+ * 演示模式禁用 api 切面
+ *
+ * @author Jiahang Li
+ * @version 1.0.0
+ * @since 2024/5/21 16:52
+ */
+@Aspect
+@Slf4j
+@Order(BeanOrderConst.DEMO_DISABLE_API_ASPECT)
+public class DemoDisableApiAspect {
+
+    @Pointcut("@annotation(e)")
+    public void disableApi(DemoDisableApi e) {
+    }
+
+    @Before(value = "disableApi(e)", argNames = "e")
+    public void beforeDisableApi(DemoDisableApi e) {
+        throw ErrorCode.DEMO_DISABLE_API.exception();
+    }
+
+}

orion-visor-framework/orion-visor-spring-boot-starter-web/src/main/java/com/orion/visor/framework/web/core/handler/WrapperResultHandler.java

@@ -3,7 +3,7 @@ package com.orion.visor.framework.web.core.handler;
 import com.orion.lang.constant.StandardContentType;
 import com.orion.lang.define.wrapper.HttpWrapper;
 import com.orion.lang.define.wrapper.RpcWrapper;
-import com.orion.visor.framework.common.constant.ResponseAdviceOrderConst;
+import com.orion.visor.framework.common.constant.BeanOrderConst;
 import com.orion.visor.framework.web.core.annotation.IgnoreWrapper;
 import com.orion.visor.framework.web.core.annotation.RestWrapper;
 import org.jetbrains.annotations.NotNull;
@@ -23,7 +23,7 @@ import org.springframework.web.servlet.mvc.method.annotation.ResponseBodyAdvice;
  * @version 1.0.0
  * @since 2023/6/15 17:38
  */
-@Order(ResponseAdviceOrderConst.WRAPPER)
+@Order(BeanOrderConst.RESPONSE_ADVICE_WRAPPER)
 @ControllerAdvice
 public class WrapperResultHandler implements ResponseBodyAdvice<Object> {
 

orion-visor-framework/orion-visor-spring-boot-starter-web/src/main/resources/META-INF/spring-configuration-metadata.json

@@ -5,6 +5,12 @@
       "type": "java.lang.String",
       "description": "项目版本."
     },
+    {
+      "name": "orion.demo",
+      "type": "java.lang.Boolean",
+      "description": "是否为演示模式.",
+      "defaultValue": false
+    },
     {
       "name": "orion.api.prefix",
       "type": "java.lang.String",

orion-visor-framework/orion-visor-spring-boot-starter-websocket/src/main/java/com/orion/visor/framework/websocket/core/session/WebSocketSyncSession.java

@@ -0,0 +1,118 @@
+package com.orion.visor.framework.websocket.core.session;
+
+import org.springframework.http.HttpHeaders;
+import org.springframework.web.socket.CloseStatus;
+import org.springframework.web.socket.WebSocketExtension;
+import org.springframework.web.socket.WebSocketMessage;
+import org.springframework.web.socket.WebSocketSession;
+
+import java.io.IOException;
+import java.net.InetSocketAddress;
+import java.net.URI;
+import java.security.Principal;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * web socket 同步会话
+ *
+ * @author Jiahang Li
+ * @version 1.0.0
+ * @since 2024/5/20 10:12
+ */
+public class WebSocketSyncSession implements WebSocketSession {
+
+    private final WebSocketSession delegate;
+
+    public WebSocketSyncSession(WebSocketSession delegate) {
+        this.delegate = delegate;
+    }
+
+    @Override
+    public String getId() {
+        return this.delegate.getId();
+    }
+
+    @Override
+    public URI getUri() {
+        return this.delegate.getUri();
+    }
+
+    @Override
+    public HttpHeaders getHandshakeHeaders() {
+        return this.delegate.getHandshakeHeaders();
+    }
+
+    @Override
+    public Map<String, Object> getAttributes() {
+        return this.delegate.getAttributes();
+    }
+
+    @Override
+    public Principal getPrincipal() {
+        return this.delegate.getPrincipal();
+    }
+
+    @Override
+    public InetSocketAddress getLocalAddress() {
+        return this.delegate.getLocalAddress();
+    }
+
+    @Override
+    public InetSocketAddress getRemoteAddress() {
+        return this.delegate.getRemoteAddress();
+    }
+
+    @Override
+    public String getAcceptedProtocol() {
+        return this.delegate.getAcceptedProtocol();
+    }
+
+    @Override
+    public void setTextMessageSizeLimit(int messageSizeLimit) {
+        this.delegate.setTextMessageSizeLimit(messageSizeLimit);
+    }
+
+    @Override
+    public int getTextMessageSizeLimit() {
+        return this.delegate.getTextMessageSizeLimit();
+    }
+
+    @Override
+    public void setBinaryMessageSizeLimit(int messageSizeLimit) {
+        this.delegate.setBinaryMessageSizeLimit(messageSizeLimit);
+    }
+
+    @Override
+    public int getBinaryMessageSizeLimit() {
+        return this.delegate.getBinaryMessageSizeLimit();
+    }
+
+    @Override
+    public List<WebSocketExtension> getExtensions() {
+        return this.delegate.getExtensions();
+    }
+
+    @Override
+    public void sendMessage(WebSocketMessage<?> message) throws IOException {
+        synchronized (this.delegate) {
+            this.delegate.sendMessage(message);
+        }
+    }
+
+    @Override
+    public boolean isOpen() {
+        return this.delegate.isOpen();
+    }
+
+    @Override
+    public void close() throws IOException {
+        this.delegate.close();
+    }
+
+    @Override
+    public void close(CloseStatus status) throws IOException {
+        this.delegate.close(status);
+    }
+
+}

orion-visor-framework/orion-visor-spring-boot-starter-websocket/src/main/java/com/orion/visor/framework/websocket/core/utils/WebSockets.java

@@ -3,7 +3,9 @@ package com.orion.visor.framework.websocket.core.utils;
 import com.alibaba.fastjson.JSON;
 import com.orion.lang.utils.Exceptions;
 import com.orion.lang.utils.Threads;
+import com.orion.visor.framework.common.constant.Const;
 import com.orion.visor.framework.websocket.core.constant.WsCloseCode;
+import com.orion.visor.framework.websocket.core.session.WebSocketSyncSession;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.socket.CloseStatus;
 import org.springframework.web.socket.TextMessage;
@@ -24,6 +26,16 @@ public class WebSockets {
     private WebSockets() {
     }
 
+    /**
+     * 创建同步会话
+     *
+     * @param session session
+     * @return session
+     */
+    public static WebSocketSession createSyncSession(WebSocketSession session) {
+        return new WebSocketSyncSession(session);
+    }
+
     /**
      * 获取属性
      *
@@ -58,13 +70,20 @@ public class WebSockets {
             return;
         }
         try {
-            // 发重消息
+            if (session instanceof WebSocketSyncSession) {
-            session.sendMessage(new TextMessage(message));
+                // 发送消息
+                session.sendMessage(new TextMessage(message));
+            } else {
+                synchronized (session) {
+                    // 发送消息
+                    session.sendMessage(new TextMessage(message));
+                }
+            }
         } catch (IllegalStateException e) {
             // 并发异常
             log.error("发送消息失败, 准备进行重试 {}", Exceptions.getDigest(e));
             // 并发重试
-            retrySendText(session, message, 50);
+            retrySendText(session, message, Const.MS_100);
         } catch (IOException e) {
             throw Exceptions.ioRuntime(e);
         }

orion-visor-launch/src/main/java/com/orion/visor/launch/LaunchApplication.java

@@ -1,7 +1,17 @@
 package com.orion.visor.launch;
 
+import com.orion.lang.utils.Strings;
+import com.orion.visor.framework.common.constant.Const;
+import org.springframework.beans.factory.annotation.AnnotatedBeanDefinition;
+import org.springframework.beans.factory.config.BeanDefinition;
+import org.springframework.beans.factory.support.BeanDefinitionReaderUtils;
+import org.springframework.beans.factory.support.BeanDefinitionRegistry;
+import org.springframework.beans.factory.support.BeanNameGenerator;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.builder.SpringApplicationBuilder;
+import org.springframework.core.type.AnnotationMetadata;
+
+import java.util.Optional;
 
 /**
  * application 启动类
@@ -14,7 +24,35 @@ import org.springframework.boot.builder.SpringApplicationBuilder;
 public class LaunchApplication {
 
     public static void main(String[] args) {
-        new SpringApplicationBuilder(LaunchApplication.class).run(args);
+        new SpringApplicationBuilder(LaunchApplication.class)
+                .beanNameGenerator(new CustomBeanNameGenerator())
+                .run(args);
+    }
+
+    /**
+     * 自定义 bean 名称生成器
+     */
+    public static class CustomBeanNameGenerator implements BeanNameGenerator {
+
+        private static final String BEAN_ANNOTATION_CLASS_NAME = "org.springframework.stereotype.Component";
+
+        @Override
+        public String generateBeanName(BeanDefinition definition, BeanDefinitionRegistry registry) {
+            // 兼容注解自定义名称
+            if (definition instanceof AnnotatedBeanDefinition) {
+                AnnotationMetadata metadata = ((AnnotatedBeanDefinition) definition).getMetadata();
+                // 处理自定义 bean 名称
+                return Optional.of(metadata)
+                        .map(s -> s.getAnnotationAttributes(BEAN_ANNOTATION_CLASS_NAME))
+                        .map(s -> s.get(Const.VALUE))
+                        .map(Object::toString)
+                        .filter(Strings::isNotBlank)
+                        .orElseGet(definition::getBeanClassName);
+            } else {
+                // 非注解形式默认使用默认名称
+                return BeanDefinitionReaderUtils.generateBeanName(definition, registry);
+            }
+        }
     }
 
 }

orion-visor-launch/src/main/resources/application-dev.yaml

@@ -7,6 +7,8 @@ spring:
       initial-size: 0
       min-idle: 1
       max-active: 5
+      stat-view-servlet:
+        enabled: false
   redis:
     host: 127.0.0.1
     port: 6379
@@ -14,6 +16,20 @@ spring:
   redisson:
     threads: 2
     netty-threads: 2
+    minimum-idle-size: 2
+  boot:
+    admin:
+      client:
+        enabled: false
+      server:
+        enabled: false
+
+management:
+  endpoints:
+    enabled-by-default: false
+    web:
+      exposure:
+        include: shutdown
 
 mybatis-plus:
   configuration:

orion-visor-launch/src/main/resources/application-prod.yaml

@@ -10,10 +10,13 @@ spring:
       min-idle: 5
       # 最大连接池数量
       max-active: 20
-      web-stat-filter:
+      # 控制台
-        enabled: true
       stat-view-servlet:
         enabled: true
+        login-username: ${DRUID_USERNAME:admin}
+        login-password: ${DRUID_PASSWORD:admin}
+      web-stat-filter:
+        enabled: true
       filter:
         stat:
           enabled: true
@@ -24,12 +27,23 @@ spring:
   redisson:
     threads: 4
     netty-threads: 4
+    minimum-idle-size: 4
   quartz:
     properties:
       org:
         quartz:
           threadPool:
             threadCount: 10
+  boot:
+    admin:
+      client:
+        enabled: true
+      server:
+        enabled: true
+
+management:
+  endpoints:
+    enabled-by-default: true
 
 springdoc:
   api-docs:
@@ -39,8 +53,11 @@ springdoc:
 
 knife4j:
   enable: false
+  production: true
 
 orion:
+  # 是否为演示模式
+  demo: ${DEMO_MODE:false}
   logging:
     printer:
       mode: ROW

orion-visor-launch/src/main/resources/application.yaml

@@ -19,6 +19,9 @@ spring:
   mvc:
     pathmatch:
       matching-strategy: ANT_PATH_MATCHER
+    async:
+      # 异步请求时间 30min
+      request-timeout: 1800000
   datasource:
     druid:
       driver-class-name: com.mysql.cj.jdbc.Driver
@@ -37,13 +40,14 @@ spring:
       # 最大生存的时间
       max-evictable-idle-time-millis: 900000
       validation-query: SELECT 1
-      web-stat-filter:
+      # 控制台
-        enabled: true
       stat-view-servlet:
         enabled: true
         url-pattern: /druid/*
         login-username:
         login-password:
+      web-stat-filter:
+        enabled: true
       filter:
         stat:
           enabled: true
@@ -85,7 +89,7 @@ spring:
             misfireThreshold: 60000
             clusterCheckinInterval: 5000
             isClustered: true
-          #连接池
+          # 连接池
           threadPool:
             class: org.quartz.simpl.SimpleThreadPool
             threadCount: 5
@@ -95,12 +99,16 @@ spring:
     admin:
       context-path: /admin
       client:
+        enabled: true
         url: http://127.0.0.1:${server.port}/${spring.boot.admin.context-path}
         instance:
           service-host-type: IP
+      server:
+        enabled: true
 
 management:
   endpoints:
+    enabled-by-default: true
     web:
       base-path: /actuator
       exposure:
@@ -190,10 +198,12 @@ app:
 orion:
   # 版本
   version: @revision@
+  # 是否为演示模式
+  demo: false
   api:
     # 公共 api 前缀
     prefix: /orion-visor/api
-    # 是否开启跨域
+    # 是否允许跨域
     cors: true
   websocket:
     # 公共 websocket 前缀
@@ -206,7 +216,7 @@ orion:
     session-idle-timeout: 1800000
   swagger:
     # swagger 配置
-    author: lijiahang
+    author: Jiahang Li
     title: orion-visor 运维平台
     description: 一站式运维服务平台
     version: ${orion.version}