Merge pull request #12 from lijiahangmax/dev

Dev

Author: lijiahangmax

DISCLAIMER.md

@@ -1,6 +1,6 @@
 ## 免责声明
 
-> 欢迎您选择使用 orion-ops-pro（以下简称「本项目」）。在使用本项目前，请您仔细阅读本免责声明，并确保您已充分理解其中的内容。您的使用行为将视为对本声明全部内容的认可和接受。
+> 欢迎您选择使用 orion-visor（以下简称「本项目」）。在使用本项目前，请您仔细阅读本免责声明，并确保您已充分理解其中的内容。您的使用行为将视为对本声明全部内容的认可和接受。
 
 > 本项目为一款开源免费的运维管理工具，采用 Apache 2.0 许可证授权。您可在遵守相关法律法规及许可证条款的前提下，自由修改和使用本项目。
 

README.md

@@ -1,124 +1,111 @@
-<h1 style="display: flex; align-items: center;">
- <img style="margin-right: 8px;" src="https://bjuimg.obs.cn-north-4.myhuaweicloud.com/images/2024/2/27/8c687ef1-5711-4a93-9db0-79c010af7902.png" width="32px" height="32px"/> orion-ops-pro 是什么
-</h1>
-
-`orion-ops-pro`
-是一款现代化、高颜值的一站式智能运维管理平台，集资产管理、资产授权、批量执行、批量上传、计划任务、WebShell、WebSftp、角色管理、系统管理等功能于一体，致力于简化运维团队的治理工作。
-
-<p style="text-align: left">
-    <a target="_blank" style="text-decoration: none" href="https://app.codacy.com/gh/lijiahangmax/orion-ops-pro/dashboard?utm_source=gh&utm_medium=referral&utm_content=&utm_campaign=Badge_grade">
+<div align="center"><img src="https://bjuimg.obs.cn-north-4.myhuaweicloud.com/images/2024/2/27/8c687ef1-5711-4a93-9db0-79c010af7902.png" alt="logo" width="32" /></div>
+<p style="margin-top: 12px" align="center"><b>高颜值、现代化的智能运维&轻量堡垒机平台。</b></p>
+<p align="center">
+    <a target="_blank" href="https://app.codacy.com/gh/lijiahangmax/orion-visor/dashboard?utm_source=gh&utm_medium=referral&utm_content=&utm_campaign=Badge_grade">
         <img src="https://app.codacy.com/project/badge/Grade/49eaab3a9a474af3b87e1d21ffec71c4" alt="quality"/>
     </a>
-	<a target="_blank" style="text-decoration: none" href="https://www.oracle.com/java/technologies/javase/javase-jdk8-downloads.html">
-		<img src="https://img.shields.io/badge/JDK-8+-green.svg" alt="jdk8"/>
+	<a target="_blank" href="https://www.apache.org/licenses/LICENSE-2.0">
+		<img src="https://img.shields.io/github/license/lijiahangmax/orion-visor" alt="License"/>
 	</a>
-	<a target="_blank" style="text-decoration: none" href="https://www.apache.org/licenses/LICENSE-2.0">
-		<img src="https://img.shields.io/github/license/lijiahangmax/orion-ops-pro" alt="License"/>
+	<a target="_blank" href="https://github.com/lijiahangmax/orion-visor/releases">
+		<img src="https://img.shields.io/github/v/release/lijiahangmax/orion-visor" alt="release"/>
 	</a>
-	<a target="_blank" style="text-decoration: none" href="https://gitee.com/lijiahangmax/orion-ops-pro/stargazers">
-		<img src="https://gitee.com/lijiahangmax/orion-ops-pro/badge/star.svg?theme=dark" alt="star"/>
+	<a target="_blank" href="https://gitee.com/lijiahangmax/orion-visor/stargazers">
+		<img src="https://gitee.com/lijiahangmax/orion-visor/badge/star.svg?theme=dark" alt="star"/>
 	</a>
