Merge pull request #74 from dromara/dev

Dev

.env.example

@@ -0,0 +1,15 @@
+SERVICE_PORT=1081
+VOLUME_BASE=/data/orion-visor-space/docker-volumes
+
+MYSQL_HOST=mysql
+MYSQL_PORT=3306
+MYSQL_DATABASE=orion_visor
+MYSQL_USER=orion
+MYSQL_PASSWORD=Data@123456
+MYSQL_ROOT_PASSWORD=Data@123456
+
+REDIS_HOST=redis
+REDIS_PASSWORD=Data@123456
+
+SECRET_KEY=uQeacXV8b3isvKLK
+DEMO_MODE=false

.github/workflows/e2e.yaml

@@ -0,0 +1,21 @@
+name: E2E
+
+on:
+  pull_request:
+    branches:
+      - main
+
+concurrency:
+  group: ${{github.workflow}} - ${{github.ref}}
+  cancel-in-progress: true
+
+jobs:
+  testing:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: E2E Testing
+        run: |
+          sudo curl -L https://github.com/docker/compose/releases/download/v2.23.0/docker-compose-linux-x86_64 -o /usr/local/bin/docker-compose
+          sudo chmod u+x /usr/local/bin/docker-compose
+          docker compose -f docker-compose-testing.yml up --build testing --exit-code-from testing --remove-orphans

.gitignore

@@ -33,3 +33,4 @@ build/
 
 ### VS Code ###
 .vscode/
+.env

LICENSE

@@ -200,90 +200,3 @@
    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.
-
-
-Apache Dubbo Submodules:
-
-Apache Dubbo includes a number of submodules with separate copyright notices
-and license terms. Your use of these submodules is subject to the terms and
-conditions of the following licenses.
-
-For the package org.apache.dubbo.common.threadlocal and org.apache.dubbo.common.timer:
-
-This product contains a modified portion of 'Netty', an event-driven asynchronous network application framework also
- under a "Apache License 2.0" license, see https://github.com/netty/netty/blob/4.1/LICENSE.txt:
-
- * io.netty.util.concurrent.FastThreadLocal
- * io.netty.util.internal.InternalThreadLocalMap
- * io.netty.util.Timer
- * io.netty.util.TimerTask
- * io.netty.util.Timeout
- * io.netty.util.HashedWheelTimer
-
-For the org.apache.dubbo.common.utils.CIDRUtils :
-
-This product contains a modified portion of 'edazdarevic.commons.net.CIDRUtils' published at
-https://github.com/edazdarevic/CIDRUtils. The project is licensed under a MIT License:
-    * The MIT License
-    *
-    * Copyright (c) 2013 Edin Dazdarevic (edin.dazdarevic@gmail.com)
-    * Permission is hereby granted, free of charge, to any person obtaining a copy
-    * of this software and associated documentation files (the "Software"), to deal
-    * in the Software without restriction, including without limitation the rights
-    * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-    * copies of the Software, and to permit persons to whom the Software is
-    * furnished to do so, subject to the following conditions:
-    * The above copyright notice and this permission notice shall be included in
-    * all copies or substantial portions of the Software.
-    * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-    * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-    * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-    * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-    * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-    * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-    * THE SOFTWARE.
-
-For the file org.apache.dubbo.common.utils.Utf8Utils.java:
-
-This product contains a portion of the Protocol Buffers project, which is published at
-https://developers.google.com/protocol-buffers/ and is licensed under the following License:
-
-    Copyright 2008 Google Inc.  All rights reserved.
-
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions are
-    met:
-
-        * Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
-        * Redistributions in binary form must reproduce the above
-    copyright notice, this list of conditions and the following disclaimer
-    in the documentation and/or other materials provided with the
-    distribution.
-        * Neither the name of Google Inc. nor the names of its
-    contributors may be used to endorse or promote products derived from
-    this software without specific prior written permission.
-
-    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-    "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-    LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-    A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-    OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-    SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-    LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-    DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-    THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-    (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-    OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-    Code generated by the Protocol Buffer compiler is owned by the owner
-    of the input file used when generating it.  This code is not
-    standalone and requires a support library to be linked with it.  This
-    support library is itself covered by the above license.
-
-For the ca.proto in dubbo-registry-xds:
-
-This product contains a modified portion of 'Istio', an open platform to connect, manage, and secure microservices also
- under a "Apache License 2.0" license, see https://github.com/istio/api/blob/master/LICENSE:
-
- * security/v1alpha1/ca.proto

NOTICE

@@ -0,0 +1,9 @@
+ * 在使用本项目前，请您仔细阅读使用须知及免责声明，确保您已充分理解其中的内容
+
+ * 本项目采用 APACHE LICENSE 2.0 开源协议，如您需要源码的开发方式，需要遵循以下几点
+
+ 1. 禁止修改或删除 LICENSE 文件。
+ 2. 禁止修改或删除源码头部的版权声明。
+ 3. 本项目可免费商业使用，商业使用请保留项目源码、出处、描述文件和作者声明等。
+ 4. 分发源码时候，请注明软件出处 https://visor.dromara.org/
+ 5. 不可二次开发或参与同类竞品的开发。

README.md

@@ -1,46 +1,46 @@
-<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>
+<div align="center"><img src="https://bjuimg.obs.cn-north-4.myhuaweicloud.com/images/2024/9/11/11e7e78e-2af0-4c68-9811-db8a4c4400f4.png" alt="logo" width="520" /></div>
+<p style="margin-top: 12px" align="center"><b>【Dromara】 一款高颜值、现代化的自动化运维&轻量堡垒机平台。</b></p>
 <p align="center">
     <a target="_blank"
        style="text-decoration: none !important;"
-       href="https://app.codacy.com/gh/lijiahangmax/orion-visor/dashboard?utm_source=gh&utm_medium=referral&utm_content=&utm_campaign=Badge_grade">
+       href="https://app.codacy.com/gh/orionsec/orion-visor/dashboard?utm_source=gh&utm_medium=referral&utm_content=&utm_campaign=Badge_grade">
       <img src="https://app.codacy.com/project/badge/Grade/49eaab3a9a474af3b87e1d21ffec71c4" alt="quality" />
     </a>
     <a target="_blank"
        style="text-decoration: none !important;"
        href="https://www.apache.org/licenses/LICENSE-2.0">
-      <img src="https://img.shields.io/github/license/lijiahangmax/orion-visor" alt="License" />
+      <img src="https://img.shields.io/github/license/dromara/orion-visor" alt="License" />
     </a>
     <a target="_blank"
        style="text-decoration: none !important;"
-       href="https://github.com/lijiahangmax/orion-visor/releases">
-      <img src="https://img.shields.io/github/v/release/lijiahangmax/orion-visor" alt="release" />
+       href="https://github.com/dromara/orion-visor/releases">
+      <img src="https://img.shields.io/github/v/release/dromara/orion-visor" alt="release" />
     </a>
     <a target="_blank"
        style="text-decoration: none !important;"
-       href="https://gitee.com/lijiahangmax/orion-visor/stargazers">
-      <img src="https://gitee.com/lijiahangmax/orion-visor/badge/star.svg?theme=dark" alt="star" />
+       href="https://gitee.com/dromara/orion-visor/stargazers">
+      <img src="https://gitee.com/dromara/orion-visor/badge/star.svg?theme=gvp" alt="star" />
     </a>
     <a target="_blank"
        style="text-decoration: none !important;"
-       href="https://gitee.com/lijiahangmax/orion-visor/members">
-      <img src="https://gitee.com/lijiahangmax/orion-visor/badge/fork.svg?theme=dark" alt="fork" />
+       href="https://gitee.com/dromara/orion-visor/members">
+      <img src="https://gitee.com/dromara/orion-visor/badge/fork.svg?theme=gvp" alt="fork" />
     </a>
     <a target="_blank"
        style="text-decoration: none !important;"
-       href="https://github.com/lijiahangmax/orion-visor">
-      <img src="https://img.shields.io/github/stars/lijiahangmax/orion-visor" alt="star" />
+       href="https://github.com/dromara/orion-visor">
+      <img src="https://img.shields.io/github/stars/dromara/orion-visor" alt="star" />
     </a>
     <a target="_blank"
        style="text-decoration: none !important;"
-       href="https://github.com/lijiahangmax/orion-visor">
-      <img src="https://img.shields.io/github/forks/lijiahangmax/orion-visor" alt="star" />
+       href="https://github.com/dromara/orion-visor">
+      <img src="https://img.shields.io/github/forks/dromara/orion-visor" alt="star" />
     </a>
 </p>
 
 ------------------------------
 
-**`orion-visor`** 提供一站式服务器运维解决方案。
+**`orion-visor`** 提供一站式自动化运维解决方案。
 
 * **资产管理**：支持对资产进行分组，实现对主机、密钥和身份的统一管理和授权。
 * **在线终端**：提供在线终端 SSH 服务，支持快捷命令、自定义快捷键和主题风格。
@@ -51,18 +51,20 @@
 
 ## 演示环境
 
