diff --git a/docker/adminer/build.sh b/docker/adminer/build.sh
index 5dae54b3..97d0266b 100644
--- a/docker/adminer/build.sh
+++ b/docker/adminer/build.sh
@@ -1,5 +1,5 @@
#/bin/bash
-version=2.3.3
+version=2.3.4
docker build -t orion-visor-adminer:${version} .
docker tag orion-visor-adminer:${version} registry.cn-hangzhou.aliyuncs.com/orionsec/orion-visor-adminer:${version}
docker tag orion-visor-adminer:${version} registry.cn-hangzhou.aliyuncs.com/orionsec/orion-visor-adminer:latest
diff --git a/docker/mysql/build.sh b/docker/mysql/build.sh
index 51a26763..b64a607f 100644
--- a/docker/mysql/build.sh
+++ b/docker/mysql/build.sh
@@ -1,5 +1,5 @@
#/bin/bash
-version=2.3.3
+version=2.3.4
cp -r ../../sql ./sql
docker build -t orion-visor-mysql:${version} .
rm -rf ./sql
diff --git a/docker/push.sh b/docker/push.sh
index 56a439fd..fb8d1ba1 100644
--- a/docker/push.sh
+++ b/docker/push.sh
@@ -1,5 +1,5 @@
#/bin/bash
-version=2.3.3
+version=2.3.4
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}
diff --git a/docker/redis/build.sh b/docker/redis/build.sh
index d669b75e..4518add0 100644
--- a/docker/redis/build.sh
+++ b/docker/redis/build.sh
@@ -1,5 +1,5 @@
#/bin/bash
-version=2.3.3
+version=2.3.4
docker build -t orion-visor-redis:${version} .
docker tag orion-visor-redis:${version} registry.cn-hangzhou.aliyuncs.com/orionsec/orion-visor-redis:${version}
docker tag orion-visor-redis:${version} registry.cn-hangzhou.aliyuncs.com/orionsec/orion-visor-redis:latest
diff --git a/docker/service/build.sh b/docker/service/build.sh
index 3626de1e..bac9df8b 100644
--- a/docker/service/build.sh
+++ b/docker/service/build.sh
@@ -1,5 +1,5 @@
#/bin/bash
-version=2.3.3
+version=2.3.4
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/orion-visor-common/src/main/java/org/dromara/visor/common/constant/AppConst.java b/orion-visor-common/src/main/java/org/dromara/visor/common/constant/AppConst.java
index f351d98e..205de11b 100644
--- a/orion-visor-common/src/main/java/org/dromara/visor/common/constant/AppConst.java
+++ b/orion-visor-common/src/main/java/org/dromara/visor/common/constant/AppConst.java
@@ -36,7 +36,7 @@ public interface AppConst extends OrionConst {
/**
* 同 ${orion.version} 迭代时候需要手动更改
*/
- String VERSION = "2.3.3";
+ String VERSION = "2.3.4";
/**
* 同 ${spring.application.name}
diff --git a/orion-visor-dependencies/pom.xml b/orion-visor-dependencies/pom.xml
index 8088f981..9429b3f9 100644
--- a/orion-visor-dependencies/pom.xml
+++ b/orion-visor-dependencies/pom.xml
@@ -14,7 +14,7 @@
https://github.com/dromara/orion-visor
- 2.3.3
+ 2.3.4
2.7.17
2.7.15
1.5.0
diff --git a/orion-visor-launch/src/main/resources/application-dev.yaml b/orion-visor-launch/src/main/resources/application-dev.yaml
index b8e04dc2..7763d778 100644
--- a/orion-visor-launch/src/main/resources/application-dev.yaml
+++ b/orion-visor-launch/src/main/resources/application-dev.yaml
@@ -1,18 +1,18 @@
spring:
datasource:
druid:
- url: jdbc:mysql://127.0.0.1:3306/orion_visor?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowPublicKeyRetrieval=true&useSSL=false&serverTimezone=Asia/Shanghai&autoReconnect=true
- username: root
- password: Data@123456
+ url: jdbc:mysql://${MYSQL_HOST:127.0.0.1}:${MYSQL_PORT:3306}/${MYSQL_DATABASE:orion_visor}?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowPublicKeyRetrieval=true&useSSL=false&serverTimezone=Asia/Shanghai&autoReconnect=true
+ username: ${MYSQL_USER:root}
+ password: ${MYSQL_PASSWORD:Data@123456}
initial-size: 0
min-idle: 1
max-active: 5
stat-view-servlet:
enabled: false
redis:
- host: 127.0.0.1
- port: 6379
- password: Data@123456
+ host: ${REDIS_HOST:127.0.0.1}
+ port: ${REDIS_PORT:6379}
+ password: ${REDIS_PASSWORD:Data@123456}
redisson:
threads: 2
netty-threads: 2
diff --git a/orion-visor-launch/src/test/java/org/dromara/visor/launch/ReplaceVersion.java b/orion-visor-launch/src/test/java/org/dromara/visor/launch/ReplaceVersion.java
index 2aabd296..99667424 100644
--- a/orion-visor-launch/src/test/java/org/dromara/visor/launch/ReplaceVersion.java
+++ b/orion-visor-launch/src/test/java/org/dromara/visor/launch/ReplaceVersion.java
@@ -39,9 +39,9 @@ import java.util.function.Function;
*/
public class ReplaceVersion {
- private static final String TARGET_VERSION = "2.3.2";
+ private static final String TARGET_VERSION = "2.3.3";
- private static final String REPLACE_VERSION = "2.3.3";
+ private static final String REPLACE_VERSION = "2.3.4";
private static final String PATH = new File("").getAbsolutePath();
diff --git a/orion-visor-ui/.env.development b/orion-visor-ui/.env.development
index 80746b77..e56bf947 100644
--- a/orion-visor-ui/.env.development
+++ b/orion-visor-ui/.env.development
@@ -3,4 +3,4 @@ VITE_API_BASE_URL=http://127.0.0.1:9200/orion-visor/api
# websocket 路径
VITE_WS_BASE_URL=ws://127.0.0.1:9200/orion-visor/keep-alive
# 版本号
-VITE_APP_VERSION=2.3.3
+VITE_APP_VERSION=2.3.4
diff --git a/orion-visor-ui/.env.production b/orion-visor-ui/.env.production
index 02ac4a76..73110745 100644
--- a/orion-visor-ui/.env.production
+++ b/orion-visor-ui/.env.production
@@ -3,4 +3,4 @@ VITE_API_BASE_URL=/orion-visor/api
# websocket 路径
VITE_WS_BASE_URL=/orion-visor/keep-alive
# 版本号
-VITE_APP_VERSION=2.3.3
+VITE_APP_VERSION=2.3.4
diff --git a/orion-visor-ui/package.json b/orion-visor-ui/package.json
index 3214fa68..103dc7af 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.3.3",
+ "version": "2.3.4",
"private": true,
"author": "Jiahang Li",
"license": "Apache 2.0",
diff --git a/pom.xml b/pom.xml
index 055c6c8f..b4b08396 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
- 2.3.3
+ 2.3.4
8
8
3.0.0-M5