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 18257b38..9bd1e7ef 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.2.2"; + private static final String TARGET_VERSION = "2.2.3"; - private static final String REPLACE_VERSION = "2.2.3"; + private static final String REPLACE_VERSION = "2.3.0"; private static final String PATH = new File("").getAbsolutePath(); diff --git a/sql/init-2-schema-tables.sql b/sql/init-2-schema-tables.sql index d447f246..e2303400 100644 --- a/sql/init-2-schema-tables.sql +++ b/sql/init-2-schema-tables.sql @@ -152,16 +152,16 @@ CREATE TABLE `data_permission` DROP TABLE IF EXISTS `dict_key`; CREATE TABLE `dict_key` ( - `id` bigint(0) NOT NULL AUTO_INCREMENT COMMENT 'id', - `key_name` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '配置项', - `value_type` char(12) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '配置值定义', - `extra_schema` json NULL COMMENT '额外配置定义', - `description` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT 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 '修改时间', - `creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '创建人', - `updater` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '更新人', - `deleted` tinyint(1) NULL DEFAULT 0 COMMENT '是否删除 0未删除 1已删除', + `id` bigint(0) NOT NULL AUTO_INCREMENT COMMENT 'id', + `key_name` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '配置项', + `value_type` char(12) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '配置值定义', + `extra_schema` json 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 '创建时间', + `update_time` datetime(0) NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '修改时间', + `creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '创建人', + `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 `idx_key` (`key_name`) USING BTREE ) ENGINE = InnoDB @@ -294,7 +294,7 @@ CREATE TABLE `exec_log` `source` char(12) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '执行来源', `source_id` bigint(0) NULL DEFAULT NULL COMMENT '执行来源id', `exec_mode` char(8) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '执行方式', - `description` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '执行描述', + `description` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '执行描述', `exec_seq` int(0) NULL DEFAULT 0 COMMENT '执行序列', `command` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL COMMENT '执行命令', `parameter_schema` json NULL COMMENT '参数 schema', @@ -422,6 +422,7 @@ CREATE TABLE `host` `port` int(0) NULL DEFAULT NULL COMMENT '主机端口', `status` char(8) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '主机状态', `config` json 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 '创建时间', `update_time` datetime(0) NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '修改时间', `creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '创建人', @@ -447,6 +448,7 @@ CREATE TABLE `host_identity` `username` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '用户名', `password` varchar(512) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '用户密码', `key_id` bigint(0) NULL DEFAULT NULL COMMENT '密钥id', + `description` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT 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 '修改时间', `creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '创建人', @@ -470,6 +472,7 @@ CREATE TABLE `host_key` `public_key` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL COMMENT '公钥文本', `private_key` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL COMMENT '私钥文本', `password` varchar(512) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci 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 '创建时间', `update_time` datetime(0) NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '修改时间', `creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '创建人', @@ -552,7 +555,7 @@ CREATE TABLE `preference` `user_id` bigint(0) NULL DEFAULT NULL COMMENT '用户id', `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 '配置项', - `value` json NULL COMMENT '配置值', + `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 '修改时间', `creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '创建人', @@ -629,15 +632,16 @@ CREATE TABLE `system_message` DROP TABLE IF EXISTS `system_role`; CREATE TABLE `system_role` ( - `id` bigint(0) NOT NULL AUTO_INCREMENT COMMENT 'id', - `name` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '角色名称', - `code` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '角色编码', - `status` tinyint(0) NULL DEFAULT 1 COMMENT '状态 0停用 1启用', - `create_time` datetime(0) NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', - `update_time` datetime(0) NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '修改时间', - `creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '创建人', - `updater` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '更新人', - `deleted` tinyint(1) NULL DEFAULT 0 COMMENT '是否删除 0未删除 1已删除', + `id` bigint(0) NOT NULL AUTO_INCREMENT COMMENT 'id', + `name` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '角色名称', + `code` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '角色编码', + `status` tinyint(0) NULL DEFAULT 1 COMMENT '状态 0停用 1启用', + `description` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT 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 '修改时间', + `creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '创建人', + `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 ) ENGINE = InnoDB AUTO_INCREMENT = 1 @@ -674,15 +678,18 @@ 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 '配置项', - `value` json NULL COMMENT '配置值', + `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 '修改时间', `creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '创建人', `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 + PRIMARY KEY (`id`) USING BTREE, + INDEX `type_item_idx` (`type`, `item`) USING BTREE, + INDEX `key_idx` (`config_key`) USING BTREE ) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 @@ -706,6 +713,7 @@ CREATE TABLE `system_user` `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 '修改密码原因', `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 '创建时间', `update_time` datetime(0) NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '修改时间', `creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '创建人', @@ -829,7 +837,7 @@ CREATE TABLE `upload_task` `user_id` bigint(0) NULL DEFAULT NULL COMMENT '用户id', `username` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '用户名', `remote_path` varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '远程路径', - `description` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '描述', + `description` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '描述', `status` char(16) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '状态', `file_count` int(0) NULL DEFAULT NULL COMMENT '文件数量', `host_count` int(0) NULL DEFAULT NULL COMMENT '主机数量', diff --git a/sql/init-4-data.sql b/sql/init-4-data.sql index 0a9bcb1e..b3effb50 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, NOW(), NOW(), '1', '1', 0); +INSERT INTO `system_user` VALUES (1, 'admin', 'c3284d0f94606de1fd2af172aba15bf3', '管理员', NULL, NULL, NULL, 1, 1, 'NEW', NULL, NULL, NOW(), NOW(), '1', '1', 0); -- 角色配置 INSERT INTO `system_role` VALUES (1, '管理员', 'admin', 1, '2023-07-16 21:13:14', '2023-07-17 17:31:29', '1', '1', 0); @@ -9,7 +9,9 @@ INSERT INTO `system_role` VALUES (1, '管理员', 'admin', 1, '2023-07-16 21:13: INSERT INTO `system_user_role` VALUES (1, 1, 1, '2023-07-16 21:15:49', '2023-07-17 18:18:02', '1', '1', 0); -- 系统设置 -INSERT INTO `system_setting` VALUES (1, 'SFTP', 'previewSize', '{\"value\": 2}', '2024-09-27 17:33:05', '2024-09-27 17:33:05', '1', '1', 0); +INSERT INTO `system_setting` VALUES (1, 'sftp.previewSize', 'SFTP', 'previewSize', '2', '2024-09-27 17:33:05', '2025-01-07 11:15:39', '1', '1', 0); +INSERT INTO `system_setting` VALUES (2, 'encrypt.publicKey', 'ENCRYPT', 'publicKey', 'MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC6++dxyeNdij6ZfM2I9ojLQ1tzmqyuL3rkectm9uXJsXOFiN0aFi4glsoGVZO5hMH5/pppdSQnYz3rSV9b0qjFTRMv5u1BHHzuzoOkI43WqXCX96f8diHIZsEu9fZ+AkxVck/kDPfmR2dVjwo8ZBuJ7drsP8fDbs8N3vtEwPSotwIDAQAB', '2025-01-07 15:40:18', '2025-01-07 15:40:18', '1', '1', 0); +INSERT INTO `system_setting` VALUES (3, 'encrypt.privateKey', 'ENCRYPT', 'privateKey', 'MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBALr753HJ412KPpl8zYj2iMtDW3OarK4veuR5y2b25cmxc4WI3RoWLiCWygZVk7mEwfn+mml1JCdjPetJX1vSqMVNEy/m7UEcfO7Og6QjjdapcJf3p/x2IchmwS719n4CTFVyT+QM9+ZHZ1WPCjxkG4nt2uw/x8Nuzw3e+0TA9Ki3AgMBAAECgYA+sD3ENH952ONr6h+uj5kFLKv4ch76twhomTzMZHJd0JR+bIhUOqN0YZmRzhcc15mBCw8R1Cgu3GLiA1NpIZNbH6ujsGzwOGn9E+1TIgRAfgOV1JmMIJ4sVa2zb5+seZ4TkU2MfpKjToa/cX1kovoiNR8gPV+HCE8HUBXgOziF4QJBAOf2LGTjjKSag8WBQjgy2OCi6l0260jGSCGBJYCG884feeH/msTbTdvo44iYyd3P9txxBmmnpdJLvPgJWCu01q0CQQDOXH8yPkSCBL+ZvFizBHayhoO0FN/YFyrYf1wewt43mCDHbx4fzwXtc2CLrSt+nqgwTA4M73Sf2DAOW9pk9T1zAkBIT1d7g+v+DCTz1t2bw04UiPTiZhJmt1kZCLd2H5u1L97A8vt+Tpcw7KKxnF+hhAkCo0FKgnaQ3gdkkxUnWtJpAkEAoA4v/bk8C5hBP61NIrRQmBEq767NG16Etdy6h4VfM8GDkwvFUqiQkWZOuKc8t/24t5UVxMSpMR1N0KU/k9R+rwJBALjw7SzSeqWV2VLUZVqtWPu9nZvX79SWZWMp0gtmYYgzKa1dttzdJsXY5i/cfKH6RO2hwicO1rVBpiZ5zMggljo=', '2025-01-07 15:40:18', '2025-01-07 15:40:18', '1', '1', 0); -- 字典项 INSERT INTO `dict_key` VALUES (1, 'operatorLogModule', 'STRING', '[]', '操作日志模块', '2023-10-21 02:04:22', '2023-10-30 14:11:38', '1', '1', 0); diff --git a/sql/常用.sql b/sql/常用.sql index 253043a4..39bbe869 100644 --- a/sql/常用.sql +++ b/sql/常用.sql @@ -22,3 +22,11 @@ DELETE FROM dict_key WHERE deleted = 1; DELETE FROM dict_value WHERE deleted = 1; DELETE FROM system_menu WHERE deleted = 1; DELETE FROM system_setting WHERE deleted = 1; + +-- 删除已删除的记录数据 +DELETE FROM operator_log WHERE deleted = 1; +DELETE FROM exec_log WHERE deleted = 1; +DELETE FROM exec_host_log WHERE deleted = 1; +DELETE FROM terminal_connect_log WHERE deleted = 1; +DELETE FROM upload_task WHERE deleted = 1; +DELETE FROM upload_task_file WHERE deleted = 1;