-演示地址: http://101.43.254.243:1081/   
-演示账号: admin/admin
-
-⭐ 体验后可以点一下 `star` 这对我很重要!  
-🌈 如果本项目对你有帮助请帮忙推广一下 让更多的人知道此项目!
-[github](https://github.com/lijiahangmax/orion-visor) [gitee](https://gitee.com/lijiahangmax/orion-visor)
+* 🔗 演示地址: [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)
+* 🌈 如果本项目对你有帮助请帮忙推广一下 让更多的人知道此项目!
+* 🎭 演示环境部分功能不可用, 完整功能请本地部署!
+* 📛 演示环境请不要随便删除数据!
+* 📧 如果演示环境不可用请联系我!
 
 ## 快速开始
 
 ```bash
 # clone
-git clone https://github.com/lijiahangmax/orion-visor
+git clone --depth=1 https://github.com/dromara/orion-visor
 cd orion-visor
 # 启动
 docker compose up -d
@@ -71,15 +73,15 @@ docker compose up -d
 
 ## 项目文档
 
-* [文档地址](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)
+* [文档地址](https://visor.dromara.org/)
+* [安装文档](https://visor.dromara.org/quickstart/docker.html)
+* [更新日志](https://visor.dromara.org/update/change-log.html)
+* [操作手册](https://visor.dromara.org/operator/asset.html)
+* [常见问题](https://visor.dromara.org/support/faq.html)
 
 ## 技术栈
 
-* SpringBoot 2.7.17
+* SpringBoot 2.7.+
 * Mysql 8.0.+
 * Redis 6.0.+
 * Vue3 3.2.+
@@ -108,18 +110,20 @@ docker compose up -d
 
 ## Star History
 
-[![Star History Chart](https://api.star-history.com/svg?repos=lijiahangmax/orion-visor&type=Date)](https://star-history.com/#lijiahangmax/orion-visor&Date)
+[![Star History Chart](https://api.star-history.com/svg?repos=dromara/orion-visor&type=Date)](https://star-history.com/#dromara/orion-visor&Date)
+
+## 关于我
+
+本人专注于使用 Java 和 Vue 进行全栈开发, 并在系统自动化运维方面拥有丰富开发的经验。如果您在这些领域有需求或遇到痛点, 请随时联系我, 并备注“合作”。
 
 ## 联系我
 
-<div style="display: flex;">
-  <img src="https://bjuimg.obs.cn-north-4.myhuaweicloud.com/images/2024/5/17/d42d91f3-f0ee-4c63-adab-a35809e0804c.jpg" alt="wx" width="298px" height="398px"/>  
-</div>
+<img src="https://bjuimg.obs.cn-north-4.myhuaweicloud.com/images/2024/10/11/cf72c603-3951-4171-95b4-06271dda1c80.jpg" alt="wx" width="628px"/>  
 
-![个人微信: ljh1553488](https://img.shields.io/badge/ljh1553488-blue?style=social&label=WX%3A)
-![QQ群1: 755242157](https://img.shields.io/badge/755242157-blue?style=social&label=QQ%E7%BE%A41%3A%20)
+微信: ljh1553488  
+QQ群: 755242157
 
-📧 咨询问题微信备注: vis  
+📧 问题/加群微信备注: ops  
 📧 合作/功能定制备注: 合作
 
 ## 支持一下
@@ -130,8 +134,12 @@ docker compose up -d
 
 ## 免责声明
 
-在使用本项目之前, 请确保您已经了解并同意相关的使用协议和隐私政策。[免责声明](https://github.com/lijiahangmax/orion-visor/blob/main/DISCLAIMER.md)
+在使用本项目之前, 请确保您已经了解并同意相关的使用协议和隐私政策。[免责声明](https://github.com/dromara/orion-visor/blob/main/DISCLAIMER.md)
 
 ## License
 
-本项目遵循 [Apache-2.0](https://github.com/lijiahangmax/orion-visor/blob/main/LICENSE) 开源许可证。  
+本项目遵循 [Apache-2.0](https://github.com/dromara/orion-visor/blob/main/LICENSE) 开源许可证。
+
+## Gite 最有价值开源项目 GVP
+
+![GVP](https://bjuimg.obs.cn-north-4.myhuaweicloud.com/images/2024/10/24/8dd98b8d-9de5-44e6-86d3-04e27ec66123.jpg "GVP")

docker-compose-testing.yml

@@ -0,0 +1,79 @@
+version: '3.3'
+services:
+  service:
+    image: registry.cn-hangzhou.aliyuncs.com/orionsec/orion-visor-service:2.2.2
+    privileged: true
+    ports:
+      - 1081:80
+    environment:
+      - MYSQL_HOST=mysql
+      - MYSQL_PORT=3306
+      - MYSQL_DATABASE=orion_visor
+      - MYSQL_USER=root
+      - MYSQL_PASSWORD=Data@123456
+      - REDIS_HOST=redis
+      - REDIS_PASSWORD=Data@123456
+      - SECRET_KEY=uQeacXV8b3isvKLK
+      - DEMO_MODE=false
+    volumes:
+      - /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
+    depends_on:
+      mysql:
+        condition: service_healthy
+      redis:
+        condition: service_healthy
+    links:
+      - mysql
+      - redis
+  mysql:
+    image: registry.cn-hangzhou.aliyuncs.com/orionsec/orion-visor-mysql:2.2.2
+    privileged: true
+    ports:
+      - 3307:3306
+    environment:
+      - MYSQL_DATABASE=orion_visor
+      - MYSQL_USER=orion
+      - MYSQL_PASSWORD=Data@123456
+      - MYSQL_ROOT_PASSWORD=Data@123456
+    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
+      retries: 10
+      start_period: 3s
+  redis:
+    image: registry.cn-hangzhou.aliyuncs.com/orionsec/orion-visor-redis:2.2.2
+    privileged: true
+    ports:
+      - 6380:6379
+    environment:
+      - REDIS_PASSWORD=Data@123456
+    volumes:
+      - /data/orion-visor-space/docker-volumes/redis/data:/data
+    command: sh -c "redis-server /usr/local/redis.conf --requirepass $${REDIS_PASSWORD}"
+    healthcheck:
+      test: [ "CMD", "redis-cli", "--raw", "incr", "ping" ]
+      interval: 3s
+      timeout: 60s
+      retries: 10
+      start_period: 3s
+  testing:
+    build:
+      context: ./docker/e2e
+    environment:
+      SERVER: http://service:80
+    depends_on:
+      service:
+        condition: service_healthy
+    links:
+      - service

docker-compose.yml

@@ -1,49 +1,78 @@
 version: '3.3'
 services:
-  orion-visor-service:
-    image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-service:2.0.5
+  service:
+    image: registry.cn-hangzhou.aliyuncs.com/orionsec/orion-visor-service:2.2.2
+    privileged: true
     ports:
-      - 1081:80
+      - ${SERVICE_PORT:-1081}:80
     environment:
-      - MYSQL_HOST=orion-visor-mysql
-      - MYSQL_PORT=3306
-      - MYSQL_DATABASE=orion_visor
-      - MYSQL_USER=root
-      - MYSQL_PASSWORD=Data@123456
-      - REDIS_HOST=orion-visor-redis
-      - REDIS_PASSWORD=Data@123456
-      - SECRET_KEY=uQeacXV8b3isvKLK
-      - DEMO_MODE=false
+      - MYSQL_HOST=${MYSQL_HOST:-mysql}
+      - MYSQL_PORT=${MYSQL_PORT:-3306}
+      - MYSQL_DATABASE=${MYSQL_DATABASE:-orion_visor}
+      - MYSQL_USER=${MYSQL_USER:-root}
+      - MYSQL_PASSWORD=${MYSQL_PASSWORD:-Data@123456}
+      - REDIS_HOST=${REDIS_HOST:-redis}
+      - REDIS_PASSWORD=${REDIS_PASSWORD:-Data@123456}
+      - SECRET_KEY=${SECRET_KEY:-uQeacXV8b3isvKLK}
+      - DEMO_MODE=${DEMO_MODE:-false}
     volumes:
-      - /data/orion-visor-space/docker-volumes/orion-visor-service/root-orion:/root/orion
+      - ${VOLUME_BASE:-/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: 15s
+      timeout: 300s
+      retries: 15
+      start_period: 3s
     depends_on:
-      - orion-visor-mysql
-      - orion-visor-redis
-  orion-visor-mysql:
-    image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-mysql:2.0.5
+      mysql:
+        condition: service_healthy
+      redis:
+        condition: service_healthy
+    links:
+      - mysql
+      - redis
+  mysql:
+    image: registry.cn-hangzhou.aliyuncs.com/orionsec/orion-visor-mysql:2.2.2
     privileged: true
     ports:
       - 3307:3306
     environment:
-      - MYSQL_DATABASE=orion_visor
-      - MYSQL_USER=orion
-      - MYSQL_PASSWORD=Data@123456
-      - MYSQL_ROOT_PASSWORD=Data@123456
+      - MYSQL_DATABASE=${MYSQL_DATABASE:-orion_visor}
+      - MYSQL_USER=${MYSQL_USER:-orion}
+      - MYSQL_PASSWORD=${MYSQL_PASSWORD:-Data@123456}
+      - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD:-Data@123456}
     volumes:
-      - /data/orion-visor-space/docker-volumes/orion-visor-mysql/var-lib-mysql:/var/lib/mysql
-      - /data/orion-visor-space/docker-volumes/orion-visor-mysql/var-lib-mysql-files:/var/lib/mysql-files
-      - /data/orion-visor-space/docker-volumes/orion-visor-mysql/etc-mysql:/etc/mysql
-  orion-visor-redis:
-    image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-redis:2.0.5
+      - ${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
+    healthcheck:
+      test: [ "CMD", "bash", "-c", "cat < /dev/null > /dev/tcp/127.0.0.1/3306" ]
+      interval: 15s
+      timeout: 60s
+      retries: 15
+      start_period: 3s
+  redis:
+    image: registry.cn-hangzhou.aliyuncs.com/orionsec/orion-visor-redis:2.2.2
     privileged: true
     ports:
       - 6380:6379
     environment:
-      - REDIS_PASSWORD=Data@123456
+      - REDIS_PASSWORD=${REDIS_PASSWORD:-Data@123456}
     volumes:
-      - /data/orion-visor-space/docker-volumes/orion-visor-redis/data:/data
+      - ${VOLUME_BASE:-/data/orion-visor-space/docker-volumes}/redis/data:/data
     command: sh -c "redis-server /usr/local/redis.conf --requirepass $${REDIS_PASSWORD}"
-  orion-visor-adminer:
-    image: adminer
+    healthcheck:
+      test: [ "CMD", "redis-cli", "--raw", "incr", "ping" ]
+      interval: 15s
+      timeout: 60s
+      retries: 15
+      start_period: 3s
+  adminer:
+    image: registry.cn-hangzhou.aliyuncs.com/orionsec/orion-visor-adminer:2.2.2
     ports:
       - 8081:8080
+    depends_on:
+      mysql:
+        condition: service_healthy
+    links:
+      - mysql

docker-upgrade.sh

@@ -1,8 +1,7 @@
 #/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
+    sed -i 's/\${DEMO_MODE:-false}/true/g' docker-compose.yml
 fi
-docker compose up -d
+docker compose up -d --remove-orphans

docker/adminer/Dockerfile

@@ -0,0 +1 @@
+FROM adminer:latest

docker/adminer/build.sh

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

docker/e2e/Dockerfile

@@ -0,0 +1,7 @@
+FROM ghcr.io/linuxsuren/api-testing:v0.0.17
+
+WORKDIR /workspace
+COPY . .
+RUN chmod 777 *
+
+CMD [ "/workspace/entrypoint.sh" ]

docker/e2e/entrypoint.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+set -e
+atest run -p testsuite.yaml --report md

docker/e2e/testsuite.yaml

@@ -0,0 +1,49 @@
+#!api-testing
+# 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")}}
+items:
+  - name: login
+    request:
+      api: /orion-visor/api/infra/auth/login
+      method: POST
+      header:
+        Content-type: application/json
+      body: |
+        {"username":"admin","password":"21232f297a57a5a743894a0e4a801fc3"}
+    expect:
+      bodyFieldsExpect:
+        code: 200
+  - name: userPermission
+    request:
+      api: /orion-visor/api/infra/user-permission/user
+      header:
+        Authorization: Bearer {{.login.data.token}}
+    expect:
+      bodyFieldsExpect:
+        code: 200
+        msg: "success"
+  - name: menu
+    request:
+      api: /orion-visor/api/infra/user-permission/menu
+      header:
+        Authorization: Bearer {{.login.data.token}}
+    expect:
+      bodyFieldsExpect:
+        code: 200
+        msg: "success"
+  - name: haveUnRead
+    request:
+      api: /orion-visor/api/infra/system-message/has-unread
+  - name: queryOperatorLog
+    request:
+      api: /orion-visor/api/infra/mine/query-operator-log
+      method: POST
+  - name: hostList
+    request:
+      api: /orion-visor/api/infra/tag/list?type=HOST
+  - name: queryHost
+    request:
+      api: /orion-visor/api/asset/host/query
+      method: POST

docker/mysql/build.sh

@@ -1,7 +1,6 @@
 #/bin/bash
-version=2.0.5
+version=2.2.2
 cp -r ../../sql ./sql
 docker build -t orion-visor-mysql:${version} .
 rm -rf ./sql
-docker tag orion-visor-mysql:${version} registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-mysql:${version}
-docker push registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-mysql:${version}
+docker tag orion-visor-mysql:${version} registry.cn-hangzhou.aliyuncs.com/orionsec/orion-visor-mysql:${version}

docker/mysql/my.cnf

@@ -18,7 +18,7 @@ default-time_zone='+8:00'
 # 服务端字符集
 character_set_server=utf8mb4
 # 字符排序规则
-collation_server=utf8mb4_general_ci
+collation_server=utf8mb4_unicode_ci
 # 默认存储引擎
 default-storage-engine=InnoDB 
 # 禁止 DNS 解析

docker/orion-visor-redis/build.sh

@@ -1,5 +0,0 @@
-#/bin/bash
-version=2.0.5
-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/push.sh

@@ -0,0 +1,6 @@
+#/bin/bash
+version=2.2.2
+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/redis/build.sh

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

docker/service/Dockerfile

@@ -8,6 +8,7 @@ RUN \
   sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories && \
   apk update && \
   apk add tzdata && \
+  apk add dmidecode && \
   apk add openjdk8
 # 设置时区
 RUN ln -sf /usr/share/zoneinfo/${TZ} /etc/localtime && \

docker/service/build.sh

@@ -1,9 +1,8 @@
 #/bin/bash
-version=2.0.5
+version=2.2.2
 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} .
+docker build --no-cache -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/lijiahangmax/orion-visor-service:${version}
-docker push registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-service:${version}
+docker tag orion-visor-service:${version} registry.cn-hangzhou.aliyuncs.com/orionsec/orion-visor-service:${version}

docker/service/nginx.conf

@@ -29,7 +29,7 @@ server {
     location /orion-visor/api {
         proxy_pass    http://localhost:9200/orion-visor/api;
         proxy_set_header Host $host;
-        proxy_set_header X-Real-IP  $remote_addr;
+        proxy_set_header X-Real-IP $remote_addr;
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
         proxy_set_header X-Forwarded-Proto $scheme;
     }

docs/README.md

@@ -19,12 +19,12 @@
     <a target="_blank"
        style="text-decoration: none !important;"
        href="https://gitee.com/lijiahangmax/orion-visor/stargazers">
-      <img src="https://gitee.com/lijiahangmax/orion-visor/badge/star.svg?theme=dark" alt="star" />
+      <img src="https://gitee.com/lijiahangmax/orion-visor/badge/star.svg?theme=gvp" alt="star" />
     </a>
     <a target="_blank"
        style="text-decoration: none !important;"
        href="https://gitee.com/lijiahangmax/orion-visor/members">
-      <img src="https://gitee.com/lijiahangmax/orion-visor/badge/fork.svg?theme=dark" alt="fork" />
+      <img src="https://gitee.com/lijiahangmax/orion-visor/badge/fork.svg?theme=gvp" alt="fork" />
     </a>
     <a target="_blank"
        style="text-decoration: none !important;"

docs/index.html

@@ -20,7 +20,7 @@
         // 左侧文档名称
         name: 'orion-visor',
         // 右上角仓库
-        repo: 'https://github.com/lijiahangmax/orion-visor',
+        repo: 'https://github.com/dromara/orion-visor',
         coverpage: true,
         // 加载侧边栏
         loadSidebar: true,

docs/quickstart/docker-install.md

@@ -21,22 +21,35 @@ Dashboard 修改)
 
 ```shell
 # github
-git clone https://github.com/lijiahangmax/orion-visor
+git clone --depth=1 https://github.com/lijiahangmax/orion-visor
 # gitee
-git clone https://gitee.com/lijiahangmax/orion-visor
+git clone --depth=1 https://gitee.com/lijiahangmax/orion-visor
 ```
 
-### 构建镜像
+### 拉取镜像
 
 ```
 # 进入仓库目录
 cd orion-visor
-# 修改 docker-compose.yml (建议修改)
-    # MYSQL_USER          mysql 用户名
-    # MYSQL_PASSWORD      mysql 用户密码
-    # MYSQL_ROOT_PASSWORD mysql root 密码
-    # REDIS_PASSWORD      redis 密码
-    # SECRET_KEY          加密密钥
+# 创建名为 .env 的 .env.example 副本
+cp .env.example .env
+# 将其中的值删除以保持默认或将其修改为你喜欢的值
+    # SERVICE_PORT            你希望服务监听的端口
+    # VOLUME_BASE             你希望数据持久化保存的目录, 如果不提前创建将以 docker 进程宿主身份创建(通常是 root)
+
+    # MYSQL_HOST              mysql 服务所在的主机, 如果你没有现有的 MySQL 请保持值为 mysql, 如果你有自部署的请在 docker-compose.yml 中移除 services.mysql 以节约性能
+    # MYSQL_PORT              mysql 监听的端口
+    # MYSQL_DATABASE          mysql 数据库
+    # MYSQL_USER              mysql 用户名
+    # MYSQL_PASSWORD          mysql 用户密码
+    # MYSQL_ROOT_PASSWORD     mysql root 密码
+
+    # REDIS_HOST              redis 服务所在的主机, 如果你没有现有的 Redis 请保持值为 redis, 如果你有自部署的请在 docker-compose.yml 中移除 services.redis 以节约性能
+    # REDIS_PASSWORD          redis 密码
+
+    # SECRET_KEY              加密密钥
+# 拉取远程镜像
+docker compose pull
 ```
 
 ### 启动
@@ -45,7 +58,7 @@ cd orion-visor
 docker compose up -d
 ```
 
-### 修改加密方式
+### 修改 MySQL 账户的加密方式
 
 ```
 访问 adminer: http://localhost:8081

orion-visor-dependencies/pom.xml

@@ -4,21 +4,21 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>com.orion.visor</groupId>
+    <groupId>org.dromara.visor</groupId>
     <artifactId>orion-visor-dependencies</artifactId>
     <version>${revision}</version>
     <packaging>pom</packaging>
     <name>${project.artifactId}</name>
 
-    <description>项目所有依赖</description>
-    <url>https://github.com/lijiahangmax/orion-visor</url>
+    <description>项目全部依赖</description>
+    <url>https://github.com/dromara/orion-visor</url>
 
     <properties>
-        <revision>2.0.5</revision>
+        <revision>2.2.2</revision>
         <spring.boot.version>2.7.17</spring.boot.version>
         <spring.boot.admin.version>2.7.15</spring.boot.admin.version>
         <flatten.maven.plugin.version>1.5.0</flatten.maven.plugin.version>
-        <orion.kit.version>1.0.7</orion.kit.version>
+        <orion.kit.version>2.0.1</orion.kit.version>
         <aspectj.version>1.9.7</aspectj.version>
         <lombok.version>1.18.26</lombok.version>
         <springdoc.version>1.6.15</springdoc.version>
@@ -48,95 +48,95 @@
 
             <!-- orion-kit -->
             <dependency>
-                <groupId>io.github.lijiahangmax</groupId>
+                <groupId>cn.orionsec.kit</groupId>
                 <artifactId>orion-all</artifactId>
                 <version>${orion.kit.version}</version>
                 <exclusions>
                     <exclusion>
                         <artifactId>orion-log</artifactId>
-                        <groupId>io.github.lijiahangmax</groupId>
+                        <groupId>cn.orionsec.kit</groupId>
                     </exclusion>
                 </exclusions>
             </dependency>
 
             <!-- orion-visor-starter -->
             <dependency>
-                <groupId>com.orion.visor</groupId>
+                <groupId>org.dromara.visor</groupId>
                 <artifactId>orion-visor-framework-common</artifactId>
                 <version>${revision}</version>
             </dependency>
             <dependency>
-                <groupId>com.orion.visor</groupId>
+                <groupId>org.dromara.visor</groupId>
                 <artifactId>orion-visor-spring-boot-starter-banner</artifactId>
                 <version>${revision}</version>
             </dependency>
             <dependency>
-                <groupId>com.orion.visor</groupId>
+                <groupId>org.dromara.visor</groupId>
                 <artifactId>orion-visor-spring-boot-starter-web</artifactId>
                 <version>${revision}</version>
             </dependency>
             <dependency>
-                <groupId>com.orion.visor</groupId>
+                <groupId>org.dromara.visor</groupId>
                 <artifactId>orion-visor-spring-boot-starter-swagger</artifactId>
                 <version>${revision}</version>
             </dependency>
             <dependency>
-                <groupId>com.orion.visor</groupId>
+                <groupId>org.dromara.visor</groupId>
                 <artifactId>orion-visor-spring-boot-starter-datasource</artifactId>
                 <version>${revision}</version>
             </dependency>
             <dependency>
-                <groupId>com.orion.visor</groupId>
+                <groupId>org.dromara.visor</groupId>
                 <artifactId>orion-visor-spring-boot-starter-mybatis</artifactId>
                 <version>${revision}</version>
             </dependency>
             <dependency>
-                <groupId>com.orion.visor</groupId>
+                <groupId>org.dromara.visor</groupId>
                 <artifactId>orion-visor-spring-boot-starter-job</artifactId>
                 <version>${revision}</version>
             </dependency>
             <dependency>
-                <groupId>com.orion.visor</groupId>
+                <groupId>org.dromara.visor</groupId>
                 <artifactId>orion-visor-spring-boot-starter-websocket</artifactId>
                 <version>${revision}</version>
             </dependency>
             <dependency>
-                <groupId>com.orion.visor</groupId>
+                <groupId>org.dromara.visor</groupId>
                 <artifactId>orion-visor-spring-boot-starter-redis</artifactId>
                 <version>${revision}</version>
             </dependency>
             <dependency>
-                <groupId>com.orion.visor</groupId>
+                <groupId>org.dromara.visor</groupId>
                 <artifactId>orion-visor-spring-boot-starter-desensitize</artifactId>
                 <version>${revision}</version>
             </dependency>
             <dependency>
-                <groupId>com.orion.visor</groupId>
+                <groupId>org.dromara.visor</groupId>
                 <artifactId>orion-visor-spring-boot-starter-log</artifactId>
                 <version>${revision}</version>
             </dependency>
             <dependency>
-                <groupId>com.orion.visor</groupId>
+                <groupId>org.dromara.visor</groupId>
                 <artifactId>orion-visor-spring-boot-starter-storage</artifactId>
                 <version>${revision}</version>
             </dependency>
             <dependency>
-                <groupId>com.orion.visor</groupId>
+                <groupId>org.dromara.visor</groupId>
                 <artifactId>orion-visor-spring-boot-starter-security</artifactId>
                 <version>${revision}</version>
             </dependency>
             <dependency>
-                <groupId>com.orion.visor</groupId>
+                <groupId>org.dromara.visor</groupId>
                 <artifactId>orion-visor-spring-boot-starter-monitor</artifactId>
                 <version>${revision}</version>
             </dependency>
             <dependency>
-                <groupId>com.orion.visor</groupId>
+                <groupId>org.dromara.visor</groupId>
                 <artifactId>orion-visor-spring-boot-starter-test</artifactId>
                 <version>${revision}</version>
             </dependency>
             <dependency>
-                <groupId>com.orion.visor</groupId>
+                <groupId>org.dromara.visor</groupId>
                 <artifactId>orion-visor-spring-boot-starter-biz-operator-log</artifactId>
                 <version>${revision}</version>
             </dependency>

orion-visor-framework/orion-visor-framework-common/pom.xml

@@ -3,7 +3,7 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <groupId>com.orion.visor</groupId>
+        <groupId>org.dromara.visor</groupId>
         <artifactId>orion-visor-framework</artifactId>
         <version>${revision}</version>
     </parent>
@@ -14,11 +14,11 @@
     <packaging>jar</packaging>
 
     <description>项目公共基准包</description>
-    <url>https://github.com/lijiahangmax/orion-visor</url>
+    <url>https://github.com/dromara/orion-visor</url>
 
     <dependencies>
         <dependency>
-            <groupId>io.github.lijiahangmax</groupId>
+            <groupId>cn.orionsec.kit</groupId>
             <artifactId>orion-all</artifactId>
         </dependency>
 

orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/configuration/config/AsyncExecutorConfig.java

@@ -1,44 +0,0 @@
-package com.orion.visor.framework.common.configuration.config;
-
-import lombok.Data;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-
-/**
- * 线程池配置类
- *
- * @author Jiahang Li
- * @version 1.0.0
- * @since 2023/7/10 15:49
- */
-@Data
-@ConfigurationProperties(prefix = "orion.async.executor")
-public class AsyncExecutorConfig {
-
-    /**
-     * 核心线程数量
-     */
-    private int corePoolSize;
-
-    /**
-     * 最大线程数量
-     */
-    private int maxPoolSize;
-
-    /**
-     * 队列容量
-     */
-    private int queueCapacity;
-
-    /**
-     * 活跃时间
-     */
-    private int keepAliveSeconds;
-
-    public AsyncExecutorConfig() {
-        this.corePoolSize = 8;
-        this.maxPoolSize = 16;
-        this.queueCapacity = 200;
-        this.keepAliveSeconds = 300;
-    }
-
-}

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

@@ -1,27 +0,0 @@
-package com.orion.visor.framework.common.constant;
-
-import com.orion.lang.constant.OrionConst;
-
-/**
- * 项目常量
- *
- * @author Jiahang Li
- * @version 1.0.0
- * @since 2023/6/19 18:56
- */
-public interface AppConst extends OrionConst {
-
-    /**
-     * 同 ${orion.version} 迭代时候需要手动更改
-     */
-    String VERSION = "2.0.5";
-
-    String ORION_VISOR = "orion-visor";
-
-    String GITHUB = "https://github.com/lijiahangmax/orion-visor";
-
-    String GITEE = "https://gitee.com/lijiahangmax/orion-visor";
-
-    String ISSUES = "https://github.com/lijiahangmax/orion-visor/issues";
-
-}

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

@@ -1,32 +0,0 @@
-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/CnConst.java

@@ -1,16 +0,0 @@
-package com.orion.visor.framework.common.constant;
-
-/**
- * 常量 - 中文
- *
- * @author Jiahang Li
- * @version 1.0.0
- * @since 2023/11/30 21:00
- */
-public interface CnConst {
-
-    String CN_USER = "用户";
-
-    String CN_ROLE = "角色";
-
-}

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

@@ -1,38 +0,0 @@
-package com.orion.visor.framework.common.constant;
-
-/**
- * 常量
- *
- * @author Jiahang Li
- * @version 1.0.0
- * @since 2023/6/23 18:49
- */
-public interface Const extends com.orion.lang.constant.Const, FieldConst, CnConst {
-
-    Integer NOT_DELETE = 0;
-
-    Integer IS_DELETED = 1;
-
-    int BEARER_PREFIX_LEN = 7;
-
-    int MD5_LEN = 32;
-
-    String UNKNOWN = "未知";
-
-    String INTRANET_IP = "内网IP";
-
-    Long ROOT_PARENT_ID = 0L;
-
-    Integer DEFAULT_SORT = 10;
-
-    int LOGIN_HISTORY_COUNT = 30;
-
-    Long NONE_ID = -1L;
-
-    Integer DEFAULT_VERSION = 1;
-
-    Long SYSTEM_USER_ID = 0L;
-
-    String SYSTEM_USERNAME = "system";
-
-}

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

@@ -1,102 +0,0 @@
-package com.orion.visor.framework.common.constant;
-
-/**
- * 错误信息
- *
- * @author Jiahang Li
- * @version 1.0.0
- * @since 2023/7/7 18:51
- */
-public interface ErrorMessage {
-
-    String MISSING = "{} 不能为空";
-
-    String PARAM_MISSING = "参数不能为空";
-
-    String PARAM_ERROR = "参数错误";
-
-    String ID_MISSING = "id 不能为空";
-
-    String INVALID_PARAM = "参数验证失败";
-
-    String DATA_MODIFIED = "数据发生变更, 请刷新后重试";
-
-    String DATA_ABSENT = "数据不存在";
-
-    String KEY_ABSENT = "主机密钥不存在";
-
-    String IDENTITY_ABSENT = "主机身份不存在";
-
-    String CONFIG_ABSENT = "配置不存在";
-
-    String CONFIG_PRESENT = "配置已存在";
-
-    String DATA_PRESENT = "数据已存在";
-
-    String NAME_PRESENT = "名称已存在";
-
-    String CODE_PRESENT = "编码已存在";
-
-    String NICKNAME_PRESENT = "花名已存在";
-
-    String USERNAME_PRESENT = "用户名已存在";
-
-    String ROLE_ABSENT = "角色不存在";
-
-    String ROLE_CODE_ABSENT = "角色 [{}] 不存在";
-
-    String INVALID_PARENT_MENU = "所选父菜单不合法";
-
-    String PARENT_MENU_ABSENT = "父菜单不存在";
-
-    String USERNAME_PASSWORD_ERROR = "用户名或密码错误";
-
-    String MAX_LOGIN_FAILED = "登录失败次数已上限";
-
-    String HISTORY_ABSENT = "历史值不存在";
-
-    String USER_ABSENT = "用户不存在";
-
-    String HOST_ABSENT = "主机不存在";
-
-    String GROUP_ABSENT = "分组不存在";
-
-    String UNABLE_OPERATE_ADMIN_ROLE = "无法操作管理员账号";
-
-    String UNSUPPORTED_CHARSET = "不支持的编码 [{}]";
-
-    String PASSWORD_MISSING = "请输入密码";
-
-    String BEFORE_PASSWORD_ERROR = "原密码错误";
-
-    String DATA_NO_PERMISSION = "数据无权限";
-
-    String ANY_NO_PERMISSION = "{}无权限";
-
-    String SESSION_PRESENT = "会话已存在";
-
-    String SESSION_ABSENT = "会话不存在";
-
-    String PATH_NOT_NORMALIZE = "路径不合法";
-
-    String OPERATE_ERROR = "操作失败";
-
-    String UNKNOWN_TYPE = "未知类型";
-
-    String FILE_ABSENT = "文件不存在";
-
-    String LOG_ABSENT = "日志不存在";
-
-    String TASK_ABSENT = "任务不存在";
-
-    String ILLEGAL_STATUS = "当前状态不支持此操作";
-
-    String CHECK_AUTHORIZED_HOST = "请选择已授权的主机";
-
-    String FILE_READ_ERROR = "文件读取失败";
-
-    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/ExtraFieldConst.java

@@ -1,46 +0,0 @@
-package com.orion.visor.framework.common.constant;
-
-/**
- * 额外字段常量
- *
- * @author Jiahang Li
- * @version 1.0.0
- * @since 2023/12/28 18:34
- */
-public interface ExtraFieldConst extends FieldConst {
-
-    String USER_ID = "userId";
-
-    String TRACE_ID = "traceId";
-
-    String IDENTITY = "identity";
-
-    String GROUP_NAME = "groupName";
-
-    String ID_LIST = "idList";
-
-    String USERNAME = "username";
-
-    String STATUS_NAME = "statusName";
-
-    String KEY_NAME = "keyName";
-
-    String POSITION_NAME = "positionName";
-
-    String GRANT_TYPE = "grantType";
-
-    String GRANT_NAME = "grantName";
-
-    String CHANNEL_ID = "channelId";
-
-    String SESSION_ID = "sessionId";
-
-    String CONNECT_TYPE = "connectType";
-
-    String HOST_ID = "hostId";
-
-    String HOST_NAME = "hostName";
-
-    String LOG_ID = "logId";
-
-}

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

@@ -1,68 +0,0 @@
-package com.orion.visor.framework.common.constant;
-
-/**
- * 字段常量
- *
- * @author Jiahang Li
- * @version 1.0.0
- * @since 2023/10/17 12:44
- */
-public interface FieldConst {
-
-    String ID = "id";
-
-    String KEY = "key";
-
-    String CODE = "code";
-
-    String NAME = "name";
-
-    String TITLE = "title";
-
-    String VALUE = "value";
-
-    String LABEL = "label";
-
-    String TYPE = "type";
-
-    String COLOR = "color";
-
-    String STATUS = "status";
-
-    String INFO = "info";
-
-    String REL_ID = "relId";
-
-    String BEFORE = "before";
-
-    String AFTER = "after";
-
-    String SOURCE = "source";
-
-    String TARGET = "target";
-
-    String CHARSET = "charset";
-
-    String TOKEN = "token";
-
-    String SEQ = "seq";
-
-    String PATH = "path";
-
-    String ADDRESS = "address";
-
-    String MOD = "mod";
-
-    String COUNT = "count";
-
-    String DATE = "date";
-
-    String TIME = "time";
-
-    String LOCATION = "location";
-
-    String USER_AGENT = "userAgent";
-
-    String ERROR_MESSAGE = "errorMessage";
-
-}

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

@@ -1,16 +0,0 @@
-package com.orion.visor.framework.common.constant;
-
-/**
- * 过滤器排序常量
- *
- * @author Jiahang Li
- * @version 1.0.0
- * @since 2023/6/16 17:04
- */
-public interface FilterOrderConst {
-
-    int TRICE_ID_FILTER = Integer.MIN_VALUE + 1000;
-
-    int CORS_FILTER = Integer.MIN_VALUE + 2000;
-
-}

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

@@ -1,18 +0,0 @@
-package com.orion.visor.framework.common.constant;
-
-/**
- * 路径常量
- *
- * @author Jiahang Li
- * @version 1.0.0
- * @since 2024/4/17 10:35
- */
-public interface PathConst {
-
-    String ERROR_LOG = "error.log";
-
-    String EXEC = "exec";
-
-    String SCRIPT = "script";
-
-}

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

@@ -1,20 +0,0 @@
-package com.orion.visor.framework.common.constant;
-
-/**
- * 验证常量
- *
- * @author Jiahang Li
- * @version 1.0.0
- * @since 2023/10/20 11:45
- */
-public interface ValidConst {
-
-    String USERNAME_4_32_PATTERN = "^[a-zA-Z0-9_]{4,32}$";
-
-    String USERNAME_4_32_MESSAGE = "只能为 4-32 位的数字,字母或下滑线";
-
-    String DICT_1_32_PATTERN = "^[a-zA-Z0-9_]{1,32}$";
-
-    String DICT_1_32_MESSAGE = "只能为 1-32 位的数字,字母或下滑线";
-
-}

orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/crypto/ValueCrypto.java

@@ -1,40 +0,0 @@
-package com.orion.visor.framework.common.crypto;
-
-import com.orion.lang.utils.codec.Base62s;
-import com.orion.lang.utils.crypto.symmetric.SymmetricCrypto;
-
-/**
- * 数据加密器
- *
- * @author Jiahang Li
- * @version 1.0.0
- * @since 2023/7/8 0:20
- */
-public interface ValueCrypto extends SymmetricCrypto {
-
-    /**
-     * 初始化
-     */
-    void init();
-
-    /**
-     * 加密后 base62 编码
-     *
-     * @param plain 明文
-     * @return 密文
-     */
-    default String encryptBase62(String plain) {
-        return new String(Base62s.encode(this.encrypt(plain)));
-    }
-
-    /**
-     * base62 解码后解密
-     *
-     * @param text 密文
-     * @return 明文
-     */
-    default String decryptBase62(String text) {
-        return new String(this.decrypt(Base62s.decode(text)));
-    }
-
-}

orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/entity/PageRequest.java

@@ -1,28 +0,0 @@
-package com.orion.visor.framework.common.entity;
-
-import com.orion.lang.define.wrapper.IPageRequest;
-import com.orion.visor.framework.common.validator.group.Page;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-import org.hibernate.validator.constraints.Range;
-
-/**
- * 公共页码请求
- *
- * @author Jiahang Li
- * @version 1.0.0
- * @since 2023/7/12 23:14
- */
-@Data
-@Schema(description = "公共页码请求")
-public class PageRequest implements IPageRequest {
-
-    @Range(min = 1, max = 10000, groups = Page.class)
-    @Schema(description = "页码")
-    private int page;
-
-    @Range(min = 1, max = 100, groups = Page.class)
-    @Schema(description = "大小")
-    private int limit;
-
-}

orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/entity/RequestIdentityModel.java

@@ -1,30 +0,0 @@
-package com.orion.visor.framework.common.entity;
-
-import lombok.Data;
-
-/**
- * 请求留痕模型
- *
- * @author Jiahang Li
- * @version 1.0.0
- * @since 2023/12/29 11:57
- */
-@Data
-public class RequestIdentityModel implements RequestIdentity {
-
-    /**
-     * 请求地址
-     */
-    private String address;
-
-    /**
-     * 请求位置
-     */
-    private String location;
-
-    /**
-     * userAgent
-     */
-    private String userAgent;
-
-}

orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/entity/TreeNode.java

@@ -1,49 +0,0 @@
-package com.orion.visor.framework.common.entity;
-
-import java.util.List;
-
-/**
- * 树节点
- *
- * @author Jiahang Li
- * @version 1.0.0
- * @since 2023/11/23 16:52
- */
-public interface TreeNode<T extends TreeNode<T>> {
-
-    /**
-     * id
-     *
-     * @return id
-     */
-    Long getId();
-
-    /**
-     * parentId
-     *
-     * @return parentId
-     */
-    Long getParentId();
-
-    /**
-     * sort
-     *
-     * @return sort
-     */
-    Integer getSort();
-
-    /**
-     * children
-     *
-     * @return children
-     */
-    List<T> getChildren();
-
-    /**
-     * 设置 children
-     *
-     * @param children children
-     */
-    void setChildren(List<T> children);
-
-}

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

@@ -1,43 +0,0 @@
-package com.orion.visor.framework.common.enums;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-/**
- * 启用状态
- *
- * @author Jiahang Li
- * @version 1.0.0
- * @since 2023/10/12 16:02
- */
-@Getter
-@AllArgsConstructor
-public enum EnableStatus {
-
-    /**
-     * 停用
-     */
-    DISABLED(0),
-
-    /**
-     * 启用
-     */
-    ENABLED(1),
-
-    ;
-
-    private final Integer value;
-
-    public static EnableStatus of(Integer value) {
-        if (value == null) {
-            return null;
-        }
-        for (EnableStatus e : values()) {
-            if (e.value.equals(value)) {
-                return e;
-            }
-        }
-        return null;
-    }
-
-}

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

@@ -1,42 +0,0 @@
-package com.orion.visor.framework.common.enums;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-/**
- * 移动位置
- *
- * @author Jiahang Li
- * @version 1.0.0
- * @since 2023/11/13 17:26
- */
-@Getter
-@AllArgsConstructor
-public enum MovePosition {
-
-    // 拖拽到目标元素上
-    TOP(-1),
-
-    // 拖拽到目标元素中
-    IN(0),
-
-    // 拖拽到目标元素下
-    BOTTOM(1),
-
-    ;
-
-    private final Integer position;
-
-    public static MovePosition of(Integer position) {
-        if (position == null) {
-            return null;
-        }
-        for (MovePosition value : values()) {
-            if (value.position.equals(position)) {
-                return value;
-            }
-        }
-        return null;
-    }
-
-}

orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/handler/data/GenericsDataDefinition.java

@@ -1,56 +0,0 @@
-package com.orion.visor.framework.common.handler.data;
-
-import com.alibaba.fastjson.JSON;
-import com.orion.spring.SpringHolder;
-import com.orion.visor.framework.common.handler.data.model.GenericsDataModel;
-import com.orion.visor.framework.common.handler.data.strategy.MapDataStrategy;
-
-/**
- * 标准数据定义
- *
- * @author Jiahang Li
- * @version 1.0.0
- * @since 2023/12/21 0:07
- */
-public interface GenericsDataDefinition {
-
-    /**
-     * 获取数据模型类型
-     *
-     * @return class
-     */
-    Class<? extends GenericsDataModel> getModel();
-
-    /**
-     * 获取数据处理策略
-     *
-     * @return class
-     */
-    Class<? extends MapDataStrategy<? extends GenericsDataModel>> getStrategy();
-
-    /**
-     * 获取数据模型策略处理器
-     *
-     * @param <Model>    Model
-     * @param <Strategy> Strategy
-     * @return StrategyBean
-     */
-    @SuppressWarnings("unchecked")
-    default <Model extends GenericsDataModel, Strategy extends MapDataStrategy<Model>> Strategy getStrategyBean() {
-        return (Strategy) SpringHolder.getBean(this.getStrategy());
-    }
-
-    /**
-     * 反序列化对象
-     *
-     * @param json    json
-     * @param <Model> Model
-     * @return object
-     */
-    @SuppressWarnings("unchecked")
-    default <Model extends GenericsDataModel> Model parse(String json) {
-        return (Model) JSON.parseObject(json, this.getModel());
-    }
-
-
-}

orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/handler/data/model/GenericsDataModel.java

@@ -1,23 +0,0 @@
-package com.orion.visor.framework.common.handler.data.model;
-
-import com.alibaba.fastjson.JSON;
-
-/**
- * 标准数据模型
- *
- * @author Jiahang Li
- * @version 1.0.0
- * @since 2023/12/20 22:07
- */
-public interface GenericsDataModel {
-
-    /**
-     * 序列化
-     *
-     * @return json
-     */
-    default String serial() {
-        return JSON.toJSONString(this);
-    }
-
-}

orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/handler/data/strategy/GenericsDataStrategy.java

@@ -1,68 +0,0 @@
-package com.orion.visor.framework.common.handler.data.strategy;
-
-import com.orion.visor.framework.common.handler.data.model.GenericsDataModel;
-
-/**
- * 标准数据处理策略
- *
- * @author Jiahang Li
- * @version 1.0.0
- * @since 2023/12/20 22:09
- */
-public interface GenericsDataStrategy<Model extends GenericsDataModel, View> {
-
-    /**
-     * 获取默认值
-     *
-     * @return 默认值
-     */
-    Model getDefault();
-
-    /**
-     * 更新填充
-     *
-     * @param beforeModel 修改前的配置
-     * @param afterModel  修改后的配置
-     */
-    void updateFill(Model beforeModel, Model afterModel);
-
-    /**
-     * 预校验参数
-     *
-     * @param model model
-     */
-    void preValid(Model model);
-
-    /**
-     * 校验参数
-     *
-     * @param model model
-     */
-    void valid(Model model);
-
-    /**
-     * 执行完整验证链
-     * <p>
-     * preValid > updateFill > preValid
-     *
-     * @param beforeModel beforeModel
-     * @param afterModel  afterModel
-     */
-    default void doValidChain(Model beforeModel, Model afterModel) {
-        // 预校验参数
-        this.preValid(afterModel);
-        // 更新填充
-        this.updateFill(beforeModel, afterModel);
-        // 校验参数
-        this.valid(afterModel);
-    }
-
-    /**
-     * 转为视图配置
-     *
-     * @param model model
-     * @return 视图配置
-     */
-    View toView(String model);
-
-}

orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/handler/data/strategy/MapDataStrategy.java

@@ -1,22 +0,0 @@
-package com.orion.visor.framework.common.handler.data.strategy;
-
-import com.alibaba.fastjson.JSONObject;
-import com.orion.visor.framework.common.handler.data.model.GenericsDataModel;
-
-import java.util.Map;
-
-/**
- * map 数据处理策略
- *
- * @author Jiahang Li
- * @version 1.0.0
- * @since 2023/12/20 22:11
- */
-public interface MapDataStrategy<Model extends GenericsDataModel> extends GenericsDataStrategy<Model, Map<String, Object>> {
-
-    @Override
-    default Map<String, Object> toView(String model) {
-        return JSONObject.parseObject(model);
-    }
-
-}

orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/json/filter/FieldIgnoreFilter.java

@@ -1,28 +0,0 @@
-package com.orion.visor.framework.common.json.filter;
-
-import com.alibaba.fastjson.serializer.PropertyFilter;
-import com.orion.lang.utils.collect.Lists;
-
-import java.util.List;
-
-/**
- * 字段忽略过滤器
- *
- * @author Jiahang Li
- * @version 1.0.0
- * @since 2023/10/12 11:21
- */
-public class FieldIgnoreFilter implements PropertyFilter {
-
-    private final List<String> ignoreFields;
-
-    public FieldIgnoreFilter(List<String> ignoreFields) {
-        this.ignoreFields = ignoreFields;
-    }
-
-    @Override
-    public boolean apply(Object object, String name, Object value) {
-        return Lists.isEmpty(ignoreFields) || !ignoreFields.contains(name);
-    }
-
-}

orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/lock/Locker.java

@@ -1,33 +0,0 @@
-package com.orion.visor.framework.common.lock;
-
-import java.util.function.Supplier;
-
-/**
- * 分布式锁
- *
- * @author Jiahang Li
- * @version 1.0.0
- * @since 2024/5/16 12:24
- */
-public interface Locker {
-
-    /**
-     * 尝试获取锁
-     *
-     * @param key key
-     * @param run run
-     * @return 是否获取到锁
-     */
-    boolean tryLock(String key, Runnable run);
-
-    /**
-     * 尝试获取锁
-     *
-     * @param key  key
-     * @param call call
-     * @param <T>  T
-     * @return 执行结果
-     */
-    <T> T tryLock(String key, Supplier<T> call);
-
-}

orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/meta/TraceIdHolder.java

@@ -1,38 +0,0 @@
-package com.orion.visor.framework.common.meta;
-
-import com.alibaba.ttl.TransmittableThreadLocal;
-
-/**
- * traceId 持有者
- *
- * @author Jiahang Li
- * @version 1.0.0
- * @since 2023/6/16 17:35
- */
-public class TraceIdHolder {
-
-    public static final String TRACE_ID_HEADER = "trace-id";
-
-    public static final String TRACE_ID_MDC = "tid";
-
-    private TraceIdHolder() {
-    }
-
-    /**
-     * 请求序列
-     */
-    private static final ThreadLocal<String> HOLDER = new TransmittableThreadLocal<>();
-
-    public static String get() {
-        return HOLDER.get();
-    }
-
-    public static void set(String traceId) {
-        HOLDER.set(traceId);
-    }
-
-    public static void remove() {
-        HOLDER.remove();
-    }
-
-}

orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/security/LoginUser.java

@@ -1,40 +0,0 @@
-package com.orion.visor.framework.common.security;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-import java.util.List;
-
-/**
- * 当前登录用户
- *
- * @author Jiahang Li
- * @version 1.0.0
- * @since 2023/7/6 18:36
- */
-@Data
-@Schema(name = "LoginUser", description = "当前登录用户对象")
-public class LoginUser {
-
-    @Schema(description = "id")
-    private Long id;
-
-    @Schema(description = "用户名")
-    private String username;
-
-    @Schema(description = "花名")
-    private String nickname;
-
-    @Schema(description = "用户状态")
-    private Integer status;
-
-    @Schema(description = "头像地址")
-    private String avatar;
-
-    @Schema(description = "登录时间戳")
-    private Long timestamp;
-
-    @Schema(description = "角色")
-    private List<UserRole> roles;
-
-}

orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/security/PasswordModifier.java

@@ -1,40 +0,0 @@
-package com.orion.visor.framework.common.security;
-
-import com.orion.lang.utils.Booleans;
-import com.orion.lang.utils.Strings;
-import com.orion.visor.framework.common.constant.Const;
-import com.orion.visor.framework.common.utils.CryptoUtils;
-
-/**
- * 密码修改器
- *
- * @author Jiahang Li
- * @version 1.0.0
- * @since 2023/9/21 11:35
- */
-public class PasswordModifier {
-
-    private PasswordModifier() {
-    }
-
-    /**
-     * 获取新密码
-     *
-     * @param action action
-     * @return password
-     */
-    public static String getEncryptNewPassword(UpdatePasswordAction action) {
-        if (Booleans.isTrue(action.getUseNewPassword())) {
-            // 使用新密码
-            String password = action.getPassword();
-            if (Strings.isBlank(password)) {
-                return Const.EMPTY;
-            } else {
-                return CryptoUtils.encryptAsString(password);
-            }
-        } else {
-            return null;
-        }
-    }
-
-}

orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/security/SecurityHolder.java

@@ -1,26 +0,0 @@
-package com.orion.visor.framework.common.security;
-
-/**
- * SecurityUtils 的 bean 对象
- *
- * @author Jiahang Li
- * @version 1.0.0
- * @since 2023/7/7 15:20
- */
-public interface SecurityHolder {
-
-    /**
-     * 获取当前用户
-     *
-     * @return 当前用户
-     */
-    LoginUser getLoginUser();
-
-    /**
-     * 获取当前用户id
-     *
-     * @return id
-     */
-    Long getLoginUserId();
-
-}

orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/security/UpdatePasswordAction.java

@@ -1,28 +0,0 @@
-package com.orion.visor.framework.common.security;
-
-import java.io.Serializable;
-
-/**
- * 更新密码操作
- *
- * @author Jiahang Li
- * @version 1.0.0
- * @since 2023/9/21 11:32
- */
-public interface UpdatePasswordAction extends Serializable {
-
-    /**
-     * 是否使用新密码
-     *
-     * @return use
-     */
-    Boolean getUseNewPassword();
-
-    /**
-     * 获取密码
-     *
-     * @return password
-     */
-    String getPassword();
-
-}

orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/security/UserRole.java

@@ -1,28 +0,0 @@
-package com.orion.visor.framework.common.security;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-
-/**
- * 用户角色
- *
- * @author Jiahang Li
- * @version 1.0.0
- * @since 2023/11/20 23:39
- */
-@Data
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-@EqualsAndHashCode(onlyExplicitlyIncluded = true)
-@Schema(name = "UserRole", description = "用户角色")
-public class UserRole {
-
-    @EqualsAndHashCode.Include
-    @Schema(description = "id")
-    private Long id;
-
-    @Schema(description = "角色")
-    private String code;
-
-}

orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/thread/ThreadPoolMdcTaskExecutor.java

@@ -1,33 +0,0 @@
-package com.orion.visor.framework.common.thread;
-
-import com.orion.visor.framework.common.utils.ThreadMdcUtils;
-import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
-
-import java.util.concurrent.Callable;
-import java.util.concurrent.Future;
-
-/**
- * 自动注入 MDC 异步线程池
- *
- * @author Jiahang Li
- * @version 1.0.0
- * @since 2023/7/10 15:16
- */
-public class ThreadPoolMdcTaskExecutor extends ThreadPoolTaskExecutor {
-
-    @Override
-    public void execute(Runnable task) {
-        super.execute(ThreadMdcUtils.wrap(task));
-    }
-
-    @Override
-    public <T> Future<T> submit(Callable<T> task) {
-        return super.submit(ThreadMdcUtils.wrap(task));
-    }
-
-    @Override
-    public Future<?> submit(Runnable task) {
-        return super.submit(ThreadMdcUtils.wrap(task));
-    }
-
-}

orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/utils/FileNames.java

@@ -1,28 +0,0 @@
-package com.orion.visor.framework.common.utils;
-
-import com.orion.lang.utils.time.Dates;
-import com.orion.visor.framework.common.constant.Const;
-
-/**
- * 文件名称
- *
- * @author Jiahang Li
- * @version 1.0.0
- * @since 2023/8/31 17:57
- */
-public class FileNames {
-
-    private FileNames() {
-    }
-
-    /**
-     * 导出文件名称
-     *
-     * @param title title
-     * @return name
-     */
-    public static String exportName(String title) {
-        return title + "-" + Dates.current(Dates.YMD_HMS2) + "." + Const.SUFFIX_XLSX;
-    }
-
-}

orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/utils/IpUtils.java

@@ -1,75 +0,0 @@
-package com.orion.visor.framework.common.utils;
-
-import com.orion.ext.location.Region;
-import com.orion.ext.location.region.LocationRegions;
-import com.orion.visor.framework.common.constant.Const;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * ip 工具类
- *
- * @author Jiahang Li
- * @version 1.0.0
- * @since 2023/7/14 16:26
- */
-public class IpUtils {
-
-    private static final Map<String, String> CACHE = new HashMap<>();
-
-    private IpUtils() {
-    }
-
-    /**
-     * 获取 ip 位置
-     *
-     * @param ip ip
-     * @return ip 位置
-     */
-    public static String getLocation(String ip) {
-        if (ip == null) {
-            return Const.UNKNOWN;
-        }
-        // 查询缓存
-        return CACHE.computeIfAbsent(ip, IpUtils::queryLocation);
-    }
-
-    /**
-     * 查询 ip 位置
-     *
-     * @param ip ip
-     * @return ip 位置
-     */
-    private static String queryLocation(String ip) {
-        if (ip == null) {
-            return Const.UNKNOWN;
-        }
-        Region region;
-        try {
-            region = LocationRegions.getRegion(ip, 3);
-        } catch (Exception e) {
-            return Const.UNKNOWN;
-        }
-        if (region != null) {
-            String net = region.getNet();
-            String province = region.getProvince();
-            if (net.equals(Const.INTRANET_IP)) {
-                return net;
-            }
-            if (province.equals(Const.UNKNOWN)) {
-                return province;
-            }
-            StringBuilder location = new StringBuilder()
-                    .append(region.getCountry())
-                    .append(Const.DASHED)
-                    .append(province)
-                    .append(Const.DASHED)
-                    .append(region.getCity());
-            location.append(" (").append(net).append(')');
-            return location.toString();
-        }
-        return Const.UNKNOWN;
-    }
-
-}

orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/utils/PathUtils.java

@@ -1,69 +0,0 @@
-package com.orion.visor.framework.common.utils;
-
-import com.orion.lang.utils.Objects1;
-import com.orion.visor.framework.common.constant.AppConst;
-import com.orion.visor.framework.common.constant.Const;
-
-/**
- * 路径工具类
- *
- * @author Jiahang Li
- * @version 1.0.0
- * @since 2024/4/17 10:28
- */
-public class PathUtils {
-
-    private PathUtils() {
-    }
-
-    /**
-     * 获取用户根目录
-     *
-     * @param isWindows isWindows
-     * @param username  用户名
-     * @return 用户目录
-     */
-    public static String getHomePath(boolean isWindows, String username) {
-        if (isWindows) {
-            // windows
-            return "C:/Users/" + username;
-        } else {
-            // linux
-            if (Const.ROOT.equals(username)) {
-                return "/" + Const.ROOT;
-            } else {
-                return "/home/" + username;
-            }
-        }
-    }
-
-    /**
-     * 获取应用路径
-     *
-     * @param isWindows isWindows
-     * @param username  username
-     * @return path
-     */
-    public static String getAppPath(boolean isWindows, String username) {
-        return getHomePath(isWindows, username)
-                + "/" + AppConst.ORION
-                + "/" + AppConst.ORION_VISOR;
-    }
-
-    /**
-     * 构建应用路径
-     *
-     * @param isWindows isWindows,
-     * @param username  username
-     * @param paths     paths
-     * @return path
-     */
-    public static String buildAppPath(boolean isWindows, String username, Object... paths) {
-        StringBuilder path = new StringBuilder(getAppPath(isWindows, username));
-        for (Object o : paths) {
-            path.append("/").append(Objects1.toString(o));
-        }
-        return path.toString();
-    }
-
-}

orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/validator/group/Batch.java

@@ -1,13 +0,0 @@
-package com.orion.visor.framework.common.validator.group;
-
-import javax.validation.groups.Default;
-
-/**
- * 批量验证分组
- *
- * @author Jiahang Li
- * @version 1.0.0
- * @since 2023/9/1 19:13
- */
-public interface Batch extends Default {
-}

orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/validator/group/Id.java

@@ -1,13 +0,0 @@
-package com.orion.visor.framework.common.validator.group;
-
-import javax.validation.groups.Default;
-
-/**
- * 分页验证分组
- *
- * @author Jiahang Li
- * @version 1.0.0
- * @since 2023/9/1 19:13
- */
-public interface Id extends Default {
-}

orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/validator/group/Page.java

@@ -1,13 +0,0 @@
-package com.orion.visor.framework.common.validator.group;
-
-import javax.validation.groups.Default;
-
-/**
- * 分页验证分组
- *
- * @author Jiahang Li
- * @version 1.0.0
- * @since 2023/9/1 19:13
- */
-public interface Page extends Default {
-}

orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/web/filter/FilterCreator.java

@@ -1,33 +0,0 @@
-package com.orion.visor.framework.common.web.filter;
-
-import org.springframework.boot.web.servlet.FilterRegistrationBean;
-
-import javax.servlet.Filter;
-
-/**
- * 过滤器构造器
- *
- * @author Jiahang Li
- * @version 1.0.0
- * @since 2023/6/25 15:05
- */
-public class FilterCreator {
-
-    private FilterCreator() {
-    }
-
-    /**
-     * 创建过滤器
-     *
-     * @param filter filter
-     * @param order  order
-     * @param <T>    type
-     * @return filter bean
-     */
-    public static <T extends Filter> FilterRegistrationBean<T> create(T filter, Integer order) {
-        FilterRegistrationBean<T> bean = new FilterRegistrationBean<>(filter);
-        bean.setOrder(order);
-        return bean;
-    }
-
-}

orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/configuration/OrionCommonAutoConfiguration.java

@@ -1,9 +1,31 @@
-package com.orion.visor.framework.common.configuration;
+/*
+ * 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.configuration;
 
-import com.orion.spring.SpringHolder;
-import com.orion.visor.framework.common.configuration.config.AsyncExecutorConfig;
-import com.orion.visor.framework.common.constant.AutoConfigureOrderConst;
-import com.orion.visor.framework.common.thread.ThreadPoolMdcTaskExecutor;
+import cn.orionsec.kit.spring.SpringHolder;
+import org.dromara.visor.framework.common.configuration.config.AsyncExecutorConfig;
+import org.dromara.visor.framework.common.constant.AutoConfigureOrderConst;
+import org.dromara.visor.framework.common.thread.ThreadPoolMdcTaskExecutor;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.AutoConfigureOrder;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;

orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/configuration/config/AsyncExecutorConfig.java

@@ -0,0 +1,66 @@
+/*
+ * Copyright (c) 2023 - present Dromara, All rights reserved.
+ *
+ *   https://visor.dromara.org
+ *   https://visor.dromara.org.cn
+ *   https://visor.orionsec.cn
+ *
+ * Members:
+ *   Jiahang Li - ljh1553488six@139.com - author
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.dromara.visor.framework.common.configuration.config;
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+/**
+ * 线程池配置类
+ *
+ * @author Jiahang Li
+ * @version 1.0.0
+ * @since 2023/7/10 15:49
+ */
+@Data
+@ConfigurationProperties(prefix = "orion.async.executor")
+public class AsyncExecutorConfig {
+
+    /**
+     * 核心线程数量
+     */
+    private int corePoolSize;
+
+    /**
+     * 最大线程数量
+     */
+    private int maxPoolSize;
+
+    /**
+     * 队列容量
+     */
+    private int queueCapacity;
+
+    /**
+     * 活跃时间
+     */
+    private int keepAliveSeconds;
+
+    public AsyncExecutorConfig() {
+        this.corePoolSize = 8;
+        this.maxPoolSize = 16;
+        this.queueCapacity = 200;
+        this.keepAliveSeconds = 300;
+    }
+
+}

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

@@ -0,0 +1,52 @@
+/*
+ * 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.constant;
+
+import cn.orionsec.kit.lang.constant.OrionConst;
+
+/**
+ * 项目常量
+ *
+ * @author Jiahang Li
+ * @version 1.0.0
+ * @since 2023/6/19 18:56
+ */
+public interface AppConst extends OrionConst {
+
+    /**
+     * 同 ${orion.version} 迭代时候需要手动更改
+     */
+    String VERSION = "2.2.2";
+
+    /**
+     * 同 ${spring.application.name}
+     */
+    String APP_NAME = "orion-visor";
+
+    String GITHUB = "https://github.com/dromara/orion-visor";
+
+    String GITEE = "https://gitee.com/dromara/orion-visor";
+
+    String ISSUES = "https://github.com/dromara/orion-visor/issues";
+
+}

orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/constant/AutoConfigureOrderConst.java

@@ -1,4 +1,26 @@
-package com.orion.visor.framework.common.constant;
+/*
+ * 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.constant;
 
 /**
  * 自动装配排序常量

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

@@ -0,0 +1,54 @@
+/*
+ * 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.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/org/dromara/visor/framework/common/constant/CnConst.java

@@ -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.framework.common.constant;
+
+/**
+ * 常量 - 中文
+ *
+ * @author Jiahang Li
+ * @version 1.0.0
+ * @since 2023/11/30 21:00
+ */
+public interface CnConst {
+
+    String CN_USER = "用户";
+
+    String CN_ROLE = "角色";
+
+    String CN_UNKNOWN = "未知";
+
+    String CN_INTRANET_IP = "内网IP";
+
+}

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

@@ -0,0 +1,56 @@
+/*
+ * 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.constant;
+
+/**
+ * 常量
+ *
+ * @author Jiahang Li
+ * @version 1.0.0
+ * @since 2023/6/23 18:49
+ */
+public interface Const extends cn.orionsec.kit.lang.constant.Const, FieldConst, CnConst {
+
+    Integer NOT_DELETE = 0;
+
+    Integer IS_DELETED = 1;
+
+    int BEARER_PREFIX_LEN = 7;
+
+    int MD5_LEN = 32;
+
+    Long ROOT_PARENT_ID = 0L;
+
+    Integer DEFAULT_SORT = 10;
+
+    Long NONE_ID = -1L;
+
+    Integer DEFAULT_VERSION = 1;
+
+    Long SYSTEM_USER_ID = 0L;
+
+    String SYSTEM_USERNAME = "system";
+
+    int BATCH_COUNT = 500;
+
+}

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

@@ -1,9 +1,31 @@
-package com.orion.visor.framework.common.constant;
+/*
+ * 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.constant;
 
-import com.orion.lang.define.wrapper.CodeInfo;
-import com.orion.lang.define.wrapper.HttpWrapper;
-import com.orion.lang.utils.Exceptions;
-import com.orion.lang.utils.Strings;
+import cn.orionsec.kit.lang.define.wrapper.CodeInfo;
+import cn.orionsec.kit.lang.define.wrapper.HttpWrapper;
+import cn.orionsec.kit.lang.utils.Exceptions;
+import cn.orionsec.kit.lang.utils.Strings;
 
 /**
  * 用于定义错误码

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

@@ -0,0 +1,186 @@
+/*
+ * 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.constant;
+
+import cn.orionsec.kit.lang.exception.ApplicationException;
+import cn.orionsec.kit.lang.exception.argument.InvalidArgumentException;
+
+/**
+ * 错误信息
+ *
+ * @author Jiahang Li
+ * @version 1.0.0
+ * @since 2023/7/7 18:51
+ */
+public interface ErrorMessage {
+
+    String MISSING = "{} 不能为空";
+
+    String PARAM_MISSING = "参数不能为空";
+
+    String PARAM_ERROR = "参数错误";
+
+    String ID_MISSING = "id 不能为空";
+
+    String INVALID_PARAM = "参数验证失败";
+
+    String DATA_MODIFIED = "数据发生变更, 请刷新后重试";
+
+    String DATA_ABSENT = "数据不存在";
+
+    String KEY_ABSENT = "主机密钥不存在";
+
+    String IDENTITY_ABSENT = "主机身份不存在";
+
+    String CONFIG_ABSENT = "配置不存在";
+
+    String CONFIG_PRESENT = "配置已存在";
+
+    String DATA_PRESENT = "数据已存在";
+
+    String NAME_PRESENT = "名称已存在";
+
+    String CODE_PRESENT = "编码已存在";
+
+    String NICKNAME_PRESENT = "花名已存在";
+
+    String USERNAME_PRESENT = "用户名已存在";
+
+    String ROLE_ABSENT = "角色不存在";
+
+    String ROLE_CODE_ABSENT = "角色 [{}] 不存在";
+
+    String INVALID_PARENT_MENU = "所选父菜单不合法";
+
+    String PARENT_MENU_ABSENT = "父菜单不存在";
+
+    String USERNAME_PASSWORD_ERROR = "用户名或密码错误";
+
+    String MAX_LOGIN_FAILED = "登录失败次数已上限";
+
+    String HISTORY_ABSENT = "历史值不存在";
+
+    String USER_ABSENT = "用户不存在";
+
+    String HOST_ABSENT = "主机不存在";
+
+    String GROUP_ABSENT = "分组不存在";
+
+    String HOST_TYPE_ERROR = "主机类型错误";
+
+    String HOST_NOT_ENABLED = "主机未启用";
+
+    String UNABLE_OPERATE_ADMIN_ROLE = "无法操作管理员账号";
+
+    String UNSUPPORTED_CHARSET = "不支持的编码 [{}]";
+
+    String PASSWORD_MISSING = "请输入密码";
+
+    String BEFORE_PASSWORD_ERROR = "原密码错误";
+
+    String DATA_NO_PERMISSION = "数据无权限";
+
+    String ANY_NO_PERMISSION = "{}无权限";
+
+    String SESSION_PRESENT = "会话已存在";
+
+    String SESSION_ABSENT = "会话不存在";
+
+    String PATH_NOT_NORMALIZE = "路径不合法";
+
+    String OPERATE_ERROR = "操作失败";
+
+    String UNKNOWN_TYPE = "未知类型";
+
+    String ERROR_TYPE = "错误的类型";
+
+    String FILE_ABSENT = "文件不存在";
+
+    String FILE_ABSENT_CLEAR = "文件不存在 (可能已被清理)";
+
+    String LOG_ABSENT = "日志不存在";
+
+    String TASK_ABSENT = "任务不存在";
+
+    String CONNECT_ERROR = "连接失败";
+
+    String AUTH_ERROR = "认证失败";
+
+    String FILE_UPLOAD_ERROR = "文件上传失败";
+
+    String SCRIPT_UPLOAD_ERROR = "脚本上传失败";
+
+    String EXEC_ERROR = "执行失败";
+
+    String ILLEGAL_STATUS = "当前状态不支持此操作";
+
+    String CHECK_AUTHORIZED_HOST = "请选择已授权的主机";
+
+    String FILE_READ_ERROR = "文件读取失败";
+
+    String FILE_READ_ERROR_CLEAR = "文件读取失败 (可能已被清理)";
+
+    String PLEASE_CHECK_HOST_SSH = "请检查主机 {} 是否存在/权限/SSH配置";
+
+    String CLIENT_ABORT = "手动中断";
+
+    String UNABLE_DOWNLOAD_FOLDER = "无法下载文件夹";
+
+    /**
+     * 是否为业务异常
+     *
+     * @param ex ex
+     * @return biz exception
+     */
+    static boolean isBizException(Exception ex) {
+        if (ex == null) {
+            return false;
+        }
+        return ex instanceof InvalidArgumentException
+                || ex instanceof IllegalArgumentException
+                || ex instanceof ApplicationException;
+    }
+
+    /**
+     * 获取错误信息
+     *
+     * @param ex         ex
+     * @param defaultMsg defaultMsg
+     * @return message
+     */
+    static String getErrorMessage(Exception ex, String defaultMsg) {
+        if (ex == null) {
+            return null;
+        }
+        String message = ex.getMessage();
+        if (message == null) {
+            return defaultMsg;
+        }
+        // 业务异常
+        if (isBizException(ex)) {
+            return message;
+        }
+        return defaultMsg;
+    }
+
+}

orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/constant/ExtraFieldConst.java

@@ -0,0 +1,72 @@
+/*
+ * 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.constant;
+
+/**
+ * 额外字段常量
+ *
+ * @author Jiahang Li
+ * @version 1.0.0
+ * @since 2023/12/28 18:34
+ */
+public interface ExtraFieldConst extends FieldConst {
+
+    String USER_ID = "userId";
+
+    String TRACE_ID = "traceId";
+
+    String IDENTITY = "identity";
+
+    String GROUP_NAME = "groupName";
+
+    String ID_LIST = "idList";
+
+    String USERNAME = "username";
+
+    String HOME = "home";
+
+    String STATUS_NAME = "statusName";
+
+    String KEY_NAME = "keyName";
+
+    String POSITION_NAME = "positionName";
+
+    String GRANT_TYPE = "grantType";
+
+    String GRANT_NAME = "grantName";
+
+    String CHANNEL_ID = "channelId";
+
+    String SESSION_ID = "sessionId";
+
+    String CONNECT_TYPE = "connectType";
+
+    String HOST_ID = "hostId";
+
+    String HOST_NAME = "hostName";
+
+    String LOG_ID = "logId";
+
+    String DARK = "dark";
+
+}

orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/constant/FieldConst.java

@@ -0,0 +1,108 @@
+/*
+ * 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.constant;
+
+/**
+ * 字段常量
+ *
+ * @author Jiahang Li
+ * @version 1.0.0
+ * @since 2023/10/17 12:44
+ */
+public interface FieldConst {
+
+    String ID = "id";
+
+    String KEY = "key";
+
+    String CODE = "code";
+
+    String NAME = "name";
+
+    String TITLE = "title";
+
+    String VALUE = "value";
+
+    String LABEL = "label";
+
+    String TYPE = "type";
+
+    String COLOR = "color";
+
+    String STATUS = "status";
+
+    String INFO = "info";
+
+    String EXTRA = "extra";
+
+    String REL_ID = "relId";
+
+    String BEFORE = "before";
+
+    String AFTER = "after";
+
+    String SOURCE = "source";
+
+    String TARGET = "target";
+
+    String CHARSET = "charset";
+
+    String TOKEN = "token";
+
+    String SEQ = "seq";
+
+    String PATH = "path";
+
+    String ADDRESS = "address";
+
+    String MOD = "mod";
+
+    String COUNT = "count";
+
+    String DATE = "date";
+
+    String TIME = "time";
+
+    String TEXT = "text";
+
+    String ISSUE = "issue";
+
+    String EXPIRE = "expire";
+
+    String LOCATION = "location";
+
+    String USER_AGENT = "userAgent";
+
+    String ERROR_MESSAGE = "errorMessage";
+
+    String UUID = "uuid";
+
+    String REDIRECT = "redirect";
+
+    String SCHEMA = "schema";
+
+    String FILTER = "filter";
+
+    String ALL = "all";
+
+}

orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/constant/FileConst.java

@@ -0,0 +1,40 @@
+/*
+ * 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.constant;
+
+/**
+ * 文件常量
+ *
+ * @author Jiahang Li
+ * @version 1.0.0
+ * @since 2024/4/17 10:35
+ */
+public interface FileConst {
+
+    String ERROR_LOG = "error.log";
+
+    String EXEC = "exec";
+
+    String SCRIPT = "script";
+
+}

orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/constant/FilterOrderConst.java

@@ -0,0 +1,38 @@
+/*
+ * 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.constant;
+
+/**
+ * 过滤器排序常量
+ *
+ * @author Jiahang Li
+ * @version 1.0.0
+ * @since 2023/6/16 17:04
+ */
+public interface FilterOrderConst {
+
+    int TRICE_ID_FILTER = Integer.MIN_VALUE + 1000;
+
+    int CORS_FILTER = Integer.MIN_VALUE + 2000;
+
+}

orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/constant/ValidConst.java

@@ -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.framework.common.constant;
+
+/**
+ * 验证常量
+ *
+ * @author Jiahang Li
+ * @version 1.0.0
+ * @since 2023/10/20 11:45
+ */
+public interface ValidConst {
+
+    String USERNAME_4_32_PATTERN = "^[a-zA-Z0-9_]{4,32}$";
+
+    String USERNAME_4_32_MESSAGE = "只能为 4-32 位的数字,字母或下滑线";
+
+    String DICT_1_32_PATTERN = "^[a-zA-Z0-9_]{1,32}$";
+
+    String DICT_1_32_MESSAGE = "只能为 1-32 位的数字,字母或下滑线";
+
+}

orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/crypto/ValueCrypto.java

@@ -0,0 +1,62 @@
+/*
+ * Copyright (c) 2023 - present Dromara, All rights reserved.
+ *
+ *   https://visor.dromara.org
+ *   https://visor.dromara.org.cn
+ *   https://visor.orionsec.cn
+ *
+ * Members:
+ *   Jiahang Li - ljh1553488six@139.com - author
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.dromara.visor.framework.common.crypto;
+
+import cn.orionsec.kit.lang.utils.codec.Base62s;
+import cn.orionsec.kit.lang.utils.crypto.symmetric.SymmetricCrypto;
+
+/**
+ * 数据加密器
+ *
+ * @author Jiahang Li
+ * @version 1.0.0
+ * @since 2023/7/8 0:20
+ */
+public interface ValueCrypto extends SymmetricCrypto {
+
+    /**
+     * 初始化
+     */
+    void init();
+
+    /**
+     * 加密后 base62 编码
+     *
+     * @param plain 明文
+     * @return 密文
+     */
+    default String encryptBase62(String plain) {
+        return new String(Base62s.encode(this.encrypt(plain)));
+    }
+
+    /**
+     * base62 解码后解密
+     *
+     * @param text 密文
+     * @return 明文
+     */
+    default String decryptBase62(String text) {
+        return new String(this.decrypt(Base62s.decode(text)));
+    }
+
+}

orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/entity/AutoClearConfig.java

@@ -0,0 +1,45 @@
+/*
+ * 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.entity;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+/**
+ * 自动清理配置
+ *
+ * @author Jiahang Li
+ * @version 1.0.0
+ * @since 2024/6/24 15:03
+ */
+@Data
+@Schema(name = "AutoClearConfig", description = "自动清理配置")
+public class AutoClearConfig {
+
+    @Schema(description = "是否开启")
+    private Boolean enabled;
+
+    @Schema(description = "保留周期 (天)")
+    private Integer keepPeriod;
+
+}

orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/entity/DataClearRequest.java

@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2023 - present Dromara, All rights reserved.
+ *
+ *   https://visor.dromara.org
+ *   https://visor.dromara.org.cn
+ *   https://visor.orionsec.cn
+ *
+ * Members:
+ *   Jiahang Li - ljh1553488six@139.com - author
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.dromara.visor.framework.common.entity;
+
+/**
+ * 数据清理请求 定义
+ *
+ * @author Jiahang Li
+ * @version 1.0.0
+ * @since 2024/8/29 11:26
+ */
+public interface DataClearRequest {
+
+    /**
+     * 获取清理数量限制
+     *
+     * @return 清理限制
+     */
+    Integer getLimit();
+
+    /**
+     * 设置清理数量限制
+     *
+     * @param limit limit
+     */
+    void setLimit(Integer limit);
+
+}

orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/entity/PageRequest.java

@@ -0,0 +1,56 @@
+/*
+ * 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.entity;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import org.dromara.visor.framework.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 {
+
+    @NotNull(groups = Page.class)
+    @Min(value = 1, groups = Page.class)
+    @Max(value = 10000, groups = Page.class)
+    @Schema(description = "页码")
+    private Integer page;
+
+    @NotNull(groups = Page.class)
+    @Min(value = 1, groups = Page.class)
+    @Max(value = 200, groups = Page.class)
+    @Schema(description = "大小")
+    private Integer limit;
+
+}

orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/entity/RequestIdentity.java

@@ -1,4 +1,26 @@
-package com.orion.visor.framework.common.entity;
+/*
+ * 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.entity;
 
 import java.io.Serializable;
 

orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/entity/RequestIdentityModel.java

@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2023 - present Dromara, All rights reserved.
+ *
+ *   https://visor.dromara.org
+ *   https://visor.dromara.org.cn
+ *   https://visor.orionsec.cn
+ *
+ * Members:
+ *   Jiahang Li - ljh1553488six@139.com - author
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.dromara.visor.framework.common.entity;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+/**
+ * 请求留痕模型
+ *
+ * @author Jiahang Li
+ * @version 1.0.0
+ * @since 2023/12/29 11:57
+ */
+@Data
+@Schema(name = "RequestIdentityModel", description = "请求留痕模型")
+public class RequestIdentityModel implements RequestIdentity {
+
+    @Schema(description = "请求地址")
+    private String address;
+
+    @Schema(description = "请求位置")
+    private String location;
+
+    @Schema(description = "userAgent")
+    private String userAgent;
+
+}

orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/entity/TreeNode.java

@@ -0,0 +1,71 @@
+/*
+ * 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.entity;
+
+import java.util.List;
+
+/**
+ * 树节点
+ *
+ * @author Jiahang Li
+ * @version 1.0.0
+ * @since 2023/11/23 16:52
+ */
+public interface TreeNode<T extends TreeNode<T>> {
+
+    /**
+     * id
+     *
+     * @return id
+     */
+    Long getId();
+
+    /**
+     * parentId
+     *
+     * @return parentId
+     */
+    Long getParentId();
+
+    /**
+     * sort
+     *
+     * @return sort
+     */
+    Integer getSort();
+
+    /**
+     * children
+     *
+     * @return children
+     */
+    List<T> getChildren();
+
+    /**
+     * 设置 children
+     *
+     * @param children children
+     */
+    void setChildren(List<T> children);
+
+}

orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/enums/BooleanBit.java

@@ -1,4 +1,26 @@
-package com.orion.visor.framework.common.enums;
+/*
+ * 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.enums;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/enums/EnableStatus.java

@@ -0,0 +1,65 @@
+/*
+ * 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.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 启用状态
+ *
+ * @author Jiahang Li
+ * @version 1.0.0
+ * @since 2023/10/12 16:02
+ */
+@Getter
+@AllArgsConstructor
+public enum EnableStatus {
+
+    /**
+     * 停用
+     */
+    DISABLED(0),
+
+    /**
+     * 启用
+     */
+    ENABLED(1),
+
+    ;
+
+    private final Integer value;
+
+    public static EnableStatus of(Integer value) {
+        if (value == null) {
+            return null;
+        }
+        for (EnableStatus e : values()) {
+            if (e.value.equals(value)) {
+                return e;
+            }
+        }
+        return null;
+    }
+
+}

orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/enums/EndpointDefine.java

@@ -0,0 +1,67 @@
+/*
+ * 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.enums;
+
+import cn.orionsec.kit.lang.utils.Strings;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 端点定义
+ *
+ * @author Jiahang Li
+ * @version 1.0.0
+ * @since 2024/6/21 19:15
+ */
+@Getter
+@AllArgsConstructor
+public enum EndpointDefine {
+
+    /**
+     * 上传临时分区
+     */
+    UPLOAD_SWAP("/upload/swap/{}"),
+
+    /**
+     * 批量执行日志
+     */
+    EXEC_LOG("/exec/{}/{}.log"),
+
+    ;
+
+    /**
+     * 端点
+     */
+    private final String endpoint;
+
+    /**
+     * 格式化
+     *
+     * @param params params
+     * @return path
+     */
+    public String format(Object... params) {
+        return Strings.format(this.endpoint, params);
+    }
+
+}

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

@@ -0,0 +1,70 @@
+/*
+ * Copyright (c) 2023 - present Dromara, All rights reserved.
+ *
+ *   https://visor.dromara.org
+ *   https://visor.dromara.org.cn
+ *   https://visor.orionsec.cn
+ *
+ * Members:
+ *   Jiahang Li - ljh1553488six@139.com - author
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.dromara.visor.framework.common.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 移动位置
+ *
+ * @author Jiahang Li
+ * @version 1.0.0
+ * @since 2023/11/13 17:26
+ */
+@Getter
+@AllArgsConstructor
+public enum MovePosition {
+
+    /**
+     * 拖拽到目标元素上
+     */
+    TOP(-1),
+
+    /**
+     * 拖拽到目标元素中
+     */
+    IN(0),
+
+    /**
+     * 拖拽到目标元素下
+     */
+    BOTTOM(1),
+
+    ;
+
+    private final Integer position;
+
+    public static MovePosition of(Integer position) {
+        if (position == null) {
+            return null;
+        }
+        for (MovePosition value : values()) {
+            if (value.position.equals(position)) {
+                return value;
+            }
+        }
+        return null;
+    }
+
+}

orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/file/FileClient.java

@@ -1,4 +1,26 @@
-package com.orion.visor.framework.common.file;
+/*
+ * 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.file;
 
 import java.io.InputStream;
 import java.io.OutputStream;

orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/handler/data/GenericsDataDefinition.java

@@ -0,0 +1,82 @@
+/*
+ * 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.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;
+
+/**
+ * 标准数据定义
+ *
+ * @author Jiahang Li
+ * @version 1.0.0
+ * @since 2023/12/21 0:07
+ */
+@SuppressWarnings("unchecked")
+public interface GenericsDataDefinition {
+
+    /**
+     * 获取数据处理策略
+     *
+     * @return class
+     */
+    Class<? extends GenericsDataStrategy<? extends GenericsDataModel>> getStrategyClass();
+
+    /**
+     * 获取数据模型策略处理器
+     *
+     * @param <M> Model
+     * @param <S> Strategy
+     * @return Strategy Bean
+     */
+    default <M extends GenericsDataModel, S extends GenericsDataStrategy<M>> S getStrategy() {
+        return (S) SpringHolder.getBean(this.getStrategyClass());
+    }
+
+    /**
+     * 反序列化对象
+     *
+     * @param serialModel serialModel
+     * @param <M>         Model
+     * @return object
+     */
+    default <M extends GenericsDataModel> M parse(String serialModel) {
+        return (M) this.getStrategy().parse(serialModel);
+    }
+
+    /**
+     * 转为视图对象
+     *
+     * @param serialModel serialModel
+     * @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;
+    }
+
+}

orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/handler/data/model/GenericsDataModel.java

@@ -0,0 +1,57 @@
+/*
+ * 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.handler.data.model;
+
+import com.alibaba.fastjson.JSON;
+
+import java.util.Map;
+
+/**
+ * 标准数据模型
+ *
+ * @author Jiahang Li
+ * @version 1.0.0
+ * @since 2023/12/20 22:07
+ */
+public interface GenericsDataModel {
+
+    /**
+     * 序列化
+     *
+     * @return json
+     */
+    default String serial() {
+        return JSON.toJSONString(this);
+    }
+
+
+    /**
+     * 转为 map
+     *
+     * @return map
+     */
+    default Map<String, Object> toMap() {
+        return JSON.parseObject(this.serial());
+    }
+
+}

orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/handler/data/strategy/AbstractGenericsDataStrategy.java

@@ -0,0 +1,87 @@
+/*
+ * 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.handler.data.strategy;
+
+import com.alibaba.fastjson.JSON;
+import org.dromara.visor.framework.common.handler.data.model.GenericsDataModel;
+
+/**
+ * 标准数据处理策略 基类
+ *
+ * @author Jiahang Li
+ * @version 1.0.0
+ * @since 2024/6/11 21:44
+ */
+public abstract class AbstractGenericsDataStrategy<M extends GenericsDataModel> implements GenericsDataStrategy<M> {
+
+    protected final Class<M> modelClass;
+
+    public AbstractGenericsDataStrategy(Class<M> modelClass) {
+        this.modelClass = modelClass;
+    }
+
+    /**
+     * 更新填充
+     *
+     * @param beforeModel 修改前的配置
+     * @param afterModel  修改后的配置
+     */
+    protected void updateFill(M beforeModel, M afterModel) {
+    }
+
+    /**
+     * 预校验参数
+     *
+     * @param model model
+     */
+    protected void preValid(M model) {
+    }
+
+    /**
+     * 校验参数
+     *
+     * @param model model
+     */
+    protected void valid(M model) {
+    }
+
+    @Override
+    public void doValid(M beforeModel, M afterModel) {
+        // 预校验参数
+        this.preValid(afterModel);
+        // 更新填充
+        this.updateFill(beforeModel, afterModel);
+        // 校验参数
+        this.valid(afterModel);
+    }
+
+    @Override
+    public M parse(String serialModel) {
+        return JSON.parseObject(serialModel, modelClass);
+    }
+
+    @Override
+    public void toView(M model) {
+    }
+
+}

orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/handler/data/strategy/GenericsDataStrategy.java

@@ -0,0 +1,68 @@
+/*
+ * 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.handler.data.strategy;
+
+import org.dromara.visor.framework.common.handler.data.model.GenericsDataModel;
+
+/**
+ * 标准数据处理策略
+ *
+ * @author Jiahang Li
+ * @version 1.0.0
+ * @since 2023/12/20 22:09
+ */
+public interface GenericsDataStrategy<M extends GenericsDataModel> {
+
+    /**
+     * 获取默认值
+     *
+     * @return 默认值
+     */
+    M getDefault();
+
+    /**
+     * 执行完整验证链
+     * <p>
+     * preValid > updateFill > valid
+     *
+     * @param beforeModel beforeModel
+     * @param afterModel  afterModel
+     */
+    void doValid(M beforeModel, M afterModel);
+
+    /**
+     * 解析数据
+     *
+     * @param serialModel serialModel
+     * @return model
+     */
+    M parse(String serialModel);
+
+    /**
+     * 转为视图配置
+     *
+     * @param model model
+     */
+    void toView(M model);
+
+}

orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/json/filter/FieldDesensitizeFilter.java

@@ -1,9 +1,31 @@
-package com.orion.visor.framework.common.json.filter;
+/*
+ * 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.json.filter;
 
+import cn.orionsec.kit.lang.utils.Desensitizes;
+import cn.orionsec.kit.lang.utils.Objects1;
+import cn.orionsec.kit.lang.utils.collect.Lists;
 import com.alibaba.fastjson.serializer.ValueFilter;
-import com.orion.lang.utils.Desensitizes;
-import com.orion.lang.utils.Objects1;
-import com.orion.lang.utils.collect.Lists;
 
 import java.util.List;
 

orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/json/filter/FieldIgnoreFilter.java

@@ -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.framework.common.json.filter;
+
+import cn.orionsec.kit.lang.utils.collect.Lists;
+import com.alibaba.fastjson.serializer.PropertyFilter;
+
+import java.util.List;
+
+/**
+ * 字段忽略过滤器
+ *
+ * @author Jiahang Li
+ * @version 1.0.0
+ * @since 2023/10/12 11:21
+ */
+public class FieldIgnoreFilter implements PropertyFilter {
+
+    private final List<String> ignoreFields;
+
+    public FieldIgnoreFilter(List<String> ignoreFields) {
+        this.ignoreFields = ignoreFields;
+    }
+
+    @Override
+    public boolean apply(Object object, String name, Object value) {
+        return Lists.isEmpty(ignoreFields) || !ignoreFields.contains(name);
+    }
+
+}