diff --git a/docker-compose.yml b/docker-compose.yml index bbbb6fd4..a091af2a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,7 @@ version: '3.3' services: orion-visor-service: - image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-service:2.0.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 diff --git a/docker/orion-visor-mysql/build.sh b/docker/orion-visor-mysql/build.sh index 2573d936..e4ddf266 100644 --- a/docker/orion-visor-mysql/build.sh +++ b/docker/orion-visor-mysql/build.sh @@ -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 diff --git a/docker/orion-visor-redis/Dockerfile b/docker/orion-visor-redis/Dockerfile index cd57df26..953f6d1e 100644 --- a/docker/orion-visor-redis/Dockerfile +++ b/docker/orion-visor-redis/Dockerfile @@ -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 diff --git a/docker/orion-visor-redis/build.sh b/docker/orion-visor-redis/build.sh index e782cdf3..a7009fe6 100644 --- a/docker/orion-visor-redis/build.sh +++ b/docker/orion-visor-redis/build.sh @@ -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} diff --git a/docker/orion-visor-service/Dockerfile b/docker/orion-visor-service/Dockerfile index 8609e399..92bd9179 100644 --- a/docker/orion-visor-service/Dockerfile +++ b/docker/orion-visor-service/Dockerfile @@ -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/* # 复制包 diff --git a/docker/orion-visor-service/build.sh b/docker/orion-visor-service/build.sh index 8aaaeccc..012e10de 100644 --- a/docker/orion-visor-service/build.sh +++ b/docker/orion-visor-service/build.sh @@ -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} . diff --git a/docs/_coverpage.md b/docs/_coverpage.md index b769b74d..f6f03695 100644 --- a/docs/_coverpage.md +++ b/docs/_coverpage.md @@ -1,4 +1,4 @@ -# orion-visor 2.0.2 +# orion-visor 2.0.3 > 一款高颜值、现代化的智能运维&轻量堡垒机平台。 diff --git a/docs/about/change-log.md b/docs/about/change-log.md index 50899caa..7d551e4a 100644 --- a/docs/about/change-log.md +++ b/docs/about/change-log.md @@ -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` diff --git a/docs/assert/logo.svg b/docs/assert/logo.svg index 99023d13..c62baa9c 100644 --- a/docs/assert/logo.svg +++ b/docs/assert/logo.svg @@ -1,17 +1,23 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/docs/index.html b/docs/index.html index d5c249b2..75390a35 100644 --- a/docs/index.html +++ b/docs/index.html @@ -2,7 +2,7 @@ - 关于 orion-visor + orion-visor diff --git a/docs/update/v2.0.3.md b/docs/update/v2.0.x.md similarity index 86% rename from docs/update/v2.0.3.md rename to docs/update/v2.0.x.md index f4d9d399..0425fdd0 100644 --- a/docs/update/v2.0.3.md +++ b/docs/update/v2.0.x.md @@ -1,4 +1,4 @@ -### v2.0.3 +### v2.0.x ### sql 脚本 - DDL diff --git a/orion-visor-dependencies/pom.xml b/orion-visor-dependencies/pom.xml index 180408a1..c6f5a055 100644 --- a/orion-visor-dependencies/pom.xml +++ b/orion-visor-dependencies/pom.xml @@ -14,7 +14,7 @@ https://github.com/lijiahangmax/orion-visor - 2.0.2 + 2.0.3 2.7.17 2.7.15 1.5.0 diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/constant/AppConst.java b/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/constant/AppConst.java index 8cfe19f4..792d5092 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/constant/AppConst.java +++ b/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/constant/AppConst.java @@ -14,7 +14,7 @@ public interface AppConst extends OrionConst { /** * 同 ${orion.version} 迭代时候需要手动更改 */ - String VERSION = "2.0.2"; + String VERSION = "2.0.3"; String ORION_VISOR = "orion-visor"; diff --git a/orion-visor-ui/.env.development b/orion-visor-ui/.env.development index 2c995fad..fdc659c1 100644 --- a/orion-visor-ui/.env.development +++ b/orion-visor-ui/.env.development @@ -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 diff --git a/orion-visor-ui/.env.production b/orion-visor-ui/.env.production index dda3a55c..f3992cab 100644 --- a/orion-visor-ui/.env.production +++ b/orion-visor-ui/.env.production @@ -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 diff --git a/orion-visor-ui/config/plugin/pwa.ts b/orion-visor-ui/config/plugin/pwa.ts index ad188fc5..52cb57e0 100644 --- a/orion-visor-ui/config/plugin/pwa.ts +++ b/orion-visor-ui/config/plugin/pwa.ts @@ -37,8 +37,8 @@ const enabled = (): Partial => { description: '一款高颜值、现代化的智能运维&轻量堡垒机平台。', theme_color: '#212529', icons: [{ - src: 'logo_150.png', - sizes: '150x150', + src: 'manifest_logo_267.png', + sizes: '267x267', type: 'image/png', }], }, diff --git a/orion-visor-ui/index.html b/orion-visor-ui/index.html index cfac14c9..4bc7383a 100644 --- a/orion-visor-ui/index.html +++ b/orion-visor-ui/index.html @@ -2,7 +2,7 @@ - + Orion Visor diff --git a/orion-visor-ui/package.json b/orion-visor-ui/package.json index a81a4071..797634ba 100644 --- a/orion-visor-ui/package.json +++ b/orion-visor-ui/package.json @@ -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", diff --git a/orion-visor-ui/public/favicon.ico b/orion-visor-ui/public/favicon.ico new file mode 100644 index 00000000..dee83a60 Binary files /dev/null and b/orion-visor-ui/public/favicon.ico differ diff --git a/orion-visor-ui/public/logo_150.png b/orion-visor-ui/public/logo_150.png deleted file mode 100644 index 05c2c8af..00000000 Binary files a/orion-visor-ui/public/logo_150.png and /dev/null differ diff --git a/orion-visor-ui/public/manifest_logo_267.png b/orion-visor-ui/public/manifest_logo_267.png new file mode 100644 index 00000000..55b4c92c Binary files /dev/null and b/orion-visor-ui/public/manifest_logo_267.png differ diff --git a/orion-visor-ui/src/assets/images/logo.svg b/orion-visor-ui/src/assets/images/logo.svg new file mode 100644 index 00000000..c62baa9c --- /dev/null +++ b/orion-visor-ui/src/assets/images/logo.svg @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + diff --git a/orion-visor-ui/src/assets/images/logo_134.png b/orion-visor-ui/src/assets/images/logo_134.png deleted file mode 100644 index 47f50134..00000000 Binary files a/orion-visor-ui/src/assets/images/logo_134.png and /dev/null differ diff --git a/orion-visor-ui/src/assets/images/logo_200.png b/orion-visor-ui/src/assets/images/logo_200.png deleted file mode 100644 index ac319fbb..00000000 Binary files a/orion-visor-ui/src/assets/images/logo_200.png and /dev/null differ diff --git a/orion-visor-ui/src/assets/images/logo_267.png b/orion-visor-ui/src/assets/images/logo_267.png new file mode 100644 index 00000000..54a7cf5a Binary files /dev/null and b/orion-visor-ui/src/assets/images/logo_267.png differ diff --git a/orion-visor-ui/src/assets/images/logo_32.png b/orion-visor-ui/src/assets/images/logo_32.png deleted file mode 100644 index 60cdb614..00000000 Binary files a/orion-visor-ui/src/assets/images/logo_32.png and /dev/null differ diff --git a/orion-visor-ui/src/assets/images/logo_transparent_267.png b/orion-visor-ui/src/assets/images/logo_transparent_267.png new file mode 100644 index 00000000..e883752c Binary files /dev/null and b/orion-visor-ui/src/assets/images/logo_transparent_267.png differ diff --git a/orion-visor-ui/src/assets/images/logo_white_fill.svg b/orion-visor-ui/src/assets/images/logo_white_fill.svg new file mode 100644 index 00000000..047d3658 --- /dev/null +++ b/orion-visor-ui/src/assets/images/logo_white_fill.svg @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + diff --git a/orion-visor-ui/src/assets/images/logo_white_fill_100.png b/orion-visor-ui/src/assets/images/logo_white_fill_100.png new file mode 100644 index 00000000..82215dc5 Binary files /dev/null and b/orion-visor-ui/src/assets/images/logo_white_fill_100.png differ diff --git a/orion-visor-ui/src/assets/images/logo_white_fill_134.png b/orion-visor-ui/src/assets/images/logo_white_fill_134.png new file mode 100644 index 00000000..f29ed0b1 Binary files /dev/null and b/orion-visor-ui/src/assets/images/logo_white_fill_134.png differ diff --git a/orion-visor-ui/src/assets/images/logo_white_fill_transparent.svg b/orion-visor-ui/src/assets/images/logo_white_fill_transparent.svg new file mode 100644 index 00000000..868344d7 --- /dev/null +++ b/orion-visor-ui/src/assets/images/logo_white_fill_transparent.svg @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + diff --git a/orion-visor-ui/src/assets/images/logo_white_fill_transparent_100.png b/orion-visor-ui/src/assets/images/logo_white_fill_transparent_100.png new file mode 100644 index 00000000..ff20f9c1 Binary files /dev/null and b/orion-visor-ui/src/assets/images/logo_white_fill_transparent_100.png differ diff --git a/orion-visor-ui/src/assets/images/logo_white_fill_transparent_134.png b/orion-visor-ui/src/assets/images/logo_white_fill_transparent_134.png new file mode 100644 index 00000000..5e647a5e Binary files /dev/null and b/orion-visor-ui/src/assets/images/logo_white_fill_transparent_134.png differ diff --git a/orion-visor-ui/src/assets/images/logo_white_fill_transparent_267.png b/orion-visor-ui/src/assets/images/logo_white_fill_transparent_267.png new file mode 100644 index 00000000..55b4c92c Binary files /dev/null and b/orion-visor-ui/src/assets/images/logo_white_fill_transparent_267.png differ diff --git a/orion-visor-ui/src/assets/style/arco-extends.less b/orion-visor-ui/src/assets/style/arco-extends.less index 87470c5f..9313364c 100644 --- a/orion-visor-ui/src/assets/style/arco-extends.less +++ b/orion-visor-ui/src/assets/style/arco-extends.less @@ -136,6 +136,7 @@ // 抽屉 .arco-drawer { + width: 100%; &-body { padding: 0; diff --git a/orion-visor-ui/src/views/host/terminal/components/layout/layout-header.vue b/orion-visor-ui/src/views/host/terminal/components/layout/layout-header.vue index bccbdfca..21ce5f59 100644 --- a/orion-visor-ui/src/views/host/terminal/components/layout/layout-header.vue +++ b/orion-visor-ui/src/views/host/terminal/components/layout/layout-header.vue @@ -86,8 +86,8 @@ } &-logo { - width: 32px; - height: 32px; + width: 28px; + height: 28px; } &-logo-text { diff --git a/pom.xml b/pom.xml index d3162a1f..dff47449 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ - 2.0.2 + 2.0.3 8 8 3.0.0-M5