-	<a target="_blank" style="text-decoration: none" href="https://gitee.com/lijiahangmax/orion-ops-pro/members">
-		<img src="https://gitee.com/lijiahangmax/orion-ops-pro/badge/fork.svg?theme=dark" alt="fork"/>
+	<a target="_blank" style="display: none;" href="https://gitee.com/lijiahangmax/orion-visor/members">
+		<img src="https://gitee.com/lijiahangmax/orion-visor/badge/fork.svg?theme=dark" alt="fork"/>
 	</a>		
-	<a target="_blank" style="text-decoration: none" href="https://github.com/lijiahangmax/orion-ops-pro">
-		<img src="https://img.shields.io/github/stars/lijiahangmax/orion-ops-pro.svg?style=social" alt="star"/>
+	<a target="_blank" href="https://github.com/lijiahangmax/orion-visor">
+		<img src="https://img.shields.io/github/stars/lijiahangmax/orion-visor.svg?style=social" alt="star"/>
+	</a>  
+	<a target="_blank" style="display: none;" href="https://github.com/lijiahangmax/orion-visor">
+		<img src="https://img.shields.io/github/forks/lijiahangmax/orion-visor.svg?style=social" alt="star"/>
 	</a>  
 </p>
 
-当前版本: **1.0.8**  
+------------------------------
 
-**github:** https://github.com/lijiahangmax/orion-ops-pro  
-**gitee:** https://gitee.com/lijiahangmax/orion-ops-pro  
-**文档:** https://lijiahangmax.github.io/orion-ops-pro/#/  
-**demo:** http://101.43.254.243:1081/
+**`orion-visor`** 提供一站式服务器运维解决方案。
 
-演示账号: `admin`    
-演示密码: `admin`  
-⭐ 体验后可以点一下 `star` 这对我很重要!  
-🌈 如果本项目对你有帮助请帮忙推广一下 让更多的人知道此项目!  
-📞 合作/功能定制请联系底部 备注: '合作'
+* **资产管理**：支持对资产进行分组，实现对主机、密钥和身份的统一管理和授权。
+* **在线终端**：提供在线 Terminal 服务，支持快捷命令、大文件上传、在线编辑等操作。
+* **批量操作**：支持批量执行主机命令、多主机文件分发等功能。
+* **计划任务**：支持配置 cron 表达式，定时执行主机命令。
+* **安全可靠**：动态配置权限，记录用户操作日志，提供简单的审计功能。
 
-## 特性
+## 演示环境
 
-* **快速稳定**: 使用全新的系统架构, 提高系统性能以及稳定性。
-* **交互友好**: 对与用户的交互进行了细致化的打磨, 操作更加方便快捷。
-* **资产管理**: 支持对资产进行分组, 实现对主机、秘钥和身份的统一管理和授权。
-* **权限控制**: 全面管理用户角色, 支持动态菜单配置和强制下线等功能。
-* **在线终端**: 提供便捷的在线 Web 终端服务, 支持快捷命令、自定义快捷键和主题风格。
-* **文件管理**: 实现远程主机大文件的批量上传、下载和在线编辑等操作。
-* **批量操作**: 支持远程主机批量执行主机命令、多主机文件分发。
-* **计划任务**: 支持配置 cron 表达式, 定时执行主机命令。
-* **操作审计**: 记录用户操作日志，确保操作可追溯, 提高系统安全性。
+演示地址: http://101.43.254.243:1081/   
+演示账号: admin/admin
+
+⭐ 体验后可以点一下 `star` 这对我很重要!  
+🌈 如果本项目对你有帮助请帮忙推广一下 让更多的人知道此项目!
 
 ## 快速开始
 
