diff --git a/docker/adminer/build.sh b/docker/adminer/build.sh
index 5cb800a9..c697e552 100644
--- a/docker/adminer/build.sh
+++ b/docker/adminer/build.sh
@@ -1,5 +1,5 @@
#/bin/bash
-version=2.3.1
+version=2.3.2
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 f5ca4806..bce2b2de 100644
--- a/docker/mysql/build.sh
+++ b/docker/mysql/build.sh
@@ -1,5 +1,5 @@
#/bin/bash
-version=2.3.1
+version=2.3.2
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 625b9332..a17cff11 100644
--- a/docker/push.sh
+++ b/docker/push.sh
@@ -1,5 +1,5 @@
#/bin/bash
-version=2.3.1
+version=2.3.2
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 9ed0c658..e22bf882 100644
--- a/docker/redis/build.sh
+++ b/docker/redis/build.sh
@@ -1,5 +1,5 @@
#/bin/bash
-version=2.3.1
+version=2.3.2
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 0d553c44..24d2170e 100644
--- a/docker/service/build.sh
+++ b/docker/service/build.sh
@@ -1,5 +1,5 @@
#/bin/bash
-version=2.3.1
+version=2.3.2
mv ../../orion-visor-launch/target/orion-visor-launch.jar ./orion-visor-launch.jar
mv ../../orion-visor-ui/dist ./dist
docker build --no-cache -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 9b6f0042..fac0147b 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.1";
+ String VERSION = "2.3.2";
/**
* 同 ${spring.application.name}
diff --git a/orion-visor-dependencies/pom.xml b/orion-visor-dependencies/pom.xml
index 3cedb2b4..a3401873 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.1
+ 2.3.2
2.7.17
2.7.15
1.5.0
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 7ff40dac..9918fa23 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.0";
+ private static final String TARGET_VERSION = "2.3.1";
- private static final String REPLACE_VERSION = "2.3.1";
+ private static final String REPLACE_VERSION = "2.3.2";
private static final String PATH = new File("").getAbsolutePath();
diff --git a/orion-visor-ui/.env.development b/orion-visor-ui/.env.development
index 1075bb2e..32429245 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.1
+VITE_APP_VERSION=2.3.2
diff --git a/orion-visor-ui/.env.production b/orion-visor-ui/.env.production
index c0e5d778..6a37e4ef 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.1
+VITE_APP_VERSION=2.3.2
diff --git a/orion-visor-ui/package.json b/orion-visor-ui/package.json
index 38d22d81..29319e39 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.1",
+ "version": "2.3.2",
"private": true,
"author": "Jiahang Li",
"license": "Apache 2.0",
diff --git a/pom.xml b/pom.xml
index 3b65eba6..74ace999 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
- 2.3.1
+ 2.3.2
8
8
3.0.0-M5
diff --git a/sql/init-2-schema-tables.sql b/sql/init-2-schema-tables.sql
index e2303400..ec32ed7d 100644
--- a/sql/init-2-schema-tables.sql
+++ b/sql/init-2-schema-tables.sql
@@ -678,9 +678,8 @@ DROP TABLE IF EXISTS `system_setting`;
CREATE TABLE `system_setting`
(
`id` bigint(0) NOT NULL AUTO_INCREMENT COMMENT 'id',
- `config_key` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '配置key',
`type` char(16) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '配置类型',
- `item` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '配置项',
+ `config_key` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '配置key',
`value` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL COMMENT '配置值',
`create_time` datetime(0) NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
`update_time` datetime(0) NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '修改时间',
@@ -688,8 +687,7 @@ CREATE TABLE `system_setting`
`updater` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '更新人',
`deleted` tinyint(1) NULL DEFAULT 0 COMMENT '是否删除 0未删除 1已删除',
PRIMARY KEY (`id`) USING BTREE,
- INDEX `type_item_idx` (`type`, `item`) USING BTREE,
- INDEX `key_idx` (`config_key`) USING BTREE
+ INDEX `idx_key` (`config_key`) USING BTREE
) ENGINE = InnoDB
AUTO_INCREMENT = 1
CHARACTER SET = utf8mb4
@@ -712,6 +710,7 @@ CREATE TABLE `system_user`
`status` tinyint(0) NULL DEFAULT 1 COMMENT '用户状态 0停用 1启用',
`update_password_status` tinyint(0) NULL DEFAULT 0 COMMENT '修改密码状态 0无需修改 1需要修改',
`update_password_reason` varchar(12) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '修改密码原因',
+ `update_password_time` datetime(0) NULL DEFAULT NULL COMMENT '修改密码时间',
`last_login_time` datetime(0) NULL DEFAULT NULL COMMENT '最后登录时间',
`description` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '用户描述',
`create_time` datetime(0) NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
@@ -810,7 +809,7 @@ CREATE TABLE `terminal_connect_log`
`host_address` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '主机地址',
`type` varchar(16) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '类型',
`status` varchar(16) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '状态',
- `token` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT 'token',
+ `session_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT 'sessionId',
`start_time` datetime(3) NULL DEFAULT NULL COMMENT '开始时间',
`end_time` datetime(3) NULL DEFAULT NULL COMMENT '结束时间',
`extra_info` json NULL COMMENT '额外信息',
@@ -820,7 +819,7 @@ CREATE TABLE `terminal_connect_log`
PRIMARY KEY (`id`) USING BTREE,
INDEX `idx_user_id` (`user_id`) USING BTREE,
INDEX `idx_host_type` (`host_id`, `type`) USING BTREE,
- INDEX `idx_token` (`token`) USING BTREE
+ INDEX `idx_session_id` (`session_id`) USING BTREE
) ENGINE = InnoDB
AUTO_INCREMENT = 1
CHARACTER SET = utf8mb4
diff --git a/sql/init-4-data.sql b/sql/init-4-data.sql
index c75acf93..79e9b9d2 100644
--- a/sql/init-4-data.sql
+++ b/sql/init-4-data.sql
@@ -1,6 +1,6 @@
-- 默认管理员账号
-- 账号: admin 密码: admin
-INSERT INTO `system_user` VALUES (1, 'admin', 'c3284d0f94606de1fd2af172aba15bf3', '管理员', NULL, NULL, NULL, 1, 1, 'NEW', NULL, NULL, NOW(), NOW(), '1', '1', 0);
+INSERT INTO `system_user` VALUES (1, 'admin', 'c3284d0f94606de1fd2af172aba15bf3', '管理员', NULL, NULL, NULL, 1, 1, 'NEW', NULL, NULL, NULL, NOW(), NOW(), '1', '1', 0);
-- 角色配置
INSERT INTO `system_role` VALUES (1, '管理员', 'admin', 1, NULL, '2023-07-16 21:13:14', '2023-07-17 17:31:29', '1', '1', 0);