manager/orion-visor
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

🔖 升级版本.

Browse Source
This commit is contained in:
lijiahang
2024-05-28 17:07:41 +08:00
parent df0ec5b3f7
commit aed2436ec5
37 changed files with 140 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
docker-compose.yml
View File

@@ -1,7 +1,7 @@
version: '3.3'
services:
orion-visor-service:
image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-service:2.0.2
image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-service:2.0.3
ports:
- 1081:80
environment:
@@ -20,7 +20,7 @@ services:
- orion-visor-mysql
- orion-visor-redis
orion-visor-mysql:
image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-mysql:2.0.2
image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-mysql:2.0.3
privileged: true
ports:
- 3307:3306
@@ -34,7 +34,7 @@ services:
- /data/orion-visor-space/docker-volumes/orion-visor-mysql/var-lib-mysql-files:/var/lib/mysql-files
- /data/orion-visor-space/docker-volumes/orion-visor-mysql/etc-mysql:/etc/mysql
orion-visor-redis:
image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-redis:2.0.2
image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-redis:2.0.3
privileged: true
ports:
- 6380:6379

2
docker/orion-visor-mysql/build.sh
View File

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

13
docker/orion-visor-redis/Dockerfile
View File

@@ -2,15 +2,16 @@ FROM redis:6.0.16-alpine
WORKDIR /data
# 系统时区
ARG TZ=Asia/Shanghai
# 切换源
# 添加包
RUN \
echo "" > /etc/apk/repositories && \
echo "http://mirrors.aliyun.com/alpine/v3.8/main" >> /etc/apk/repositories && \
echo "http://mirrors.aliyun.com/alpine/v3.8/community" >> /etc/apk/repositories && \
apk update
echo "https://mirrors.aliyun.com/alpine/v3.8/main" >> /etc/apk/repositories && \
echo "https://mirrors.aliyun.com/alpine/v3.8/community" >> /etc/apk/repositories && \
echo "https://mirrors.tuna.tsinghua.edu.cn" >> /etc/apk/repositories && \
apk update && \
apk add tzdata
# 设置时区
RUN apk add tzdata && \
ln -sf /usr/share/zoneinfo/${TZ} /etc/localtime && \
RUN ln -sf /usr/share/zoneinfo/${TZ} /etc/localtime && \
echo '${TZ}' > /etc/timezone
# redis 配置
COPY ./redis.conf /tmp

2
docker/orion-visor-redis/build.sh
View File

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

16
docker/orion-visor-service/Dockerfile
View File