-* [docker安装](https://lijiahangmax.github.io/orion-ops-pro/#/quickstart/docker-install)
-* [普通安装](https://lijiahangmax.github.io/orion-ops-pro/#/quickstart/install)
-* [更新日志](https://lijiahangmax.github.io/orion-ops-pro/#/about/change-log)
-* [操作手册](https://lijiahangmax.github.io/orion-ops-pro/#/operator/asset)
-* [常见问题](https://lijiahangmax.github.io/orion-ops-pro/#/quickstart/faq)
+* [文档地址](https://lijiahangmax.github.io/orion-visor/#/)
+* [docker安装](https://lijiahangmax.github.io/orion-visor/#/quickstart/docker-install)
+* [普通安装](https://lijiahangmax.github.io/orion-visor/#/quickstart/install)
+* [更新日志](https://lijiahangmax.github.io/orion-visor/#/about/change-log)
+* [操作手册](https://lijiahangmax.github.io/orion-visor/#/operator/asset)
+* [常见问题](https://lijiahangmax.github.io/orion-visor/#/quickstart/faq)
 
 ## 技术栈
 
-* Docker
-* SpringBoot
-* Mysql
-* Redis
-* Vue3
-* Arco Design
+* SpringBoot 2.7.17
+* Mysql 8.0.+
+* Redis 6.0.+
+* Vue3 3.2.+
+* Arco Design 2.55.+
 
 ## 主要功能预览
 
-> 主机终端
+#### 主机终端
 
-![新建连接](https://bjuimg.obs.cn-north-4.myhuaweicloud.com/images/2024/4/20/fb90febf-b1aa-45d4-a6f8-ed681dd259b2.png "新建连接")
-![主机终端](https://bjuimg.obs.cn-north-4.myhuaweicloud.com/images/2024/4/20/8055df25-82d5-434d-8846-78afb2ee4638.png "主机终端")
-![sftp](https://bjuimg.obs.cn-north-4.myhuaweicloud.com/images/2024/4/20/b7f2b644-a3d8-4562-8d05-d860805fb815.png "sftp")
-![主题设置](https://bjuimg.obs.cn-north-4.myhuaweicloud.com/images/2024/3/22/20741d51-af62-40f0-bd6f-6e954d9b0398.png "主题设置")
-![终端设置](https://bjuimg.obs.cn-north-4.myhuaweicloud.com/images/2024/3/22/a3bf32bc-26b5-4ec7-b429-54c17ccd136b.png "终端设置")
+![新建连接](https://bjuimg.obs.cn-north-4.myhuaweicloud.com/images/2024/5/17/19288b64-cdb2-4073-8df9-ecd642d4077f.png "新建连接")
+![主机终端](https://bjuimg.obs.cn-north-4.myhuaweicloud.com/images/2024/5/17/41d9deb5-aede-48a5-a6f3-5522cfff9a9f.png "主机终端")
+![sftp](https://bjuimg.obs.cn-north-4.myhuaweicloud.com/images/2024/5/17/366db511-0c1d-4680-9200-4da8f22b028b.png "sftp")
+![主题设置](https://bjuimg.obs.cn-north-4.myhuaweicloud.com/images/2024/5/17/a3e4c2fb-11f5-4387-998e-6f454e336472.png "主题设置")
 
-> 批量执行
+#### 批量执行
 
-![批量执行](https://bjuimg.obs.cn-north-4.myhuaweicloud.com/images/2024/4/20/197804f2-cb69-4ebb-b1e1-b52372972301.png "批量执行")
-![执行日志](https://bjuimg.obs.cn-north-4.myhuaweicloud.com/images/2024/3/22/06d02d38-70ef-43c2-950c-9f8c73a105ba.png "执行日志")
-![执行记录](https://bjuimg.obs.cn-north-4.myhuaweicloud.com/images/2024/3/22/0e474cc2-f7cf-49bc-be3c-f6445783ad7c.png "执行记录")
+![批量执行](https://bjuimg.obs.cn-north-4.myhuaweicloud.com/images/2024/5/17/99839bab-9f0e-45ea-b03d-a4c992203e95.png "批量执行")
 
-> 批量上传
+#### 批量上传
 
-![批量上传任务](https://bjuimg.obs.cn-north-4.myhuaweicloud.com/images/2024/5/12/1e9d0c74-4ef7-4322-ae17-42085b7ba552.png "批量上传任务")
-![批量上传中](https://bjuimg.obs.cn-north-4.myhuaweicloud.com/images/2024/5/12/a94a6d96-0969-4205-91fb-4c6f8cf092a8.png "批量上传中")
+![批量上传任务](https://bjuimg.obs.cn-north-4.myhuaweicloud.com/images/2024/5/17/04ccd627-8a46-43a1-acd9-740f75dbf386.png "批量上传任务")
 
-> 计划任务
+#### 计划任务
 
-![计划任务编辑](https://bjuimg.obs.cn-north-4.myhuaweicloud.com/images/2024/4/20/b6ba7ec0-011f-48ff-a36e-c8d93bd1f75c.png "计划任务编辑")
-![计划任务](https://bjuimg.obs.cn-north-4.myhuaweicloud.com/images/2024/4/15/ba5c0635-50c1-4c43-8062-3470ad33830e.png "计划任务")
+![计划任务详情](https://bjuimg.obs.cn-north-4.myhuaweicloud.com/images/2024/5/17/0c4342fc-9fde-4fc1-b886-104a4d22c0b2.png "计划任务详情")
 
-> 用户管理
+## Star History
 
-![个人中心](https://bjuimg.obs.cn-north-4.myhuaweicloud.com/images/2024/3/22/ed1e5e02-f854-44ee-bb37-ea6e45526457.png "个人中心")
-![操作日志](https://bjuimg.obs.cn-north-4.myhuaweicloud.com/images/2024/3/22/ba6f1526-da00-4a3d-a550-470a6b3d2803.png "操作日志")
+[![Star History Chart](https://api.star-history.com/svg?repos=lijiahangmax/orion-visor&type=Date)](https://star-history.com/#lijiahangmax/orion-visor&Date)
 
 ## 联系我
 
 <div style="display: flex;">
-  <img src="https://bjuimg.obs.cn-north-4.myhuaweicloud.com/images/2024/2/27/d452cd30-cecd-4236-86f5-5ecbf3eac091.jpg" alt="qq" width="268px" height="398px"/>  
-  <img src="https://bjuimg.obs.cn-north-4.myhuaweicloud.com/images/2024/2/27/4f1c4e77-8e36-45a3-8be6-9da5387bb96e.jpg" alt="wx" width="298px" height="398px"/>  
+  <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>
 
-📧 咨询问题微信备注: ops  
+![个人微信: 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)
+
+📧 咨询问题微信备注: vis  
 📧 合作/功能定制备注: 合作
 
 ## 支持一下
 
-<img src="https://bjuimg.obs.cn-north-4.myhuaweicloud.com/images/2024/2/27/8063cf87-9de9-4df2-8009-d5dea6d69861.jpg" alt="收款码" width="540px"/>  
+<img src="https://bjuimg.obs.cn-north-4.myhuaweicloud.com/images/2024/5/17/a5351e59-294c-4bec-b767-1a44c362fcbc.jpg" alt="收款码" width="540px"/>  
 
 🎁 为了项目能健康持续的发展, 我期望获得相应的资金支持, 你们的支持是我不断更新前进的动力!
 
 ## 免责声明
 
-在使用本项目之前, 请确保您已经了解并同意相关的使用协议和隐私政策。[免责声明](https://github.com/lijiahangmax/orion-ops-pro/blob/main/DISCLAIMER.md)
+在使用本项目之前, 请确保您已经了解并同意相关的使用协议和隐私政策。[免责声明](https://github.com/lijiahangmax/orion-visor/blob/main/DISCLAIMER.md)
 
 ## License
 
-本项目遵循 [Apache-2.0](https://github.com/lijiahangmax/orion-ops-pro/blob/main/LICENSE) 开源许可证。  
+本项目遵循 [Apache-2.0](https://github.com/lijiahangmax/orion-visor/blob/main/LICENSE) 开源许可证。  

docker-compose.yml

@@ -1,46 +1,50 @@
 version: '3.3'
 services:
-  orion-ops-pro:
-    image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-ops-pro:1.0.8
+  orion-visor-service:
+    image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-service:2.0.0
     ports:
       - 1081:80
     environment:
-      - MYSQL_HOST=orion-ops-pro-db
+      - MYSQL_HOST=orion-visor-mysql
       - MYSQL_PORT=3306
+      - MYSQL_DATABASE=orion_visor
       - MYSQL_USER=orion
       - MYSQL_PASSWORD=Data@123456
-      - REDIS_HOST=orion-ops-pro-redis
+      - REDIS_HOST=orion-visor-redis
       - REDIS_PASSWORD=Data@123456
       - SECRET_KEY=uQeacXV8b3isvKLK
     volumes:
-      - /data/orion-ops-pro-space/docker-volumes/orion-ops-pro/logs:/root/orion/logs/orion-ops-pro
-      - /data/orion-ops-pro-space/docker-volumes/orion-ops-pro/app:/root/orion/orion-ops-pro
+      - /data/orion-visor-space/docker-volumes/orion-visor-service/logs:/root/orion/logs/orion-visor
+      - /data/orion-visor-space/docker-volumes/orion-visor-service/app:/root/orion/orion-visor
     depends_on:
-      - orion-ops-pro-db
-      - orion-ops-pro-redis
-  orion-ops-pro-db:
-    image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-ops-pro-mysql:1.0.8
+      - orion-visor-mysql
+      - orion-visor-redis
+  orion-visor-mysql:
+    image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-mysql:2.0.0
     privileged: true
     ports:
       - 3307:3306
     environment:
-      - MYSQL_DATABASE=orion-ops-pro
+      - MYSQL_DATABASE=orion_visor
       - MYSQL_USER=orion
       - MYSQL_PASSWORD=Data@123456
       - MYSQL_ROOT_PASSWORD=Data@123456
     volumes:
-      - /data/orion-ops-pro-space/docker-volumes/mysql/var-lib-mysql:/var/lib/mysql
-      - /data/orion-ops-pro-space/docker-volumes/mysql/var-lib-mysql-files:/var/lib/mysql-files
-      - /data/orion-ops-pro-space/docker-volumes/mysql/etc-mysql:/etc/mysql
-  orion-ops-pro-redis:
-    image: redis:6.0.16-alpine
-    command: redis-server --appendonly yes --requirepass Data@123456
+      - /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.0
+    privileged: true
     ports:
       - 6380:6379
+    environment:
+      - REDIS_PASSWORD=Data@123456
     volumes:
-      - /data/orion-ops-pro-space/docker-volumes/redis/data:/data
-      - /data/orion-ops-pro-space/docker-volumes/redis/redis.conf:/usr/local/etc/redis/redis.conf
-  orion-ops-pro-adminer:
+      - /data/orion-visor-space/docker-volumes/orion-visor-redis/data:/data
+      - /data/orion-visor-space/docker-volumes/orion-visor-redis/usr-local-etc-redis:/usr/local/etc/redis
+    command: sh -c "redis-server /usr/local/etc/redis/redis.conf --requirepass $${REDIS_PASSWORD}"
+  orion-visor-adminer:
     image: adminer
     ports:
       - 8081:8080

docker-upgrade.sh

@@ -0,0 +1,4 @@
+#/bin/bash
+docker compose down
+sh ./pull.sh
+docker compose up -d

docker/mysql/build.sh

@@ -0,0 +1,7 @@
+#/bin/bash
+version=2.0.0
+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/orion-ops-pro/build.sh

@@ -0,0 +1,2 @@
+FROM redis:6.0.16-alpine
+COPY ./redis.conf /usr/local/etc/redis/redis.conf

docker/mysql/Dockerfile docker/orion-visor-mysql/Dockerfile

@@ -0,0 +1,5 @@
+#/bin/bash
+version=2.0.0
+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}