From 7d6797c9961e657adf6e17bb85c687acd6afef1e Mon Sep 17 00:00:00 2001
From: lixiangyang <707682720@qq.com>
Date: Wed, 22 Mar 2023 10:49:05 +0800
Subject: [PATCH] upgrade version.
---
README.md | 2 +-
docker-compose.yml | 2 +-
docker/orion-ops/Dockerfile | 2 +-
docs/README.md | 2 +-
docs/about/change-log.md | 2 +-
docs/quickstart/faq.md | 4 ++--
docs/quickstart/install.md | 4 ++--
orion-ops-vue/package.json | 2 +-
orion-ops-vue/yarn.lock | 2 +-
9 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/README.md b/README.md
index a0b1a593..89519980 100644
--- a/README.md
+++ b/README.md
@@ -26,7 +26,7 @@
-当前最新版本: **1.2.2**
+当前最新版本: **1.2.3**
github: https://github.com/lijiahangmax/orion-ops
gitee: https://gitee.com/lijiahangmax/orion-ops
csdn: https://blog.csdn.net/qq_41011894
diff --git a/docker-compose.yml b/docker-compose.yml
index 20d86f33..eae8f041 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -4,7 +4,7 @@ services:
build:
context: .
dockerfile: docker/orion-ops/Dockerfile
- image: orion-ops:1.2.2
+ image: orion-ops:1.2.3
ports:
- "3090:80"
environment:
diff --git a/docker/orion-ops/Dockerfile b/docker/orion-ops/Dockerfile
index a7550aca..11227bae 100644
--- a/docker/orion-ops/Dockerfile
+++ b/docker/orion-ops/Dockerfile
@@ -13,7 +13,7 @@ RUN sed -i 's/#PermitRootLogin.*/PermitRootLogin yes/g' /etc/ssh/sshd_config &&
ssh-keygen -t ed25519 -P '' -f /etc/ssh/ssh_host_ed25519_key && \
echo 'root:orionadmin' | chpasswd
WORKDIR /app
-COPY orion-ops-api/orion-ops-web/target/orion-ops-web-1.2.2.jar /app/app.jar
+COPY orion-ops-api/orion-ops-web/target/orion-ops-web-1.2.3.jar /app/app.jar
COPY orion-ops-vue/dist/index.html /usr/share/nginx/html/
COPY orion-ops-vue/dist /usr/share/nginx/html/ops
ADD docker/orion-ops/entrypoint.sh /app/entrypoint.sh
diff --git a/docs/README.md b/docs/README.md
index d4b399b5..819c6ed5 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -26,7 +26,7 @@
-当前最新版本: **1.2.2**
+当前最新版本: **1.2.3**
github: https://github.com/lijiahangmax/orion-ops
gitee: https://gitee.com/lijiahangmax/orion-ops
csdn: https://blog.csdn.net/qq_41011894
diff --git a/docs/about/change-log.md b/docs/about/change-log.md
index 2e3bc89f..43c91357 100644
--- a/docs/about/change-log.md
+++ b/docs/about/change-log.md
@@ -1,4 +1,4 @@
-## 1.2.2
+## 1.2.3
`2023-03-22` `release`
diff --git a/docs/quickstart/faq.md b/docs/quickstart/faq.md
index 311ae77b..89a92e1a 100644
--- a/docs/quickstart/faq.md
+++ b/docs/quickstart/faq.md
@@ -8,7 +8,7 @@
重启后端服务 添加启动参数 `--reset-admin` 会将 `orionadmin` 的密码重置为 `orionadmin`
```
-nohup java -jar orion-ops-web-1.2.2.jar --spring.profiles.active=prod --reset-admin &
+nohup java -jar orion-ops-web-1.2.3.jar --spring.profiles.active=prod --reset-admin &
```
@@ -18,7 +18,7 @@ nohup java -jar orion-ops-web-1.2.2.jar --spring.profiles.active=prod --reset-ad
重启后端服务 添加启动参数 `--disable-ip-filter` 会将禁用ip过滤器
```
-nohup java -jar orion-ops-web-1.2.2.jar --spring.profiles.active=prod --disable-ip-filter &
+nohup java -jar orion-ops-web-1.2.3.jar --spring.profiles.active=prod --disable-ip-filter &
```
diff --git a/docs/quickstart/install.md b/docs/quickstart/install.md
index 18c6b7a7..0537640c 100644
--- a/docs/quickstart/install.md
+++ b/docs/quickstart/install.md
@@ -110,9 +110,9 @@ server {
```
复制 orion-ops/orion-ops-vue/dist/index.html 到 /usr/share/nginx/html
复制 orion-ops/orion-ops-vue/dist 到 /usr/share/nginx/html 并且重命名为 ops
-复制 orion-ops/orion-ops-api/orion-ops-api/target/orion-ops-web-1.2.2.jar 到 /data/orion
+复制 orion-ops/orion-ops-api/orion-ops-api/target/orion-ops-web-1.2.3.jar 到 /data/orion
# 启动后台服务
-nohup java -jar orion-ops-web-1.2.2.jar --spring.profiles.active=prod --generator-admin &
+nohup java -jar orion-ops-web-1.2.3.jar --spring.profiles.active=prod --generator-admin &
# 启动 nginx
service nginx start
```
diff --git a/orion-ops-vue/package.json b/orion-ops-vue/package.json
index 3dfe00c5..edc99923 100644
--- a/orion-ops-vue/package.json
+++ b/orion-ops-vue/package.json
@@ -1,6 +1,6 @@
{
"name": "orion-ops-vue",
- "version": "1.2.2",
+ "version": "1.2.3",
"private": true,
"scripts": {
"serve": "vue-cli-service serve",
diff --git a/orion-ops-vue/yarn.lock b/orion-ops-vue/yarn.lock
index a4b53723..3783ba05 100644
--- a/orion-ops-vue/yarn.lock
+++ b/orion-ops-vue/yarn.lock
@@ -1350,7 +1350,7 @@
integrity sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ==
"@types/minimist@^1.2.0":
- version "1.2.2"
+ version "1.2.3"
resolved "https://registry.nlark.com/@types/minimist/download/@types/minimist-1.2.2.tgz?cache=0&sync_timestamp=1629708337116&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40types%2Fminimist%2Fdownload%2F%40types%2Fminimist-1.2.2.tgz#ee771e2ba4b3dc5b372935d549fd9617bf345b8c"
integrity sha1-7nceK6Sz3Fs3KTXVSf2WF780W4w=