@@ -3,18 +3,18 @@ USER root
WORKDIR /app
# 系统时区
ARG TZ=Asia/Shanghai
# 切换源
# 添加包
RUN \
echo "" > /etc/apk/repositories && \
echo "http://mirrors.aliyun.com/alpine/v3.8/main" >> /etc/apk/repositories && \
echo "http://mirrors.aliyun.com/alpine/v3.8/community" >> /etc/apk/repositories && \
apk update
echo "https://mirrors.aliyun.com/alpine/v3.8/main" >> /etc/apk/repositories && \
echo "https://mirrors.aliyun.com/alpine/v3.8/community" >> /etc/apk/repositories && \
echo "https://mirrors.tuna.tsinghua.edu.cn" >> /etc/apk/repositories && \
apk update && \
apk add tzdata && \
apk add openjdk8
# 设置时区
RUN apk add tzdata && \
ln -sf /usr/share/zoneinfo/${TZ} /etc/localtime && \
RUN ln -sf /usr/share/zoneinfo/${TZ} /etc/localtime && \
echo '${TZ}' > /etc/timezone
# 添加 jdk
RUN apk add openjdk8
# 删除原 nginx 配置
RUN rm -rf /etc/nginx/conf.d/*
# 复制包

2
docker/orion-visor-service/build.sh
View File

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

2
docs/_coverpage.md
View File

@@ -1,4 +1,4 @@
# orion-visor <small>2.0.2</small>
# orion-visor <small>2.0.3</small>
> 一款高颜值、现代化的智能运维&轻量堡垒机平台。

8
docs/about/change-log.md
View File

@@ -14,6 +14,14 @@
* 执行 升级的 `bash` 脚本
* 进入 代码目录执行 `sh docker-upgrade.sh` 进行容器升级 `down` > `pull` > `up -d`
### v2.0.3
`2024-05-2` `release`
* 🐞 修复 抽屉 ui 显示错误
* 🩰 修改 logo
* 🔨 修改 docker 时区
### v2.0.2
`2024-05-24` `release`

36
docs/assert/logo.svg
View File

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

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

2
docs/index.html
View File

@@ -2,7 +2,7 @@
<html lang="en">
<head>
<meta charset="UTF-8">
<title>关于 orion-visor</title>
<title>orion-visor</title>
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"/>
<meta name="description" content="Description">
<link rel="icon" href="./assert/logo.svg">

2
docs/update/v2.0.3.md → docs/update/v2.0.x.md
View File

@@ -1,4 +1,4 @@
### v2.0.3
### v2.0.x
### sql 脚本 - DDL

2
orion-visor-dependencies/pom.xml
View File

@@ -14,7 +14,7 @@
<url>https://github.com/lijiahangmax/orion-visor</url>
<properties>
<revision>2.0.2</revision>
<revision>2.0.3</revision>
<spring.boot.version>2.7.17</spring.boot.version>
<spring.boot.admin.version>2.7.15</spring.boot.admin.version>
<flatten.maven.plugin.version>1.5.0</flatten.maven.plugin.version>

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

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

2
orion-visor-ui/.env.development
View File

@@ -1,5 +1,5 @@
VITE_API_BASE_URL= 'http://127.0.0.1:9200/orion-visor/api'
VITE_WS_BASE_URL= 'ws://127.0.0.1:9200/orion-visor/keep-alive'
VITE_APP_VERSION= '2.0.2'
VITE_APP_VERSION= '2.0.3'
VITE_SFTP_PREVIEW_MB= 2
VITE_DEMO_MODE= false

2
orion-visor-ui/.env.production
View File

@@ -1,5 +1,5 @@
VITE_API_BASE_URL= '/orion-visor/api'
VITE_WS_BASE_URL= '/orion-visor/keep-alive'
VITE_APP_VERSION= '2.0.2'
VITE_APP_VERSION= '2.0.3'
VITE_SFTP_PREVIEW_MB= 2
VITE_DEMO_MODE= false

4
orion-visor-ui/config/plugin/pwa.ts
View File

@@ -37,8 +37,8 @@ const enabled = (): Partial<VitePWAOptions> => {
description: '一款高颜值、现代化的智能运维&轻量堡垒机平台。',
theme_color: '#212529',
icons: [{
src: 'logo_150.png',
sizes: '150x150',
src: 'manifest_logo_267.png',
sizes: '267x267',
type: 'image/png',
}],
},

2
orion-visor-ui/index.html
View File

@@ -2,7 +2,7 @@
<html lang="en">
<head>
<meta charset="UTF-8" />
<link rel="shortcut icon" type="image/x-icon" href="/src/assets/logo.svg?url">
<link rel="shortcut icon" type="image/x-icon" href="./favicon.ico">
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Orion Visor</title>
</head>

2
orion-visor-ui/package.json
View File

@@ -1,7 +1,7 @@
{
"name": "orion-visor-ui",
"description": "Orion Visor UI",
"version": "2.0.2",
"version": "2.0.3",
"private": true,
"author": "Jiahang Li",
"license": "Apache 2.0",

BIN
orion-visor-ui/public/favicon.ico Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 41 KiB

BIN
orion-visor-ui/public/logo_150.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 4.6 KiB

BIN
orion-visor-ui/public/manifest_logo_267.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.9 KiB

23
orion-visor-ui/src/assets/images/logo.svg Normal file
View File

@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 25.3.1, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 32 32" style="enable-background:new 0 0 32 32;" xml:space="preserve">
<style type="text/css">
.st0{fill:url(#SVGID_1_);}
.st1{fill:#3B28CC;}
</style>
<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="27.1802" y1="7.7935" x2="15.2269" y2="25.137">
<stop offset="0" style="stop-color:#ADD7F6"/>
<stop offset="0.2512" style="stop-color:#AAD5F6"/>
<stop offset="0.4195" style="stop-color:#A1CDF7"/>
<stop offset="0.5636" style="stop-color:#92C1F8"/>
<stop offset="0.694" style="stop-color:#7DAFF9"/>
<stop offset="0.8152" style="stop-color:#6198FB"/>
<stop offset="0.9279" style="stop-color:#407CFD"/>
<stop offset="1" style="stop-color:#2667FF"/>
</linearGradient>
<path class="st0" d="M31.41,4.01h-8.04c-0.27,0-0.51,0.18-0.57,0.44c-0.64,2.56-4.19,15.45-11.86,20.81c0,0,9.5,13.77,21.03-20.47
C32.1,4.4,31.81,4.01,31.41,4.01z"/>
<path class="st1" d="M0.62,3.98h8.02c0.28,0,0.52,0.18,0.59,0.45c0.69,2.58,4.47,15.52,12.14,20.88c0,0-10.88,13.73-21.34-20.54
C-0.09,4.37,0.2,3.98,0.62,3.98z"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
orion-visor-ui/src/assets/images/logo_134.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 4.0 KiB

BIN
orion-visor-ui/src/assets/images/logo_200.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 6.1 KiB

BIN
orion-visor-ui/src/assets/images/logo_267.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 7.7 KiB

BIN
orion-visor-ui/src/assets/images/logo_32.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.1 KiB

BIN
orion-visor-ui/src/assets/images/logo_transparent_267.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.6 KiB

25
orion-visor-ui/src/assets/images/logo_white_fill.svg Normal file
View File

@@ -0,0 +1,25 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 25.3.1, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 32 32" style="enable-background:new 0 0 32 32;" xml:space="preserve">
<style type="text/css">
.st0{fill:#FFFFFF;}
.st1{fill:url(#SVGID_1_);}
.st2{fill:#3B28CC;}
</style>
<path class="st0" d="M25.3,32H6.7C3,32,0,29,0,25.3V6.7C0,3,3,0,6.7,0h18.6C29,0,32,3,32,6.7v18.6C32,29,29,32,25.3,32z"/>
<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="22.873" y1="10.9551" x2="15.5247" y2="21.6169">
<stop offset="0" style="stop-color:#ADD7F6"/>
<stop offset="0.2512" style="stop-color:#AAD5F6"/>
<stop offset="0.4195" style="stop-color:#A1CDF7"/>
<stop offset="0.5636" style="stop-color:#92C1F8"/>
<stop offset="0.694" style="stop-color:#7DAFF9"/>
<stop offset="0.8152" style="stop-color:#6198FB"/>
<stop offset="0.9279" style="stop-color:#407CFD"/>
<stop offset="1" style="stop-color:#2667FF"/>
</linearGradient>
<path class="st1" d="M25.47,8.63h-4.94c-0.17,0-0.31,0.11-0.35,0.27c-0.39,1.57-2.58,9.5-7.29,12.79c0,0,5.84,8.47,12.93-12.59
C25.9,8.87,25.72,8.63,25.47,8.63z"/>
<path class="st2" d="M6.54,8.61h4.93c0.17,0,0.32,0.11,0.36,0.28c0.43,1.59,2.75,9.54,7.46,12.84c0,0-6.69,8.44-13.12-12.63
C6.11,8.85,6.29,8.61,6.54,8.61z"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
orion-visor-ui/src/assets/images/logo_white_fill_100.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.8 KiB

BIN
orion-visor-ui/src/assets/images/logo_white_fill_134.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.0 KiB

26
orion-visor-ui/src/assets/images/logo_white_fill_transparent.svg Normal file
View File

@@ -0,0 +1,26 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 25.3.1, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 32 32" style="enable-background:new 0 0 32 32;" xml:space="preserve">
<style type="text/css">
.st0{fill:#FFFFFF;}
.st1{fill:url(#SVGID_1_);}
.st2{fill:#3B28CC;}
</style>
<path class="st0" d="M23.89,30.59H8.11c-3.7,0-6.7-3-6.7-6.7V8.11c0-3.7,3-6.7,6.7-6.7h15.78c3.7,0,6.7,3,6.7,6.7v15.78
C30.59,27.59,27.59,30.59,23.89,30.59z"/>
<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="22.266" y1="11.4006" x2="15.5667" y2="21.1209">
<stop offset="0" style="stop-color:#ADD7F6"/>
<stop offset="0.2512" style="stop-color:#AAD5F6"/>
<stop offset="0.4195" style="stop-color:#A1CDF7"/>
<stop offset="0.5636" style="stop-color:#92C1F8"/>
<stop offset="0.694" style="stop-color:#7DAFF9"/>
<stop offset="0.8152" style="stop-color:#6198FB"/>
<stop offset="0.9279" style="stop-color:#407CFD"/>
<stop offset="1" style="stop-color:#2667FF"/>
</linearGradient>
<path class="st1" d="M24.64,9.28h-4.5c-0.15,0-0.28,0.1-0.32,0.25c-0.36,1.43-2.35,8.66-6.65,11.66c0,0,5.32,7.72,11.79-11.47
C25.02,9.5,24.86,9.28,24.64,9.28z"/>
<path class="st2" d="M7.38,9.26h4.49c0.16,0,0.29,0.1,0.33,0.25c0.39,1.45,2.51,8.7,6.8,11.7c0,0-6.1,7.69-11.96-11.51
C6.98,9.48,7.15,9.26,7.38,9.26z"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
orion-visor-ui/src/assets/images/logo_white_fill_transparent_100.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.7 KiB

BIN
orion-visor-ui/src/assets/images/logo_white_fill_transparent_134.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.9 KiB

BIN
orion-visor-ui/src/assets/images/logo_white_fill_transparent_267.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.9 KiB

1
orion-visor-ui/src/assets/style/arco-extends.less
View File

@@ -136,6 +136,7 @@
// 抽屉
.arco-drawer {
width: 100%;
&-body {
padding: 0;

4
orion-visor-ui/src/views/host/terminal/components/layout/layout-header.vue
View File

@@ -86,8 +86,8 @@
}
&-logo {
width: 32px;
height: 32px;
width: 28px;
height: 28px;
}
&-logo-text {

2
pom.xml
View File

@@ -22,7 +22,7 @@
</modules>
<properties>
<revision>2.0.2</revision>
<revision>2.0.3</revision>
<maven.compiler.source>8</maven.compiler.source>
<maven.compiler.target>8</maven.compiler.target>
<maven.surefire.plugin.version>3.0.0-M5</maven.surefire.plugin.version>