From d52133394c999ba855a591fd0614e968070a72d4 Mon Sep 17 00:00:00 2001 From: ailanyin Date: Fri, 7 Jul 2023 17:51:48 +0800 Subject: [PATCH] add --- document/db/MySQL/qiaoba-boot-MySQL5.7.sql | 144 ++++++------------ .../qiaoba/api/tenant/entity/SysTenant.java | 2 + .../common/base/code/DatasourceErrorCode.java | 2 +- .../common/base/code/TenantErrorCode.java | 12 +- .../controller/SysTenantInitController.java | 8 +- .../mapper/SysTenantDatasourceMapper.java | 2 +- .../module/tenant/mapper/SysTenantMapper.java | 10 ++ .../tenant/service/SysTenantInitService.java | 7 + .../impl/SysTenantDatasourceServiceImpl.java | 3 +- .../impl/SysTenantInitServiceImpl.java | 19 +++ .../service/impl/SysTenantServiceImpl.java | 11 +- .../main/resources/mapper/SysTenantMapper.xml | 10 ++ 12 files changed, 124 insertions(+), 106 deletions(-) create mode 100644 qiaoba-modules/qiaoba-module-tenant/src/main/resources/mapper/SysTenantMapper.xml diff --git a/document/db/MySQL/qiaoba-boot-MySQL5.7.sql b/document/db/MySQL/qiaoba-boot-MySQL5.7.sql index 03e1061..55bb738 100644 --- a/document/db/MySQL/qiaoba-boot-MySQL5.7.sql +++ b/document/db/MySQL/qiaoba-boot-MySQL5.7.sql @@ -11,7 +11,7 @@ Target Server Version : 50742 File Encoding : 65001 - Date: 05/07/2023 17:30:52 + Date: 07/07/2023 17:51:17 */ SET NAMES utf8mb4; @@ -32,15 +32,15 @@ CREATE TABLE `generator_table` ( `function_name` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '生成功能名', `author` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '生成功能作者', `parent_menu_id` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '父级菜单ID', - `doc_flag` char(1) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '文档开关', - `excel_flag` char(1) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT 'Excel导出开关', + `doc_flag` char(1) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '0' COMMENT '文档开关', + `excel_flag` char(1) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '0' COMMENT 'Excel导出开关', PRIMARY KEY (`table_id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 1676523729943375874 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '代码生成业务表' ROW_FORMAT = DYNAMIC; +) ENGINE = InnoDB AUTO_INCREMENT = 1676757962154688514 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '代码生成业务表' ROW_FORMAT = DYNAMIC; -- ---------------------------- -- Records of generator_table -- ---------------------------- -INSERT INTO `generator_table` VALUES (1676523729943375873, 'test_user', '用户信息表', 'TestUser', 'com.qiaoba.module.generator', 'generator', 'user', '用户信息', 'Ailanyin', NULL, NULL, NULL); +INSERT INTO `generator_table` VALUES (1676757962154688513, 'test_user', '用户信息表', 'TestUser', 'com.qiaoba.module.generator', 'generator', 'user', '用户信息', 'Ailanyin', NULL, '0', '0'); -- ---------------------------- -- Table structure for generator_table_column @@ -54,37 +54,37 @@ CREATE TABLE `generator_table_column` ( `column_type` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '列类型', `java_type` varchar(500) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT 'JAVA类型', `java_field` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT 'JAVA字段名', - `is_pk` char(1) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '是否主键（1是）', - `is_required` char(1) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '是否必填（1是）', - `is_insert` char(1) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '是否为插入字段（1是）', - `is_edit` char(1) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '是否编辑字段（1是）', - `is_list` char(1) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '是否列表字段（1是）', - `is_query` char(1) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '是否查询字段（1是）', + `is_pk` char(1) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '0' COMMENT '是否主键（1是）', + `is_required` char(1) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '0' COMMENT '是否必填（1是）', + `is_insert` char(1) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '0' COMMENT '是否为插入字段（1是）', + `is_edit` char(1) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '0' COMMENT '是否编辑字段（1是）', + `is_list` char(1) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '0' COMMENT '是否列表字段（1是）', + `is_query` char(1) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '0' COMMENT '是否查询字段（1是）', `query_type` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT 'EQ' COMMENT '查询方式（等于、不等于、大于、小于、范围）', `html_type` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '显示类型（文本框、文本域、下拉框、复选框、单选框、日期控件）', `dict_type` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '' COMMENT '字典类型', `sort` int(11) NULL DEFAULT NULL COMMENT '排序', PRIMARY KEY (`column_id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 1676523730350223363 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '代码生成业务表字段' ROW_FORMAT = DYNAMIC; +) ENGINE = InnoDB AUTO_INCREMENT = 1676757962507010050 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '代码生成业务表字段' ROW_FORMAT = DYNAMIC; -- ---------------------------- -- Records of generator_table_column -- ---------------------------- -INSERT INTO `generator_table_column` VALUES (1676523730039844866, '1676523729943375873', 'user_id', '用户ID123', 'bigint(200)', 'Long', 'userId', '1', NULL, '1', '1', '1', NULL, 'EQ', 'input', '', 1); -INSERT INTO `generator_table_column` VALUES (1676523730065010689, '1676523729943375873', 'dept_id', '部门ID', 'bigint(20)', 'Long', 'deptId', '0', NULL, '1', '1', '1', NULL, 'EQ', 'input', '', 2); -INSERT INTO `generator_table_column` VALUES (1676523730085982209, '1676523729943375873', 'username', '用户账号', 'varchar(30)', 'String', 'username', '0', '1', '1', '1', '1', '1', 'LIKE', 'input', '', 3); -INSERT INTO `generator_table_column` VALUES (1676523730102759425, '1676523729943375873', 'nickname', '用户昵称', 'varchar(30)', 'String', 'nickname', '0', '1', '1', '1', '1', '1', 'LIKE', 'input', '', 4); -INSERT INTO `generator_table_column` VALUES (1676523730119536642, '1676523729943375873', 'email', '用户邮箱', 'varchar(50)', 'String', 'email', '0', NULL, '1', '1', '1', NULL, 'EQ', 'input', '', 5); -INSERT INTO `generator_table_column` VALUES (1676523730140508162, '1676523729943375873', 'phone', '手机号码', 'varchar(11)', 'String', 'phone', '0', NULL, '1', '1', '1', '1', 'LIKE', 'input', '', 6); -INSERT INTO `generator_table_column` VALUES (1676523730165673986, '1676523729943375873', 'gender', '用户性别（0男 1女 2未知）', 'char(1)', 'String', 'gender', '0', NULL, '1', '1', '1', NULL, 'EQ', 'select', '', 7); -INSERT INTO `generator_table_column` VALUES (1676523730199228418, '1676523729943375873', 'avatar', '头像地址', 'varchar(100)', 'String', 'avatar', '0', NULL, '1', '1', '1', NULL, 'EQ', 'input', '', 8); -INSERT INTO `generator_table_column` VALUES (1676523730241171457, '1676523729943375873', 'password', '密码', 'varchar(100)', 'String', 'password', '0', NULL, '1', '1', '1', NULL, 'EQ', 'input', '', 9); -INSERT INTO `generator_table_column` VALUES (1676523730274725889, '1676523729943375873', 'status', '帐号状态（1正常 0停用）', 'char(1)', 'String', 'status', '0', NULL, '1', '1', '1', NULL, 'EQ', 'radio', '', 10); -INSERT INTO `generator_table_column` VALUES (1676523730287308801, '1676523729943375873', 'create_user', '创建者', 'varchar(64)', 'String', 'createUser', '0', NULL, NULL, NULL, NULL, NULL, 'EQ', 'input', '', 11); -INSERT INTO `generator_table_column` VALUES (1676523730295697410, '1676523729943375873', 'create_time', '创建时间', 'datetime', 'Date', 'createTime', '0', NULL, NULL, NULL, NULL, NULL, 'EQ', 'datetime', '', 12); -INSERT INTO `generator_table_column` VALUES (1676523730312474626, '1676523729943375873', 'update_user', '更新者', 'varchar(64)', 'String', 'updateUser', '0', NULL, NULL, NULL, NULL, NULL, 'EQ', 'input', '', 13); -INSERT INTO `generator_table_column` VALUES (1676523730333446145, '1676523729943375873', 'update_time', '更新时间', 'datetime', 'Date', 'updateTime', '0', NULL, NULL, NULL, NULL, NULL, 'EQ', 'datetime', '', 14); -INSERT INTO `generator_table_column` VALUES (1676523730350223362, '1676523729943375873', 'tenant_id', '租户ID', 'bigint(20)', 'Long', 'tenantId', '0', NULL, NULL, NULL, NULL, NULL, 'EQ', 'input', '', 15); +INSERT INTO `generator_table_column` VALUES (1676757962225991682, '1676757962154688513', 'user_id', '用户ID123', 'bigint(200)', 'Long', 'userId', '1', '0', '1', '1', '1', '0', 'EQ', 'input', '', 1); +INSERT INTO `generator_table_column` VALUES (1676757962242768898, '1676757962154688513', 'dept_id', '部门ID', 'bigint(20)', 'Long', 'deptId', '0', '0', '1', '1', '1', '0', 'EQ', 'input', '', 2); +INSERT INTO `generator_table_column` VALUES (1676757962255351810, '1676757962154688513', 'username', '用户账号', 'varchar(30)', 'String', 'username', '0', '1', '1', '1', '1', '1', 'LIKE', 'input', '', 3); +INSERT INTO `generator_table_column` VALUES (1676757962276323329, '1676757962154688513', 'nickname', '用户昵称', 'varchar(30)', 'String', 'nickname', '0', '1', '1', '1', '1', '1', 'LIKE', 'input', '', 4); +INSERT INTO `generator_table_column` VALUES (1676757962293100546, '1676757962154688513', 'email', '用户邮箱', 'varchar(50)', 'String', 'email', '0', '0', '1', '1', '1', '0', 'EQ', 'input', '', 5); +INSERT INTO `generator_table_column` VALUES (1676757962314072066, '1676757962154688513', 'phone', '手机号码', 'varchar(11)', 'String', 'phone', '0', '0', '1', '1', '1', '1', 'LIKE', 'input', '', 6); +INSERT INTO `generator_table_column` VALUES (1676757962330849282, '1676757962154688513', 'gender', '用户性别（0男 1女 2未知）', 'char(1)', 'String', 'gender', '0', '0', '1', '1', '1', '0', 'EQ', 'select', '', 7); +INSERT INTO `generator_table_column` VALUES (1676757962347626498, '1676757962154688513', 'avatar', '头像地址', 'varchar(100)', 'String', 'avatar', '0', '0', '1', '1', '1', '0', 'EQ', 'input', '', 8); +INSERT INTO `generator_table_column` VALUES (1676757962364403714, '1676757962154688513', 'password', '密码', 'varchar(100)', 'String', 'password', '0', '0', '1', '1', '1', '0', 'EQ', 'input', '', 9); +INSERT INTO `generator_table_column` VALUES (1676757962423123970, '1676757962154688513', 'status', '帐号状态（1正常 0停用）', 'char(1)', 'String', 'status', '0', '0', '1', '1', '1', '0', 'EQ', 'radio', '', 10); +INSERT INTO `generator_table_column` VALUES (1676757962439901185, '1676757962154688513', 'create_user', '创建者', 'varchar(64)', 'String', 'createUser', '0', '0', '0', '0', '0', '0', 'EQ', 'input', '', 11); +INSERT INTO `generator_table_column` VALUES (1676757962456678402, '1676757962154688513', 'create_time', '创建时间', 'datetime', 'Date', 'createTime', '0', '0', '0', '0', '0', '0', 'EQ', 'datetime', '', 12); +INSERT INTO `generator_table_column` VALUES (1676757962469261313, '1676757962154688513', 'update_user', '更新者', 'varchar(64)', 'String', 'updateUser', '0', '0', '0', '0', '0', '0', 'EQ', 'input', '', 13); +INSERT INTO `generator_table_column` VALUES (1676757962486038530, '1676757962154688513', 'update_time', '更新时间', 'datetime', 'Date', 'updateTime', '0', '0', '0', '0', '0', '0', 'EQ', 'datetime', '', 14); +INSERT INTO `generator_table_column` VALUES (1676757962507010049, '1676757962154688513', 'tenant_id', '租户ID', 'bigint(20)', 'Long', 'tenantId', '0', '0', '0', '0', '0', '0', 'EQ', 'input', '', 15); -- ---------------------------- -- Table structure for sys_config @@ -117,7 +117,7 @@ INSERT INTO `sys_config` VALUES (1661603968779079683, '主框架页-默认皮肤 INSERT INTO `sys_config` VALUES (1668426274817994753, '登陆最大错误次数', 'sys.account.loginErrorMaxCount', '10', 'Y', 'admin', '2023-06-13 09:13:16', 'admin', '2023-06-13 09:35:59', '超过次数, 就会被拉黑', 1); INSERT INTO `sys_config` VALUES (1668428263694135297, '黑名单过期时间', 'sys.account.blacklistExpireTime', '30', 'Y', 'admin', '2023-06-13 09:21:11', 'admin', '2023-06-13 09:35:29', '拉黑时间, 单位：分钟, 仅支持正整数', 1); INSERT INTO `sys_config` VALUES (1670692775595900930, '登录日志开关', 'sys.login.loginLogOnOff', 'true', 'Y', 'admin', '2023-06-19 15:19:32', 'admin', '2023-06-19 15:34:42', '登录日志开关', 1); -INSERT INTO `sys_config` VALUES (1670696367736258562, '账号同时在线开关', 'sys.account.allowBothOnline', 'true', 'Y', 'admin', '2023-06-19 15:33:49', 'admin', '2023-06-29 14:17:05', '同时在线开关', 1); +INSERT INTO `sys_config` VALUES (1670696367736258562, '账号同时在线开关', 'sys.account.allowBothOnline', 'false', 'Y', 'admin', '2023-06-19 15:33:49', 'admin', '2023-07-07 11:26:04', '同时在线开关', 1); -- ---------------------------- -- Table structure for sys_dept @@ -233,75 +233,10 @@ CREATE TABLE `sys_login_log` ( -- ---------------------------- -- Records of sys_login_log -- ---------------------------- -INSERT INTO `sys_login_log` VALUES (1670722570643869697, '34ca854d3c1549318b9f7b2923faf4f7', 'admin', '小王', '192.168.0.201', '0|0|0|内网IP|内网IP', 'Chrome|114.0.0.0', 'Windows 10 or Windows Server 2016', '2023-06-19 17:17:56', '', NULL, '', NULL, NULL, 1); -INSERT INTO `sys_login_log` VALUES (1670723605751959554, 'b9c055b82943483799feab5a1c0e0f46', 'admin', '小王', '192.168.0.201', '0|0|0|内网IP|内网IP', 'Chrome|114.0.0.0', 'Windows 10 or Windows Server 2016', '2023-06-19 17:22:03', '', NULL, '', NULL, NULL, 1); -INSERT INTO `sys_login_log` VALUES (1671343831271133185, '33a81da4b73c41fca53c48a96c7efa9a', 'admin', '小王', '192.168.0.201', '0|0|0|内网IP|内网IP', 'Chrome|114.0.0.0', 'Windows 10 or Windows Server 2016', '2023-06-21 10:26:36', '', NULL, '', NULL, NULL, 1); -INSERT INTO `sys_login_log` VALUES (1671345257183481858, 'b6c9b691220945a6b60e57552f1d38db', 'admin', '小王', '192.168.0.201', '0|0|0|内网IP|内网IP', 'Chrome|114.0.0.0', 'Windows 10 or Windows Server 2016', '2023-06-21 10:32:16', '', NULL, '', NULL, NULL, 1); -INSERT INTO `sys_login_log` VALUES (1671351311367794689, 'b8e80e8e5be94951ada9722879593e97', 'admin', '小王', '192.168.0.201', '0|0|0|内网IP|内网IP', 'Chrome|114.0.0.0', 'Windows 10 or Windows Server 2016', '2023-06-21 10:56:19', '', NULL, '', NULL, NULL, 1); -INSERT INTO `sys_login_log` VALUES (1671354103641796610, '8d5611fb9ed743d4b9c8dd1fa97762ef', 'admin', '小王', '192.168.0.201', '0|0|0|内网IP|内网IP', 'Chrome|114.0.0.0', 'Windows 10 or Windows Server 2016', '2023-06-21 11:07:25', '', NULL, '', NULL, NULL, 1); -INSERT INTO `sys_login_log` VALUES (1671354965323804673, '42bcaebb0f0a4f52ac46b4c994f8b106', 'admin', '小王', '192.168.0.201', '0|0|0|内网IP|内网IP', 'Chrome|114.0.0.0', 'Windows 10 or Windows Server 2016', '2023-06-21 11:10:51', '', NULL, '', NULL, NULL, 1); -INSERT INTO `sys_login_log` VALUES (1671360756479029250, '50061c2cbe424ddfad428fc1d824ed38', 'admin', '小王', '192.168.0.200', '0|0|0|内网IP|内网IP', 'Firefox|114.0', 'OSX', '2023-06-21 11:33:51', '', NULL, '', NULL, NULL, 1); -INSERT INTO `sys_login_log` VALUES (1671392710658224129, '645c7db45998449b92ca05ec1929a431', 'admin', '小王', '192.168.0.201', '0|0|0|内网IP|内网IP', 'Chrome|114.0.0.0', 'Windows 10 or Windows Server 2016', '2023-06-21 13:40:50', '', NULL, '', NULL, NULL, 1); -INSERT INTO `sys_login_log` VALUES (1671400214419021825, '18547633b2a44b6988cb0273d891711e', 'admin', '小王', '192.168.0.201', '0|0|0|内网IP|内网IP', 'Chrome|114.0.0.0', 'Windows 10 or Windows Server 2016', '2023-06-21 14:10:39', '', NULL, '', NULL, NULL, 1); -INSERT INTO `sys_login_log` VALUES (1671404237511487489, '69b7cdcc4dac4f5499c134d22681d61d', 'admin', '小王', '192.168.0.200', '0|0|0|内网IP|内网IP', 'Firefox|114.0', 'OSX', '2023-06-21 14:26:38', '', NULL, '', NULL, NULL, 1); -INSERT INTO `sys_login_log` VALUES (1671408236826488833, '568f52d5e1aa4db5ab0d239fa3869152', 'admin', '小王', '192.168.0.200', '0|0|0|内网IP|内网IP', 'Chrome|114.0.0.0', 'OSX', '2023-06-21 14:42:32', '', NULL, '', NULL, NULL, 1); -INSERT INTO `sys_login_log` VALUES (1671409521441140738, 'b76bfc803e5348859073d7e154c4a501', 'admin', '小王', '192.168.0.200', '0|0|0|内网IP|内网IP', 'Firefox|114.0', 'OSX', '2023-06-21 14:47:38', '', NULL, '', NULL, NULL, 1); -INSERT INTO `sys_login_log` VALUES (1671411391563853826, 'c8bf796f3ae74d0d8bf70ea781a01bf6', 'admin', '小王', '192.168.0.200', '0|0|0|内网IP|内网IP', 'Firefox|114.0', 'OSX', '2023-06-21 14:55:04', '', NULL, '', NULL, NULL, 1); -INSERT INTO `sys_login_log` VALUES (1671419983864033282, '78ac62045e414ceebb6546240bea4f21', 'admin', '小王', '192.168.0.201', '0|0|0|内网IP|内网IP', 'Chrome|114.0.0.0', 'Windows 10 or Windows Server 2016', '2023-06-21 15:29:12', '', NULL, '', NULL, NULL, 1); -INSERT INTO `sys_login_log` VALUES (1671420293474979842, '11a9a6aa79e94f50a5593d9d3c38c0f5', 'admin', '小王', '192.168.0.201', '0|0|0|内网IP|内网IP', 'Chrome|114.0.0.0', 'Windows 10 or Windows Server 2016', '2023-06-21 15:30:26', '', NULL, '', NULL, NULL, 1); -INSERT INTO `sys_login_log` VALUES (1671420846439436289, 'b29b306d109440d59fd6021771146804', 'admin', '小王', '192.168.0.201', '0|0|0|内网IP|内网IP', 'Chrome|114.0.0.0', 'Windows 10 or Windows Server 2016', '2023-06-21 15:32:38', '', NULL, '', NULL, NULL, 1); -INSERT INTO `sys_login_log` VALUES (1671422073659232257, '9edfad96f8154d9487c741ab7e3fb093', 'admin', '小王', '192.168.0.201', '0|0|0|内网IP|内网IP', 'Chrome|114.0.0.0', 'Windows 10 or Windows Server 2016', '2023-06-21 15:37:31', '', NULL, '', NULL, NULL, 1); -INSERT INTO `sys_login_log` VALUES (1671422330321276929, '7e25b040adb241bdb52f58d1cf04cb8a', 'admin', '小王', '192.168.0.200', '0|0|0|内网IP|内网IP', 'Firefox|114.0', 'OSX', '2023-06-21 15:38:32', '', NULL, '', NULL, NULL, 1); -INSERT INTO `sys_login_log` VALUES (1671424932798828546, '39cab58f1e9144379233c68c94a647d1', 'admin', '小王', '192.168.0.201', '0|0|0|内网IP|内网IP', 'Chrome|114.0.0.0', 'Windows 10 or Windows Server 2016', '2023-06-21 15:48:52', '', NULL, '', NULL, NULL, 1); -INSERT INTO `sys_login_log` VALUES (1672819284613050370, '8a2511f477dc4a1b9b46df6d5ddc1dce', 'admin', '小王', '192.168.0.201', '0|0|0|内网IP|内网IP', 'Chrome|114.0.0.0', 'Windows 10 or Windows Server 2016', '2023-06-25 12:09:32', '', NULL, '', NULL, NULL, 1); -INSERT INTO `sys_login_log` VALUES (1672821488581443585, '85f0fb6fc72f4650ab470eeebc466630', 'admin', '小王', '192.168.0.201', '0|0|0|内网IP|内网IP', 'Chrome|114.0.0.0', 'Windows 10 or Windows Server 2016', '2023-06-25 12:18:17', '', NULL, '', NULL, NULL, 1); -INSERT INTO `sys_login_log` VALUES (1672822310388178945, 'f49d6117160b4dc7841ab42b0a3025ba', 'admin', '小王', '192.168.0.201', '0|0|0|内网IP|内网IP', 'Chrome|114.0.0.0', 'Windows 10 or Windows Server 2016', '2023-06-25 12:21:33', '', NULL, '', NULL, NULL, 1); -INSERT INTO `sys_login_log` VALUES (1673495140398272513, '82bb5e6d57fd45afb0379b23efdcbdae', 'admin', '小王', '192.168.0.200', '0|0|0|内网IP|内网IP', 'Firefox|114.0', 'OSX', '2023-06-27 08:55:08', '', NULL, '', NULL, NULL, 1); -INSERT INTO `sys_login_log` VALUES (1673623018750386178, 'b6cd8cb61ed84a0ba3d3607580077395', 'admin', '小王', '192.168.0.200', '0|0|0|内网IP|内网IP', 'Firefox|114.0', 'OSX', '2023-06-27 17:23:17', '', NULL, '', NULL, NULL, 1); -INSERT INTO `sys_login_log` VALUES (1673626154231709697, '40c665d9a928403c858be25e3002bea7', 'admin', '小王', '192.168.0.201', '0|0|0|内网IP|内网IP', 'Chrome|114.0.0.0', 'Windows 10 or Windows Server 2016', '2023-06-27 17:35:44', '', NULL, '', NULL, NULL, 1); -INSERT INTO `sys_login_log` VALUES (1673627808146493441, 'ca1619bbddb84c459671d9d2816ea562', 'admin', '小王', '192.168.0.201', '0|0|0|内网IP|内网IP', 'Chrome|114.0.0.0', 'Windows 10 or Windows Server 2016', '2023-06-27 17:42:19', '', NULL, '', NULL, NULL, 1); -INSERT INTO `sys_login_log` VALUES (1673628336561655809, '59be890f51ac43649e604e5492e8d8b1', 'admin', '小王', '192.168.0.201', '0|0|0|内网IP|内网IP', 'Chrome|114.0.0.0', 'Windows 10 or Windows Server 2016', '2023-06-27 17:44:25', '', NULL, '', NULL, NULL, 1); -INSERT INTO `sys_login_log` VALUES (1674287717158551554, '3ea2ed34517b42498f12692fe0dc6556', 'admin', '小王', '192.168.0.201', '0|0|0|内网IP|内网IP', 'Chrome|114.0.0.0', 'Windows 10 or Windows Server 2016', '2023-06-29 13:24:33', '', NULL, '', NULL, NULL, 1); -INSERT INTO `sys_login_log` VALUES (1674288367120482306, '9e5f49f39ada4c5ebece12a834462104', 'admin', '小王', '192.168.0.201', '0|0|0|内网IP|内网IP', 'Chrome|114.0.0.0', 'Windows 10 or Windows Server 2016', '2023-06-29 13:27:08', '', NULL, '', NULL, NULL, 1); -INSERT INTO `sys_login_log` VALUES (1674295885062303746, '32a79465ff054b3385a3cac8d6201653', 'admin', '小王', '192.168.0.200', '0|0|0|内网IP|内网IP', 'Firefox|114.0', 'OSX', '2023-06-29 13:57:01', '', NULL, '', NULL, NULL, 1); -INSERT INTO `sys_login_log` VALUES (1674299864659845122, '8612fecc6e9940208cdf894a98fafe78', 'admin', '小王', '192.168.0.201', '0|0|0|内网IP|内网IP', 'Chrome|114.0.0.0', 'Windows 10 or Windows Server 2016', '2023-06-29 14:12:49', '', NULL, '', NULL, NULL, 1); -INSERT INTO `sys_login_log` VALUES (1674300247989870593, '0737e8cb1aa943579b6dc5881e5072c3', 'admin', '小王', '192.168.0.200', '0|0|0|内网IP|内网IP', 'Firefox|114.0', 'OSX', '2023-06-29 14:14:21', '', NULL, '', NULL, NULL, 1); -INSERT INTO `sys_login_log` VALUES (1674300878649614338, '67e19664762b4c7b9b7353b46ef2cf0a', 'admin', '小王', '192.168.0.201', '0|0|0|内网IP|内网IP', 'Chrome|114.0.0.0', 'Windows 10 or Windows Server 2016', '2023-06-29 14:16:51', '', NULL, '', NULL, NULL, 1); -INSERT INTO `sys_login_log` VALUES (1674309922462367745, 'baa10201c0914389b161342339863c1a', 'admin', '小王', '192.168.0.200', '0|0|0|内网IP|内网IP', 'Firefox|114.0', 'OSX', '2023-06-29 14:52:47', '', NULL, '', NULL, NULL, 1); -INSERT INTO `sys_login_log` VALUES (1674309922462367746, '4979a6b215a943f1808a974a110fcfb4', 'admin', '小王', '192.168.0.200', '0|0|0|内网IP|内网IP', 'Firefox|114.0', 'OSX', '2023-06-29 14:52:47', '', NULL, '', NULL, NULL, 1); -INSERT INTO `sys_login_log` VALUES (1674310002187698178, '6ce92b6c02ad4b53a50eb316689a78c3', 'admin', '小王', '192.168.0.200', '0|0|0|内网IP|内网IP', 'Firefox|114.0', 'OSX', '2023-06-29 14:53:06', '', NULL, '', NULL, NULL, 1); -INSERT INTO `sys_login_log` VALUES (1674317996849983489, '1b7d957896c64412ae2f92eb6d2373b7', 'admin', '小王', '192.168.0.201', '0|0|0|内网IP|内网IP', 'Chrome|114.0.0.0', 'Windows 10 or Windows Server 2016', '2023-06-29 15:24:52', '', NULL, '', NULL, NULL, 1); -INSERT INTO `sys_login_log` VALUES (1674676067589750786, '488a203a4ff343a0acc1d5f4dfef43fc', 'admin', '小王', '192.168.0.201', '0|0|0|内网IP|内网IP', 'Chrome|114.0.0.0', 'Windows 10 or Windows Server 2016', '2023-06-30 15:07:43', '', NULL, '', NULL, NULL, 1); -INSERT INTO `sys_login_log` VALUES (1674677079801135105, '594817f39535461d8053e3706686630e', 'admin', '小王', '192.168.0.200', '0|0|0|内网IP|内网IP', 'Firefox|114.0', 'OSX', '2023-06-30 15:11:44', '', NULL, '', NULL, NULL, 1); -INSERT INTO `sys_login_log` VALUES (1674683687876755458, '389fe5bba3084773b47a7432335f4a2e', 'admin', '小王', '192.168.0.200', '0|0|0|内网IP|内网IP', 'Firefox|114.0', 'OSX', '2023-06-30 15:38:00', '', NULL, '', NULL, NULL, 1); -INSERT INTO `sys_login_log` VALUES (1674684168237744130, 'f84fa6f7b21c4ce3bd1519574c30885a', 'admin', '小王', '192.168.0.201', '0|0|0|内网IP|内网IP', 'Chrome|114.0.0.0', 'Windows 10 or Windows Server 2016', '2023-06-30 15:39:54', '', NULL, '', NULL, NULL, 1); -INSERT INTO `sys_login_log` VALUES (1674686672493084674, '1eb95893354f49028b3d120a0b526714', 'admin', '小王', '192.168.0.200', '0|0|0|内网IP|内网IP', 'Firefox|114.0', 'OSX', '2023-06-30 15:49:52', '', NULL, '', NULL, NULL, 1); -INSERT INTO `sys_login_log` VALUES (1674687698633752578, '06458226410b4fd5b0c62434172ea079', 'admin', '小王', '192.168.0.201', '0|0|0|内网IP|内网IP', 'Chrome|114.0.0.0', 'Windows 10 or Windows Server 2016', '2023-06-30 15:53:56', '', NULL, '', NULL, NULL, 1); -INSERT INTO `sys_login_log` VALUES (1674694028866179074, 'bc678e6e160649f7b19fef95c1e848b9', 'admin', '小王', '192.168.0.201', '0|0|0|内网IP|内网IP', 'Chrome|114.0.0.0', 'Windows 10 or Windows Server 2016', '2023-06-30 16:19:05', '', NULL, '', NULL, NULL, 1); -INSERT INTO `sys_login_log` VALUES (1675673177286074370, '0ca8648ac05c4b8d8622ab7434b5c21e', 'admin', '小王', '192.168.0.201', '0|0|0|内网IP|内网IP', 'Chrome|114.0.0.0', 'Windows 10 or Windows Server 2016', '2023-07-03 09:09:52', '', NULL, '', NULL, NULL, 1); -INSERT INTO `sys_login_log` VALUES (1675844141158649858, 'c1c0e35ec6c54d489274dcaa46c4059a', 'admin', '小王', '127.0.0.1', '0|0|0|内网IP|内网IP', 'Chrome|108.0.0.0', 'Windows 10 or Windows Server 2016', '2023-07-03 20:29:14', '', NULL, '', NULL, NULL, 1); -INSERT INTO `sys_login_log` VALUES (1675846226075865090, '4efabe6e524048d797b6bb64c46be317', 'admin', '小王', '127.0.0.1', '0|0|0|内网IP|内网IP', 'Chrome|108.0.0.0', 'Windows 10 or Windows Server 2016', '2023-07-03 20:37:31', '', NULL, '', NULL, NULL, 1); -INSERT INTO `sys_login_log` VALUES (1675847691775397890, 'd7e5c05cfd4c482b81044c468e0a1977', 'admin', '小王', '127.0.0.1', '0|0|0|内网IP|内网IP', 'Chrome|108.0.0.0', 'Windows 10 or Windows Server 2016', '2023-07-03 20:43:20', '', NULL, '', NULL, NULL, 1); -INSERT INTO `sys_login_log` VALUES (1675865446528524289, 'e15b4168ec6c430788b8d30121247c35', 'admin', '小王', '127.0.0.1', '0|0|0|内网IP|内网IP', 'Chrome|108.0.0.0', 'Windows 10 or Windows Server 2016', '2023-07-03 21:53:53', '', NULL, '', NULL, NULL, 1); -INSERT INTO `sys_login_log` VALUES (1675866008431042562, 'c602923e58b24a72be492b78e689b117', 'admin', '小王', '127.0.0.1', '0|0|0|内网IP|内网IP', 'Chrome|108.0.0.0', 'Windows 10 or Windows Server 2016', '2023-07-03 21:56:07', '', NULL, '', NULL, NULL, 1); -INSERT INTO `sys_login_log` VALUES (1676030485081948161, '553ddb8b511340d0bae3512d20373ea0', 'admin', '小王', '127.0.0.1', '0|0|0|内网IP|内网IP', 'Chrome|114.0.0.0', 'Windows 10 or Windows Server 2016', '2023-07-04 08:49:41', '', NULL, '', NULL, NULL, 1); -INSERT INTO `sys_login_log` VALUES (1676033199325138946, '322a4eb1deae4f8d8259365513ae85b3', 'admin', '小王', '192.168.0.200', '0|0|0|内网IP|内网IP', 'Firefox|114.0', 'OSX', '2023-07-04 09:00:29', '', NULL, '', NULL, NULL, 1); -INSERT INTO `sys_login_log` VALUES (1676127576290619394, '3e553aaf45fd402c8bb8c942b56b1879', 'admin', '小王', '192.168.0.201', '0|0|0|内网IP|内网IP', 'Chrome|114.0.0.0', 'Windows 10 or Windows Server 2016', '2023-07-04 15:15:30', '', NULL, '', NULL, NULL, 1); -INSERT INTO `sys_login_log` VALUES (1676169998718554113, 'f1b44f041ea74ab3ad5a3b992960763d', 'admin', '小王', '192.168.0.201', '0|0|0|内网IP|内网IP', 'Chrome|114.0.0.0', 'Windows 10 or Windows Server 2016', '2023-07-04 18:04:04', '', NULL, '', NULL, NULL, 1); -INSERT INTO `sys_login_log` VALUES (1676407137817337858, '2d4544efe0784ff78adda21a7871a200', 'admin', '小王', '192.168.0.201', '0|0|0|内网IP|内网IP', 'Chrome|114.0.0.0', 'Windows 10 or Windows Server 2016', '2023-07-05 09:46:22', '', NULL, '', NULL, NULL, 1); -INSERT INTO `sys_login_log` VALUES (1676411525273231361, '0d2e414ace56410da9a11f05e038ce8d', 'admin', '小王', '192.168.0.200', '0|0|0|内网IP|内网IP', 'Firefox|114.0', 'OSX', '2023-07-05 10:03:48', '', NULL, '', NULL, NULL, 1); -INSERT INTO `sys_login_log` VALUES (1676414234550403073, '2c543d659d7b41af81e7f57d2d976fe4', 'admin', '小王', '192.168.0.201', '0|0|0|内网IP|内网IP', 'Chrome|114.0.0.0', 'Windows 10 or Windows Server 2016', '2023-07-05 10:14:34', '', NULL, '', NULL, NULL, 1); -INSERT INTO `sys_login_log` VALUES (1676417431067238401, 'd33f3ea6f76f4594bee6e75177e0bbb5', 'admin', '小王', '192.168.0.201', '0|0|0|内网IP|内网IP', 'Chrome|114.0.0.0', 'Windows 10 or Windows Server 2016', '2023-07-05 10:27:16', '', NULL, '', NULL, NULL, 1); -INSERT INTO `sys_login_log` VALUES (1676426053985845249, '5f324dd28d0c4d928c76e98bf1adecf6', 'admin', '小王', '192.168.0.201', '0|0|0|内网IP|内网IP', 'Chrome|114.0.0.0', 'Windows 10 or Windows Server 2016', '2023-07-05 11:01:32', '', NULL, '', NULL, NULL, 1); -INSERT INTO `sys_login_log` VALUES (1676426168481955842, 'e01e3442c0bd493a89b4c0acf0771d29', 'admin', '小王', '192.168.0.201', '0|0|0|内网IP|内网IP', 'Chrome|114.0.0.0', 'Windows 10 or Windows Server 2016', '2023-07-05 11:02:00', '', NULL, '', NULL, NULL, 1); -INSERT INTO `sys_login_log` VALUES (1676426234663878657, '03ccbaa09a77465eacbf5881c36b0bd8', 'admin', '小王', '192.168.0.201', '0|0|0|内网IP|内网IP', 'Chrome|114.0.0.0', 'Windows 10 or Windows Server 2016', '2023-07-05 11:02:15', '', NULL, '', NULL, NULL, 1); -INSERT INTO `sys_login_log` VALUES (1676444341532958721, '599ec4d4ec284239a2c15fa0023e6b7b', 'admin', '小王', '192.168.0.200', '0|0|0|内网IP|内网IP', 'Firefox|114.0', 'OSX', '2023-07-05 12:14:12', '', NULL, '', NULL, NULL, 1); -INSERT INTO `sys_login_log` VALUES (1676482773508476929, 'c285b175b69547c9824053443cf3a708', 'admin', '小王', '192.168.0.201', '0|0|0|内网IP|内网IP', 'Chrome|114.0.0.0', 'Windows 10 or Windows Server 2016', '2023-07-05 14:46:55', '', NULL, '', NULL, NULL, 1); -INSERT INTO `sys_login_log` VALUES (1676483066891653122, 'eec284c56a4045df86a7eb03c6d602a5', 'admin', '小王', '192.168.0.201', '0|0|0|内网IP|内网IP', 'Chrome|114.0.0.0', 'Windows 10 or Windows Server 2016', '2023-07-05 14:48:05', '', NULL, '', NULL, NULL, 1); -INSERT INTO `sys_login_log` VALUES (1676490398224699393, '03aec0103fa4456cb5a51390b5951ad1', 'admin', '小王', '192.168.0.200', '0|0|0|内网IP|内网IP', 'Firefox|114.0', 'OSX', '2023-07-05 15:17:13', '', NULL, '', NULL, NULL, 1); -INSERT INTO `sys_login_log` VALUES (1676504142338166786, '60cfd50dca384997a1fc6cf075b15bba', 'admin', '小王', '192.168.0.201', '0|0|0|内网IP|内网IP', 'Chrome|114.0.0.0', 'Windows 10 or Windows Server 2016', '2023-07-05 16:11:50', '', NULL, '', NULL, NULL, 1); -INSERT INTO `sys_login_log` VALUES (1676511047492132865, 'd3edbc1426b14af0a5e8f6c4a3b34614', 'admin', '小王', '192.168.0.201', '0|0|0|内网IP|内网IP', 'Chrome|114.0.0.0', 'Windows 10 or Windows Server 2016', '2023-07-05 16:39:16', '', NULL, '', NULL, NULL, 1); -INSERT INTO `sys_login_log` VALUES (1676523812147539969, '874a9ba3d7e647fc94477fea892d7a0a', 'admin', '小王', '192.168.0.201', '0|0|0|内网IP|内网IP', 'Chrome|114.0.0.0', 'Windows 10 or Windows Server 2016', '2023-07-05 17:30:00', '', NULL, '', NULL, NULL, 1); +INSERT INTO `sys_login_log` VALUES (1677244196215947265, '02d96e130ca945b8af2a59a9b7bcb198', 'admin', '小王', '192.168.0.200', '0|0|0|内网IP|内网IP', 'Firefox|114.0', 'OSX', '2023-07-07 17:12:33', '', NULL, '', NULL, NULL, 1); +INSERT INTO `sys_login_log` VALUES (1677251105694265345, '2eeea51df0234e4ab9e8ec4e3998c13a', 'admin', '小王', '192.168.0.201', '0|0|0|内网IP|内网IP', 'Chrome|114.0.0.0', 'Windows 10 or Windows Server 2016', '2023-07-07 17:40:00', '', NULL, '', NULL, NULL, 1); +INSERT INTO `sys_login_log` VALUES (1677251274879905793, '3b2bd9c401d14b76a6b310d2bee66df6', 'admin', '小王', '192.168.0.201', '0|0|0|内网IP|内网IP', 'Chrome|114.0.0.0', 'Windows 10 or Windows Server 2016', '2023-07-07 17:40:40', '', NULL, '', NULL, NULL, 1); +INSERT INTO `sys_login_log` VALUES (1677252021637984257, '10c302a859204d9482ce107dc6cf345d', 'admin', '小王', '192.168.0.201', '0|0|0|内网IP|内网IP', 'Chrome|114.0.0.0', 'Windows 10 or Windows Server 2016', '2023-07-07 17:43:38', '', NULL, '', NULL, NULL, 1); -- ---------------------------- -- Table structure for sys_menu @@ -637,8 +572,8 @@ CREATE TABLE `sys_tenant` ( -- ---------------------------- -- Records of sys_tenant -- ---------------------------- -INSERT INTO `sys_tenant` VALUES (1, '主系统', '111', '111', '11', '11122', '111', NULL, '2099-05-30 23:59:59', 111, '1', '3', NULL, 'admin', '2023-05-30 15:18:04', 'admin', '2023-06-13 16:04:04', '111'); -INSERT INTO `sys_tenant` VALUES (1676519873008209922, '121', '313', '4143', '313', '52353', '313', NULL, '2023-07-05 17:14:19', 121, '1', NULL, NULL, 'admin', '2023-07-05 17:14:21', 'admin', '2023-07-05 17:14:30', '313'); +INSERT INTO `sys_tenant` VALUES (1, '主系统', '111', '111', '11', '11122', '111', NULL, '2099-05-30 23:59:59', 111, '1', '3', '0', 'admin', '2023-05-30 15:18:04', 'admin', '2023-06-13 16:04:04', '111'); +INSERT INTO `sys_tenant` VALUES (1676519873008209922, '121', '313', '4143', '313', '52353', '313', NULL, '2023-07-05 17:14:19', 121, '1', '3', '1', 'admin', '2023-07-05 17:14:21', 'admin', '2023-07-07 17:36:54', '313'); -- ---------------------------- -- Table structure for sys_tenant_datasource @@ -669,6 +604,8 @@ CREATE TABLE `sys_tenant_datasource` ( -- ---------------------------- -- Records of sys_tenant_datasource -- ---------------------------- +INSERT INTO `sys_tenant_datasource` VALUES (1677230063764467714, 'PostgreSQL', '192.168.0.202', '5432', 'mydb', 'qiaoba-boot-2', 'postgres', 'postgres', 1, 1, 1, '1', '', NULL, '', NULL, NULL, 1676519873008209922); +INSERT INTO `sys_tenant_datasource` VALUES (1677248768539996161, 'MySQL', 'rwer', '234', 'rwr', NULL, 'rw', 'werr', 1, 1, 1, '0', '', NULL, '', NULL, NULL, 1676519873008209922); -- ---------------------------- -- Table structure for sys_use_log @@ -698,7 +635,14 @@ CREATE TABLE `sys_use_log` ( -- ---------------------------- -- Records of sys_use_log -- ---------------------------- -INSERT INTO `sys_use_log` VALUES (1676521836735180802, '操作日志', 9, 'com.qiaoba.module.log.controller.SysUseLogController.clean()', 'DELETE', 1, 'admin', '', '/monitor/use-log/clean', '192.168.0.201', '0|0|0|内网IP|内网IP', '', '{\"msg\":\"操作成功\",\"code\":200}', 1, '', '2023-07-05 17:22:09', 1); +INSERT INTO `sys_use_log` VALUES (1677229187121377282, '操作日志', 9, 'com.qiaoba.module.log.controller.SysUseLogController.clean()', 'DELETE', 1, 'admin', '', '/monitor/use-log/clean', '192.168.0.201', '0|0|0|内网IP|内网IP', '', '{\"msg\":\"操作成功\",\"code\":200}', 1, '', '2023-07-07 16:12:54', 1); +INSERT INTO `sys_use_log` VALUES (1677237992072790017, '新增租户', 1, 'com.qiaoba.module.tenant.controller.SysTenantController.add()', 'POST', 1, 'admin', '', '/tenant', '192.168.0.201', '0|0|0|内网IP|内网IP', '{\"tenantId\":\"1677237991938572290\",\"companyName\":\"121\",\"status\":\"1\",\"initialized\":\"0\",\"createUser\":\"admin\",\"createTime\":1688719673503}', '{\"msg\":\"操作成功\",\"code\":200}', 1, '', '2023-07-07 16:47:54', 1); +INSERT INTO `sys_use_log` VALUES (1677241172135297026, '新增租户', 1, 'com.qiaoba.module.tenant.controller.SysTenantController.add()', 'POST', 1, 'admin', '', '/tenant', '192.168.0.201', '0|0|0|内网IP|内网IP', '{\"companyName\":\"121\"}', '', 0, 'Invalid bound statement (not found): com.qiaoba.module.tenant.mapper.SysTenantMapper.checkCompanyNameIsExist', '2023-07-07 17:00:32', 1); +INSERT INTO `sys_use_log` VALUES (1677241345439731714, '新增租户', 1, 'com.qiaoba.module.tenant.controller.SysTenantController.add()', 'POST', 1, 'admin', '', '/tenant', '192.168.0.201', '0|0|0|内网IP|内网IP', '{\"companyName\":\"121\"}', '', 0, '未找到租户信息', '2023-07-07 17:01:13', 1); +INSERT INTO `sys_use_log` VALUES (1677241378390183938, '新增租户', 1, 'com.qiaoba.module.tenant.controller.SysTenantController.add()', 'POST', 1, 'admin', '', '/tenant', '192.168.0.201', '0|0|0|内网IP|内网IP', '{\"companyName\":\"121\"}', '', 0, '未找到租户信息', '2023-07-07 17:01:21', 1); +INSERT INTO `sys_use_log` VALUES (1677241463454863362, '新增租户', 1, 'com.qiaoba.module.tenant.controller.SysTenantController.add()', 'POST', 1, 'admin', '', '/tenant', '192.168.0.201', '0|0|0|内网IP|内网IP', '{\"companyName\":\"121\"}', '', 0, '未找到租户信息', '2023-07-07 17:01:41', 1); +INSERT INTO `sys_use_log` VALUES (1677241720502845441, '新增租户', 1, 'com.qiaoba.module.tenant.controller.SysTenantController.add()', 'POST', 1, 'admin', '', '/tenant', '192.168.0.201', '0|0|0|内网IP|内网IP', '{\"companyName\":\"121\"}', '', 0, '公司名称已存在', '2023-07-07 17:02:42', 1); +INSERT INTO `sys_use_log` VALUES (1677241736013381633, '新增租户', 1, 'com.qiaoba.module.tenant.controller.SysTenantController.add()', 'POST', 1, 'admin', '', '/tenant', '192.168.0.201', '0|0|0|内网IP|内网IP', '{\"tenantId\":\"1677241735971438594\",\"companyName\":\"1211\",\"status\":\"1\",\"initialized\":\"0\",\"createUser\":\"admin\",\"createTime\":1688720566151}', '{\"msg\":\"操作成功\",\"code\":200}', 1, '', '2023-07-07 17:02:46', 1); -- ---------------------------- -- Table structure for sys_user diff --git a/qiaoba-apis/qiaoba-api-tenant/src/main/java/com/qiaoba/api/tenant/entity/SysTenant.java b/qiaoba-apis/qiaoba-api-tenant/src/main/java/com/qiaoba/api/tenant/entity/SysTenant.java index 26317ad..4c36fac 100644 --- a/qiaoba-apis/qiaoba-api-tenant/src/main/java/com/qiaoba/api/tenant/entity/SysTenant.java +++ b/qiaoba-apis/qiaoba-api-tenant/src/main/java/com/qiaoba/api/tenant/entity/SysTenant.java @@ -78,4 +78,6 @@ public class SysTenant extends BaseEntity { this.tenantId = tenantId; this.status = status; } + + } diff --git a/qiaoba-commons/qiaoba-common-base/src/main/java/com/qiaoba/common/base/code/DatasourceErrorCode.java b/qiaoba-commons/qiaoba-common-base/src/main/java/com/qiaoba/common/base/code/DatasourceErrorCode.java index 9dde8ae..d524c31 100644 --- a/qiaoba-commons/qiaoba-common-base/src/main/java/com/qiaoba/common/base/code/DatasourceErrorCode.java +++ b/qiaoba-commons/qiaoba-common-base/src/main/java/com/qiaoba/common/base/code/DatasourceErrorCode.java @@ -15,7 +15,7 @@ public enum DatasourceErrorCode { /** * 未找到 */ - NOT_FIND(50401, "未找到数据源信息"), + NOT_FIND(50401, "未找到数据源信息 (可能未设置使用)"), /** * 连接错误 diff --git a/qiaoba-commons/qiaoba-common-base/src/main/java/com/qiaoba/common/base/code/TenantErrorCode.java b/qiaoba-commons/qiaoba-common-base/src/main/java/com/qiaoba/common/base/code/TenantErrorCode.java index fca6f3f..9c48197 100644 --- a/qiaoba-commons/qiaoba-common-base/src/main/java/com/qiaoba/common/base/code/TenantErrorCode.java +++ b/qiaoba-commons/qiaoba-common-base/src/main/java/com/qiaoba/common/base/code/TenantErrorCode.java @@ -30,7 +30,17 @@ public enum TenantErrorCode { /** * 租户模式不存在 */ - MODE_NOT_FIND(50103, "未找到租户模式"); + MODE_NOT_FIND(50103, "未找到租户模式"), + + /** + * 已初始化过 + */ + INITIALIZED(50104, "已初始化过"), + + /** + * 租户名称已存在 + */ + TENANT_NAME_EXIST(50105, "公司名称已存在"); private final Integer code; private final String msg; diff --git a/qiaoba-modules/qiaoba-module-tenant/src/main/java/com/qiaoba/module/tenant/controller/SysTenantInitController.java b/qiaoba-modules/qiaoba-module-tenant/src/main/java/com/qiaoba/module/tenant/controller/SysTenantInitController.java index db7636d..5ee67f4 100644 --- a/qiaoba-modules/qiaoba-module-tenant/src/main/java/com/qiaoba/module/tenant/controller/SysTenantInitController.java +++ b/qiaoba-modules/qiaoba-module-tenant/src/main/java/com/qiaoba/module/tenant/controller/SysTenantInitController.java @@ -1,5 +1,6 @@ package com.qiaoba.module.tenant.controller; +import com.qiaoba.common.base.result.AjaxResult; import com.qiaoba.module.tenant.entity.vo.TenantInitCheckVo; import com.qiaoba.module.tenant.entity.vo.TenantInitVo; import com.qiaoba.module.tenant.service.SysTenantInitService; @@ -43,5 +44,10 @@ public class SysTenantInitController { public TenantInitVo initData(@PathVariable String tenantId) throws Exception { return sysTenantInitService.initData(tenantId); } - + @PostMapping(value = "/initCompleted/{tenantId}") + @Operation(summary = "初始化完毕") + public AjaxResult initCompleted(@PathVariable String tenantId) { + sysTenantInitService.initCompleted(tenantId); + return AjaxResult.success(); + } } diff --git a/qiaoba-modules/qiaoba-module-tenant/src/main/java/com/qiaoba/module/tenant/mapper/SysTenantDatasourceMapper.java b/qiaoba-modules/qiaoba-module-tenant/src/main/java/com/qiaoba/module/tenant/mapper/SysTenantDatasourceMapper.java index e02c62d..d615acf 100644 --- a/qiaoba-modules/qiaoba-module-tenant/src/main/java/com/qiaoba/module/tenant/mapper/SysTenantDatasourceMapper.java +++ b/qiaoba-modules/qiaoba-module-tenant/src/main/java/com/qiaoba/module/tenant/mapper/SysTenantDatasourceMapper.java @@ -29,5 +29,5 @@ public interface SysTenantDatasourceMapper extends BaseMapper { + + /** + * 检查公司名称是否存在 + * + * @param sysTenant sysTenant + * @return 已存在的名称 + */ + @SelectOneRow + String checkCompanyNameIsExist(SysTenant sysTenant); } diff --git a/qiaoba-modules/qiaoba-module-tenant/src/main/java/com/qiaoba/module/tenant/service/SysTenantInitService.java b/qiaoba-modules/qiaoba-module-tenant/src/main/java/com/qiaoba/module/tenant/service/SysTenantInitService.java index 4eb971c..5b9371c 100644 --- a/qiaoba-modules/qiaoba-module-tenant/src/main/java/com/qiaoba/module/tenant/service/SysTenantInitService.java +++ b/qiaoba-modules/qiaoba-module-tenant/src/main/java/com/qiaoba/module/tenant/service/SysTenantInitService.java @@ -38,4 +38,11 @@ public interface SysTenantInitService { * @throws SQLException SQLException */ TenantInitVo initData(String tenantId) throws SQLException; + + /** + * 初始化完毕 + * + * @param tenantId 租户ID + */ + void initCompleted(String tenantId); } diff --git a/qiaoba-modules/qiaoba-module-tenant/src/main/java/com/qiaoba/module/tenant/service/impl/SysTenantDatasourceServiceImpl.java b/qiaoba-modules/qiaoba-module-tenant/src/main/java/com/qiaoba/module/tenant/service/impl/SysTenantDatasourceServiceImpl.java index 49fa6af..759e1f1 100644 --- a/qiaoba-modules/qiaoba-module-tenant/src/main/java/com/qiaoba/module/tenant/service/impl/SysTenantDatasourceServiceImpl.java +++ b/qiaoba-modules/qiaoba-module-tenant/src/main/java/com/qiaoba/module/tenant/service/impl/SysTenantDatasourceServiceImpl.java @@ -89,6 +89,7 @@ public class SysTenantDatasourceServiceImpl implements SysTenantDatasourceServic @Override @Transactional(rollbackFor = Exception.class) public int switchPrimary(String tenantId, String datasourceId) { + // todo 检查连接可用性 // 更新其他的为非主要 setBackupDatasourceExcludeId(tenantId, datasourceId); // 更新他为主要 @@ -97,7 +98,7 @@ public class SysTenantDatasourceServiceImpl implements SysTenantDatasourceServic int result = updateById(datasource); // 刷新PrimaryDatasourceMap if (result > BaseConstant.HANDLE_ERROR) { - // todo + // todo 刷新PrimaryDatasourceMap } return result; } diff --git a/qiaoba-modules/qiaoba-module-tenant/src/main/java/com/qiaoba/module/tenant/service/impl/SysTenantInitServiceImpl.java b/qiaoba-modules/qiaoba-module-tenant/src/main/java/com/qiaoba/module/tenant/service/impl/SysTenantInitServiceImpl.java index 246c179..f86438b 100644 --- a/qiaoba-modules/qiaoba-module-tenant/src/main/java/com/qiaoba/module/tenant/service/impl/SysTenantInitServiceImpl.java +++ b/qiaoba-modules/qiaoba-module-tenant/src/main/java/com/qiaoba/module/tenant/service/impl/SysTenantInitServiceImpl.java @@ -9,7 +9,9 @@ import com.qiaoba.api.tenant.entity.SysTenantDatasource; import com.qiaoba.api.tenant.enums.TenantModeEnum; import com.qiaoba.common.base.code.DatasourceErrorCode; import com.qiaoba.common.base.code.TenantErrorCode; +import com.qiaoba.common.base.enums.BaseEnum; import com.qiaoba.common.base.enums.DataBaseEnum; +import com.qiaoba.common.base.exceptions.ServiceException; import com.qiaoba.common.database.context.PrimaryDatasourceContext; import com.qiaoba.common.database.context.TenantDbTypeContext; import com.qiaoba.common.database.properties.TenantSchema; @@ -49,6 +51,7 @@ public class SysTenantInitServiceImpl implements SysTenantInitService { public TenantInitCheckVo check(String tenantId) { // 1. 查询租户信息, 获取租户名称|租户模式 SysTenant sysTenant = sysTenantService.selectById(tenantId, false); + checkInitialized(sysTenant); // 2. 租户模式 = 3 数据源模式 if (TenantModeEnum.isDatasource(sysTenant.getMode())) { // 3. 根据租户ID查询主要数据源(1条) @@ -91,6 +94,7 @@ public class SysTenantInitServiceImpl implements SysTenantInitService { @Override public TenantInitVo createTables(String tenantId) { SysTenant sysTenant = sysTenantService.selectById(tenantId, false); + checkInitialized(sysTenant); // 字段模式 if (TenantModeEnum.isColumn(sysTenant.getMode())) { return new TenantInitVo(HttpStatus.HTTP_OK, "字段模式, 无需新建表"); @@ -124,6 +128,7 @@ public class SysTenantInitServiceImpl implements SysTenantInitService { @Override public TenantInitVo initData(String tenantId) throws SQLException { SysTenant sysTenant = sysTenantService.selectById(tenantId, false); + checkInitialized(sysTenant); // 字段模式 if (TenantModeEnum.isColumn(sysTenant.getMode())) { // 获取默认租户的主数据源 @@ -154,6 +159,20 @@ public class SysTenantInitServiceImpl implements SysTenantInitService { return new TenantInitVo(TenantErrorCode.MODE_NOT_FIND.getCode(), TenantErrorCode.MODE_NOT_FIND.getMsg()); } + @Override + public void initCompleted(String tenantId) { + SysTenant sysTenant = new SysTenant(); + sysTenant.setTenantId(tenantId); + sysTenant.setInitialized(BaseEnum.YES.getCode()); + sysTenantService.update(sysTenant); + } + + private void checkInitialized(SysTenant sysTenant) { + if (BaseEnum.YES.getCode().equals(sysTenant.getInitialized())) { + throw new ServiceException(TenantErrorCode.INITIALIZED.getCode(), TenantErrorCode.INITIALIZED.getMsg()); + } + } + private TenantInitVo init(Connection conn, String tenantId) { try { diff --git a/qiaoba-modules/qiaoba-module-tenant/src/main/java/com/qiaoba/module/tenant/service/impl/SysTenantServiceImpl.java b/qiaoba-modules/qiaoba-module-tenant/src/main/java/com/qiaoba/module/tenant/service/impl/SysTenantServiceImpl.java index 894fde2..0f3adeb 100644 --- a/qiaoba-modules/qiaoba-module-tenant/src/main/java/com/qiaoba/module/tenant/service/impl/SysTenantServiceImpl.java +++ b/qiaoba-modules/qiaoba-module-tenant/src/main/java/com/qiaoba/module/tenant/service/impl/SysTenantServiceImpl.java @@ -40,14 +40,15 @@ public class SysTenantServiceImpl implements SysTenantService, SysTenantApiServi private final SysTenantMapper sysTenantMapper; - private final SysTenantDatasourceService sysTenantDatasourceService; private final RedisService redisService; @Override public int insert(SysTenant sysTenant) { + checkCompanyNameIsExist(sysTenant); sysTenant.setCreateTime(new Date()); sysTenant.setCreateUser(SecurityUtil.getLoginUsername()); sysTenant.setStatus(BaseEnum.NORMAL.getCode()); + sysTenant.setInitialized(BaseEnum.NO.getCode()); int result = sysTenantMapper.insert(sysTenant); if (result > BaseConstant.HANDLE_ERROR) { toCache(sysTenant); @@ -57,6 +58,7 @@ public class SysTenantServiceImpl implements SysTenantService, SysTenantApiServi @Override public int update(SysTenant sysTenant) { + checkCompanyNameIsExist(sysTenant); sysTenant.setUpdateTime(new Date()); sysTenant.setUpdateUser(SecurityUtil.getLoginUsername()); int result = sysTenantMapper.updateById(sysTenant); @@ -139,6 +141,13 @@ public class SysTenantServiceImpl implements SysTenantService, SysTenantApiServi redisService.set(TenantConstant.TENANT_INFO_KEY_PREFIX + sysTenant.getTenantId(), sysTenant); } + private void checkCompanyNameIsExist(SysTenant sysTenant) { + String companyName = sysTenantMapper.checkCompanyNameIsExist(sysTenant); + if (StrUtil.isNotBlank(companyName)) { + throw new ServiceException(TenantErrorCode.TENANT_NAME_EXIST.getCode(), TenantErrorCode.TENANT_NAME_EXIST.getMsg()); + } + } + @Override public List selectList(SysTenantParam param) { return sysTenantMapper.selectList(param2Wrapper(param)); diff --git a/qiaoba-modules/qiaoba-module-tenant/src/main/resources/mapper/SysTenantMapper.xml b/qiaoba-modules/qiaoba-module-tenant/src/main/resources/mapper/SysTenantMapper.xml new file mode 100644 index 0000000..5b36091 --- /dev/null +++ b/qiaoba-modules/qiaoba-module-tenant/src/main/resources/mapper/SysTenantMapper.xml @@ -0,0 +1,10 @@ + + + + +