diff --git a/document/db/MySQL/qiaoba-boot-MySQL5.7.sql b/document/db/MySQL/qiaoba-boot-MySQL5.7.sql index 5576fe2..935e2d0 100644 --- a/document/db/MySQL/qiaoba-boot-MySQL5.7.sql +++ b/document/db/MySQL/qiaoba-boot-MySQL5.7.sql @@ -1,7 +1,7 @@ /* Navicat Premium Data Transfer - Source Server : 虚拟机-202 + Source Server : 虚拟机-202-MySQL Source Server Type : MySQL Source Server Version : 50742 Source Host : 192.168.0.202:3306 @@ -11,7 +11,7 @@ Target Server Version : 50742 File Encoding : 65001 - Date: 10/07/2023 17:39:11 + Date: 13/07/2023 17:28:33 */ SET NAMES utf8mb4; @@ -240,6 +240,10 @@ INSERT INTO `sys_login_log` VALUES (1677252021637984257, '10c302a859204d9482ce10 INSERT INTO `sys_login_log` VALUES (1678205404947537921, 'cb80f07af11740e8aaf215f212911ac0', 'admin', '小王', '192.168.0.201', '0|0|0|内网IP|内网IP', 'Chrome|114.0.0.0', 'Windows 10 or Windows Server 2016', '2023-07-10 08:52:03', '', NULL, '', NULL, NULL, 1); INSERT INTO `sys_login_log` VALUES (1678206680972255234, '1a8775debaa043b285057422d1178d45', 'admin', '小王', '192.168.0.201', '0|0|0|内网IP|内网IP', 'Chrome|114.0.0.0', 'Windows 10 or Windows Server 2016', '2023-07-10 08:57:07', '', NULL, '', NULL, NULL, 1); INSERT INTO `sys_login_log` VALUES (1678310447323394049, '611a69a132a5466b9f2bc95c96abe191', 'admin', '小王', '192.168.0.200', '0|0|0|内网IP|内网IP', 'Firefox|114.0', 'OSX', '2023-07-10 15:49:27', '', NULL, '', NULL, NULL, 1); +INSERT INTO `sys_login_log` VALUES (1679333614585143297, 'f85ca74deb1940a7a31ce563e4006d24', 'admin', '小王', '127.0.0.1', '0|0|0|内网IP|内网IP', 'Chrome|114.0.0.0', 'Windows 10 or Windows Server 2016', '2023-07-13 11:35:09', '', NULL, '', NULL, NULL, 1); +INSERT INTO `sys_login_log` VALUES (1679379553597304834, '0c073dfc76e649b3bf21e9cbb5a05ead', 'admin', '小王', '127.0.0.1', '0|0|0|内网IP|内网IP', 'Chrome|114.0.0.0', 'Windows 10 or Windows Server 2016', '2023-07-13 14:37:41', '', NULL, '', NULL, NULL, 1); +INSERT INTO `sys_login_log` VALUES (1679412040377622530, '470d9d8e4be84270b132b91b7b4305ef', 'admin', '小王', '127.0.0.1', '0|0|0|内网IP|内网IP', 'Chrome|114.0.0.0', 'Windows 10 or Windows Server 2016', '2023-07-13 16:46:47', '', NULL, '', NULL, NULL, 1); +INSERT INTO `sys_login_log` VALUES (1679421075671814145, 'eae6a3293cd947988ca358f21d098e5e', 'admin', '小王', '127.0.0.1', '0|0|0|内网IP|内网IP', 'Chrome|114.0.0.0', 'Windows 10 or Windows Server 2016', '2023-07-13 17:22:41', '', NULL, '', NULL, NULL, 1); -- ---------------------------- -- Table structure for sys_menu @@ -576,7 +580,7 @@ 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', '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-11 17:14:19', 121, '1', '3', '1', 'admin', '2023-07-05 17:14:21', 'admin', '2023-07-10 08:57:24', '313'); +INSERT INTO `sys_tenant` VALUES (1676519873008209922, '副系统', '313', '4143', '313', '52353', '313', NULL, '2029-09-01 17:14:19', 121, '1', '3', '1', 'admin', '2023-07-05 17:14:21', 'admin', '2023-07-13 16:46:23', '313'); -- ---------------------------- -- Table structure for sys_tenant_datasource @@ -607,8 +611,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); +INSERT INTO `sys_tenant_datasource` VALUES (1679408412346556418, 'MySQL', '192.168.0.202', '3306', 'qiaoba-1676519873008209922', NULL, 'root', 'Root123456789.', 1, 1, 1, '1', '', NULL, '', NULL, NULL, 1676519873008209922); +INSERT INTO `sys_tenant_datasource` VALUES (1679421310812884994, 'MySQL', '192.168.0.203', '3306', 'qiaoba-1676519873008209922', NULL, 'root', 'Root123456789.', 1, 1, 1, '0', '', NULL, '', NULL, NULL, 1676519873008209922); -- ---------------------------- -- Table structure for sys_use_log diff --git a/pom.xml b/pom.xml index e91a8b0..88a060f 100644 --- a/pom.xml +++ b/pom.xml @@ -9,9 +9,9 @@ pom 1.0 - qiaoba-modules - qiaoba-apis - qiaoba-commons + qiaoba-module + qiaoba-api + qiaoba-common qiaoba-application qiaoba-auth diff --git a/qiaoba-apis/pom.xml b/qiaoba-api/pom.xml similarity index 95% rename from qiaoba-apis/pom.xml rename to qiaoba-api/pom.xml index 7a590bc..301c4e6 100644 --- a/qiaoba-apis/pom.xml +++ b/qiaoba-api/pom.xml @@ -9,7 +9,7 @@ 4.0.0 - qiaoba-apis + qiaoba-api pom api模块, 用于抽取共用部分, 供其他模块调用 diff --git a/qiaoba-apis/qiaoba-api-auth/pom.xml b/qiaoba-api/qiaoba-api-auth/pom.xml similarity index 94% rename from qiaoba-apis/qiaoba-api-auth/pom.xml rename to qiaoba-api/qiaoba-api-auth/pom.xml index cf37ffe..6c0b09e 100644 --- a/qiaoba-apis/qiaoba-api-auth/pom.xml +++ b/qiaoba-api/qiaoba-api-auth/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - qiaoba-apis + qiaoba-api com.qiaoba 1.0 diff --git a/qiaoba-apis/qiaoba-api-auth/src/main/java/com/qiaoba/api/auth/annotation/DataScope.java b/qiaoba-api/qiaoba-api-auth/src/main/java/com/qiaoba/api/auth/annotation/DataScope.java similarity index 100% rename from qiaoba-apis/qiaoba-api-auth/src/main/java/com/qiaoba/api/auth/annotation/DataScope.java rename to qiaoba-api/qiaoba-api-auth/src/main/java/com/qiaoba/api/auth/annotation/DataScope.java diff --git a/qiaoba-apis/qiaoba-api-auth/src/main/java/com/qiaoba/api/auth/constants/SecurityConstant.java b/qiaoba-api/qiaoba-api-auth/src/main/java/com/qiaoba/api/auth/constants/SecurityConstant.java similarity index 100% rename from qiaoba-apis/qiaoba-api-auth/src/main/java/com/qiaoba/api/auth/constants/SecurityConstant.java rename to qiaoba-api/qiaoba-api-auth/src/main/java/com/qiaoba/api/auth/constants/SecurityConstant.java diff --git a/qiaoba-apis/qiaoba-api-auth/src/main/java/com/qiaoba/api/auth/entity/LoginUser.java b/qiaoba-api/qiaoba-api-auth/src/main/java/com/qiaoba/api/auth/entity/LoginUser.java similarity index 100% rename from qiaoba-apis/qiaoba-api-auth/src/main/java/com/qiaoba/api/auth/entity/LoginUser.java rename to qiaoba-api/qiaoba-api-auth/src/main/java/com/qiaoba/api/auth/entity/LoginUser.java diff --git a/qiaoba-apis/qiaoba-api-auth/src/main/java/com/qiaoba/api/auth/entity/OnlineUser.java b/qiaoba-api/qiaoba-api-auth/src/main/java/com/qiaoba/api/auth/entity/OnlineUser.java similarity index 100% rename from qiaoba-apis/qiaoba-api-auth/src/main/java/com/qiaoba/api/auth/entity/OnlineUser.java rename to qiaoba-api/qiaoba-api-auth/src/main/java/com/qiaoba/api/auth/entity/OnlineUser.java diff --git a/qiaoba-apis/qiaoba-api-auth/src/main/java/com/qiaoba/api/auth/entity/SecurityUser.java b/qiaoba-api/qiaoba-api-auth/src/main/java/com/qiaoba/api/auth/entity/SecurityUser.java similarity index 100% rename from qiaoba-apis/qiaoba-api-auth/src/main/java/com/qiaoba/api/auth/entity/SecurityUser.java rename to qiaoba-api/qiaoba-api-auth/src/main/java/com/qiaoba/api/auth/entity/SecurityUser.java diff --git a/qiaoba-apis/qiaoba-api-auth/src/main/java/com/qiaoba/api/auth/entity/dto/OnlineUserDto.java b/qiaoba-api/qiaoba-api-auth/src/main/java/com/qiaoba/api/auth/entity/dto/OnlineUserDto.java similarity index 100% rename from qiaoba-apis/qiaoba-api-auth/src/main/java/com/qiaoba/api/auth/entity/dto/OnlineUserDto.java rename to qiaoba-api/qiaoba-api-auth/src/main/java/com/qiaoba/api/auth/entity/dto/OnlineUserDto.java diff --git a/qiaoba-apis/qiaoba-api-auth/src/main/java/com/qiaoba/api/auth/entity/dto/RoleDto.java b/qiaoba-api/qiaoba-api-auth/src/main/java/com/qiaoba/api/auth/entity/dto/RoleDto.java similarity index 100% rename from qiaoba-apis/qiaoba-api-auth/src/main/java/com/qiaoba/api/auth/entity/dto/RoleDto.java rename to qiaoba-api/qiaoba-api-auth/src/main/java/com/qiaoba/api/auth/entity/dto/RoleDto.java diff --git a/qiaoba-apis/qiaoba-api-auth/src/main/java/com/qiaoba/api/auth/service/AuthConfigApiService.java b/qiaoba-api/qiaoba-api-auth/src/main/java/com/qiaoba/api/auth/service/AuthConfigApiService.java similarity index 100% rename from qiaoba-apis/qiaoba-api-auth/src/main/java/com/qiaoba/api/auth/service/AuthConfigApiService.java rename to qiaoba-api/qiaoba-api-auth/src/main/java/com/qiaoba/api/auth/service/AuthConfigApiService.java diff --git a/qiaoba-apis/qiaoba-api-auth/src/main/java/com/qiaoba/api/auth/service/OnlineUserService.java b/qiaoba-api/qiaoba-api-auth/src/main/java/com/qiaoba/api/auth/service/OnlineUserService.java similarity index 100% rename from qiaoba-apis/qiaoba-api-auth/src/main/java/com/qiaoba/api/auth/service/OnlineUserService.java rename to qiaoba-api/qiaoba-api-auth/src/main/java/com/qiaoba/api/auth/service/OnlineUserService.java diff --git a/qiaoba-apis/qiaoba-api-auth/src/main/java/com/qiaoba/api/auth/service/SysUserDetailsApiService.java b/qiaoba-api/qiaoba-api-auth/src/main/java/com/qiaoba/api/auth/service/SysUserDetailsApiService.java similarity index 100% rename from qiaoba-apis/qiaoba-api-auth/src/main/java/com/qiaoba/api/auth/service/SysUserDetailsApiService.java rename to qiaoba-api/qiaoba-api-auth/src/main/java/com/qiaoba/api/auth/service/SysUserDetailsApiService.java diff --git a/qiaoba-apis/qiaoba-api-auth/src/main/java/com/qiaoba/api/auth/utils/SecurityUtil.java b/qiaoba-api/qiaoba-api-auth/src/main/java/com/qiaoba/api/auth/utils/SecurityUtil.java similarity index 100% rename from qiaoba-apis/qiaoba-api-auth/src/main/java/com/qiaoba/api/auth/utils/SecurityUtil.java rename to qiaoba-api/qiaoba-api-auth/src/main/java/com/qiaoba/api/auth/utils/SecurityUtil.java diff --git a/qiaoba-apis/qiaoba-api-auth/src/main/java/com/qiaoba/api/auth/utils/TokenUtil.java b/qiaoba-api/qiaoba-api-auth/src/main/java/com/qiaoba/api/auth/utils/TokenUtil.java similarity index 95% rename from qiaoba-apis/qiaoba-api-auth/src/main/java/com/qiaoba/api/auth/utils/TokenUtil.java rename to qiaoba-api/qiaoba-api-auth/src/main/java/com/qiaoba/api/auth/utils/TokenUtil.java index 6a41026..23a7597 100644 --- a/qiaoba-apis/qiaoba-api-auth/src/main/java/com/qiaoba/api/auth/utils/TokenUtil.java +++ b/qiaoba-api/qiaoba-api-auth/src/main/java/com/qiaoba/api/auth/utils/TokenUtil.java @@ -3,8 +3,8 @@ package com.qiaoba.api.auth.utils; import cn.hutool.core.util.StrUtil; import com.qiaoba.api.auth.constants.SecurityConstant; import com.qiaoba.api.auth.entity.dto.OnlineUserDto; -import com.qiaoba.common.base.constants.BaseConstant; -import com.qiaoba.common.base.exceptions.ServiceException; +import com.qiaoba.common.base.constant.BaseConstant; +import com.qiaoba.common.base.exception.ServiceException; import javax.servlet.http.HttpServletRequest; diff --git a/qiaoba-apis/qiaoba-api-file/pom.xml b/qiaoba-api/qiaoba-api-file/pom.xml similarity index 94% rename from qiaoba-apis/qiaoba-api-file/pom.xml rename to qiaoba-api/qiaoba-api-file/pom.xml index 45ead2d..d499025 100644 --- a/qiaoba-apis/qiaoba-api-file/pom.xml +++ b/qiaoba-api/qiaoba-api-file/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - qiaoba-apis + qiaoba-api com.qiaoba 1.0 diff --git a/qiaoba-apis/qiaoba-api-file/src/main/java/com/qiaoba/api/file/entity/File.java b/qiaoba-api/qiaoba-api-file/src/main/java/com/qiaoba/api/file/entity/File.java similarity index 100% rename from qiaoba-apis/qiaoba-api-file/src/main/java/com/qiaoba/api/file/entity/File.java rename to qiaoba-api/qiaoba-api-file/src/main/java/com/qiaoba/api/file/entity/File.java diff --git a/qiaoba-apis/qiaoba-api-file/src/main/java/com/qiaoba/api/file/service/FileApiService.java b/qiaoba-api/qiaoba-api-file/src/main/java/com/qiaoba/api/file/service/FileApiService.java similarity index 100% rename from qiaoba-apis/qiaoba-api-file/src/main/java/com/qiaoba/api/file/service/FileApiService.java rename to qiaoba-api/qiaoba-api-file/src/main/java/com/qiaoba/api/file/service/FileApiService.java diff --git a/qiaoba-apis/qiaoba-api-file/src/main/resources/.gitkeep b/qiaoba-api/qiaoba-api-file/src/main/resources/.gitkeep similarity index 100% rename from qiaoba-apis/qiaoba-api-file/src/main/resources/.gitkeep rename to qiaoba-api/qiaoba-api-file/src/main/resources/.gitkeep diff --git a/qiaoba-apis/qiaoba-api-file/src/test/java/.gitkeep b/qiaoba-api/qiaoba-api-file/src/test/java/.gitkeep similarity index 100% rename from qiaoba-apis/qiaoba-api-file/src/test/java/.gitkeep rename to qiaoba-api/qiaoba-api-file/src/test/java/.gitkeep diff --git a/qiaoba-apis/qiaoba-api-job/pom.xml b/qiaoba-api/qiaoba-api-job/pom.xml similarity index 88% rename from qiaoba-apis/qiaoba-api-job/pom.xml rename to qiaoba-api/qiaoba-api-job/pom.xml index 7df87c5..de35eb2 100644 --- a/qiaoba-apis/qiaoba-api-job/pom.xml +++ b/qiaoba-api/qiaoba-api-job/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - qiaoba-apis + qiaoba-api com.qiaoba 1.0 @@ -12,4 +12,4 @@ qiaoba-api-job - \ No newline at end of file + diff --git a/qiaoba-apis/qiaoba-api-job/src/main/java/.gitkeep b/qiaoba-api/qiaoba-api-job/src/main/java/.gitkeep similarity index 100% rename from qiaoba-apis/qiaoba-api-job/src/main/java/.gitkeep rename to qiaoba-api/qiaoba-api-job/src/main/java/.gitkeep diff --git a/qiaoba-apis/qiaoba-api-job/src/main/resources/.gitkeep b/qiaoba-api/qiaoba-api-job/src/main/resources/.gitkeep similarity index 100% rename from qiaoba-apis/qiaoba-api-job/src/main/resources/.gitkeep rename to qiaoba-api/qiaoba-api-job/src/main/resources/.gitkeep diff --git a/qiaoba-apis/qiaoba-api-job/src/test/java/.gitkeep b/qiaoba-api/qiaoba-api-job/src/test/java/.gitkeep similarity index 100% rename from qiaoba-apis/qiaoba-api-job/src/test/java/.gitkeep rename to qiaoba-api/qiaoba-api-job/src/test/java/.gitkeep diff --git a/qiaoba-apis/qiaoba-api-log/pom.xml b/qiaoba-api/qiaoba-api-log/pom.xml similarity index 90% rename from qiaoba-apis/qiaoba-api-log/pom.xml rename to qiaoba-api/qiaoba-api-log/pom.xml index e8c9c72..763986b 100644 --- a/qiaoba-apis/qiaoba-api-log/pom.xml +++ b/qiaoba-api/qiaoba-api-log/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - qiaoba-apis + qiaoba-api com.qiaoba 1.0 diff --git a/qiaoba-apis/qiaoba-api-log/src/main/java/com/qiaoba/api/job/annotation/Log.java b/qiaoba-api/qiaoba-api-log/src/main/java/com/qiaoba/api/job/annotation/Log.java similarity index 100% rename from qiaoba-apis/qiaoba-api-log/src/main/java/com/qiaoba/api/job/annotation/Log.java rename to qiaoba-api/qiaoba-api-log/src/main/java/com/qiaoba/api/job/annotation/Log.java diff --git a/qiaoba-apis/qiaoba-api-log/src/main/java/com/qiaoba/api/job/enums/BusinessType.java b/qiaoba-api/qiaoba-api-log/src/main/java/com/qiaoba/api/job/enums/BusinessType.java similarity index 100% rename from qiaoba-apis/qiaoba-api-log/src/main/java/com/qiaoba/api/job/enums/BusinessType.java rename to qiaoba-api/qiaoba-api-log/src/main/java/com/qiaoba/api/job/enums/BusinessType.java diff --git a/qiaoba-apis/qiaoba-api-log/src/main/java/com/qiaoba/api/job/enums/OperatorType.java b/qiaoba-api/qiaoba-api-log/src/main/java/com/qiaoba/api/job/enums/OperatorType.java similarity index 100% rename from qiaoba-apis/qiaoba-api-log/src/main/java/com/qiaoba/api/job/enums/OperatorType.java rename to qiaoba-api/qiaoba-api-log/src/main/java/com/qiaoba/api/job/enums/OperatorType.java diff --git a/qiaoba-apis/qiaoba-api-monitor/pom.xml b/qiaoba-api/qiaoba-api-monitor/pom.xml similarity index 94% rename from qiaoba-apis/qiaoba-api-monitor/pom.xml rename to qiaoba-api/qiaoba-api-monitor/pom.xml index 352f043..165e049 100644 --- a/qiaoba-apis/qiaoba-api-monitor/pom.xml +++ b/qiaoba-api/qiaoba-api-monitor/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - qiaoba-apis + qiaoba-api com.qiaoba 1.0 diff --git a/qiaoba-apis/qiaoba-api-monitor/src/main/java/com/qiaoba/api/monitor/entity/SysLoginLog.java b/qiaoba-api/qiaoba-api-monitor/src/main/java/com/qiaoba/api/monitor/entity/SysLoginLog.java similarity index 100% rename from qiaoba-apis/qiaoba-api-monitor/src/main/java/com/qiaoba/api/monitor/entity/SysLoginLog.java rename to qiaoba-api/qiaoba-api-monitor/src/main/java/com/qiaoba/api/monitor/entity/SysLoginLog.java diff --git a/qiaoba-apis/qiaoba-api-monitor/src/main/java/com/qiaoba/api/monitor/entity/param/LoginLogParam.java b/qiaoba-api/qiaoba-api-monitor/src/main/java/com/qiaoba/api/monitor/entity/param/LoginLogParam.java similarity index 100% rename from qiaoba-apis/qiaoba-api-monitor/src/main/java/com/qiaoba/api/monitor/entity/param/LoginLogParam.java rename to qiaoba-api/qiaoba-api-monitor/src/main/java/com/qiaoba/api/monitor/entity/param/LoginLogParam.java diff --git a/qiaoba-apis/qiaoba-api-monitor/src/main/java/com/qiaoba/api/monitor/service/SysLoginLogApiService.java b/qiaoba-api/qiaoba-api-monitor/src/main/java/com/qiaoba/api/monitor/service/SysLoginLogApiService.java similarity index 100% rename from qiaoba-apis/qiaoba-api-monitor/src/main/java/com/qiaoba/api/monitor/service/SysLoginLogApiService.java rename to qiaoba-api/qiaoba-api-monitor/src/main/java/com/qiaoba/api/monitor/service/SysLoginLogApiService.java diff --git a/qiaoba-apis/qiaoba-api-system/pom.xml b/qiaoba-api/qiaoba-api-system/pom.xml similarity index 95% rename from qiaoba-apis/qiaoba-api-system/pom.xml rename to qiaoba-api/qiaoba-api-system/pom.xml index 171891f..e9705fe 100644 --- a/qiaoba-apis/qiaoba-api-system/pom.xml +++ b/qiaoba-api/qiaoba-api-system/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - qiaoba-apis + qiaoba-api com.qiaoba 1.0 diff --git a/qiaoba-apis/qiaoba-api-system/src/main/java/com/qiaoba/api/system/entity/SysConfig.java b/qiaoba-api/qiaoba-api-system/src/main/java/com/qiaoba/api/system/entity/SysConfig.java similarity index 100% rename from qiaoba-apis/qiaoba-api-system/src/main/java/com/qiaoba/api/system/entity/SysConfig.java rename to qiaoba-api/qiaoba-api-system/src/main/java/com/qiaoba/api/system/entity/SysConfig.java diff --git a/qiaoba-apis/qiaoba-api-system/src/main/java/com/qiaoba/api/system/entity/SysDept.java b/qiaoba-api/qiaoba-api-system/src/main/java/com/qiaoba/api/system/entity/SysDept.java similarity index 100% rename from qiaoba-apis/qiaoba-api-system/src/main/java/com/qiaoba/api/system/entity/SysDept.java rename to qiaoba-api/qiaoba-api-system/src/main/java/com/qiaoba/api/system/entity/SysDept.java diff --git a/qiaoba-apis/qiaoba-api-system/src/main/java/com/qiaoba/api/system/entity/SysDictData.java b/qiaoba-api/qiaoba-api-system/src/main/java/com/qiaoba/api/system/entity/SysDictData.java similarity index 100% rename from qiaoba-apis/qiaoba-api-system/src/main/java/com/qiaoba/api/system/entity/SysDictData.java rename to qiaoba-api/qiaoba-api-system/src/main/java/com/qiaoba/api/system/entity/SysDictData.java diff --git a/qiaoba-apis/qiaoba-api-system/src/main/java/com/qiaoba/api/system/entity/SysDictType.java b/qiaoba-api/qiaoba-api-system/src/main/java/com/qiaoba/api/system/entity/SysDictType.java similarity index 100% rename from qiaoba-apis/qiaoba-api-system/src/main/java/com/qiaoba/api/system/entity/SysDictType.java rename to qiaoba-api/qiaoba-api-system/src/main/java/com/qiaoba/api/system/entity/SysDictType.java diff --git a/qiaoba-apis/qiaoba-api-system/src/main/java/com/qiaoba/api/system/entity/SysMenu.java b/qiaoba-api/qiaoba-api-system/src/main/java/com/qiaoba/api/system/entity/SysMenu.java similarity index 100% rename from qiaoba-apis/qiaoba-api-system/src/main/java/com/qiaoba/api/system/entity/SysMenu.java rename to qiaoba-api/qiaoba-api-system/src/main/java/com/qiaoba/api/system/entity/SysMenu.java diff --git a/qiaoba-apis/qiaoba-api-system/src/main/java/com/qiaoba/api/system/entity/SysPost.java b/qiaoba-api/qiaoba-api-system/src/main/java/com/qiaoba/api/system/entity/SysPost.java similarity index 100% rename from qiaoba-apis/qiaoba-api-system/src/main/java/com/qiaoba/api/system/entity/SysPost.java rename to qiaoba-api/qiaoba-api-system/src/main/java/com/qiaoba/api/system/entity/SysPost.java diff --git a/qiaoba-apis/qiaoba-api-system/src/main/java/com/qiaoba/api/system/entity/SysRole.java b/qiaoba-api/qiaoba-api-system/src/main/java/com/qiaoba/api/system/entity/SysRole.java similarity index 100% rename from qiaoba-apis/qiaoba-api-system/src/main/java/com/qiaoba/api/system/entity/SysRole.java rename to qiaoba-api/qiaoba-api-system/src/main/java/com/qiaoba/api/system/entity/SysRole.java diff --git a/qiaoba-apis/qiaoba-api-system/src/main/java/com/qiaoba/api/system/entity/SysRoleDept.java b/qiaoba-api/qiaoba-api-system/src/main/java/com/qiaoba/api/system/entity/SysRoleDept.java similarity index 100% rename from qiaoba-apis/qiaoba-api-system/src/main/java/com/qiaoba/api/system/entity/SysRoleDept.java rename to qiaoba-api/qiaoba-api-system/src/main/java/com/qiaoba/api/system/entity/SysRoleDept.java diff --git a/qiaoba-apis/qiaoba-api-system/src/main/java/com/qiaoba/api/system/entity/SysRoleMenu.java b/qiaoba-api/qiaoba-api-system/src/main/java/com/qiaoba/api/system/entity/SysRoleMenu.java similarity index 100% rename from qiaoba-apis/qiaoba-api-system/src/main/java/com/qiaoba/api/system/entity/SysRoleMenu.java rename to qiaoba-api/qiaoba-api-system/src/main/java/com/qiaoba/api/system/entity/SysRoleMenu.java diff --git a/qiaoba-apis/qiaoba-api-system/src/main/java/com/qiaoba/api/system/entity/SysTenantDatasource.java b/qiaoba-api/qiaoba-api-system/src/main/java/com/qiaoba/api/system/entity/SysTenantDatasource.java similarity index 100% rename from qiaoba-apis/qiaoba-api-system/src/main/java/com/qiaoba/api/system/entity/SysTenantDatasource.java rename to qiaoba-api/qiaoba-api-system/src/main/java/com/qiaoba/api/system/entity/SysTenantDatasource.java diff --git a/qiaoba-apis/qiaoba-api-system/src/main/java/com/qiaoba/api/system/entity/SysUser.java b/qiaoba-api/qiaoba-api-system/src/main/java/com/qiaoba/api/system/entity/SysUser.java similarity index 100% rename from qiaoba-apis/qiaoba-api-system/src/main/java/com/qiaoba/api/system/entity/SysUser.java rename to qiaoba-api/qiaoba-api-system/src/main/java/com/qiaoba/api/system/entity/SysUser.java diff --git a/qiaoba-apis/qiaoba-api-system/src/main/java/com/qiaoba/api/system/entity/SysUserPost.java b/qiaoba-api/qiaoba-api-system/src/main/java/com/qiaoba/api/system/entity/SysUserPost.java similarity index 100% rename from qiaoba-apis/qiaoba-api-system/src/main/java/com/qiaoba/api/system/entity/SysUserPost.java rename to qiaoba-api/qiaoba-api-system/src/main/java/com/qiaoba/api/system/entity/SysUserPost.java diff --git a/qiaoba-apis/qiaoba-api-system/src/main/java/com/qiaoba/api/system/entity/SysUserRole.java b/qiaoba-api/qiaoba-api-system/src/main/java/com/qiaoba/api/system/entity/SysUserRole.java similarity index 100% rename from qiaoba-apis/qiaoba-api-system/src/main/java/com/qiaoba/api/system/entity/SysUserRole.java rename to qiaoba-api/qiaoba-api-system/src/main/java/com/qiaoba/api/system/entity/SysUserRole.java diff --git a/qiaoba-apis/qiaoba-api-system/src/main/java/com/qiaoba/api/system/entity/dto/DataScopeDto.java b/qiaoba-api/qiaoba-api-system/src/main/java/com/qiaoba/api/system/entity/dto/DataScopeDto.java similarity index 100% rename from qiaoba-apis/qiaoba-api-system/src/main/java/com/qiaoba/api/system/entity/dto/DataScopeDto.java rename to qiaoba-api/qiaoba-api-system/src/main/java/com/qiaoba/api/system/entity/dto/DataScopeDto.java diff --git a/qiaoba-apis/qiaoba-api-system/src/main/java/com/qiaoba/api/system/entity/dto/LoginDto.java b/qiaoba-api/qiaoba-api-system/src/main/java/com/qiaoba/api/system/entity/dto/LoginDto.java similarity index 100% rename from qiaoba-apis/qiaoba-api-system/src/main/java/com/qiaoba/api/system/entity/dto/LoginDto.java rename to qiaoba-api/qiaoba-api-system/src/main/java/com/qiaoba/api/system/entity/dto/LoginDto.java diff --git a/qiaoba-apis/qiaoba-api-system/src/main/java/com/qiaoba/api/system/entity/dto/ResetPasswordDto.java b/qiaoba-api/qiaoba-api-system/src/main/java/com/qiaoba/api/system/entity/dto/ResetPasswordDto.java similarity index 100% rename from qiaoba-apis/qiaoba-api-system/src/main/java/com/qiaoba/api/system/entity/dto/ResetPasswordDto.java rename to qiaoba-api/qiaoba-api-system/src/main/java/com/qiaoba/api/system/entity/dto/ResetPasswordDto.java diff --git a/qiaoba-apis/qiaoba-api-system/src/main/java/com/qiaoba/api/system/entity/dto/ResetUserBasicInfoDto.java b/qiaoba-api/qiaoba-api-system/src/main/java/com/qiaoba/api/system/entity/dto/ResetUserBasicInfoDto.java similarity index 100% rename from qiaoba-apis/qiaoba-api-system/src/main/java/com/qiaoba/api/system/entity/dto/ResetUserBasicInfoDto.java rename to qiaoba-api/qiaoba-api-system/src/main/java/com/qiaoba/api/system/entity/dto/ResetUserBasicInfoDto.java diff --git a/qiaoba-apis/qiaoba-api-system/src/main/java/com/qiaoba/api/system/entity/dto/ResetUserStatusDto.java b/qiaoba-api/qiaoba-api-system/src/main/java/com/qiaoba/api/system/entity/dto/ResetUserStatusDto.java similarity index 100% rename from qiaoba-apis/qiaoba-api-system/src/main/java/com/qiaoba/api/system/entity/dto/ResetUserStatusDto.java rename to qiaoba-api/qiaoba-api-system/src/main/java/com/qiaoba/api/system/entity/dto/ResetUserStatusDto.java diff --git a/qiaoba-apis/qiaoba-api-system/src/main/java/com/qiaoba/api/system/entity/dto/SysRoleDto.java b/qiaoba-api/qiaoba-api-system/src/main/java/com/qiaoba/api/system/entity/dto/SysRoleDto.java similarity index 100% rename from qiaoba-apis/qiaoba-api-system/src/main/java/com/qiaoba/api/system/entity/dto/SysRoleDto.java rename to qiaoba-api/qiaoba-api-system/src/main/java/com/qiaoba/api/system/entity/dto/SysRoleDto.java diff --git a/qiaoba-apis/qiaoba-api-system/src/main/java/com/qiaoba/api/system/entity/dto/SysUserDto.java b/qiaoba-api/qiaoba-api-system/src/main/java/com/qiaoba/api/system/entity/dto/SysUserDto.java similarity index 100% rename from qiaoba-apis/qiaoba-api-system/src/main/java/com/qiaoba/api/system/entity/dto/SysUserDto.java rename to qiaoba-api/qiaoba-api-system/src/main/java/com/qiaoba/api/system/entity/dto/SysUserDto.java diff --git a/qiaoba-apis/qiaoba-api-system/src/main/java/com/qiaoba/api/system/entity/param/SysConfigParam.java b/qiaoba-api/qiaoba-api-system/src/main/java/com/qiaoba/api/system/entity/param/SysConfigParam.java similarity index 100% rename from qiaoba-apis/qiaoba-api-system/src/main/java/com/qiaoba/api/system/entity/param/SysConfigParam.java rename to qiaoba-api/qiaoba-api-system/src/main/java/com/qiaoba/api/system/entity/param/SysConfigParam.java diff --git a/qiaoba-apis/qiaoba-api-system/src/main/java/com/qiaoba/api/system/entity/param/SysDeptParam.java b/qiaoba-api/qiaoba-api-system/src/main/java/com/qiaoba/api/system/entity/param/SysDeptParam.java similarity index 100% rename from qiaoba-apis/qiaoba-api-system/src/main/java/com/qiaoba/api/system/entity/param/SysDeptParam.java rename to qiaoba-api/qiaoba-api-system/src/main/java/com/qiaoba/api/system/entity/param/SysDeptParam.java diff --git a/qiaoba-apis/qiaoba-api-system/src/main/java/com/qiaoba/api/system/entity/param/SysDictDataParam.java b/qiaoba-api/qiaoba-api-system/src/main/java/com/qiaoba/api/system/entity/param/SysDictDataParam.java similarity index 100% rename from qiaoba-apis/qiaoba-api-system/src/main/java/com/qiaoba/api/system/entity/param/SysDictDataParam.java rename to qiaoba-api/qiaoba-api-system/src/main/java/com/qiaoba/api/system/entity/param/SysDictDataParam.java diff --git a/qiaoba-apis/qiaoba-api-system/src/main/java/com/qiaoba/api/system/entity/param/SysDictTypeParam.java b/qiaoba-api/qiaoba-api-system/src/main/java/com/qiaoba/api/system/entity/param/SysDictTypeParam.java similarity index 100% rename from qiaoba-apis/qiaoba-api-system/src/main/java/com/qiaoba/api/system/entity/param/SysDictTypeParam.java rename to qiaoba-api/qiaoba-api-system/src/main/java/com/qiaoba/api/system/entity/param/SysDictTypeParam.java diff --git a/qiaoba-apis/qiaoba-api-system/src/main/java/com/qiaoba/api/system/entity/param/SysMenuParam.java b/qiaoba-api/qiaoba-api-system/src/main/java/com/qiaoba/api/system/entity/param/SysMenuParam.java similarity index 100% rename from qiaoba-apis/qiaoba-api-system/src/main/java/com/qiaoba/api/system/entity/param/SysMenuParam.java rename to qiaoba-api/qiaoba-api-system/src/main/java/com/qiaoba/api/system/entity/param/SysMenuParam.java diff --git a/qiaoba-apis/qiaoba-api-system/src/main/java/com/qiaoba/api/system/entity/param/SysPostParam.java b/qiaoba-api/qiaoba-api-system/src/main/java/com/qiaoba/api/system/entity/param/SysPostParam.java similarity index 100% rename from qiaoba-apis/qiaoba-api-system/src/main/java/com/qiaoba/api/system/entity/param/SysPostParam.java rename to qiaoba-api/qiaoba-api-system/src/main/java/com/qiaoba/api/system/entity/param/SysPostParam.java diff --git a/qiaoba-apis/qiaoba-api-system/src/main/java/com/qiaoba/api/system/entity/param/SysRoleParam.java b/qiaoba-api/qiaoba-api-system/src/main/java/com/qiaoba/api/system/entity/param/SysRoleParam.java similarity index 100% rename from qiaoba-apis/qiaoba-api-system/src/main/java/com/qiaoba/api/system/entity/param/SysRoleParam.java rename to qiaoba-api/qiaoba-api-system/src/main/java/com/qiaoba/api/system/entity/param/SysRoleParam.java diff --git a/qiaoba-apis/qiaoba-api-system/src/main/java/com/qiaoba/api/system/entity/param/SysUserParam.java b/qiaoba-api/qiaoba-api-system/src/main/java/com/qiaoba/api/system/entity/param/SysUserParam.java similarity index 100% rename from qiaoba-apis/qiaoba-api-system/src/main/java/com/qiaoba/api/system/entity/param/SysUserParam.java rename to qiaoba-api/qiaoba-api-system/src/main/java/com/qiaoba/api/system/entity/param/SysUserParam.java diff --git a/qiaoba-apis/qiaoba-api-system/src/main/java/com/qiaoba/api/system/entity/vo/MetaVo.java b/qiaoba-api/qiaoba-api-system/src/main/java/com/qiaoba/api/system/entity/vo/MetaVo.java similarity index 100% rename from qiaoba-apis/qiaoba-api-system/src/main/java/com/qiaoba/api/system/entity/vo/MetaVo.java rename to qiaoba-api/qiaoba-api-system/src/main/java/com/qiaoba/api/system/entity/vo/MetaVo.java diff --git a/qiaoba-apis/qiaoba-api-system/src/main/java/com/qiaoba/api/system/entity/vo/RouterVo.java b/qiaoba-api/qiaoba-api-system/src/main/java/com/qiaoba/api/system/entity/vo/RouterVo.java similarity index 100% rename from qiaoba-apis/qiaoba-api-system/src/main/java/com/qiaoba/api/system/entity/vo/RouterVo.java rename to qiaoba-api/qiaoba-api-system/src/main/java/com/qiaoba/api/system/entity/vo/RouterVo.java diff --git a/qiaoba-apis/qiaoba-api-system/src/main/java/com/qiaoba/api/system/entity/vo/SysMenuVo.java b/qiaoba-api/qiaoba-api-system/src/main/java/com/qiaoba/api/system/entity/vo/SysMenuVo.java similarity index 100% rename from qiaoba-apis/qiaoba-api-system/src/main/java/com/qiaoba/api/system/entity/vo/SysMenuVo.java rename to qiaoba-api/qiaoba-api-system/src/main/java/com/qiaoba/api/system/entity/vo/SysMenuVo.java diff --git a/qiaoba-apis/qiaoba-api-system/src/main/java/com/qiaoba/api/system/entity/vo/SysRoleDto.java b/qiaoba-api/qiaoba-api-system/src/main/java/com/qiaoba/api/system/entity/vo/SysRoleDto.java similarity index 100% rename from qiaoba-apis/qiaoba-api-system/src/main/java/com/qiaoba/api/system/entity/vo/SysRoleDto.java rename to qiaoba-api/qiaoba-api-system/src/main/java/com/qiaoba/api/system/entity/vo/SysRoleDto.java diff --git a/qiaoba-apis/qiaoba-api-system/src/main/java/com/qiaoba/api/system/entity/vo/SysUserVo.java b/qiaoba-api/qiaoba-api-system/src/main/java/com/qiaoba/api/system/entity/vo/SysUserVo.java similarity index 100% rename from qiaoba-apis/qiaoba-api-system/src/main/java/com/qiaoba/api/system/entity/vo/SysUserVo.java rename to qiaoba-api/qiaoba-api-system/src/main/java/com/qiaoba/api/system/entity/vo/SysUserVo.java diff --git a/qiaoba-apis/qiaoba-api-system/src/main/java/com/qiaoba/api/system/service/SysConfigApiService.java b/qiaoba-api/qiaoba-api-system/src/main/java/com/qiaoba/api/system/service/SysConfigApiService.java similarity index 100% rename from qiaoba-apis/qiaoba-api-system/src/main/java/com/qiaoba/api/system/service/SysConfigApiService.java rename to qiaoba-api/qiaoba-api-system/src/main/java/com/qiaoba/api/system/service/SysConfigApiService.java diff --git a/qiaoba-apis/qiaoba-api-system/src/main/java/com/qiaoba/api/system/service/SysDeptApiService.java b/qiaoba-api/qiaoba-api-system/src/main/java/com/qiaoba/api/system/service/SysDeptApiService.java similarity index 100% rename from qiaoba-apis/qiaoba-api-system/src/main/java/com/qiaoba/api/system/service/SysDeptApiService.java rename to qiaoba-api/qiaoba-api-system/src/main/java/com/qiaoba/api/system/service/SysDeptApiService.java diff --git a/qiaoba-apis/qiaoba-api-system/src/main/java/com/qiaoba/api/system/service/SysDictApiService.java b/qiaoba-api/qiaoba-api-system/src/main/java/com/qiaoba/api/system/service/SysDictApiService.java similarity index 100% rename from qiaoba-apis/qiaoba-api-system/src/main/java/com/qiaoba/api/system/service/SysDictApiService.java rename to qiaoba-api/qiaoba-api-system/src/main/java/com/qiaoba/api/system/service/SysDictApiService.java diff --git a/qiaoba-apis/qiaoba-api-system/src/main/java/com/qiaoba/api/system/service/SysMenuApiService.java b/qiaoba-api/qiaoba-api-system/src/main/java/com/qiaoba/api/system/service/SysMenuApiService.java similarity index 100% rename from qiaoba-apis/qiaoba-api-system/src/main/java/com/qiaoba/api/system/service/SysMenuApiService.java rename to qiaoba-api/qiaoba-api-system/src/main/java/com/qiaoba/api/system/service/SysMenuApiService.java diff --git a/qiaoba-apis/qiaoba-api-system/src/main/java/com/qiaoba/api/system/service/SysPostApiService.java b/qiaoba-api/qiaoba-api-system/src/main/java/com/qiaoba/api/system/service/SysPostApiService.java similarity index 100% rename from qiaoba-apis/qiaoba-api-system/src/main/java/com/qiaoba/api/system/service/SysPostApiService.java rename to qiaoba-api/qiaoba-api-system/src/main/java/com/qiaoba/api/system/service/SysPostApiService.java diff --git a/qiaoba-apis/qiaoba-api-system/src/main/java/com/qiaoba/api/system/service/SysRoleApiService.java b/qiaoba-api/qiaoba-api-system/src/main/java/com/qiaoba/api/system/service/SysRoleApiService.java similarity index 100% rename from qiaoba-apis/qiaoba-api-system/src/main/java/com/qiaoba/api/system/service/SysRoleApiService.java rename to qiaoba-api/qiaoba-api-system/src/main/java/com/qiaoba/api/system/service/SysRoleApiService.java diff --git a/qiaoba-apis/qiaoba-api-system/src/main/java/com/qiaoba/api/system/service/SysUserApiService.java b/qiaoba-api/qiaoba-api-system/src/main/java/com/qiaoba/api/system/service/SysUserApiService.java similarity index 100% rename from qiaoba-apis/qiaoba-api-system/src/main/java/com/qiaoba/api/system/service/SysUserApiService.java rename to qiaoba-api/qiaoba-api-system/src/main/java/com/qiaoba/api/system/service/SysUserApiService.java diff --git a/qiaoba-apis/qiaoba-api-system/src/main/resources/.gitkeep b/qiaoba-api/qiaoba-api-system/src/main/resources/.gitkeep similarity index 100% rename from qiaoba-apis/qiaoba-api-system/src/main/resources/.gitkeep rename to qiaoba-api/qiaoba-api-system/src/main/resources/.gitkeep diff --git a/qiaoba-apis/qiaoba-api-system/src/test/java/.gitkeep b/qiaoba-api/qiaoba-api-system/src/test/java/.gitkeep similarity index 100% rename from qiaoba-apis/qiaoba-api-system/src/test/java/.gitkeep rename to qiaoba-api/qiaoba-api-system/src/test/java/.gitkeep diff --git a/qiaoba-apis/qiaoba-api-tenant/pom.xml b/qiaoba-api/qiaoba-api-tenant/pom.xml similarity index 93% rename from qiaoba-apis/qiaoba-api-tenant/pom.xml rename to qiaoba-api/qiaoba-api-tenant/pom.xml index db9e8c1..805af10 100644 --- a/qiaoba-apis/qiaoba-api-tenant/pom.xml +++ b/qiaoba-api/qiaoba-api-tenant/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - qiaoba-apis + qiaoba-api com.qiaoba 1.0 @@ -21,4 +21,4 @@ qiaoba-common-doc - \ No newline at end of file + diff --git a/qiaoba-apis/qiaoba-api-tenant/src/main/java/com/qiaoba/api/tenant/entity/SysTenant.java b/qiaoba-api/qiaoba-api-tenant/src/main/java/com/qiaoba/api/tenant/entity/SysTenant.java similarity index 100% rename from qiaoba-apis/qiaoba-api-tenant/src/main/java/com/qiaoba/api/tenant/entity/SysTenant.java rename to qiaoba-api/qiaoba-api-tenant/src/main/java/com/qiaoba/api/tenant/entity/SysTenant.java diff --git a/qiaoba-apis/qiaoba-api-tenant/src/main/java/com/qiaoba/api/tenant/entity/SysTenantDatasource.java b/qiaoba-api/qiaoba-api-tenant/src/main/java/com/qiaoba/api/tenant/entity/SysTenantDatasource.java similarity index 100% rename from qiaoba-apis/qiaoba-api-tenant/src/main/java/com/qiaoba/api/tenant/entity/SysTenantDatasource.java rename to qiaoba-api/qiaoba-api-tenant/src/main/java/com/qiaoba/api/tenant/entity/SysTenantDatasource.java diff --git a/qiaoba-apis/qiaoba-api-tenant/src/main/java/com/qiaoba/api/tenant/entity/param/SysTenantDatasourceParam.java b/qiaoba-api/qiaoba-api-tenant/src/main/java/com/qiaoba/api/tenant/entity/param/SysTenantDatasourceParam.java similarity index 100% rename from qiaoba-apis/qiaoba-api-tenant/src/main/java/com/qiaoba/api/tenant/entity/param/SysTenantDatasourceParam.java rename to qiaoba-api/qiaoba-api-tenant/src/main/java/com/qiaoba/api/tenant/entity/param/SysTenantDatasourceParam.java diff --git a/qiaoba-apis/qiaoba-api-tenant/src/main/java/com/qiaoba/api/tenant/entity/param/SysTenantParam.java b/qiaoba-api/qiaoba-api-tenant/src/main/java/com/qiaoba/api/tenant/entity/param/SysTenantParam.java similarity index 100% rename from qiaoba-apis/qiaoba-api-tenant/src/main/java/com/qiaoba/api/tenant/entity/param/SysTenantParam.java rename to qiaoba-api/qiaoba-api-tenant/src/main/java/com/qiaoba/api/tenant/entity/param/SysTenantParam.java diff --git a/qiaoba-apis/qiaoba-api-tenant/src/main/java/com/qiaoba/api/tenant/enums/TenantModeEnum.java b/qiaoba-api/qiaoba-api-tenant/src/main/java/com/qiaoba/api/tenant/enums/TenantModeEnum.java similarity index 100% rename from qiaoba-apis/qiaoba-api-tenant/src/main/java/com/qiaoba/api/tenant/enums/TenantModeEnum.java rename to qiaoba-api/qiaoba-api-tenant/src/main/java/com/qiaoba/api/tenant/enums/TenantModeEnum.java diff --git a/qiaoba-apis/qiaoba-api-tenant/src/main/java/com/qiaoba/api/tenant/enums/TenantStatusEnum.java b/qiaoba-api/qiaoba-api-tenant/src/main/java/com/qiaoba/api/tenant/enums/TenantStatusEnum.java similarity index 100% rename from qiaoba-apis/qiaoba-api-tenant/src/main/java/com/qiaoba/api/tenant/enums/TenantStatusEnum.java rename to qiaoba-api/qiaoba-api-tenant/src/main/java/com/qiaoba/api/tenant/enums/TenantStatusEnum.java diff --git a/qiaoba-apis/qiaoba-api-tenant/src/main/java/com/qiaoba/api/tenant/service/SysTenantApiService.java b/qiaoba-api/qiaoba-api-tenant/src/main/java/com/qiaoba/api/tenant/service/SysTenantApiService.java similarity index 100% rename from qiaoba-apis/qiaoba-api-tenant/src/main/java/com/qiaoba/api/tenant/service/SysTenantApiService.java rename to qiaoba-api/qiaoba-api-tenant/src/main/java/com/qiaoba/api/tenant/service/SysTenantApiService.java diff --git a/qiaoba-apis/qiaoba-api-tenant/src/main/java/com/qiaoba/api/tenant/utils/TenantUtil.java b/qiaoba-api/qiaoba-api-tenant/src/main/java/com/qiaoba/api/tenant/utils/TenantUtil.java similarity index 95% rename from qiaoba-apis/qiaoba-api-tenant/src/main/java/com/qiaoba/api/tenant/utils/TenantUtil.java rename to qiaoba-api/qiaoba-api-tenant/src/main/java/com/qiaoba/api/tenant/utils/TenantUtil.java index 9cb24ec..d7e1fc6 100644 --- a/qiaoba-apis/qiaoba-api-tenant/src/main/java/com/qiaoba/api/tenant/utils/TenantUtil.java +++ b/qiaoba-api/qiaoba-api-tenant/src/main/java/com/qiaoba/api/tenant/utils/TenantUtil.java @@ -2,7 +2,7 @@ package com.qiaoba.api.tenant.utils; import com.qiaoba.api.tenant.entity.SysTenant; import com.qiaoba.api.tenant.enums.TenantModeEnum; -import com.qiaoba.common.base.constants.TenantConstant; +import com.qiaoba.common.base.constant.TenantConstant; import com.qiaoba.common.base.context.BaseContext; import com.qiaoba.common.database.context.TenantDbTypeContext; diff --git a/qiaoba-auth/src/main/java/com/qiaoba/auth/aspectj/DataScopeAspect.java b/qiaoba-auth/src/main/java/com/qiaoba/auth/aspectj/DataScopeAspect.java index 006427d..7446aa7 100644 --- a/qiaoba-auth/src/main/java/com/qiaoba/auth/aspectj/DataScopeAspect.java +++ b/qiaoba-auth/src/main/java/com/qiaoba/auth/aspectj/DataScopeAspect.java @@ -7,7 +7,7 @@ import com.qiaoba.api.auth.entity.LoginUser; import com.qiaoba.api.auth.entity.dto.RoleDto; import com.qiaoba.api.auth.utils.SecurityUtil; import com.qiaoba.common.base.entity.DataScopeParam; -import com.qiaoba.common.base.utils.DatabaseUtil; +import com.qiaoba.common.base.util.DatabaseUtil; import org.aspectj.lang.JoinPoint; import org.aspectj.lang.annotation.Aspect; import org.aspectj.lang.annotation.Before; diff --git a/qiaoba-auth/src/main/java/com/qiaoba/auth/config/SpringSecurityConfig.java b/qiaoba-auth/src/main/java/com/qiaoba/auth/config/SpringSecurityConfig.java index 5ab2d06..8954d1b 100644 --- a/qiaoba-auth/src/main/java/com/qiaoba/auth/config/SpringSecurityConfig.java +++ b/qiaoba-auth/src/main/java/com/qiaoba/auth/config/SpringSecurityConfig.java @@ -1,11 +1,11 @@ package com.qiaoba.auth.config; import com.qiaoba.api.auth.constants.SecurityConstant; -import com.qiaoba.auth.filters.SecurityContextHolderFilter; +import com.qiaoba.auth.filter.SecurityContextHolderFilter; import com.qiaoba.auth.handler.AccessDeniedHandler; import com.qiaoba.auth.handler.LogoutHandler; import com.qiaoba.auth.properties.AuthConfigProperties; -import com.qiaoba.common.base.constants.BaseConstant; +import com.qiaoba.common.base.constant.BaseConstant; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.context.annotation.Bean; diff --git a/qiaoba-auth/src/main/java/com/qiaoba/auth/filters/OnlineUserFilter.java b/qiaoba-auth/src/main/java/com/qiaoba/auth/filter/OnlineUserFilter.java similarity index 96% rename from qiaoba-auth/src/main/java/com/qiaoba/auth/filters/OnlineUserFilter.java rename to qiaoba-auth/src/main/java/com/qiaoba/auth/filter/OnlineUserFilter.java index c7b9e66..c7915b2 100644 --- a/qiaoba-auth/src/main/java/com/qiaoba/auth/filters/OnlineUserFilter.java +++ b/qiaoba-auth/src/main/java/com/qiaoba/auth/filter/OnlineUserFilter.java @@ -1,4 +1,4 @@ -package com.qiaoba.auth.filters; +package com.qiaoba.auth.filter; import com.qiaoba.api.auth.constants.SecurityConstant; import com.qiaoba.api.auth.entity.dto.OnlineUserDto; @@ -8,8 +8,8 @@ import com.qiaoba.api.auth.utils.TokenUtil; import com.qiaoba.auth.properties.AuthConfigProperties; import com.qiaoba.common.base.order.FilterOrder; import com.qiaoba.common.redis.service.RedisService; -import com.qiaoba.common.web.utils.ResponseUtil; -import com.qiaoba.common.web.utils.UriUtil; +import com.qiaoba.common.web.util.ResponseUtil; +import com.qiaoba.common.web.util.UriUtil; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.context.annotation.Configuration; diff --git a/qiaoba-auth/src/main/java/com/qiaoba/auth/filters/SecurityContextHolderFilter.java b/qiaoba-auth/src/main/java/com/qiaoba/auth/filter/SecurityContextHolderFilter.java similarity index 94% rename from qiaoba-auth/src/main/java/com/qiaoba/auth/filters/SecurityContextHolderFilter.java rename to qiaoba-auth/src/main/java/com/qiaoba/auth/filter/SecurityContextHolderFilter.java index 0a5ee39..e4101ad 100644 --- a/qiaoba-auth/src/main/java/com/qiaoba/auth/filters/SecurityContextHolderFilter.java +++ b/qiaoba-auth/src/main/java/com/qiaoba/auth/filter/SecurityContextHolderFilter.java @@ -1,10 +1,8 @@ -package com.qiaoba.auth.filters; +package com.qiaoba.auth.filter; import cn.hutool.core.util.StrUtil; import com.qiaoba.api.auth.entity.dto.OnlineUserDto; import com.qiaoba.api.auth.utils.TokenUtil; -import com.qiaoba.auth.properties.AuthConfigProperties; -import com.qiaoba.common.base.context.BaseContext; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.context.annotation.Configuration; diff --git a/qiaoba-auth/src/main/java/com/qiaoba/auth/handler/AccessDeniedHandler.java b/qiaoba-auth/src/main/java/com/qiaoba/auth/handler/AccessDeniedHandler.java index acdfed2..cf4c37b 100644 --- a/qiaoba-auth/src/main/java/com/qiaoba/auth/handler/AccessDeniedHandler.java +++ b/qiaoba-auth/src/main/java/com/qiaoba/auth/handler/AccessDeniedHandler.java @@ -2,7 +2,7 @@ package com.qiaoba.auth.handler; import cn.hutool.http.HttpStatus; import com.qiaoba.api.auth.constants.SecurityConstant; -import com.qiaoba.common.web.utils.ResponseUtil; +import com.qiaoba.common.web.util.ResponseUtil; import org.springframework.security.core.AuthenticationException; import org.springframework.security.web.AuthenticationEntryPoint; import org.springframework.stereotype.Component; diff --git a/qiaoba-auth/src/main/java/com/qiaoba/auth/service/impl/AuthConfigServiceImpl.java b/qiaoba-auth/src/main/java/com/qiaoba/auth/service/impl/AuthConfigServiceImpl.java index f823b19..5bc702d 100644 --- a/qiaoba-auth/src/main/java/com/qiaoba/auth/service/impl/AuthConfigServiceImpl.java +++ b/qiaoba-auth/src/main/java/com/qiaoba/auth/service/impl/AuthConfigServiceImpl.java @@ -3,8 +3,8 @@ package com.qiaoba.auth.service.impl; import cn.hutool.core.util.StrUtil; import com.qiaoba.api.auth.service.AuthConfigApiService; import com.qiaoba.api.auth.constants.SecurityConstant; -import com.qiaoba.common.base.constants.ConfigConstant; -import com.qiaoba.common.base.exceptions.ServiceException; +import com.qiaoba.common.base.constant.ConfigConstant; +import com.qiaoba.common.base.exception.ServiceException; import com.qiaoba.common.redis.service.RedisService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; diff --git a/qiaoba-auth/src/main/java/com/qiaoba/auth/service/impl/OnlineUserServiceImpl.java b/qiaoba-auth/src/main/java/com/qiaoba/auth/service/impl/OnlineUserServiceImpl.java index 1b1d7c3..e83f9f2 100644 --- a/qiaoba-auth/src/main/java/com/qiaoba/auth/service/impl/OnlineUserServiceImpl.java +++ b/qiaoba-auth/src/main/java/com/qiaoba/auth/service/impl/OnlineUserServiceImpl.java @@ -8,9 +8,9 @@ import com.qiaoba.api.auth.entity.dto.OnlineUserDto; import com.qiaoba.api.auth.service.AuthConfigApiService; import com.qiaoba.api.auth.service.OnlineUserService; import com.qiaoba.api.auth.utils.TokenUtil; -import com.qiaoba.common.base.constants.BaseConstant; +import com.qiaoba.common.base.constant.BaseConstant; import com.qiaoba.common.base.entity.BasePage; -import com.qiaoba.common.base.exceptions.ServiceException; +import com.qiaoba.common.base.exception.ServiceException; import com.qiaoba.common.redis.service.RedisService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; diff --git a/qiaoba-auth/src/main/java/com/qiaoba/auth/service/impl/SysLoginServiceImpl.java b/qiaoba-auth/src/main/java/com/qiaoba/auth/service/impl/SysLoginServiceImpl.java index add6c9a..601947c 100644 --- a/qiaoba-auth/src/main/java/com/qiaoba/auth/service/impl/SysLoginServiceImpl.java +++ b/qiaoba-auth/src/main/java/com/qiaoba/auth/service/impl/SysLoginServiceImpl.java @@ -21,12 +21,12 @@ import com.qiaoba.api.system.entity.SysUser; import com.qiaoba.api.system.entity.dto.LoginDto; import com.qiaoba.api.system.service.SysUserApiService; import com.qiaoba.auth.service.SysLoginService; -import com.qiaoba.common.base.constants.BaseConstant; -import com.qiaoba.common.base.constants.ConfigConstant; +import com.qiaoba.common.base.constant.BaseConstant; +import com.qiaoba.common.base.constant.ConfigConstant; import com.qiaoba.common.base.enums.BaseEnum; -import com.qiaoba.common.base.exceptions.ServiceException; +import com.qiaoba.common.base.exception.ServiceException; import com.qiaoba.common.redis.service.RedisService; -import com.qiaoba.common.web.utils.IpUtil; +import com.qiaoba.common.web.util.IpUtil; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; diff --git a/qiaoba-commons/pom.xml b/qiaoba-common/pom.xml similarity index 95% rename from qiaoba-commons/pom.xml rename to qiaoba-common/pom.xml index 3aa1bc5..0305fc2 100644 --- a/qiaoba-commons/pom.xml +++ b/qiaoba-common/pom.xml @@ -9,7 +9,7 @@ 4.0.0 - qiaoba-commons + qiaoba-common pom qiaoba-common-base diff --git a/qiaoba-commons/qiaoba-common-base/pom.xml b/qiaoba-common/qiaoba-common-base/pom.xml similarity index 95% rename from qiaoba-commons/qiaoba-common-base/pom.xml rename to qiaoba-common/qiaoba-common-base/pom.xml index cd22293..739d88b 100644 --- a/qiaoba-commons/qiaoba-common-base/pom.xml +++ b/qiaoba-common/qiaoba-common-base/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - qiaoba-commons + qiaoba-common com.qiaoba 1.0 diff --git a/qiaoba-commons/qiaoba-common-base/src/main/java/com/qiaoba/common/base/code/ConfigErrorCode.java b/qiaoba-common/qiaoba-common-base/src/main/java/com/qiaoba/common/base/code/ConfigErrorCode.java similarity index 100% rename from qiaoba-commons/qiaoba-common-base/src/main/java/com/qiaoba/common/base/code/ConfigErrorCode.java rename to qiaoba-common/qiaoba-common-base/src/main/java/com/qiaoba/common/base/code/ConfigErrorCode.java diff --git a/qiaoba-commons/qiaoba-common-base/src/main/java/com/qiaoba/common/base/code/DatasourceErrorCode.java b/qiaoba-common/qiaoba-common-base/src/main/java/com/qiaoba/common/base/code/DatasourceErrorCode.java similarity index 100% rename from qiaoba-commons/qiaoba-common-base/src/main/java/com/qiaoba/common/base/code/DatasourceErrorCode.java rename to qiaoba-common/qiaoba-common-base/src/main/java/com/qiaoba/common/base/code/DatasourceErrorCode.java diff --git a/qiaoba-commons/qiaoba-common-base/src/main/java/com/qiaoba/common/base/code/DictErrorCode.java b/qiaoba-common/qiaoba-common-base/src/main/java/com/qiaoba/common/base/code/DictErrorCode.java similarity index 100% rename from qiaoba-commons/qiaoba-common-base/src/main/java/com/qiaoba/common/base/code/DictErrorCode.java rename to qiaoba-common/qiaoba-common-base/src/main/java/com/qiaoba/common/base/code/DictErrorCode.java diff --git a/qiaoba-commons/qiaoba-common-base/src/main/java/com/qiaoba/common/base/code/TenantErrorCode.java b/qiaoba-common/qiaoba-common-base/src/main/java/com/qiaoba/common/base/code/TenantErrorCode.java similarity index 100% rename from qiaoba-commons/qiaoba-common-base/src/main/java/com/qiaoba/common/base/code/TenantErrorCode.java rename to qiaoba-common/qiaoba-common-base/src/main/java/com/qiaoba/common/base/code/TenantErrorCode.java diff --git a/qiaoba-commons/qiaoba-common-base/src/main/java/com/qiaoba/common/base/code/UserErrorCode.java b/qiaoba-common/qiaoba-common-base/src/main/java/com/qiaoba/common/base/code/UserErrorCode.java similarity index 100% rename from qiaoba-commons/qiaoba-common-base/src/main/java/com/qiaoba/common/base/code/UserErrorCode.java rename to qiaoba-common/qiaoba-common-base/src/main/java/com/qiaoba/common/base/code/UserErrorCode.java diff --git a/qiaoba-commons/qiaoba-common-base/src/main/java/com/qiaoba/common/base/constants/BaseConstant.java b/qiaoba-common/qiaoba-common-base/src/main/java/com/qiaoba/common/base/constant/BaseConstant.java similarity index 97% rename from qiaoba-commons/qiaoba-common-base/src/main/java/com/qiaoba/common/base/constants/BaseConstant.java rename to qiaoba-common/qiaoba-common-base/src/main/java/com/qiaoba/common/base/constant/BaseConstant.java index 2cf143a..ad70a53 100644 --- a/qiaoba-commons/qiaoba-common-base/src/main/java/com/qiaoba/common/base/constants/BaseConstant.java +++ b/qiaoba-common/qiaoba-common-base/src/main/java/com/qiaoba/common/base/constant/BaseConstant.java @@ -1,4 +1,4 @@ -package com.qiaoba.common.base.constants; +package com.qiaoba.common.base.constant; /** * BaseConstant diff --git a/qiaoba-commons/qiaoba-common-base/src/main/java/com/qiaoba/common/base/constants/ConfigConstant.java b/qiaoba-common/qiaoba-common-base/src/main/java/com/qiaoba/common/base/constant/ConfigConstant.java similarity index 97% rename from qiaoba-commons/qiaoba-common-base/src/main/java/com/qiaoba/common/base/constants/ConfigConstant.java rename to qiaoba-common/qiaoba-common-base/src/main/java/com/qiaoba/common/base/constant/ConfigConstant.java index 2ca6879..d86f3dc 100644 --- a/qiaoba-commons/qiaoba-common-base/src/main/java/com/qiaoba/common/base/constants/ConfigConstant.java +++ b/qiaoba-common/qiaoba-common-base/src/main/java/com/qiaoba/common/base/constant/ConfigConstant.java @@ -1,4 +1,4 @@ -package com.qiaoba.common.base.constants; +package com.qiaoba.common.base.constant; /** * 配置常量 diff --git a/qiaoba-commons/qiaoba-common-base/src/main/java/com/qiaoba/common/base/constants/DictConstant.java b/qiaoba-common/qiaoba-common-base/src/main/java/com/qiaoba/common/base/constant/DictConstant.java similarity index 84% rename from qiaoba-commons/qiaoba-common-base/src/main/java/com/qiaoba/common/base/constants/DictConstant.java rename to qiaoba-common/qiaoba-common-base/src/main/java/com/qiaoba/common/base/constant/DictConstant.java index f488533..534a75d 100644 --- a/qiaoba-commons/qiaoba-common-base/src/main/java/com/qiaoba/common/base/constants/DictConstant.java +++ b/qiaoba-common/qiaoba-common-base/src/main/java/com/qiaoba/common/base/constant/DictConstant.java @@ -1,4 +1,4 @@ -package com.qiaoba.common.base.constants; +package com.qiaoba.common.base.constant; /** * 字典常量 diff --git a/qiaoba-commons/qiaoba-common-base/src/main/java/com/qiaoba/common/base/constants/MenuConstant.java b/qiaoba-common/qiaoba-common-base/src/main/java/com/qiaoba/common/base/constant/MenuConstant.java similarity index 96% rename from qiaoba-commons/qiaoba-common-base/src/main/java/com/qiaoba/common/base/constants/MenuConstant.java rename to qiaoba-common/qiaoba-common-base/src/main/java/com/qiaoba/common/base/constant/MenuConstant.java index aad4d20..1b820c6 100644 --- a/qiaoba-commons/qiaoba-common-base/src/main/java/com/qiaoba/common/base/constants/MenuConstant.java +++ b/qiaoba-common/qiaoba-common-base/src/main/java/com/qiaoba/common/base/constant/MenuConstant.java @@ -1,4 +1,4 @@ -package com.qiaoba.common.base.constants; +package com.qiaoba.common.base.constant; /** * 菜单常量 diff --git a/qiaoba-commons/qiaoba-common-base/src/main/java/com/qiaoba/common/base/constants/TenantConstant.java b/qiaoba-common/qiaoba-common-base/src/main/java/com/qiaoba/common/base/constant/TenantConstant.java similarity index 94% rename from qiaoba-commons/qiaoba-common-base/src/main/java/com/qiaoba/common/base/constants/TenantConstant.java rename to qiaoba-common/qiaoba-common-base/src/main/java/com/qiaoba/common/base/constant/TenantConstant.java index 6fd574e..23dd02e 100644 --- a/qiaoba-commons/qiaoba-common-base/src/main/java/com/qiaoba/common/base/constants/TenantConstant.java +++ b/qiaoba-common/qiaoba-common-base/src/main/java/com/qiaoba/common/base/constant/TenantConstant.java @@ -1,4 +1,4 @@ -package com.qiaoba.common.base.constants; +package com.qiaoba.common.base.constant; /** * 租户常量 diff --git a/qiaoba-commons/qiaoba-common-base/src/main/java/com/qiaoba/common/base/context/BaseContext.java b/qiaoba-common/qiaoba-common-base/src/main/java/com/qiaoba/common/base/context/BaseContext.java similarity index 100% rename from qiaoba-commons/qiaoba-common-base/src/main/java/com/qiaoba/common/base/context/BaseContext.java rename to qiaoba-common/qiaoba-common-base/src/main/java/com/qiaoba/common/base/context/BaseContext.java diff --git a/qiaoba-commons/qiaoba-common-base/src/main/java/com/qiaoba/common/base/entity/BaseEntity.java b/qiaoba-common/qiaoba-common-base/src/main/java/com/qiaoba/common/base/entity/BaseEntity.java similarity index 100% rename from qiaoba-commons/qiaoba-common-base/src/main/java/com/qiaoba/common/base/entity/BaseEntity.java rename to qiaoba-common/qiaoba-common-base/src/main/java/com/qiaoba/common/base/entity/BaseEntity.java diff --git a/qiaoba-commons/qiaoba-common-base/src/main/java/com/qiaoba/common/base/entity/BasePage.java b/qiaoba-common/qiaoba-common-base/src/main/java/com/qiaoba/common/base/entity/BasePage.java similarity index 100% rename from qiaoba-commons/qiaoba-common-base/src/main/java/com/qiaoba/common/base/entity/BasePage.java rename to qiaoba-common/qiaoba-common-base/src/main/java/com/qiaoba/common/base/entity/BasePage.java diff --git a/qiaoba-commons/qiaoba-common-base/src/main/java/com/qiaoba/common/base/entity/DataScopeParam.java b/qiaoba-common/qiaoba-common-base/src/main/java/com/qiaoba/common/base/entity/DataScopeParam.java similarity index 100% rename from qiaoba-commons/qiaoba-common-base/src/main/java/com/qiaoba/common/base/entity/DataScopeParam.java rename to qiaoba-common/qiaoba-common-base/src/main/java/com/qiaoba/common/base/entity/DataScopeParam.java diff --git a/qiaoba-commons/qiaoba-common-base/src/main/java/com/qiaoba/common/base/enums/BaseEnum.java b/qiaoba-common/qiaoba-common-base/src/main/java/com/qiaoba/common/base/enums/BaseEnum.java similarity index 100% rename from qiaoba-commons/qiaoba-common-base/src/main/java/com/qiaoba/common/base/enums/BaseEnum.java rename to qiaoba-common/qiaoba-common-base/src/main/java/com/qiaoba/common/base/enums/BaseEnum.java diff --git a/qiaoba-commons/qiaoba-common-base/src/main/java/com/qiaoba/common/base/enums/DataBaseEnum.java b/qiaoba-common/qiaoba-common-base/src/main/java/com/qiaoba/common/base/enums/DataBaseEnum.java similarity index 97% rename from qiaoba-commons/qiaoba-common-base/src/main/java/com/qiaoba/common/base/enums/DataBaseEnum.java rename to qiaoba-common/qiaoba-common-base/src/main/java/com/qiaoba/common/base/enums/DataBaseEnum.java index 5c4f232..1641f1b 100644 --- a/qiaoba-commons/qiaoba-common-base/src/main/java/com/qiaoba/common/base/enums/DataBaseEnum.java +++ b/qiaoba-common/qiaoba-common-base/src/main/java/com/qiaoba/common/base/enums/DataBaseEnum.java @@ -1,7 +1,7 @@ package com.qiaoba.common.base.enums; import cn.hutool.core.util.StrUtil; -import com.qiaoba.common.base.exceptions.ServiceException; +import com.qiaoba.common.base.exception.ServiceException; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/qiaoba-commons/qiaoba-common-base/src/main/java/com/qiaoba/common/base/exceptions/ServiceException.java b/qiaoba-common/qiaoba-common-base/src/main/java/com/qiaoba/common/base/exception/ServiceException.java similarity index 94% rename from qiaoba-commons/qiaoba-common-base/src/main/java/com/qiaoba/common/base/exceptions/ServiceException.java rename to qiaoba-common/qiaoba-common-base/src/main/java/com/qiaoba/common/base/exception/ServiceException.java index 9b30134..111628b 100644 --- a/qiaoba-commons/qiaoba-common-base/src/main/java/com/qiaoba/common/base/exceptions/ServiceException.java +++ b/qiaoba-common/qiaoba-common-base/src/main/java/com/qiaoba/common/base/exception/ServiceException.java @@ -1,4 +1,4 @@ -package com.qiaoba.common.base.exceptions; +package com.qiaoba.common.base.exception; import lombok.Getter; diff --git a/qiaoba-commons/qiaoba-common-base/src/main/java/com/qiaoba/common/base/order/FilterOrder.java b/qiaoba-common/qiaoba-common-base/src/main/java/com/qiaoba/common/base/order/FilterOrder.java similarity index 100% rename from qiaoba-commons/qiaoba-common-base/src/main/java/com/qiaoba/common/base/order/FilterOrder.java rename to qiaoba-common/qiaoba-common-base/src/main/java/com/qiaoba/common/base/order/FilterOrder.java diff --git a/qiaoba-commons/qiaoba-common-base/src/main/java/com/qiaoba/common/base/result/AjaxResult.java b/qiaoba-common/qiaoba-common-base/src/main/java/com/qiaoba/common/base/result/AjaxResult.java similarity index 100% rename from qiaoba-commons/qiaoba-common-base/src/main/java/com/qiaoba/common/base/result/AjaxResult.java rename to qiaoba-common/qiaoba-common-base/src/main/java/com/qiaoba/common/base/result/AjaxResult.java diff --git a/qiaoba-commons/qiaoba-common-base/src/main/java/com/qiaoba/common/base/utils/AnnotationUtil.java b/qiaoba-common/qiaoba-common-base/src/main/java/com/qiaoba/common/base/util/AnnotationUtil.java similarity index 84% rename from qiaoba-commons/qiaoba-common-base/src/main/java/com/qiaoba/common/base/utils/AnnotationUtil.java rename to qiaoba-common/qiaoba-common-base/src/main/java/com/qiaoba/common/base/util/AnnotationUtil.java index 36a5914..bfdbb8c 100644 --- a/qiaoba-commons/qiaoba-common-base/src/main/java/com/qiaoba/common/base/utils/AnnotationUtil.java +++ b/qiaoba-common/qiaoba-common-base/src/main/java/com/qiaoba/common/base/util/AnnotationUtil.java @@ -1,4 +1,4 @@ -package com.qiaoba.common.base.utils; +package com.qiaoba.common.base.util; import cn.hutool.core.util.ClassUtil; @@ -15,10 +15,10 @@ import java.lang.reflect.Method; public class AnnotationUtil extends cn.hutool.core.annotation.AnnotationUtil { public static boolean hasAnnotation(String referenceMethod, Class annotation) { - // com.qiaoba.common.base.utils.AnnotationUtil.hasAnnotation + // com.qiaoba.common.base.util.AnnotationUtil.hasAnnotation StringBuilder sb = new StringBuilder(referenceMethod); int index = sb.lastIndexOf("."); - // com.qiaoba.common.base.utils.AnnotationUtil + // com.qiaoba.common.base.util.AnnotationUtil String clazzName = sb.substring(0, index); // hasAnnotation String methodName = sb.substring(index + 1, sb.length()); diff --git a/qiaoba-commons/qiaoba-common-base/src/main/java/com/qiaoba/common/base/utils/ArrayUtil.java b/qiaoba-common/qiaoba-common-base/src/main/java/com/qiaoba/common/base/util/ArrayUtil.java similarity index 93% rename from qiaoba-commons/qiaoba-common-base/src/main/java/com/qiaoba/common/base/utils/ArrayUtil.java rename to qiaoba-common/qiaoba-common-base/src/main/java/com/qiaoba/common/base/util/ArrayUtil.java index 06bb88a..a0c0107 100644 --- a/qiaoba-commons/qiaoba-common-base/src/main/java/com/qiaoba/common/base/utils/ArrayUtil.java +++ b/qiaoba-common/qiaoba-common-base/src/main/java/com/qiaoba/common/base/util/ArrayUtil.java @@ -1,4 +1,4 @@ -package com.qiaoba.common.base.utils; +package com.qiaoba.common.base.util; import cn.hutool.core.util.StrUtil; diff --git a/qiaoba-commons/qiaoba-common-base/src/main/java/com/qiaoba/common/base/utils/DatabaseUtil.java b/qiaoba-common/qiaoba-common-base/src/main/java/com/qiaoba/common/base/util/DatabaseUtil.java similarity index 97% rename from qiaoba-commons/qiaoba-common-base/src/main/java/com/qiaoba/common/base/utils/DatabaseUtil.java rename to qiaoba-common/qiaoba-common-base/src/main/java/com/qiaoba/common/base/util/DatabaseUtil.java index a5a4b8d..62baf62 100644 --- a/qiaoba-commons/qiaoba-common-base/src/main/java/com/qiaoba/common/base/utils/DatabaseUtil.java +++ b/qiaoba-common/qiaoba-common-base/src/main/java/com/qiaoba/common/base/util/DatabaseUtil.java @@ -1,4 +1,4 @@ -package com.qiaoba.common.base.utils; +package com.qiaoba.common.base.util; import cn.hutool.core.convert.Convert; import com.qiaoba.common.base.context.BaseContext; diff --git a/qiaoba-commons/qiaoba-common-base/src/main/java/com/qiaoba/common/base/utils/ObjectUtil.java b/qiaoba-common/qiaoba-common-base/src/main/java/com/qiaoba/common/base/util/ObjectUtil.java similarity index 96% rename from qiaoba-commons/qiaoba-common-base/src/main/java/com/qiaoba/common/base/utils/ObjectUtil.java rename to qiaoba-common/qiaoba-common-base/src/main/java/com/qiaoba/common/base/util/ObjectUtil.java index 7820c26..a45be40 100644 --- a/qiaoba-commons/qiaoba-common-base/src/main/java/com/qiaoba/common/base/utils/ObjectUtil.java +++ b/qiaoba-common/qiaoba-common-base/src/main/java/com/qiaoba/common/base/util/ObjectUtil.java @@ -1,4 +1,4 @@ -package com.qiaoba.common.base.utils; +package com.qiaoba.common.base.util; import java.lang.reflect.Field; diff --git a/qiaoba-commons/qiaoba-common-base/src/main/java/com/qiaoba/common/base/validate/AddGroup.java b/qiaoba-common/qiaoba-common-base/src/main/java/com/qiaoba/common/base/validate/AddGroup.java similarity index 100% rename from qiaoba-commons/qiaoba-common-base/src/main/java/com/qiaoba/common/base/validate/AddGroup.java rename to qiaoba-common/qiaoba-common-base/src/main/java/com/qiaoba/common/base/validate/AddGroup.java diff --git a/qiaoba-commons/qiaoba-common-base/src/main/java/com/qiaoba/common/base/validate/EditGroup.java b/qiaoba-common/qiaoba-common-base/src/main/java/com/qiaoba/common/base/validate/EditGroup.java similarity index 100% rename from qiaoba-commons/qiaoba-common-base/src/main/java/com/qiaoba/common/base/validate/EditGroup.java rename to qiaoba-common/qiaoba-common-base/src/main/java/com/qiaoba/common/base/validate/EditGroup.java diff --git a/qiaoba-commons/qiaoba-common-base/src/main/java/com/qiaoba/common/base/validate/QueryGroup.java b/qiaoba-common/qiaoba-common-base/src/main/java/com/qiaoba/common/base/validate/QueryGroup.java similarity index 100% rename from qiaoba-commons/qiaoba-common-base/src/main/java/com/qiaoba/common/base/validate/QueryGroup.java rename to qiaoba-common/qiaoba-common-base/src/main/java/com/qiaoba/common/base/validate/QueryGroup.java diff --git a/qiaoba-commons/qiaoba-common-datasource/pom.xml b/qiaoba-common/qiaoba-common-datasource/pom.xml similarity index 96% rename from qiaoba-commons/qiaoba-common-datasource/pom.xml rename to qiaoba-common/qiaoba-common-datasource/pom.xml index 56cecff..dd8b714 100644 --- a/qiaoba-commons/qiaoba-common-datasource/pom.xml +++ b/qiaoba-common/qiaoba-common-datasource/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - qiaoba-commons + qiaoba-common com.qiaoba 1.0 diff --git a/qiaoba-commons/qiaoba-common-datasource/src/main/java/com/qiaoba/common/database/annotations/SelectOneRow.java b/qiaoba-common/qiaoba-common-datasource/src/main/java/com/qiaoba/common/database/annotation/SelectOneRow.java similarity index 83% rename from qiaoba-commons/qiaoba-common-datasource/src/main/java/com/qiaoba/common/database/annotations/SelectOneRow.java rename to qiaoba-common/qiaoba-common-datasource/src/main/java/com/qiaoba/common/database/annotation/SelectOneRow.java index 8161858..a01911a 100644 --- a/qiaoba-commons/qiaoba-common-datasource/src/main/java/com/qiaoba/common/database/annotations/SelectOneRow.java +++ b/qiaoba-common/qiaoba-common-datasource/src/main/java/com/qiaoba/common/database/annotation/SelectOneRow.java @@ -1,4 +1,4 @@ -package com.qiaoba.common.database.annotations; +package com.qiaoba.common.database.annotation; import java.lang.annotation.*; diff --git a/qiaoba-commons/qiaoba-common-datasource/src/main/java/com/qiaoba/common/database/config/DynamicDataSourceConfig.java b/qiaoba-common/qiaoba-common-datasource/src/main/java/com/qiaoba/common/database/config/DynamicDataSourceConfig.java similarity index 72% rename from qiaoba-commons/qiaoba-common-datasource/src/main/java/com/qiaoba/common/database/config/DynamicDataSourceConfig.java rename to qiaoba-common/qiaoba-common-datasource/src/main/java/com/qiaoba/common/database/config/DynamicDataSourceConfig.java index dfb6291..3320a5c 100644 --- a/qiaoba-commons/qiaoba-common-datasource/src/main/java/com/qiaoba/common/database/config/DynamicDataSourceConfig.java +++ b/qiaoba-common/qiaoba-common-datasource/src/main/java/com/qiaoba/common/database/config/DynamicDataSourceConfig.java @@ -5,7 +5,7 @@ import cn.hutool.core.collection.ListUtil; import cn.hutool.core.io.IoUtil; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.pool.DruidPooledConnection; -import com.qiaoba.common.base.constants.TenantConstant; +import com.qiaoba.common.base.constant.TenantConstant; import com.qiaoba.common.base.context.BaseContext; import com.qiaoba.common.base.enums.BaseEnum; import com.qiaoba.common.database.context.BackupDatasourceContext; @@ -16,7 +16,8 @@ import com.qiaoba.common.database.entity.DynamicDataSource; import com.qiaoba.common.database.monitor.NotOnlineDatasourceMonitor; import com.qiaoba.common.database.properties.DataSourceProperties; import com.qiaoba.common.database.service.DynamicDatasourceService; -import com.qiaoba.common.database.utils.JdbcUtil; +import com.qiaoba.common.database.util.DatasourceUtil; +import com.qiaoba.common.database.util.JdbcUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.context.annotation.Configuration; @@ -81,7 +82,7 @@ public class DynamicDataSourceConfig { List dataSources = dataSourceProperties.getDataSources(); for (int i = 0; i < dataSources.size(); i++) { // 0索引作为主数据源 - Object dataSource = buildDataSource(TenantConstant.DEFAULT_TENANT_ID, dataSources.get(i)); + Object dataSource = DatasourceUtil.buildDataSource(TenantConstant.DEFAULT_TENANT_ID, dataSources.get(i)); if (Objects.isNull(dataSource)) { // 默认的主数据源挂了 // 加入到错误数据源Map 等待重试 @@ -111,7 +112,7 @@ public class DynamicDataSourceConfig { for (int i = 0; i < dataSources.size(); i++) { DynamicDataSource dynamicDataSource = dataSources.get(i); if (BaseEnum.YES.getCode().equals(dynamicDataSource.getIsPrimary())) { - Object dataSource = buildDataSource(dataSources.get(i).getTenantId(), dataSources.get(i)); + Object dataSource = DatasourceUtil.buildDataSource(dataSources.get(i).getTenantId(), dataSources.get(i)); if (Objects.isNull(dataSource)) { // 默认的主数据源挂了 // 加入到错误数据源Map 等待重试 @@ -136,52 +137,6 @@ public class DynamicDataSourceConfig { } - - public void changePrimaryDatasource(String tenantId, Object datasource) { - PrimaryDatasourceContext.set(tenantId, datasource); - // 将数据源的类型保存 - DruidPooledConnection connection = null; - try { - connection = ((DruidDataSource) datasource).getConnection(); - TenantDbTypeContext.set(tenantId, connection.getMetaData().getDatabaseProductName()); - } catch (SQLException e) { - e.printStackTrace(); - } finally { - // 归还 connection - IoUtil.close(connection); - } - dataSource.freshDataSource(PrimaryDatasourceContext.getAll()); - } - - public static Object buildDataSource(String tenantId, DynamicDataSource dynamicDataSource) { - log.debug("正在创建数据源DataSource, 租户: {}", tenantId); - boolean connect = JdbcUtil.checkConnect(dynamicDataSource.getDriver(), dynamicDataSource.getUrl(), dynamicDataSource.getUsername(), dynamicDataSource.getPassword()); - if (!connect) { - log.error("租户: {} 数据源连接失败, Url: {}", tenantId, dynamicDataSource.getUrl()); - return null; - } - DruidDataSource dataSource = new DruidDataSource(); - dataSource.setUrl(dynamicDataSource.getUrl()); - dataSource.setUsername(dynamicDataSource.getUsername()); - dataSource.setPassword(dynamicDataSource.getPassword()); - dataSource.setDriverClassName(dynamicDataSource.getDriver()); - dataSource.setInitialSize(dynamicDataSource.getInitialSize()); - dataSource.setMinIdle(dynamicDataSource.getMinIdle()); - dataSource.setMaxActive(dynamicDataSource.getMaxActive()); - - try { - dataSource.addFilters("stat"); - // wall 防火墙 切勿开启, 开启后 导入SQL 会失败 - // dataSource.addFilters("wall") - // 初始化数据源 - dataSource.init(); - return dataSource; - } catch (Exception e) { - IoUtil.close(dataSource); - return null; - } - } - /** * 程序关闭后,要释放数据源连接池 */ @@ -206,6 +161,7 @@ public class DynamicDataSourceConfig { } catch (SQLException e) { e.printStackTrace(); } + } } @@ -215,11 +171,6 @@ public class DynamicDataSourceConfig { } } - private void handleDataSources(String tenantId, List dataSources) { - - - } - public void setDefaultSetting() { BaseContext.setDataSource(TenantConstant.DEFAULT_TENANT_ID); BaseContext.setTenantId(TenantConstant.DEFAULT_TENANT_ID); diff --git a/qiaoba-commons/qiaoba-common-datasource/src/main/java/com/qiaoba/common/database/config/MybatisPlusConfig.java b/qiaoba-common/qiaoba-common-datasource/src/main/java/com/qiaoba/common/database/config/MybatisPlusConfig.java similarity index 94% rename from qiaoba-commons/qiaoba-common-datasource/src/main/java/com/qiaoba/common/database/config/MybatisPlusConfig.java rename to qiaoba-common/qiaoba-common-datasource/src/main/java/com/qiaoba/common/database/config/MybatisPlusConfig.java index a3f52e8..3ac039b 100644 --- a/qiaoba-commons/qiaoba-common-datasource/src/main/java/com/qiaoba/common/database/config/MybatisPlusConfig.java +++ b/qiaoba-common/qiaoba-common-datasource/src/main/java/com/qiaoba/common/database/config/MybatisPlusConfig.java @@ -9,8 +9,8 @@ import com.baomidou.mybatisplus.extension.plugins.handler.TenantLineHandler; import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor; import com.baomidou.mybatisplus.extension.plugins.inner.TenantLineInnerInterceptor; import com.qiaoba.common.base.context.BaseContext; -import com.qiaoba.common.database.interceptors.SchemaInterceptor; -import com.qiaoba.common.database.interceptors.SelectOneRowInterceptor; +import com.qiaoba.common.database.interceptor.SchemaInterceptor; +import com.qiaoba.common.database.interceptor.SelectOneRowInterceptor; import net.sf.jsqlparser.expression.Expression; import net.sf.jsqlparser.expression.StringValue; import org.springframework.context.annotation.Bean; diff --git a/qiaoba-common/qiaoba-common-datasource/src/main/java/com/qiaoba/common/database/context/BackupDatasourceContext.java b/qiaoba-common/qiaoba-common-datasource/src/main/java/com/qiaoba/common/database/context/BackupDatasourceContext.java new file mode 100644 index 0000000..16dc90c --- /dev/null +++ b/qiaoba-common/qiaoba-common-datasource/src/main/java/com/qiaoba/common/database/context/BackupDatasourceContext.java @@ -0,0 +1,97 @@ +package com.qiaoba.common.database.context; + +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.collection.ListUtil; +import com.qiaoba.common.database.entity.DynamicDataSource; + +import java.util.List; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; + +/** + * 备用(未在使用)数据源 + * + * @author ailanyin + * @version 1.0 + * @since 2023/6/28 10:36 + */ +public class BackupDatasourceContext { + + /** + * 备用数据源 + */ + private static Map> BACKUP_DATASOURCE_MAP = new ConcurrentHashMap<>(); + + + /** + * 获取租户备用数据源 + * + * @param tenantId 租户ID + * @return 数据源集合 + */ + public static List get(String tenantId) { + return BACKUP_DATASOURCE_MAP.get(tenantId); + } + + /** + * 设置租户备用数据源 + * + * @param tenantId 租户ID + * @param list 数据源集合 + */ + public static void set(String tenantId, List list) { + BACKUP_DATASOURCE_MAP.put(tenantId, list); + } + + /** + * 添加租户备用数据源 + * + * @param tenantId 租户ID + * @param dataSource 数据源 + */ + public static void addBackupMap(String tenantId, DynamicDataSource dataSource) { + List dataSourceList = get(tenantId); + if (CollUtil.isEmpty(dataSourceList)) { + set(tenantId, ListUtil.toList(dataSource)); + } else { + dataSourceList.add(dataSource); + } + } + + /** + * 删除租户备用数据源 + * + * @param tenantId 租户ID + * @param dataSourceId 数据源ID + */ + public static void delBackupMap(String tenantId, String dataSourceId) { + List dataSourceList = get(tenantId); + if (CollUtil.isEmpty(dataSourceList)) { + for (DynamicDataSource dynamicDataSource : dataSourceList) { + if (dataSourceId.equals(dynamicDataSource.getDatasourceId())) { + dataSourceList.remove(dynamicDataSource); + break; + } + } + } + } + + /** + * 修改租户备用数据源 + * + * @param tenantId 租户ID + * @param dataSource 数据源 + */ + public static void updateBackupMap(String tenantId, DynamicDataSource dataSource) { + List dataSourceList = get(tenantId); + if (CollUtil.isEmpty(dataSourceList)) { + for (DynamicDataSource dynamicDataSource : dataSourceList) { + if (dataSource.getDatasourceId().equals(dynamicDataSource.getDatasourceId())) { + dataSourceList.remove(dynamicDataSource); + dataSourceList.add(dataSource); + break; + } + } + } + } +} diff --git a/qiaoba-commons/qiaoba-common-datasource/src/main/java/com/qiaoba/common/database/context/DynamicDataSourceContext.java b/qiaoba-common/qiaoba-common-datasource/src/main/java/com/qiaoba/common/database/context/DynamicDataSourceContext.java similarity index 95% rename from qiaoba-commons/qiaoba-common-datasource/src/main/java/com/qiaoba/common/database/context/DynamicDataSourceContext.java rename to qiaoba-common/qiaoba-common-datasource/src/main/java/com/qiaoba/common/database/context/DynamicDataSourceContext.java index b7486b4..3baf673 100644 --- a/qiaoba-commons/qiaoba-common-datasource/src/main/java/com/qiaoba/common/database/context/DynamicDataSourceContext.java +++ b/qiaoba-common/qiaoba-common-datasource/src/main/java/com/qiaoba/common/database/context/DynamicDataSourceContext.java @@ -1,6 +1,6 @@ package com.qiaoba.common.database.context; -import com.qiaoba.common.base.constants.TenantConstant; +import com.qiaoba.common.base.constant.TenantConstant; import com.qiaoba.common.base.context.BaseContext; import org.springframework.jdbc.datasource.lookup.AbstractRoutingDataSource; diff --git a/qiaoba-commons/qiaoba-common-datasource/src/main/java/com/qiaoba/common/database/context/PrimaryDatasourceContext.java b/qiaoba-common/qiaoba-common-datasource/src/main/java/com/qiaoba/common/database/context/PrimaryDatasourceContext.java similarity index 96% rename from qiaoba-commons/qiaoba-common-datasource/src/main/java/com/qiaoba/common/database/context/PrimaryDatasourceContext.java rename to qiaoba-common/qiaoba-common-datasource/src/main/java/com/qiaoba/common/database/context/PrimaryDatasourceContext.java index 75253d8..57a44db 100644 --- a/qiaoba-commons/qiaoba-common-datasource/src/main/java/com/qiaoba/common/database/context/PrimaryDatasourceContext.java +++ b/qiaoba-common/qiaoba-common-datasource/src/main/java/com/qiaoba/common/database/context/PrimaryDatasourceContext.java @@ -1,6 +1,6 @@ package com.qiaoba.common.database.context; -import com.qiaoba.common.base.constants.TenantConstant; +import com.qiaoba.common.base.constant.TenantConstant; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; diff --git a/qiaoba-commons/qiaoba-common-datasource/src/main/java/com/qiaoba/common/database/context/TenantDbTypeContext.java b/qiaoba-common/qiaoba-common-datasource/src/main/java/com/qiaoba/common/database/context/TenantDbTypeContext.java similarity index 95% rename from qiaoba-commons/qiaoba-common-datasource/src/main/java/com/qiaoba/common/database/context/TenantDbTypeContext.java rename to qiaoba-common/qiaoba-common-datasource/src/main/java/com/qiaoba/common/database/context/TenantDbTypeContext.java index 40d27d5..9db8204 100644 --- a/qiaoba-commons/qiaoba-common-datasource/src/main/java/com/qiaoba/common/database/context/TenantDbTypeContext.java +++ b/qiaoba-common/qiaoba-common-datasource/src/main/java/com/qiaoba/common/database/context/TenantDbTypeContext.java @@ -1,6 +1,6 @@ package com.qiaoba.common.database.context; -import com.qiaoba.common.base.constants.TenantConstant; +import com.qiaoba.common.base.constant.TenantConstant; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; diff --git a/qiaoba-commons/qiaoba-common-datasource/src/main/java/com/qiaoba/common/database/entity/DynamicDataSource.java b/qiaoba-common/qiaoba-common-datasource/src/main/java/com/qiaoba/common/database/entity/DynamicDataSource.java similarity index 100% rename from qiaoba-commons/qiaoba-common-datasource/src/main/java/com/qiaoba/common/database/entity/DynamicDataSource.java rename to qiaoba-common/qiaoba-common-datasource/src/main/java/com/qiaoba/common/database/entity/DynamicDataSource.java diff --git a/qiaoba-commons/qiaoba-common-datasource/src/main/java/com/qiaoba/common/database/entity/PageQuery.java b/qiaoba-common/qiaoba-common-datasource/src/main/java/com/qiaoba/common/database/entity/PageQuery.java similarity index 100% rename from qiaoba-commons/qiaoba-common-datasource/src/main/java/com/qiaoba/common/database/entity/PageQuery.java rename to qiaoba-common/qiaoba-common-datasource/src/main/java/com/qiaoba/common/database/entity/PageQuery.java diff --git a/qiaoba-commons/qiaoba-common-datasource/src/main/java/com/qiaoba/common/database/entity/TableDataInfo.java b/qiaoba-common/qiaoba-common-datasource/src/main/java/com/qiaoba/common/database/entity/TableDataInfo.java similarity index 100% rename from qiaoba-commons/qiaoba-common-datasource/src/main/java/com/qiaoba/common/database/entity/TableDataInfo.java rename to qiaoba-common/qiaoba-common-datasource/src/main/java/com/qiaoba/common/database/entity/TableDataInfo.java diff --git a/qiaoba-commons/qiaoba-common-datasource/src/main/java/com/qiaoba/common/database/factories/DynamicDataSourceFactory.java b/qiaoba-common/qiaoba-common-datasource/src/main/java/com/qiaoba/common/database/factory/DynamicDataSourceFactory.java similarity index 96% rename from qiaoba-commons/qiaoba-common-datasource/src/main/java/com/qiaoba/common/database/factories/DynamicDataSourceFactory.java rename to qiaoba-common/qiaoba-common-datasource/src/main/java/com/qiaoba/common/database/factory/DynamicDataSourceFactory.java index 7e01e2b..4e158cf 100644 --- a/qiaoba-commons/qiaoba-common-datasource/src/main/java/com/qiaoba/common/database/factories/DynamicDataSourceFactory.java +++ b/qiaoba-common/qiaoba-common-datasource/src/main/java/com/qiaoba/common/database/factory/DynamicDataSourceFactory.java @@ -1,4 +1,4 @@ -package com.qiaoba.common.database.factories; +package com.qiaoba.common.database.factory; import com.qiaoba.common.database.config.DynamicDataSourceConfig; import com.qiaoba.common.database.context.DynamicDataSourceContext; diff --git a/qiaoba-commons/qiaoba-common-datasource/src/main/java/com/qiaoba/common/database/interceptors/SchemaInterceptor.java b/qiaoba-common/qiaoba-common-datasource/src/main/java/com/qiaoba/common/database/interceptor/SchemaInterceptor.java similarity index 92% rename from qiaoba-commons/qiaoba-common-datasource/src/main/java/com/qiaoba/common/database/interceptors/SchemaInterceptor.java rename to qiaoba-common/qiaoba-common-datasource/src/main/java/com/qiaoba/common/database/interceptor/SchemaInterceptor.java index 72c030e..5c0ebb5 100644 --- a/qiaoba-commons/qiaoba-common-datasource/src/main/java/com/qiaoba/common/database/interceptors/SchemaInterceptor.java +++ b/qiaoba-common/qiaoba-common-datasource/src/main/java/com/qiaoba/common/database/interceptor/SchemaInterceptor.java @@ -1,10 +1,10 @@ -package com.qiaoba.common.database.interceptors; +package com.qiaoba.common.database.interceptor; import com.baomidou.mybatisplus.extension.plugins.inner.InnerInterceptor; import com.qiaoba.common.base.context.BaseContext; import com.qiaoba.common.database.context.TenantDbTypeContext; import com.qiaoba.common.database.properties.TenantSchema; -import com.qiaoba.common.database.utils.DbUtil; +import com.qiaoba.common.database.util.DbUtil; import lombok.extern.slf4j.Slf4j; import org.apache.ibatis.executor.statement.StatementHandler; diff --git a/qiaoba-commons/qiaoba-common-datasource/src/main/java/com/qiaoba/common/database/interceptors/SelectOneRowInterceptor.java b/qiaoba-common/qiaoba-common-datasource/src/main/java/com/qiaoba/common/database/interceptor/SelectOneRowInterceptor.java similarity index 93% rename from qiaoba-commons/qiaoba-common-datasource/src/main/java/com/qiaoba/common/database/interceptors/SelectOneRowInterceptor.java rename to qiaoba-common/qiaoba-common-datasource/src/main/java/com/qiaoba/common/database/interceptor/SelectOneRowInterceptor.java index b527349..c5299fb 100644 --- a/qiaoba-commons/qiaoba-common-datasource/src/main/java/com/qiaoba/common/database/interceptors/SelectOneRowInterceptor.java +++ b/qiaoba-common/qiaoba-common-datasource/src/main/java/com/qiaoba/common/database/interceptor/SelectOneRowInterceptor.java @@ -1,4 +1,4 @@ -package com.qiaoba.common.database.interceptors; +package com.qiaoba.common.database.interceptor; import com.baomidou.mybatisplus.core.toolkit.PluginUtils; import com.baomidou.mybatisplus.extension.plugins.inner.InnerInterceptor; @@ -6,8 +6,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.DialectFactory; import com.baomidou.mybatisplus.extension.plugins.pagination.DialectModel; import com.baomidou.mybatisplus.extension.plugins.pagination.dialects.IDialect; import com.baomidou.mybatisplus.extension.toolkit.JdbcUtils; -import com.qiaoba.common.base.utils.AnnotationUtil; -import com.qiaoba.common.database.annotations.SelectOneRow; +import com.qiaoba.common.base.util.AnnotationUtil; +import com.qiaoba.common.database.annotation.SelectOneRow; import org.apache.ibatis.executor.Executor; import org.apache.ibatis.mapping.BoundSql; import org.apache.ibatis.mapping.MappedStatement; diff --git a/qiaoba-commons/qiaoba-common-datasource/src/main/java/com/qiaoba/common/database/monitor/NotOnlineDatasourceMonitor.java b/qiaoba-common/qiaoba-common-datasource/src/main/java/com/qiaoba/common/database/monitor/NotOnlineDatasourceMonitor.java similarity index 89% rename from qiaoba-commons/qiaoba-common-datasource/src/main/java/com/qiaoba/common/database/monitor/NotOnlineDatasourceMonitor.java rename to qiaoba-common/qiaoba-common-datasource/src/main/java/com/qiaoba/common/database/monitor/NotOnlineDatasourceMonitor.java index 9e8d284..5bcf256 100644 --- a/qiaoba-commons/qiaoba-common-datasource/src/main/java/com/qiaoba/common/database/monitor/NotOnlineDatasourceMonitor.java +++ b/qiaoba-common/qiaoba-common-datasource/src/main/java/com/qiaoba/common/database/monitor/NotOnlineDatasourceMonitor.java @@ -7,7 +7,7 @@ import com.baomidou.lock.LockTemplate; import com.qiaoba.common.database.config.DynamicDataSourceConfig; import com.qiaoba.common.database.context.BackupDatasourceContext; import com.qiaoba.common.database.entity.DynamicDataSource; -import com.qiaoba.common.database.utils.JdbcUtil; +import com.qiaoba.common.database.util.JdbcUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; @@ -92,20 +92,12 @@ public class NotOnlineDatasourceMonitor { ERROR_DATASOURCE_MAP.remove(tenantId); } // 加入到备用Map中 - addBackupMap(tenantId, errorDatasource); + BackupDatasourceContext.addBackupMap(tenantId, errorDatasource); } } } } - private void addBackupMap(String tenantId, DynamicDataSource dataSource) { - List dataSourceList = BackupDatasourceContext.get(tenantId); - if (CollUtil.isEmpty(dataSourceList)) { - BackupDatasourceContext.set(tenantId, ListUtil.toList(dataSource)); - } else { - dataSourceList.add(dataSource); - } - } public static void addErrorDatasource(String tenantId, DynamicDataSource dataSource) { List errorDataSourceList = NotOnlineDatasourceMonitor.ERROR_DATASOURCE_MAP.get(tenantId); diff --git a/qiaoba-commons/qiaoba-common-datasource/src/main/java/com/qiaoba/common/database/monitor/OnlineDatasourceMonitor.java b/qiaoba-common/qiaoba-common-datasource/src/main/java/com/qiaoba/common/database/monitor/OnlineDatasourceMonitor.java similarity index 95% rename from qiaoba-commons/qiaoba-common-datasource/src/main/java/com/qiaoba/common/database/monitor/OnlineDatasourceMonitor.java rename to qiaoba-common/qiaoba-common-datasource/src/main/java/com/qiaoba/common/database/monitor/OnlineDatasourceMonitor.java index b704fe0..f78fb7b 100644 --- a/qiaoba-commons/qiaoba-common-datasource/src/main/java/com/qiaoba/common/database/monitor/OnlineDatasourceMonitor.java +++ b/qiaoba-common/qiaoba-common-datasource/src/main/java/com/qiaoba/common/database/monitor/OnlineDatasourceMonitor.java @@ -5,14 +5,15 @@ import cn.hutool.core.io.IoUtil; import com.alibaba.druid.pool.DruidDataSource; import com.baomidou.lock.LockInfo; import com.baomidou.lock.LockTemplate; -import com.qiaoba.common.base.constants.TenantConstant; +import com.qiaoba.common.base.constant.TenantConstant; import com.qiaoba.common.base.enums.DataBaseEnum; import com.qiaoba.common.database.config.DynamicDataSourceConfig; import com.qiaoba.common.database.context.BackupDatasourceContext; import com.qiaoba.common.database.context.PrimaryDatasourceContext; import com.qiaoba.common.database.entity.DynamicDataSource; import com.qiaoba.common.database.service.DynamicDatasourceService; -import com.qiaoba.common.database.utils.JdbcUtil; +import com.qiaoba.common.database.util.DatasourceUtil; +import com.qiaoba.common.database.util.JdbcUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; @@ -43,8 +44,6 @@ public class OnlineDatasourceMonitor { @Resource private LockTemplate lockTemplate; @Resource - private DynamicDataSourceConfig dynamicDataSourceConfig; - @Resource private DynamicDatasourceService dynamicDatasourceService; @PostConstruct @@ -140,10 +139,10 @@ public class OnlineDatasourceMonitor { Integer backupIndex = null; for (int i = 0; i < dataSources.size(); i++) { - Object dynamicDataSource = DynamicDataSourceConfig.buildDataSource(tenantId, dataSources.get(i)); + Object dynamicDataSource = DatasourceUtil.buildDataSource(tenantId, dataSources.get(i)); // 不是空,说明备用数据源有用 if (Objects.nonNull(dynamicDataSource)) { - dynamicDataSourceConfig.changePrimaryDatasource(tenantId, dynamicDataSource); + DatasourceUtil.changePrimaryDatasource(tenantId, dynamicDataSource); backupIndex = i; break; } diff --git a/qiaoba-commons/qiaoba-common-datasource/src/main/java/com/qiaoba/common/database/properties/DataSourceProperties.java b/qiaoba-common/qiaoba-common-datasource/src/main/java/com/qiaoba/common/database/properties/DataSourceProperties.java similarity index 100% rename from qiaoba-commons/qiaoba-common-datasource/src/main/java/com/qiaoba/common/database/properties/DataSourceProperties.java rename to qiaoba-common/qiaoba-common-datasource/src/main/java/com/qiaoba/common/database/properties/DataSourceProperties.java diff --git a/qiaoba-commons/qiaoba-common-datasource/src/main/java/com/qiaoba/common/database/properties/TenantSchema.java b/qiaoba-common/qiaoba-common-datasource/src/main/java/com/qiaoba/common/database/properties/TenantSchema.java similarity index 92% rename from qiaoba-commons/qiaoba-common-datasource/src/main/java/com/qiaoba/common/database/properties/TenantSchema.java rename to qiaoba-common/qiaoba-common-datasource/src/main/java/com/qiaoba/common/database/properties/TenantSchema.java index 9638995..ad987d8 100644 --- a/qiaoba-commons/qiaoba-common-datasource/src/main/java/com/qiaoba/common/database/properties/TenantSchema.java +++ b/qiaoba-common/qiaoba-common-datasource/src/main/java/com/qiaoba/common/database/properties/TenantSchema.java @@ -1,6 +1,6 @@ package com.qiaoba.common.database.properties; -import com.qiaoba.common.base.constants.BaseConstant; +import com.qiaoba.common.base.constant.BaseConstant; import org.springframework.stereotype.Component; /** diff --git a/qiaoba-commons/qiaoba-common-datasource/src/main/java/com/qiaoba/common/database/service/DynamicDatasourceService.java b/qiaoba-common/qiaoba-common-datasource/src/main/java/com/qiaoba/common/database/service/DynamicDatasourceService.java similarity index 100% rename from qiaoba-commons/qiaoba-common-datasource/src/main/java/com/qiaoba/common/database/service/DynamicDatasourceService.java rename to qiaoba-common/qiaoba-common-datasource/src/main/java/com/qiaoba/common/database/service/DynamicDatasourceService.java diff --git a/qiaoba-common/qiaoba-common-datasource/src/main/java/com/qiaoba/common/database/util/DatasourceUtil.java b/qiaoba-common/qiaoba-common-datasource/src/main/java/com/qiaoba/common/database/util/DatasourceUtil.java new file mode 100644 index 0000000..493889c --- /dev/null +++ b/qiaoba-common/qiaoba-common-datasource/src/main/java/com/qiaoba/common/database/util/DatasourceUtil.java @@ -0,0 +1,82 @@ +package com.qiaoba.common.database.util; + +import cn.hutool.core.io.IoUtil; +import com.alibaba.druid.pool.DruidDataSource; +import com.alibaba.druid.pool.DruidPooledConnection; +import com.qiaoba.common.database.context.DynamicDataSourceContext; +import com.qiaoba.common.database.context.PrimaryDatasourceContext; +import com.qiaoba.common.database.context.TenantDbTypeContext; +import com.qiaoba.common.database.entity.DynamicDataSource; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; + +import javax.annotation.PostConstruct; +import javax.annotation.Resource; +import java.sql.SQLException; + +/** + * DatasourceUtil + * + * @author ailanyin + * @version 1.0 + * @since 2023/7/13 0013 下午 16:20 + */ +@Component +@Slf4j +public class DatasourceUtil { + + @Resource + private DynamicDataSourceContext dataSource; + + private static DynamicDataSourceContext dynamicDataSourceContext; + + @PostConstruct + public void init() { + dynamicDataSourceContext = dataSource; + } + + public static void changePrimaryDatasource(String tenantId, Object datasource) { + PrimaryDatasourceContext.set(tenantId, datasource); + // 将数据源的类型保存 + DruidPooledConnection connection = null; + try { + connection = ((DruidDataSource) datasource).getConnection(); + TenantDbTypeContext.set(tenantId, connection.getMetaData().getDatabaseProductName()); + } catch (SQLException e) { + e.printStackTrace(); + } finally { + // 归还 connection + IoUtil.close(connection); + } + dynamicDataSourceContext.freshDataSource(PrimaryDatasourceContext.getAll()); + } + + public static Object buildDataSource(String tenantId, DynamicDataSource dynamicDataSource) { + log.debug("正在创建数据源DataSource, 租户: {}", tenantId); + boolean connect = JdbcUtil.checkConnect(dynamicDataSource.getDriver(), dynamicDataSource.getUrl(), dynamicDataSource.getUsername(), dynamicDataSource.getPassword()); + if (!connect) { + log.error("租户: {} 数据源连接失败, Url: {}", tenantId, dynamicDataSource.getUrl()); + return null; + } + DruidDataSource dataSource = new DruidDataSource(); + dataSource.setUrl(dynamicDataSource.getUrl()); + dataSource.setUsername(dynamicDataSource.getUsername()); + dataSource.setPassword(dynamicDataSource.getPassword()); + dataSource.setDriverClassName(dynamicDataSource.getDriver()); + dataSource.setInitialSize(dynamicDataSource.getInitialSize()); + dataSource.setMinIdle(dynamicDataSource.getMinIdle()); + dataSource.setMaxActive(dynamicDataSource.getMaxActive()); + + try { + dataSource.addFilters("stat"); + // wall 防火墙 切勿开启, 开启后 导入SQL 会失败 + // dataSource.addFilters("wall") + // 初始化数据源 + dataSource.init(); + return dataSource; + } catch (Exception e) { + IoUtil.close(dataSource); + return null; + } + } +} diff --git a/qiaoba-commons/qiaoba-common-datasource/src/main/java/com/qiaoba/common/database/utils/DbUtil.java b/qiaoba-common/qiaoba-common-datasource/src/main/java/com/qiaoba/common/database/util/DbUtil.java similarity index 98% rename from qiaoba-commons/qiaoba-common-datasource/src/main/java/com/qiaoba/common/database/utils/DbUtil.java rename to qiaoba-common/qiaoba-common-datasource/src/main/java/com/qiaoba/common/database/util/DbUtil.java index ddbe5da..1e2c966 100644 --- a/qiaoba-commons/qiaoba-common-datasource/src/main/java/com/qiaoba/common/database/utils/DbUtil.java +++ b/qiaoba-common/qiaoba-common-datasource/src/main/java/com/qiaoba/common/database/util/DbUtil.java @@ -1,4 +1,4 @@ -package com.qiaoba.common.database.utils; +package com.qiaoba.common.database.util; import cn.hutool.core.io.IoUtil; import cn.hutool.core.util.StrUtil; diff --git a/qiaoba-commons/qiaoba-common-datasource/src/main/java/com/qiaoba/common/database/utils/JdbcUtil.java b/qiaoba-common/qiaoba-common-datasource/src/main/java/com/qiaoba/common/database/util/JdbcUtil.java similarity index 95% rename from qiaoba-commons/qiaoba-common-datasource/src/main/java/com/qiaoba/common/database/utils/JdbcUtil.java rename to qiaoba-common/qiaoba-common-datasource/src/main/java/com/qiaoba/common/database/util/JdbcUtil.java index 23f8977..b4b4a62 100644 --- a/qiaoba-commons/qiaoba-common-datasource/src/main/java/com/qiaoba/common/database/utils/JdbcUtil.java +++ b/qiaoba-common/qiaoba-common-datasource/src/main/java/com/qiaoba/common/database/util/JdbcUtil.java @@ -1,9 +1,9 @@ -package com.qiaoba.common.database.utils; +package com.qiaoba.common.database.util; import cn.hutool.core.io.IoUtil; import cn.hutool.core.util.StrUtil; import com.qiaoba.common.base.enums.DataBaseEnum; -import com.qiaoba.common.base.exceptions.ServiceException; +import com.qiaoba.common.base.exception.ServiceException; import lombok.extern.slf4j.Slf4j; import java.sql.Connection; diff --git a/qiaoba-commons/qiaoba-common-datasource/src/main/resources/META-INF/spring-configuration-metadata.json b/qiaoba-common/qiaoba-common-datasource/src/main/resources/META-INF/spring-configuration-metadata.json similarity index 100% rename from qiaoba-commons/qiaoba-common-datasource/src/main/resources/META-INF/spring-configuration-metadata.json rename to qiaoba-common/qiaoba-common-datasource/src/main/resources/META-INF/spring-configuration-metadata.json diff --git a/qiaoba-commons/qiaoba-common-datasource/src/main/resources/META-INF/spring.factories b/qiaoba-common/qiaoba-common-datasource/src/main/resources/META-INF/spring.factories similarity index 50% rename from qiaoba-commons/qiaoba-common-datasource/src/main/resources/META-INF/spring.factories rename to qiaoba-common/qiaoba-common-datasource/src/main/resources/META-INF/spring.factories index f955e9d..5de4e82 100644 --- a/qiaoba-commons/qiaoba-common-datasource/src/main/resources/META-INF/spring.factories +++ b/qiaoba-common/qiaoba-common-datasource/src/main/resources/META-INF/spring.factories @@ -1,3 +1,4 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ - com.qiaoba.common.database.factories.DynamicDataSourceFactory,\ + com.qiaoba.common.database.factory.DynamicDataSourceFactory,\ + com.qiaoba.common.database.util.DatasourceUtil,\ com.qiaoba.common.database.config.MybatisPlusConfig diff --git a/qiaoba-commons/qiaoba-common-doc/pom.xml b/qiaoba-common/qiaoba-common-doc/pom.xml similarity index 94% rename from qiaoba-commons/qiaoba-common-doc/pom.xml rename to qiaoba-common/qiaoba-common-doc/pom.xml index b91c5f6..361e12b 100644 --- a/qiaoba-commons/qiaoba-common-doc/pom.xml +++ b/qiaoba-common/qiaoba-common-doc/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - qiaoba-commons + qiaoba-common com.qiaoba 1.0 diff --git a/qiaoba-commons/qiaoba-common-doc/src/main/java/.gitkeep b/qiaoba-common/qiaoba-common-doc/src/main/java/.gitkeep similarity index 100% rename from qiaoba-commons/qiaoba-common-doc/src/main/java/.gitkeep rename to qiaoba-common/qiaoba-common-doc/src/main/java/.gitkeep diff --git a/qiaoba-commons/qiaoba-common-doc/src/main/resources/.gitkeep b/qiaoba-common/qiaoba-common-doc/src/main/resources/.gitkeep similarity index 100% rename from qiaoba-commons/qiaoba-common-doc/src/main/resources/.gitkeep rename to qiaoba-common/qiaoba-common-doc/src/main/resources/.gitkeep diff --git a/qiaoba-commons/qiaoba-common-poi/pom.xml b/qiaoba-common/qiaoba-common-poi/pom.xml similarity index 95% rename from qiaoba-commons/qiaoba-common-poi/pom.xml rename to qiaoba-common/qiaoba-common-poi/pom.xml index 6e0c751..e0b27f4 100644 --- a/qiaoba-commons/qiaoba-common-poi/pom.xml +++ b/qiaoba-common/qiaoba-common-poi/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - qiaoba-commons + qiaoba-common com.qiaoba 1.0 diff --git a/qiaoba-commons/qiaoba-common-poi/src/main/java/com/qiaoba/common/poi/model/ExcelSetting.java b/qiaoba-common/qiaoba-common-poi/src/main/java/com/qiaoba/common/poi/model/ExcelSetting.java similarity index 100% rename from qiaoba-commons/qiaoba-common-poi/src/main/java/com/qiaoba/common/poi/model/ExcelSetting.java rename to qiaoba-common/qiaoba-common-poi/src/main/java/com/qiaoba/common/poi/model/ExcelSetting.java diff --git a/qiaoba-commons/qiaoba-common-poi/src/main/java/com/qiaoba/common/poi/utils/ExcelUtil.java b/qiaoba-common/qiaoba-common-poi/src/main/java/com/qiaoba/common/poi/util/ExcelUtil.java similarity index 99% rename from qiaoba-commons/qiaoba-common-poi/src/main/java/com/qiaoba/common/poi/utils/ExcelUtil.java rename to qiaoba-common/qiaoba-common-poi/src/main/java/com/qiaoba/common/poi/util/ExcelUtil.java index 4d26822..32974cf 100644 --- a/qiaoba-commons/qiaoba-common-poi/src/main/java/com/qiaoba/common/poi/utils/ExcelUtil.java +++ b/qiaoba-common/qiaoba-common-poi/src/main/java/com/qiaoba/common/poi/util/ExcelUtil.java @@ -1,4 +1,4 @@ -package com.qiaoba.common.poi.utils; +package com.qiaoba.common.poi.util; import cn.afterturn.easypoi.excel.ExcelExportUtil; import cn.afterturn.easypoi.excel.ExcelImportUtil; diff --git a/qiaoba-commons/qiaoba-common-redis/pom.xml b/qiaoba-common/qiaoba-common-redis/pom.xml similarity index 97% rename from qiaoba-commons/qiaoba-common-redis/pom.xml rename to qiaoba-common/qiaoba-common-redis/pom.xml index efabb52..5fe9126 100644 --- a/qiaoba-commons/qiaoba-common-redis/pom.xml +++ b/qiaoba-common/qiaoba-common-redis/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - qiaoba-commons + qiaoba-common com.qiaoba 1.0 diff --git a/qiaoba-commons/qiaoba-common-redis/src/main/java/com/qiaoba/common/redis/config/RedisConfig.java b/qiaoba-common/qiaoba-common-redis/src/main/java/com/qiaoba/common/redis/config/RedisConfig.java similarity index 100% rename from qiaoba-commons/qiaoba-common-redis/src/main/java/com/qiaoba/common/redis/config/RedisConfig.java rename to qiaoba-common/qiaoba-common-redis/src/main/java/com/qiaoba/common/redis/config/RedisConfig.java diff --git a/qiaoba-commons/qiaoba-common-redis/src/main/java/com/qiaoba/common/redis/service/RedisService.java b/qiaoba-common/qiaoba-common-redis/src/main/java/com/qiaoba/common/redis/service/RedisService.java similarity index 100% rename from qiaoba-commons/qiaoba-common-redis/src/main/java/com/qiaoba/common/redis/service/RedisService.java rename to qiaoba-common/qiaoba-common-redis/src/main/java/com/qiaoba/common/redis/service/RedisService.java diff --git a/qiaoba-commons/qiaoba-common-redis/src/main/java/com/qiaoba/common/redis/service/impl/RedisServiceImpl.java b/qiaoba-common/qiaoba-common-redis/src/main/java/com/qiaoba/common/redis/service/impl/RedisServiceImpl.java similarity index 98% rename from qiaoba-commons/qiaoba-common-redis/src/main/java/com/qiaoba/common/redis/service/impl/RedisServiceImpl.java rename to qiaoba-common/qiaoba-common-redis/src/main/java/com/qiaoba/common/redis/service/impl/RedisServiceImpl.java index 3d25d0d..3816a44 100644 --- a/qiaoba-commons/qiaoba-common-redis/src/main/java/com/qiaoba/common/redis/service/impl/RedisServiceImpl.java +++ b/qiaoba-common/qiaoba-common-redis/src/main/java/com/qiaoba/common/redis/service/impl/RedisServiceImpl.java @@ -1,8 +1,8 @@ package com.qiaoba.common.redis.service.impl; -import com.qiaoba.common.base.constants.BaseConstant; -import com.qiaoba.common.base.constants.TenantConstant; +import com.qiaoba.common.base.constant.BaseConstant; +import com.qiaoba.common.base.constant.TenantConstant; import com.qiaoba.common.base.context.BaseContext; import com.qiaoba.common.base.entity.BasePage; import com.qiaoba.common.redis.service.RedisService; diff --git a/qiaoba-commons/qiaoba-common-redis/src/main/resources/META-INF/spring.factories b/qiaoba-common/qiaoba-common-redis/src/main/resources/META-INF/spring.factories similarity index 100% rename from qiaoba-commons/qiaoba-common-redis/src/main/resources/META-INF/spring.factories rename to qiaoba-common/qiaoba-common-redis/src/main/resources/META-INF/spring.factories diff --git a/qiaoba-commons/qiaoba-common-web/pom.xml b/qiaoba-common/qiaoba-common-web/pom.xml similarity index 95% rename from qiaoba-commons/qiaoba-common-web/pom.xml rename to qiaoba-common/qiaoba-common-web/pom.xml index 2261c7a..a1821b7 100644 --- a/qiaoba-commons/qiaoba-common-web/pom.xml +++ b/qiaoba-common/qiaoba-common-web/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - qiaoba-commons + qiaoba-common com.qiaoba 1.0 diff --git a/qiaoba-commons/qiaoba-common-web/src/main/java/com/qiaoba/common/web/advice/ExceptionAdvice.java b/qiaoba-common/qiaoba-common-web/src/main/java/com/qiaoba/common/web/advice/ExceptionAdvice.java similarity index 97% rename from qiaoba-commons/qiaoba-common-web/src/main/java/com/qiaoba/common/web/advice/ExceptionAdvice.java rename to qiaoba-common/qiaoba-common-web/src/main/java/com/qiaoba/common/web/advice/ExceptionAdvice.java index 53d426c..75f43d5 100644 --- a/qiaoba-commons/qiaoba-common-web/src/main/java/com/qiaoba/common/web/advice/ExceptionAdvice.java +++ b/qiaoba-common/qiaoba-common-web/src/main/java/com/qiaoba/common/web/advice/ExceptionAdvice.java @@ -1,7 +1,7 @@ package com.qiaoba.common.web.advice; -import com.qiaoba.common.base.exceptions.ServiceException; +import com.qiaoba.common.base.exception.ServiceException; import com.qiaoba.common.base.result.AjaxResult; import org.springframework.validation.BindException; import org.springframework.web.bind.MethodArgumentNotValidException; diff --git a/qiaoba-commons/qiaoba-common-web/src/main/java/com/qiaoba/common/web/config/GlobalCorsConfig.java b/qiaoba-common/qiaoba-common-web/src/main/java/com/qiaoba/common/web/config/GlobalCorsConfig.java similarity index 100% rename from qiaoba-commons/qiaoba-common-web/src/main/java/com/qiaoba/common/web/config/GlobalCorsConfig.java rename to qiaoba-common/qiaoba-common-web/src/main/java/com/qiaoba/common/web/config/GlobalCorsConfig.java diff --git a/qiaoba-commons/qiaoba-common-web/src/main/java/com/qiaoba/common/web/config/IpConfig.java b/qiaoba-common/qiaoba-common-web/src/main/java/com/qiaoba/common/web/config/IpConfig.java similarity index 96% rename from qiaoba-commons/qiaoba-common-web/src/main/java/com/qiaoba/common/web/config/IpConfig.java rename to qiaoba-common/qiaoba-common-web/src/main/java/com/qiaoba/common/web/config/IpConfig.java index 2355174..c9a80a4 100644 --- a/qiaoba-commons/qiaoba-common-web/src/main/java/com/qiaoba/common/web/config/IpConfig.java +++ b/qiaoba-common/qiaoba-common-web/src/main/java/com/qiaoba/common/web/config/IpConfig.java @@ -1,7 +1,7 @@ package com.qiaoba.common.web.config; import cn.hutool.core.io.IoUtil; -import com.qiaoba.common.web.utils.IpUtil; +import com.qiaoba.common.web.util.IpUtil; import lombok.extern.slf4j.Slf4j; import org.lionsoul.ip2region.xdb.Searcher; import org.springframework.context.annotation.Configuration; diff --git a/qiaoba-commons/qiaoba-common-web/src/main/java/com/qiaoba/common/web/utils/IpUtil.java b/qiaoba-common/qiaoba-common-web/src/main/java/com/qiaoba/common/web/util/IpUtil.java similarity index 96% rename from qiaoba-commons/qiaoba-common-web/src/main/java/com/qiaoba/common/web/utils/IpUtil.java rename to qiaoba-common/qiaoba-common-web/src/main/java/com/qiaoba/common/web/util/IpUtil.java index 77c7f1a..a4d7c97 100644 --- a/qiaoba-commons/qiaoba-common-web/src/main/java/com/qiaoba/common/web/utils/IpUtil.java +++ b/qiaoba-common/qiaoba-common-web/src/main/java/com/qiaoba/common/web/util/IpUtil.java @@ -1,4 +1,4 @@ -package com.qiaoba.common.web.utils; +package com.qiaoba.common.web.util; import cn.hutool.extra.servlet.ServletUtil; import lombok.extern.slf4j.Slf4j; diff --git a/qiaoba-commons/qiaoba-common-web/src/main/java/com/qiaoba/common/web/utils/ResponseUtil.java b/qiaoba-common/qiaoba-common-web/src/main/java/com/qiaoba/common/web/util/ResponseUtil.java similarity index 91% rename from qiaoba-commons/qiaoba-common-web/src/main/java/com/qiaoba/common/web/utils/ResponseUtil.java rename to qiaoba-common/qiaoba-common-web/src/main/java/com/qiaoba/common/web/util/ResponseUtil.java index e445ff9..410aebf 100644 --- a/qiaoba-commons/qiaoba-common-web/src/main/java/com/qiaoba/common/web/utils/ResponseUtil.java +++ b/qiaoba-common/qiaoba-common-web/src/main/java/com/qiaoba/common/web/util/ResponseUtil.java @@ -1,8 +1,8 @@ -package com.qiaoba.common.web.utils; +package com.qiaoba.common.web.util; import cn.hutool.http.ContentType; import cn.hutool.json.JSONUtil; -import com.qiaoba.common.base.constants.BaseConstant; +import com.qiaoba.common.base.constant.BaseConstant; import com.qiaoba.common.base.result.AjaxResult; import javax.servlet.http.HttpServletResponse; diff --git a/qiaoba-commons/qiaoba-common-web/src/main/java/com/qiaoba/common/web/utils/UriUtil.java b/qiaoba-common/qiaoba-common-web/src/main/java/com/qiaoba/common/web/util/UriUtil.java similarity index 93% rename from qiaoba-commons/qiaoba-common-web/src/main/java/com/qiaoba/common/web/utils/UriUtil.java rename to qiaoba-common/qiaoba-common-web/src/main/java/com/qiaoba/common/web/util/UriUtil.java index ceba62d..a2992be 100644 --- a/qiaoba-commons/qiaoba-common-web/src/main/java/com/qiaoba/common/web/utils/UriUtil.java +++ b/qiaoba-common/qiaoba-common-web/src/main/java/com/qiaoba/common/web/util/UriUtil.java @@ -1,4 +1,4 @@ -package com.qiaoba.common.web.utils; +package com.qiaoba.common.web.util; import org.springframework.util.AntPathMatcher; diff --git a/qiaoba-commons/qiaoba-common-web/src/main/resources/META-INF/spring.factories b/qiaoba-common/qiaoba-common-web/src/main/resources/META-INF/spring.factories similarity index 100% rename from qiaoba-commons/qiaoba-common-web/src/main/resources/META-INF/spring.factories rename to qiaoba-common/qiaoba-common-web/src/main/resources/META-INF/spring.factories diff --git a/qiaoba-commons/qiaoba-common-web/src/main/resources/ip2region.xdb b/qiaoba-common/qiaoba-common-web/src/main/resources/ip2region.xdb similarity index 100% rename from qiaoba-commons/qiaoba-common-web/src/main/resources/ip2region.xdb rename to qiaoba-common/qiaoba-common-web/src/main/resources/ip2region.xdb diff --git a/qiaoba-commons/qiaoba-common-datasource/src/main/java/com/qiaoba/common/database/context/BackupDatasourceContext.java b/qiaoba-commons/qiaoba-common-datasource/src/main/java/com/qiaoba/common/database/context/BackupDatasourceContext.java deleted file mode 100644 index 7d7ad65..0000000 --- a/qiaoba-commons/qiaoba-common-datasource/src/main/java/com/qiaoba/common/database/context/BackupDatasourceContext.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.qiaoba.common.database.context; - -import com.qiaoba.common.database.entity.DynamicDataSource; - -import java.util.List; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; - -/** - * 备用(未在使用)数据源 - * - * @author ailanyin - * @version 1.0 - * @since 2023/6/28 10:36 - */ -public class BackupDatasourceContext { - - /** - * 备用数据源 - */ - private static Map> BACKUP_DATASOURCE_MAP = new ConcurrentHashMap<>(); - - - /** - * 获取租户备用数据源 - * - * @param tenantId 租户ID - * @return 数据源集合 - */ - public static List get(String tenantId) { - return BACKUP_DATASOURCE_MAP.get(tenantId); - } - - /** - * 设置租户备用数据源 - * - * @param tenantId 租户ID - * @param list 数据源集合 - */ - public static void set(String tenantId, List list) { - BACKUP_DATASOURCE_MAP.put(tenantId, list); - } - -} diff --git a/qiaoba-modules/pom.xml b/qiaoba-module/pom.xml similarity index 100% rename from qiaoba-modules/pom.xml rename to qiaoba-module/pom.xml diff --git a/qiaoba-modules/qiaoba-module-demo/pom.xml b/qiaoba-module/qiaoba-module-demo/pom.xml similarity index 100% rename from qiaoba-modules/qiaoba-module-demo/pom.xml rename to qiaoba-module/qiaoba-module-demo/pom.xml diff --git a/qiaoba-modules/qiaoba-module-demo/src/main/java/com/qiaoba/module/demo/DemoApplication.java b/qiaoba-module/qiaoba-module-demo/src/main/java/com/qiaoba/module/demo/DemoApplication.java similarity index 100% rename from qiaoba-modules/qiaoba-module-demo/src/main/java/com/qiaoba/module/demo/DemoApplication.java rename to qiaoba-module/qiaoba-module-demo/src/main/java/com/qiaoba/module/demo/DemoApplication.java diff --git a/qiaoba-modules/qiaoba-module-demo/src/main/java/com/qiaoba/module/demo/controller/DemoLock4jController.java b/qiaoba-module/qiaoba-module-demo/src/main/java/com/qiaoba/module/demo/controller/DemoLock4jController.java similarity index 100% rename from qiaoba-modules/qiaoba-module-demo/src/main/java/com/qiaoba/module/demo/controller/DemoLock4jController.java rename to qiaoba-module/qiaoba-module-demo/src/main/java/com/qiaoba/module/demo/controller/DemoLock4jController.java diff --git a/qiaoba-modules/qiaoba-module-demo/src/main/java/com/qiaoba/module/demo/service/DemoLock4jService.java b/qiaoba-module/qiaoba-module-demo/src/main/java/com/qiaoba/module/demo/service/DemoLock4jService.java similarity index 100% rename from qiaoba-modules/qiaoba-module-demo/src/main/java/com/qiaoba/module/demo/service/DemoLock4jService.java rename to qiaoba-module/qiaoba-module-demo/src/main/java/com/qiaoba/module/demo/service/DemoLock4jService.java diff --git a/qiaoba-modules/qiaoba-module-demo/src/main/java/com/qiaoba/module/demo/service/impl/DemoLock4jServiceImpl.java b/qiaoba-module/qiaoba-module-demo/src/main/java/com/qiaoba/module/demo/service/impl/DemoLock4jServiceImpl.java similarity index 96% rename from qiaoba-modules/qiaoba-module-demo/src/main/java/com/qiaoba/module/demo/service/impl/DemoLock4jServiceImpl.java rename to qiaoba-module/qiaoba-module-demo/src/main/java/com/qiaoba/module/demo/service/impl/DemoLock4jServiceImpl.java index 5df16f6..d0e685d 100644 --- a/qiaoba-modules/qiaoba-module-demo/src/main/java/com/qiaoba/module/demo/service/impl/DemoLock4jServiceImpl.java +++ b/qiaoba-module/qiaoba-module-demo/src/main/java/com/qiaoba/module/demo/service/impl/DemoLock4jServiceImpl.java @@ -3,7 +3,7 @@ package com.qiaoba.module.demo.service.impl; import cn.hutool.core.thread.ThreadUtil; import com.baomidou.lock.LockInfo; import com.baomidou.lock.LockTemplate; -import com.qiaoba.common.base.exceptions.ServiceException; +import com.qiaoba.common.base.exception.ServiceException; import com.qiaoba.module.demo.service.DemoLock4jService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/qiaoba-modules/qiaoba-module-demo/src/main/resources/application.yml b/qiaoba-module/qiaoba-module-demo/src/main/resources/application.yml similarity index 100% rename from qiaoba-modules/qiaoba-module-demo/src/main/resources/application.yml rename to qiaoba-module/qiaoba-module-demo/src/main/resources/application.yml diff --git a/qiaoba-modules/qiaoba-module-file/pom.xml b/qiaoba-module/qiaoba-module-file/pom.xml similarity index 100% rename from qiaoba-modules/qiaoba-module-file/pom.xml rename to qiaoba-module/qiaoba-module-file/pom.xml diff --git a/qiaoba-modules/qiaoba-module-file/src/main/java/com/qiaoba/module/file/config/FileConfig.java b/qiaoba-module/qiaoba-module-file/src/main/java/com/qiaoba/module/file/config/FileConfig.java similarity index 94% rename from qiaoba-modules/qiaoba-module-file/src/main/java/com/qiaoba/module/file/config/FileConfig.java rename to qiaoba-module/qiaoba-module-file/src/main/java/com/qiaoba/module/file/config/FileConfig.java index 00fc8a0..2b90490 100644 --- a/qiaoba-modules/qiaoba-module-file/src/main/java/com/qiaoba/module/file/config/FileConfig.java +++ b/qiaoba-module/qiaoba-module-file/src/main/java/com/qiaoba/module/file/config/FileConfig.java @@ -1,7 +1,7 @@ package com.qiaoba.module.file.config; import cn.hutool.core.util.URLUtil; -import com.qiaoba.common.base.constants.BaseConstant; +import com.qiaoba.common.base.constant.BaseConstant; import lombok.Getter; import lombok.Setter; import org.springframework.beans.factory.annotation.Value; diff --git a/qiaoba-modules/qiaoba-module-file/src/main/java/com/qiaoba/module/file/controller/FileController.java b/qiaoba-module/qiaoba-module-file/src/main/java/com/qiaoba/module/file/controller/FileController.java similarity index 100% rename from qiaoba-modules/qiaoba-module-file/src/main/java/com/qiaoba/module/file/controller/FileController.java rename to qiaoba-module/qiaoba-module-file/src/main/java/com/qiaoba/module/file/controller/FileController.java diff --git a/qiaoba-modules/qiaoba-module-file/src/main/java/com/qiaoba/module/file/service/FileService.java b/qiaoba-module/qiaoba-module-file/src/main/java/com/qiaoba/module/file/service/FileService.java similarity index 100% rename from qiaoba-modules/qiaoba-module-file/src/main/java/com/qiaoba/module/file/service/FileService.java rename to qiaoba-module/qiaoba-module-file/src/main/java/com/qiaoba/module/file/service/FileService.java diff --git a/qiaoba-modules/qiaoba-module-file/src/main/java/com/qiaoba/module/file/service/impl/FileServiceImpl.java b/qiaoba-module/qiaoba-module-file/src/main/java/com/qiaoba/module/file/service/impl/FileServiceImpl.java similarity index 82% rename from qiaoba-modules/qiaoba-module-file/src/main/java/com/qiaoba/module/file/service/impl/FileServiceImpl.java rename to qiaoba-module/qiaoba-module-file/src/main/java/com/qiaoba/module/file/service/impl/FileServiceImpl.java index eb52eb1..b902fea 100644 --- a/qiaoba-modules/qiaoba-module-file/src/main/java/com/qiaoba/module/file/service/impl/FileServiceImpl.java +++ b/qiaoba-module/qiaoba-module-file/src/main/java/com/qiaoba/module/file/service/impl/FileServiceImpl.java @@ -2,8 +2,8 @@ package com.qiaoba.module.file.service.impl; import cn.hutool.core.io.FileUtil; import cn.hutool.core.util.StrUtil; -import com.qiaoba.common.base.constants.BaseConstant; -import com.qiaoba.common.base.exceptions.ServiceException; +import com.qiaoba.common.base.constant.BaseConstant; +import com.qiaoba.common.base.exception.ServiceException; import com.qiaoba.module.file.config.FileConfig; import com.qiaoba.module.file.service.FileService; import lombok.RequiredArgsConstructor; @@ -25,7 +25,7 @@ public class FileServiceImpl implements FileService { @Override public String upload(MultipartFile file) { - return com.qiaoba.module.file.utils.FileUtil.upload(file, fileConfig.getUploadPath()); + return com.qiaoba.module.file.util.FileUtil.upload(file, fileConfig.getUploadPath()); } @Override diff --git a/qiaoba-modules/qiaoba-module-file/src/main/java/com/qiaoba/module/file/utils/FileUtil.java b/qiaoba-module/qiaoba-module-file/src/main/java/com/qiaoba/module/file/util/FileUtil.java similarity index 96% rename from qiaoba-modules/qiaoba-module-file/src/main/java/com/qiaoba/module/file/utils/FileUtil.java rename to qiaoba-module/qiaoba-module-file/src/main/java/com/qiaoba/module/file/util/FileUtil.java index 1861b90..a7de3c2 100644 --- a/qiaoba-modules/qiaoba-module-file/src/main/java/com/qiaoba/module/file/utils/FileUtil.java +++ b/qiaoba-module/qiaoba-module-file/src/main/java/com/qiaoba/module/file/util/FileUtil.java @@ -1,10 +1,10 @@ -package com.qiaoba.module.file.utils; +package com.qiaoba.module.file.util; import cn.hutool.core.date.DateUtil; import cn.hutool.core.lang.UUID; import cn.hutool.core.util.StrUtil; -import com.qiaoba.common.base.constants.BaseConstant; -import com.qiaoba.common.base.exceptions.ServiceException; +import com.qiaoba.common.base.constant.BaseConstant; +import com.qiaoba.common.base.exception.ServiceException; import org.apache.commons.lang3.StringUtils; import org.springframework.web.multipart.MultipartFile; diff --git a/qiaoba-modules/qiaoba-module-file/src/main/resources/META-INF/spring-configuration-metadata.json b/qiaoba-module/qiaoba-module-file/src/main/resources/META-INF/spring-configuration-metadata.json similarity index 100% rename from qiaoba-modules/qiaoba-module-file/src/main/resources/META-INF/spring-configuration-metadata.json rename to qiaoba-module/qiaoba-module-file/src/main/resources/META-INF/spring-configuration-metadata.json diff --git a/qiaoba-modules/qiaoba-module-file/src/test/java/.gitkeep b/qiaoba-module/qiaoba-module-file/src/test/java/.gitkeep similarity index 100% rename from qiaoba-modules/qiaoba-module-file/src/test/java/.gitkeep rename to qiaoba-module/qiaoba-module-file/src/test/java/.gitkeep diff --git a/qiaoba-modules/qiaoba-module-generator/pom.xml b/qiaoba-module/qiaoba-module-generator/pom.xml similarity index 100% rename from qiaoba-modules/qiaoba-module-generator/pom.xml rename to qiaoba-module/qiaoba-module-generator/pom.xml diff --git a/qiaoba-modules/qiaoba-module-generator/src/main/java/com/qiaoba/module/generator/config/GeneratorConfig.java b/qiaoba-module/qiaoba-module-generator/src/main/java/com/qiaoba/module/generator/config/GeneratorConfig.java similarity index 100% rename from qiaoba-modules/qiaoba-module-generator/src/main/java/com/qiaoba/module/generator/config/GeneratorConfig.java rename to qiaoba-module/qiaoba-module-generator/src/main/java/com/qiaoba/module/generator/config/GeneratorConfig.java diff --git a/qiaoba-modules/qiaoba-module-generator/src/main/java/com/qiaoba/module/generator/constant/GenConstants.java b/qiaoba-module/qiaoba-module-generator/src/main/java/com/qiaoba/module/generator/constant/GenConstants.java similarity index 100% rename from qiaoba-modules/qiaoba-module-generator/src/main/java/com/qiaoba/module/generator/constant/GenConstants.java rename to qiaoba-module/qiaoba-module-generator/src/main/java/com/qiaoba/module/generator/constant/GenConstants.java diff --git a/qiaoba-modules/qiaoba-module-generator/src/main/java/com/qiaoba/module/generator/controller/GeneratorController.java b/qiaoba-module/qiaoba-module-generator/src/main/java/com/qiaoba/module/generator/controller/GeneratorController.java similarity index 100% rename from qiaoba-modules/qiaoba-module-generator/src/main/java/com/qiaoba/module/generator/controller/GeneratorController.java rename to qiaoba-module/qiaoba-module-generator/src/main/java/com/qiaoba/module/generator/controller/GeneratorController.java diff --git a/qiaoba-modules/qiaoba-module-generator/src/main/java/com/qiaoba/module/generator/entity/Generator.java b/qiaoba-module/qiaoba-module-generator/src/main/java/com/qiaoba/module/generator/entity/Generator.java similarity index 95% rename from qiaoba-modules/qiaoba-module-generator/src/main/java/com/qiaoba/module/generator/entity/Generator.java rename to qiaoba-module/qiaoba-module-generator/src/main/java/com/qiaoba/module/generator/entity/Generator.java index 08ece2f..f908ea4 100644 --- a/qiaoba-modules/qiaoba-module-generator/src/main/java/com/qiaoba/module/generator/entity/Generator.java +++ b/qiaoba-module/qiaoba-module-generator/src/main/java/com/qiaoba/module/generator/entity/Generator.java @@ -1,7 +1,7 @@ package com.qiaoba.module.generator.entity; import com.qiaoba.common.base.enums.BaseEnum; -import com.qiaoba.common.base.utils.ArrayUtil; +import com.qiaoba.common.base.util.ArrayUtil; import com.qiaoba.module.generator.constant.GenConstants; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/qiaoba-modules/qiaoba-module-generator/src/main/java/com/qiaoba/module/generator/entity/GeneratorTable.java b/qiaoba-module/qiaoba-module-generator/src/main/java/com/qiaoba/module/generator/entity/GeneratorTable.java similarity index 100% rename from qiaoba-modules/qiaoba-module-generator/src/main/java/com/qiaoba/module/generator/entity/GeneratorTable.java rename to qiaoba-module/qiaoba-module-generator/src/main/java/com/qiaoba/module/generator/entity/GeneratorTable.java diff --git a/qiaoba-modules/qiaoba-module-generator/src/main/java/com/qiaoba/module/generator/entity/GeneratorTableColumn.java b/qiaoba-module/qiaoba-module-generator/src/main/java/com/qiaoba/module/generator/entity/GeneratorTableColumn.java similarity index 100% rename from qiaoba-modules/qiaoba-module-generator/src/main/java/com/qiaoba/module/generator/entity/GeneratorTableColumn.java rename to qiaoba-module/qiaoba-module-generator/src/main/java/com/qiaoba/module/generator/entity/GeneratorTableColumn.java diff --git a/qiaoba-modules/qiaoba-module-generator/src/main/java/com/qiaoba/module/generator/entity/dto/GeneratorTableDto.java b/qiaoba-module/qiaoba-module-generator/src/main/java/com/qiaoba/module/generator/entity/dto/GeneratorTableDto.java similarity index 100% rename from qiaoba-modules/qiaoba-module-generator/src/main/java/com/qiaoba/module/generator/entity/dto/GeneratorTableDto.java rename to qiaoba-module/qiaoba-module-generator/src/main/java/com/qiaoba/module/generator/entity/dto/GeneratorTableDto.java diff --git a/qiaoba-modules/qiaoba-module-generator/src/main/java/com/qiaoba/module/generator/entity/dto/TableDto.java b/qiaoba-module/qiaoba-module-generator/src/main/java/com/qiaoba/module/generator/entity/dto/TableDto.java similarity index 100% rename from qiaoba-modules/qiaoba-module-generator/src/main/java/com/qiaoba/module/generator/entity/dto/TableDto.java rename to qiaoba-module/qiaoba-module-generator/src/main/java/com/qiaoba/module/generator/entity/dto/TableDto.java diff --git a/qiaoba-modules/qiaoba-module-generator/src/main/java/com/qiaoba/module/generator/entity/vo/DbTableVo.java b/qiaoba-module/qiaoba-module-generator/src/main/java/com/qiaoba/module/generator/entity/vo/DbTableVo.java similarity index 100% rename from qiaoba-modules/qiaoba-module-generator/src/main/java/com/qiaoba/module/generator/entity/vo/DbTableVo.java rename to qiaoba-module/qiaoba-module-generator/src/main/java/com/qiaoba/module/generator/entity/vo/DbTableVo.java diff --git a/qiaoba-modules/qiaoba-module-generator/src/main/java/com/qiaoba/module/generator/entity/vo/TableColumnVo.java b/qiaoba-module/qiaoba-module-generator/src/main/java/com/qiaoba/module/generator/entity/vo/TableColumnVo.java similarity index 100% rename from qiaoba-modules/qiaoba-module-generator/src/main/java/com/qiaoba/module/generator/entity/vo/TableColumnVo.java rename to qiaoba-module/qiaoba-module-generator/src/main/java/com/qiaoba/module/generator/entity/vo/TableColumnVo.java diff --git a/qiaoba-modules/qiaoba-module-generator/src/main/java/com/qiaoba/module/generator/factory/VelocityFactory.java b/qiaoba-module/qiaoba-module-generator/src/main/java/com/qiaoba/module/generator/factory/VelocityFactory.java similarity index 93% rename from qiaoba-modules/qiaoba-module-generator/src/main/java/com/qiaoba/module/generator/factory/VelocityFactory.java rename to qiaoba-module/qiaoba-module-generator/src/main/java/com/qiaoba/module/generator/factory/VelocityFactory.java index 08ab7e7..a7ec238 100644 --- a/qiaoba-modules/qiaoba-module-generator/src/main/java/com/qiaoba/module/generator/factory/VelocityFactory.java +++ b/qiaoba-module/qiaoba-module-generator/src/main/java/com/qiaoba/module/generator/factory/VelocityFactory.java @@ -1,6 +1,6 @@ package com.qiaoba.module.generator.factory; -import com.qiaoba.common.base.constants.BaseConstant; +import com.qiaoba.common.base.constant.BaseConstant; import org.apache.velocity.app.Velocity; import java.util.Properties; diff --git a/qiaoba-modules/qiaoba-module-generator/src/main/java/com/qiaoba/module/generator/mapper/GeneratorTableColumnMapper.java b/qiaoba-module/qiaoba-module-generator/src/main/java/com/qiaoba/module/generator/mapper/GeneratorTableColumnMapper.java similarity index 100% rename from qiaoba-modules/qiaoba-module-generator/src/main/java/com/qiaoba/module/generator/mapper/GeneratorTableColumnMapper.java rename to qiaoba-module/qiaoba-module-generator/src/main/java/com/qiaoba/module/generator/mapper/GeneratorTableColumnMapper.java diff --git a/qiaoba-modules/qiaoba-module-generator/src/main/java/com/qiaoba/module/generator/mapper/GeneratorTableMapper.java b/qiaoba-module/qiaoba-module-generator/src/main/java/com/qiaoba/module/generator/mapper/GeneratorTableMapper.java similarity index 100% rename from qiaoba-modules/qiaoba-module-generator/src/main/java/com/qiaoba/module/generator/mapper/GeneratorTableMapper.java rename to qiaoba-module/qiaoba-module-generator/src/main/java/com/qiaoba/module/generator/mapper/GeneratorTableMapper.java diff --git a/qiaoba-modules/qiaoba-module-generator/src/main/java/com/qiaoba/module/generator/service/GeneratorTableColumnService.java b/qiaoba-module/qiaoba-module-generator/src/main/java/com/qiaoba/module/generator/service/GeneratorTableColumnService.java similarity index 100% rename from qiaoba-modules/qiaoba-module-generator/src/main/java/com/qiaoba/module/generator/service/GeneratorTableColumnService.java rename to qiaoba-module/qiaoba-module-generator/src/main/java/com/qiaoba/module/generator/service/GeneratorTableColumnService.java diff --git a/qiaoba-modules/qiaoba-module-generator/src/main/java/com/qiaoba/module/generator/service/GeneratorTableService.java b/qiaoba-module/qiaoba-module-generator/src/main/java/com/qiaoba/module/generator/service/GeneratorTableService.java similarity index 100% rename from qiaoba-modules/qiaoba-module-generator/src/main/java/com/qiaoba/module/generator/service/GeneratorTableService.java rename to qiaoba-module/qiaoba-module-generator/src/main/java/com/qiaoba/module/generator/service/GeneratorTableService.java diff --git a/qiaoba-modules/qiaoba-module-generator/src/main/java/com/qiaoba/module/generator/service/impl/GeneratorTableColumnServiceImpl.java b/qiaoba-module/qiaoba-module-generator/src/main/java/com/qiaoba/module/generator/service/impl/GeneratorTableColumnServiceImpl.java similarity index 97% rename from qiaoba-modules/qiaoba-module-generator/src/main/java/com/qiaoba/module/generator/service/impl/GeneratorTableColumnServiceImpl.java rename to qiaoba-module/qiaoba-module-generator/src/main/java/com/qiaoba/module/generator/service/impl/GeneratorTableColumnServiceImpl.java index 6aee735..304a718 100644 --- a/qiaoba-modules/qiaoba-module-generator/src/main/java/com/qiaoba/module/generator/service/impl/GeneratorTableColumnServiceImpl.java +++ b/qiaoba-module/qiaoba-module-generator/src/main/java/com/qiaoba/module/generator/service/impl/GeneratorTableColumnServiceImpl.java @@ -4,7 +4,7 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.toolkit.Db; -import com.qiaoba.common.base.exceptions.ServiceException; +import com.qiaoba.common.base.exception.ServiceException; import com.qiaoba.module.generator.entity.GeneratorTableColumn; import com.qiaoba.module.generator.entity.vo.TableColumnVo; import com.qiaoba.module.generator.mapper.GeneratorTableColumnMapper; diff --git a/qiaoba-modules/qiaoba-module-generator/src/main/java/com/qiaoba/module/generator/service/impl/GeneratorTableServiceImpl.java b/qiaoba-module/qiaoba-module-generator/src/main/java/com/qiaoba/module/generator/service/impl/GeneratorTableServiceImpl.java similarity index 98% rename from qiaoba-modules/qiaoba-module-generator/src/main/java/com/qiaoba/module/generator/service/impl/GeneratorTableServiceImpl.java rename to qiaoba-module/qiaoba-module-generator/src/main/java/com/qiaoba/module/generator/service/impl/GeneratorTableServiceImpl.java index fc735ad..09df513 100644 --- a/qiaoba-modules/qiaoba-module-generator/src/main/java/com/qiaoba/module/generator/service/impl/GeneratorTableServiceImpl.java +++ b/qiaoba-module/qiaoba-module-generator/src/main/java/com/qiaoba/module/generator/service/impl/GeneratorTableServiceImpl.java @@ -5,9 +5,9 @@ import cn.hutool.core.io.IoUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.qiaoba.common.base.constants.BaseConstant; +import com.qiaoba.common.base.constant.BaseConstant; import com.qiaoba.common.base.enums.BaseEnum; -import com.qiaoba.common.base.exceptions.ServiceException; +import com.qiaoba.common.base.exception.ServiceException; import com.qiaoba.common.database.context.TenantDbTypeContext; import com.qiaoba.common.database.entity.PageQuery; import com.qiaoba.common.database.entity.TableDataInfo; diff --git a/qiaoba-modules/qiaoba-module-generator/src/main/java/com/qiaoba/module/generator/util/GeneratorUtil.java b/qiaoba-module/qiaoba-module-generator/src/main/java/com/qiaoba/module/generator/util/GeneratorUtil.java similarity index 98% rename from qiaoba-modules/qiaoba-module-generator/src/main/java/com/qiaoba/module/generator/util/GeneratorUtil.java rename to qiaoba-module/qiaoba-module-generator/src/main/java/com/qiaoba/module/generator/util/GeneratorUtil.java index 2444bd5..4703632 100644 --- a/qiaoba-modules/qiaoba-module-generator/src/main/java/com/qiaoba/module/generator/util/GeneratorUtil.java +++ b/qiaoba-module/qiaoba-module-generator/src/main/java/com/qiaoba/module/generator/util/GeneratorUtil.java @@ -3,8 +3,8 @@ package com.qiaoba.module.generator.util; import cn.hutool.core.io.IoUtil; import cn.hutool.core.util.StrUtil; -import com.qiaoba.common.base.constants.BaseConstant; -import com.qiaoba.common.base.utils.ArrayUtil; +import com.qiaoba.common.base.constant.BaseConstant; +import com.qiaoba.common.base.util.ArrayUtil; import com.qiaoba.module.generator.config.GeneratorConfig; import com.qiaoba.module.generator.constant.GenConstants; import com.qiaoba.module.generator.entity.GeneratorTable; diff --git a/qiaoba-modules/qiaoba-module-generator/src/main/java/com/qiaoba/module/generator/util/VelocityUtil.java b/qiaoba-module/qiaoba-module-generator/src/main/java/com/qiaoba/module/generator/util/VelocityUtil.java similarity index 99% rename from qiaoba-modules/qiaoba-module-generator/src/main/java/com/qiaoba/module/generator/util/VelocityUtil.java rename to qiaoba-module/qiaoba-module-generator/src/main/java/com/qiaoba/module/generator/util/VelocityUtil.java index 0bfbe7b..ccd2765 100644 --- a/qiaoba-modules/qiaoba-module-generator/src/main/java/com/qiaoba/module/generator/util/VelocityUtil.java +++ b/qiaoba-module/qiaoba-module-generator/src/main/java/com/qiaoba/module/generator/util/VelocityUtil.java @@ -3,7 +3,7 @@ package com.qiaoba.module.generator.util; import cn.hutool.core.date.DateUtil; import cn.hutool.core.lang.Snowflake; import cn.hutool.core.util.StrUtil; -import com.qiaoba.common.base.constants.BaseConstant; +import com.qiaoba.common.base.constant.BaseConstant; import com.qiaoba.common.base.context.BaseContext; import com.qiaoba.common.base.enums.BaseEnum; import com.qiaoba.module.generator.constant.GenConstants; diff --git a/qiaoba-modules/qiaoba-module-generator/src/main/resources/mapper/GeneratorTableColumnMapper.xml b/qiaoba-module/qiaoba-module-generator/src/main/resources/mapper/GeneratorTableColumnMapper.xml similarity index 100% rename from qiaoba-modules/qiaoba-module-generator/src/main/resources/mapper/GeneratorTableColumnMapper.xml rename to qiaoba-module/qiaoba-module-generator/src/main/resources/mapper/GeneratorTableColumnMapper.xml diff --git a/qiaoba-modules/qiaoba-module-generator/src/main/resources/mapper/GeneratorTableMapper.xml b/qiaoba-module/qiaoba-module-generator/src/main/resources/mapper/GeneratorTableMapper.xml similarity index 100% rename from qiaoba-modules/qiaoba-module-generator/src/main/resources/mapper/GeneratorTableMapper.xml rename to qiaoba-module/qiaoba-module-generator/src/main/resources/mapper/GeneratorTableMapper.xml diff --git a/qiaoba-modules/qiaoba-module-generator/src/main/resources/vm.zip b/qiaoba-module/qiaoba-module-generator/src/main/resources/vm.zip similarity index 100% rename from qiaoba-modules/qiaoba-module-generator/src/main/resources/vm.zip rename to qiaoba-module/qiaoba-module-generator/src/main/resources/vm.zip diff --git a/qiaoba-modules/qiaoba-module-generator/src/main/resources/vm/java/controller.java.qb b/qiaoba-module/qiaoba-module-generator/src/main/resources/vm/java/controller.java.qb similarity index 98% rename from qiaoba-modules/qiaoba-module-generator/src/main/resources/vm/java/controller.java.qb rename to qiaoba-module/qiaoba-module-generator/src/main/resources/vm/java/controller.java.qb index 694664e..85a006b 100644 --- a/qiaoba-modules/qiaoba-module-generator/src/main/resources/vm/java/controller.java.qb +++ b/qiaoba-module/qiaoba-module-generator/src/main/resources/vm/java/controller.java.qb @@ -9,7 +9,7 @@ import io.swagger.v3.oas.annotations.tags.Tag; #end #if($excelFlag) import javax.servlet.http.HttpServletResponse; -import com.qiaoba.common.poi.utils.ExcelUtil; +import com.qiaoba.common.poi.util.ExcelUtil; import ${packageName}.entity.template.${ClassName}Export; #end import lombok.RequiredArgsConstructor; diff --git a/qiaoba-modules/qiaoba-module-generator/src/main/resources/vm/java/dto.java.qb b/qiaoba-module/qiaoba-module-generator/src/main/resources/vm/java/dto.java.qb similarity index 100% rename from qiaoba-modules/qiaoba-module-generator/src/main/resources/vm/java/dto.java.qb rename to qiaoba-module/qiaoba-module-generator/src/main/resources/vm/java/dto.java.qb diff --git a/qiaoba-modules/qiaoba-module-generator/src/main/resources/vm/java/entity.java.qb b/qiaoba-module/qiaoba-module-generator/src/main/resources/vm/java/entity.java.qb similarity index 100% rename from qiaoba-modules/qiaoba-module-generator/src/main/resources/vm/java/entity.java.qb rename to qiaoba-module/qiaoba-module-generator/src/main/resources/vm/java/entity.java.qb diff --git a/qiaoba-modules/qiaoba-module-generator/src/main/resources/vm/java/export.java.qb b/qiaoba-module/qiaoba-module-generator/src/main/resources/vm/java/export.java.qb similarity index 100% rename from qiaoba-modules/qiaoba-module-generator/src/main/resources/vm/java/export.java.qb rename to qiaoba-module/qiaoba-module-generator/src/main/resources/vm/java/export.java.qb diff --git a/qiaoba-modules/qiaoba-module-generator/src/main/resources/vm/java/mapper.java.qb b/qiaoba-module/qiaoba-module-generator/src/main/resources/vm/java/mapper.java.qb similarity index 100% rename from qiaoba-modules/qiaoba-module-generator/src/main/resources/vm/java/mapper.java.qb rename to qiaoba-module/qiaoba-module-generator/src/main/resources/vm/java/mapper.java.qb diff --git a/qiaoba-modules/qiaoba-module-generator/src/main/resources/vm/java/param.java.qb b/qiaoba-module/qiaoba-module-generator/src/main/resources/vm/java/param.java.qb similarity index 100% rename from qiaoba-modules/qiaoba-module-generator/src/main/resources/vm/java/param.java.qb rename to qiaoba-module/qiaoba-module-generator/src/main/resources/vm/java/param.java.qb diff --git a/qiaoba-modules/qiaoba-module-generator/src/main/resources/vm/java/service.java.qb b/qiaoba-module/qiaoba-module-generator/src/main/resources/vm/java/service.java.qb similarity index 100% rename from qiaoba-modules/qiaoba-module-generator/src/main/resources/vm/java/service.java.qb rename to qiaoba-module/qiaoba-module-generator/src/main/resources/vm/java/service.java.qb diff --git a/qiaoba-modules/qiaoba-module-generator/src/main/resources/vm/java/serviceImpl.java.qb b/qiaoba-module/qiaoba-module-generator/src/main/resources/vm/java/serviceImpl.java.qb similarity index 98% rename from qiaoba-modules/qiaoba-module-generator/src/main/resources/vm/java/serviceImpl.java.qb rename to qiaoba-module/qiaoba-module-generator/src/main/resources/vm/java/serviceImpl.java.qb index bde1c3c..71391dc 100644 --- a/qiaoba-modules/qiaoba-module-generator/src/main/resources/vm/java/serviceImpl.java.qb +++ b/qiaoba-module/qiaoba-module-generator/src/main/resources/vm/java/serviceImpl.java.qb @@ -5,7 +5,7 @@ import java.util.*; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.qiaoba.api.auth.utils.SecurityUtil; -import com.qiaoba.common.base.exceptions.ServiceException; +import com.qiaoba.common.base.exception.ServiceException; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import com.qiaoba.common.database.entity.PageQuery; diff --git a/qiaoba-modules/qiaoba-module-generator/src/main/resources/vm/js/api.js.qb b/qiaoba-module/qiaoba-module-generator/src/main/resources/vm/js/api.js.qb similarity index 100% rename from qiaoba-modules/qiaoba-module-generator/src/main/resources/vm/js/api.js.qb rename to qiaoba-module/qiaoba-module-generator/src/main/resources/vm/js/api.js.qb diff --git a/qiaoba-modules/qiaoba-module-generator/src/main/resources/vm/sql/sql.qb b/qiaoba-module/qiaoba-module-generator/src/main/resources/vm/sql/sql.qb similarity index 100% rename from qiaoba-modules/qiaoba-module-generator/src/main/resources/vm/sql/sql.qb rename to qiaoba-module/qiaoba-module-generator/src/main/resources/vm/sql/sql.qb diff --git a/qiaoba-modules/qiaoba-module-generator/src/main/resources/vm/vue/index.qb b/qiaoba-module/qiaoba-module-generator/src/main/resources/vm/vue/index.qb similarity index 100% rename from qiaoba-modules/qiaoba-module-generator/src/main/resources/vm/vue/index.qb rename to qiaoba-module/qiaoba-module-generator/src/main/resources/vm/vue/index.qb diff --git a/qiaoba-modules/qiaoba-module-job/pom.xml b/qiaoba-module/qiaoba-module-job/pom.xml similarity index 100% rename from qiaoba-modules/qiaoba-module-job/pom.xml rename to qiaoba-module/qiaoba-module-job/pom.xml diff --git a/qiaoba-modules/qiaoba-module-job/src/main/java/.gitkeep b/qiaoba-module/qiaoba-module-job/src/main/java/.gitkeep similarity index 100% rename from qiaoba-modules/qiaoba-module-job/src/main/java/.gitkeep rename to qiaoba-module/qiaoba-module-job/src/main/java/.gitkeep diff --git a/qiaoba-modules/qiaoba-module-job/src/main/resources/.gitkeep b/qiaoba-module/qiaoba-module-job/src/main/resources/.gitkeep similarity index 100% rename from qiaoba-modules/qiaoba-module-job/src/main/resources/.gitkeep rename to qiaoba-module/qiaoba-module-job/src/main/resources/.gitkeep diff --git a/qiaoba-modules/qiaoba-module-job/src/test/java/.gitkeep b/qiaoba-module/qiaoba-module-job/src/test/java/.gitkeep similarity index 100% rename from qiaoba-modules/qiaoba-module-job/src/test/java/.gitkeep rename to qiaoba-module/qiaoba-module-job/src/test/java/.gitkeep diff --git a/qiaoba-modules/qiaoba-module-log/pom.xml b/qiaoba-module/qiaoba-module-log/pom.xml similarity index 100% rename from qiaoba-modules/qiaoba-module-log/pom.xml rename to qiaoba-module/qiaoba-module-log/pom.xml diff --git a/qiaoba-modules/qiaoba-module-log/src/main/java/com/qiaoba/module/log/aspect/LogAspect.java b/qiaoba-module/qiaoba-module-log/src/main/java/com/qiaoba/module/log/aspect/LogAspect.java similarity index 97% rename from qiaoba-modules/qiaoba-module-log/src/main/java/com/qiaoba/module/log/aspect/LogAspect.java rename to qiaoba-module/qiaoba-module-log/src/main/java/com/qiaoba/module/log/aspect/LogAspect.java index c85fba8..f8aa554 100644 --- a/qiaoba-modules/qiaoba-module-log/src/main/java/com/qiaoba/module/log/aspect/LogAspect.java +++ b/qiaoba-module/qiaoba-module-log/src/main/java/com/qiaoba/module/log/aspect/LogAspect.java @@ -1,7 +1,6 @@ package com.qiaoba.module.log.aspect; -import cn.hutool.core.thread.ThreadUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.extra.servlet.ServletUtil; @@ -9,7 +8,7 @@ import cn.hutool.json.JSONUtil; import com.qiaoba.api.auth.utils.TokenUtil; import com.qiaoba.api.job.annotation.Log; import com.qiaoba.common.base.enums.BaseEnum; -import com.qiaoba.common.web.utils.IpUtil; +import com.qiaoba.common.web.util.IpUtil; import com.qiaoba.module.log.entity.SysUseLog; import com.qiaoba.module.log.service.SysUserLogService; import lombok.RequiredArgsConstructor; @@ -19,7 +18,6 @@ import org.aspectj.lang.annotation.AfterThrowing; import org.aspectj.lang.annotation.Aspect; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpMethod; import org.springframework.stereotype.Component; import org.springframework.validation.BindingResult; diff --git a/qiaoba-modules/qiaoba-module-log/src/main/java/com/qiaoba/module/log/controller/SysUseLogController.java b/qiaoba-module/qiaoba-module-log/src/main/java/com/qiaoba/module/log/controller/SysUseLogController.java similarity index 97% rename from qiaoba-modules/qiaoba-module-log/src/main/java/com/qiaoba/module/log/controller/SysUseLogController.java rename to qiaoba-module/qiaoba-module-log/src/main/java/com/qiaoba/module/log/controller/SysUseLogController.java index f649b69..4c26399 100644 --- a/qiaoba-modules/qiaoba-module-log/src/main/java/com/qiaoba/module/log/controller/SysUseLogController.java +++ b/qiaoba-module/qiaoba-module-log/src/main/java/com/qiaoba/module/log/controller/SysUseLogController.java @@ -5,7 +5,7 @@ import com.qiaoba.api.job.enums.BusinessType; import com.qiaoba.common.base.result.AjaxResult; import com.qiaoba.common.database.entity.PageQuery; import com.qiaoba.common.database.entity.TableDataInfo; -import com.qiaoba.common.poi.utils.ExcelUtil; +import com.qiaoba.common.poi.util.ExcelUtil; import com.qiaoba.module.log.entity.SysUseLog; import com.qiaoba.module.log.entity.param.SysUseLogParam; import com.qiaoba.module.log.service.SysUserLogService; diff --git a/qiaoba-modules/qiaoba-module-log/src/main/java/com/qiaoba/module/log/entity/SysUseLog.java b/qiaoba-module/qiaoba-module-log/src/main/java/com/qiaoba/module/log/entity/SysUseLog.java similarity index 100% rename from qiaoba-modules/qiaoba-module-log/src/main/java/com/qiaoba/module/log/entity/SysUseLog.java rename to qiaoba-module/qiaoba-module-log/src/main/java/com/qiaoba/module/log/entity/SysUseLog.java diff --git a/qiaoba-modules/qiaoba-module-log/src/main/java/com/qiaoba/module/log/entity/param/SysUseLogParam.java b/qiaoba-module/qiaoba-module-log/src/main/java/com/qiaoba/module/log/entity/param/SysUseLogParam.java similarity index 100% rename from qiaoba-modules/qiaoba-module-log/src/main/java/com/qiaoba/module/log/entity/param/SysUseLogParam.java rename to qiaoba-module/qiaoba-module-log/src/main/java/com/qiaoba/module/log/entity/param/SysUseLogParam.java diff --git a/qiaoba-modules/qiaoba-module-log/src/main/java/com/qiaoba/module/log/mapper/SysUserLogMapper.java b/qiaoba-module/qiaoba-module-log/src/main/java/com/qiaoba/module/log/mapper/SysUserLogMapper.java similarity index 100% rename from qiaoba-modules/qiaoba-module-log/src/main/java/com/qiaoba/module/log/mapper/SysUserLogMapper.java rename to qiaoba-module/qiaoba-module-log/src/main/java/com/qiaoba/module/log/mapper/SysUserLogMapper.java diff --git a/qiaoba-modules/qiaoba-module-log/src/main/java/com/qiaoba/module/log/service/SysUserLogService.java b/qiaoba-module/qiaoba-module-log/src/main/java/com/qiaoba/module/log/service/SysUserLogService.java similarity index 100% rename from qiaoba-modules/qiaoba-module-log/src/main/java/com/qiaoba/module/log/service/SysUserLogService.java rename to qiaoba-module/qiaoba-module-log/src/main/java/com/qiaoba/module/log/service/SysUserLogService.java diff --git a/qiaoba-modules/qiaoba-module-log/src/main/java/com/qiaoba/module/log/service/impl/SysUserLogServiceImpl.java b/qiaoba-module/qiaoba-module-log/src/main/java/com/qiaoba/module/log/service/impl/SysUserLogServiceImpl.java similarity index 100% rename from qiaoba-modules/qiaoba-module-log/src/main/java/com/qiaoba/module/log/service/impl/SysUserLogServiceImpl.java rename to qiaoba-module/qiaoba-module-log/src/main/java/com/qiaoba/module/log/service/impl/SysUserLogServiceImpl.java diff --git a/qiaoba-modules/qiaoba-module-monitor/pom.xml b/qiaoba-module/qiaoba-module-monitor/pom.xml similarity index 100% rename from qiaoba-modules/qiaoba-module-monitor/pom.xml rename to qiaoba-module/qiaoba-module-monitor/pom.xml diff --git a/qiaoba-modules/qiaoba-module-monitor/src/main/java/com/qiaoba/module/monitor/controller/OnlineUserController.java b/qiaoba-module/qiaoba-module-monitor/src/main/java/com/qiaoba/module/monitor/controller/OnlineUserController.java similarity index 100% rename from qiaoba-modules/qiaoba-module-monitor/src/main/java/com/qiaoba/module/monitor/controller/OnlineUserController.java rename to qiaoba-module/qiaoba-module-monitor/src/main/java/com/qiaoba/module/monitor/controller/OnlineUserController.java diff --git a/qiaoba-modules/qiaoba-module-monitor/src/main/java/com/qiaoba/module/monitor/controller/SysLoginLogController.java b/qiaoba-module/qiaoba-module-monitor/src/main/java/com/qiaoba/module/monitor/controller/SysLoginLogController.java similarity index 97% rename from qiaoba-modules/qiaoba-module-monitor/src/main/java/com/qiaoba/module/monitor/controller/SysLoginLogController.java rename to qiaoba-module/qiaoba-module-monitor/src/main/java/com/qiaoba/module/monitor/controller/SysLoginLogController.java index 665945e..8454529 100644 --- a/qiaoba-modules/qiaoba-module-monitor/src/main/java/com/qiaoba/module/monitor/controller/SysLoginLogController.java +++ b/qiaoba-module/qiaoba-module-monitor/src/main/java/com/qiaoba/module/monitor/controller/SysLoginLogController.java @@ -5,7 +5,7 @@ import com.qiaoba.api.monitor.entity.param.LoginLogParam; import com.qiaoba.common.base.result.AjaxResult; import com.qiaoba.common.database.entity.PageQuery; import com.qiaoba.common.database.entity.TableDataInfo; -import com.qiaoba.common.poi.utils.ExcelUtil; +import com.qiaoba.common.poi.util.ExcelUtil; import com.qiaoba.module.monitor.service.SysLoginLogService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/qiaoba-modules/qiaoba-module-monitor/src/main/java/com/qiaoba/module/monitor/mapper/SysLoginLogMapper.java b/qiaoba-module/qiaoba-module-monitor/src/main/java/com/qiaoba/module/monitor/mapper/SysLoginLogMapper.java similarity index 100% rename from qiaoba-modules/qiaoba-module-monitor/src/main/java/com/qiaoba/module/monitor/mapper/SysLoginLogMapper.java rename to qiaoba-module/qiaoba-module-monitor/src/main/java/com/qiaoba/module/monitor/mapper/SysLoginLogMapper.java diff --git a/qiaoba-modules/qiaoba-module-monitor/src/main/java/com/qiaoba/module/monitor/service/SysLoginLogService.java b/qiaoba-module/qiaoba-module-monitor/src/main/java/com/qiaoba/module/monitor/service/SysLoginLogService.java similarity index 100% rename from qiaoba-modules/qiaoba-module-monitor/src/main/java/com/qiaoba/module/monitor/service/SysLoginLogService.java rename to qiaoba-module/qiaoba-module-monitor/src/main/java/com/qiaoba/module/monitor/service/SysLoginLogService.java diff --git a/qiaoba-modules/qiaoba-module-monitor/src/main/java/com/qiaoba/module/monitor/service/impl/SysLoginLogServiceImpl.java b/qiaoba-module/qiaoba-module-monitor/src/main/java/com/qiaoba/module/monitor/service/impl/SysLoginLogServiceImpl.java similarity index 100% rename from qiaoba-modules/qiaoba-module-monitor/src/main/java/com/qiaoba/module/monitor/service/impl/SysLoginLogServiceImpl.java rename to qiaoba-module/qiaoba-module-monitor/src/main/java/com/qiaoba/module/monitor/service/impl/SysLoginLogServiceImpl.java diff --git a/qiaoba-modules/qiaoba-module-system/pom.xml b/qiaoba-module/qiaoba-module-system/pom.xml similarity index 100% rename from qiaoba-modules/qiaoba-module-system/pom.xml rename to qiaoba-module/qiaoba-module-system/pom.xml diff --git a/qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/controller/SysConfigController.java b/qiaoba-module/qiaoba-module-system/src/main/java/com/qiaoba/module/system/controller/SysConfigController.java similarity index 98% rename from qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/controller/SysConfigController.java rename to qiaoba-module/qiaoba-module-system/src/main/java/com/qiaoba/module/system/controller/SysConfigController.java index 483c68b..9d5bbaf 100644 --- a/qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/controller/SysConfigController.java +++ b/qiaoba-module/qiaoba-module-system/src/main/java/com/qiaoba/module/system/controller/SysConfigController.java @@ -7,7 +7,7 @@ import com.qiaoba.common.base.validate.AddGroup; import com.qiaoba.common.base.validate.EditGroup; import com.qiaoba.common.database.entity.PageQuery; import com.qiaoba.common.database.entity.TableDataInfo; -import com.qiaoba.common.poi.utils.ExcelUtil; +import com.qiaoba.common.poi.util.ExcelUtil; import com.qiaoba.module.system.service.SysConfigService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/controller/SysDeptController.java b/qiaoba-module/qiaoba-module-system/src/main/java/com/qiaoba/module/system/controller/SysDeptController.java similarity index 100% rename from qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/controller/SysDeptController.java rename to qiaoba-module/qiaoba-module-system/src/main/java/com/qiaoba/module/system/controller/SysDeptController.java diff --git a/qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/controller/SysDictDataController.java b/qiaoba-module/qiaoba-module-system/src/main/java/com/qiaoba/module/system/controller/SysDictDataController.java similarity index 98% rename from qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/controller/SysDictDataController.java rename to qiaoba-module/qiaoba-module-system/src/main/java/com/qiaoba/module/system/controller/SysDictDataController.java index e26c3de..0d4b22d 100644 --- a/qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/controller/SysDictDataController.java +++ b/qiaoba-module/qiaoba-module-system/src/main/java/com/qiaoba/module/system/controller/SysDictDataController.java @@ -7,7 +7,7 @@ import com.qiaoba.common.base.validate.AddGroup; import com.qiaoba.common.base.validate.EditGroup; import com.qiaoba.common.database.entity.PageQuery; import com.qiaoba.common.database.entity.TableDataInfo; -import com.qiaoba.common.poi.utils.ExcelUtil; +import com.qiaoba.common.poi.util.ExcelUtil; import com.qiaoba.module.system.service.SysDictDataService; import lombok.RequiredArgsConstructor; import org.springframework.security.access.prepost.PreAuthorize; diff --git a/qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/controller/SysDictTypeController.java b/qiaoba-module/qiaoba-module-system/src/main/java/com/qiaoba/module/system/controller/SysDictTypeController.java similarity index 98% rename from qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/controller/SysDictTypeController.java rename to qiaoba-module/qiaoba-module-system/src/main/java/com/qiaoba/module/system/controller/SysDictTypeController.java index c24fa0a..dc84161 100644 --- a/qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/controller/SysDictTypeController.java +++ b/qiaoba-module/qiaoba-module-system/src/main/java/com/qiaoba/module/system/controller/SysDictTypeController.java @@ -7,7 +7,7 @@ import com.qiaoba.common.base.validate.AddGroup; import com.qiaoba.common.base.validate.EditGroup; import com.qiaoba.common.database.entity.PageQuery; import com.qiaoba.common.database.entity.TableDataInfo; -import com.qiaoba.common.poi.utils.ExcelUtil; +import com.qiaoba.common.poi.util.ExcelUtil; import com.qiaoba.module.system.service.SysDictDataService; import com.qiaoba.module.system.service.SysDictTypeService; import lombok.RequiredArgsConstructor; diff --git a/qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/controller/SysMenuController.java b/qiaoba-module/qiaoba-module-system/src/main/java/com/qiaoba/module/system/controller/SysMenuController.java similarity index 100% rename from qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/controller/SysMenuController.java rename to qiaoba-module/qiaoba-module-system/src/main/java/com/qiaoba/module/system/controller/SysMenuController.java diff --git a/qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/controller/SysPostController.java b/qiaoba-module/qiaoba-module-system/src/main/java/com/qiaoba/module/system/controller/SysPostController.java similarity index 98% rename from qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/controller/SysPostController.java rename to qiaoba-module/qiaoba-module-system/src/main/java/com/qiaoba/module/system/controller/SysPostController.java index f86f2d9..40957ad 100644 --- a/qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/controller/SysPostController.java +++ b/qiaoba-module/qiaoba-module-system/src/main/java/com/qiaoba/module/system/controller/SysPostController.java @@ -7,7 +7,7 @@ import com.qiaoba.common.base.validate.AddGroup; import com.qiaoba.common.base.validate.EditGroup; import com.qiaoba.common.database.entity.PageQuery; import com.qiaoba.common.database.entity.TableDataInfo; -import com.qiaoba.common.poi.utils.ExcelUtil; +import com.qiaoba.common.poi.util.ExcelUtil; import com.qiaoba.module.system.service.SysPostService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/controller/SysProfileController.java b/qiaoba-module/qiaoba-module-system/src/main/java/com/qiaoba/module/system/controller/SysProfileController.java similarity index 100% rename from qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/controller/SysProfileController.java rename to qiaoba-module/qiaoba-module-system/src/main/java/com/qiaoba/module/system/controller/SysProfileController.java diff --git a/qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/controller/SysRoleController.java b/qiaoba-module/qiaoba-module-system/src/main/java/com/qiaoba/module/system/controller/SysRoleController.java similarity index 99% rename from qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/controller/SysRoleController.java rename to qiaoba-module/qiaoba-module-system/src/main/java/com/qiaoba/module/system/controller/SysRoleController.java index fcb1fda..ee551be 100644 --- a/qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/controller/SysRoleController.java +++ b/qiaoba-module/qiaoba-module-system/src/main/java/com/qiaoba/module/system/controller/SysRoleController.java @@ -10,7 +10,7 @@ import com.qiaoba.common.base.validate.AddGroup; import com.qiaoba.common.base.validate.EditGroup; import com.qiaoba.common.database.entity.PageQuery; import com.qiaoba.common.database.entity.TableDataInfo; -import com.qiaoba.common.poi.utils.ExcelUtil; +import com.qiaoba.common.poi.util.ExcelUtil; import com.qiaoba.module.system.service.SysRoleService; import com.qiaoba.module.system.service.SysUserRoleService; import com.qiaoba.module.system.service.SysUserService; diff --git a/qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/controller/SysUserController.java b/qiaoba-module/qiaoba-module-system/src/main/java/com/qiaoba/module/system/controller/SysUserController.java similarity index 99% rename from qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/controller/SysUserController.java rename to qiaoba-module/qiaoba-module-system/src/main/java/com/qiaoba/module/system/controller/SysUserController.java index bf7f798..d18ca24 100644 --- a/qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/controller/SysUserController.java +++ b/qiaoba-module/qiaoba-module-system/src/main/java/com/qiaoba/module/system/controller/SysUserController.java @@ -18,7 +18,7 @@ import com.qiaoba.common.base.validate.AddGroup; import com.qiaoba.common.base.validate.EditGroup; import com.qiaoba.common.database.entity.PageQuery; import com.qiaoba.common.database.entity.TableDataInfo; -import com.qiaoba.common.poi.utils.ExcelUtil; +import com.qiaoba.common.poi.util.ExcelUtil; import com.qiaoba.module.system.service.*; import com.qiaoba.module.system.templates.SysUserExport; import com.qiaoba.module.system.templates.SysUserImport; diff --git a/qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/mapper/SysConfigMapper.java b/qiaoba-module/qiaoba-module-system/src/main/java/com/qiaoba/module/system/mapper/SysConfigMapper.java similarity index 91% rename from qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/mapper/SysConfigMapper.java rename to qiaoba-module/qiaoba-module-system/src/main/java/com/qiaoba/module/system/mapper/SysConfigMapper.java index 30929f5..3b98fff 100644 --- a/qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/mapper/SysConfigMapper.java +++ b/qiaoba-module/qiaoba-module-system/src/main/java/com/qiaoba/module/system/mapper/SysConfigMapper.java @@ -2,7 +2,7 @@ package com.qiaoba.module.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.qiaoba.api.system.entity.SysConfig; -import com.qiaoba.common.database.annotations.SelectOneRow; +import com.qiaoba.common.database.annotation.SelectOneRow; import java.util.List; diff --git a/qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/mapper/SysDeptMapper.java b/qiaoba-module/qiaoba-module-system/src/main/java/com/qiaoba/module/system/mapper/SysDeptMapper.java similarity index 94% rename from qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/mapper/SysDeptMapper.java rename to qiaoba-module/qiaoba-module-system/src/main/java/com/qiaoba/module/system/mapper/SysDeptMapper.java index ee2d908..b50e2d1 100644 --- a/qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/mapper/SysDeptMapper.java +++ b/qiaoba-module/qiaoba-module-system/src/main/java/com/qiaoba/module/system/mapper/SysDeptMapper.java @@ -2,7 +2,7 @@ package com.qiaoba.module.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.qiaoba.api.system.entity.SysDept; -import com.qiaoba.common.database.annotations.SelectOneRow; +import com.qiaoba.common.database.annotation.SelectOneRow; import java.util.List; diff --git a/qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/mapper/SysDictDataMapper.java b/qiaoba-module/qiaoba-module-system/src/main/java/com/qiaoba/module/system/mapper/SysDictDataMapper.java similarity index 92% rename from qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/mapper/SysDictDataMapper.java rename to qiaoba-module/qiaoba-module-system/src/main/java/com/qiaoba/module/system/mapper/SysDictDataMapper.java index d8afce6..026c7c2 100644 --- a/qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/mapper/SysDictDataMapper.java +++ b/qiaoba-module/qiaoba-module-system/src/main/java/com/qiaoba/module/system/mapper/SysDictDataMapper.java @@ -2,7 +2,7 @@ package com.qiaoba.module.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.qiaoba.api.system.entity.SysDictData; -import com.qiaoba.common.database.annotations.SelectOneRow; +import com.qiaoba.common.database.annotation.SelectOneRow; /** * 字典数据管理 数据层 diff --git a/qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/mapper/SysDictTypeMapper.java b/qiaoba-module/qiaoba-module-system/src/main/java/com/qiaoba/module/system/mapper/SysDictTypeMapper.java similarity index 92% rename from qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/mapper/SysDictTypeMapper.java rename to qiaoba-module/qiaoba-module-system/src/main/java/com/qiaoba/module/system/mapper/SysDictTypeMapper.java index d7f1139..60109da 100644 --- a/qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/mapper/SysDictTypeMapper.java +++ b/qiaoba-module/qiaoba-module-system/src/main/java/com/qiaoba/module/system/mapper/SysDictTypeMapper.java @@ -2,7 +2,7 @@ package com.qiaoba.module.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.qiaoba.api.system.entity.SysDictType; -import com.qiaoba.common.database.annotations.SelectOneRow; +import com.qiaoba.common.database.annotation.SelectOneRow; import java.util.List; diff --git a/qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/mapper/SysMenuMapper.java b/qiaoba-module/qiaoba-module-system/src/main/java/com/qiaoba/module/system/mapper/SysMenuMapper.java similarity index 96% rename from qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/mapper/SysMenuMapper.java rename to qiaoba-module/qiaoba-module-system/src/main/java/com/qiaoba/module/system/mapper/SysMenuMapper.java index c62cf79..078d82a 100644 --- a/qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/mapper/SysMenuMapper.java +++ b/qiaoba-module/qiaoba-module-system/src/main/java/com/qiaoba/module/system/mapper/SysMenuMapper.java @@ -3,7 +3,7 @@ package com.qiaoba.module.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.qiaoba.api.system.entity.SysMenu; import com.qiaoba.api.system.entity.vo.SysMenuVo; -import com.qiaoba.common.database.annotations.SelectOneRow; +import com.qiaoba.common.database.annotation.SelectOneRow; import java.util.List; import java.util.Set; diff --git a/qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/mapper/SysPostMapper.java b/qiaoba-module/qiaoba-module-system/src/main/java/com/qiaoba/module/system/mapper/SysPostMapper.java similarity index 91% rename from qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/mapper/SysPostMapper.java rename to qiaoba-module/qiaoba-module-system/src/main/java/com/qiaoba/module/system/mapper/SysPostMapper.java index da3a15a..3770042 100644 --- a/qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/mapper/SysPostMapper.java +++ b/qiaoba-module/qiaoba-module-system/src/main/java/com/qiaoba/module/system/mapper/SysPostMapper.java @@ -2,7 +2,7 @@ package com.qiaoba.module.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.qiaoba.api.system.entity.SysPost; -import com.qiaoba.common.database.annotations.SelectOneRow; +import com.qiaoba.common.database.annotation.SelectOneRow; /** * 岗位管理 数据层 diff --git a/qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/mapper/SysRoleDeptMapper.java b/qiaoba-module/qiaoba-module-system/src/main/java/com/qiaoba/module/system/mapper/SysRoleDeptMapper.java similarity index 100% rename from qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/mapper/SysRoleDeptMapper.java rename to qiaoba-module/qiaoba-module-system/src/main/java/com/qiaoba/module/system/mapper/SysRoleDeptMapper.java diff --git a/qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/mapper/SysRoleMapper.java b/qiaoba-module/qiaoba-module-system/src/main/java/com/qiaoba/module/system/mapper/SysRoleMapper.java similarity index 94% rename from qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/mapper/SysRoleMapper.java rename to qiaoba-module/qiaoba-module-system/src/main/java/com/qiaoba/module/system/mapper/SysRoleMapper.java index 6ac2fe1..08d3a15 100644 --- a/qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/mapper/SysRoleMapper.java +++ b/qiaoba-module/qiaoba-module-system/src/main/java/com/qiaoba/module/system/mapper/SysRoleMapper.java @@ -2,7 +2,7 @@ package com.qiaoba.module.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.qiaoba.api.system.entity.SysRole; -import com.qiaoba.common.database.annotations.SelectOneRow; +import com.qiaoba.common.database.annotation.SelectOneRow; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/mapper/SysRoleMenuMapper.java b/qiaoba-module/qiaoba-module-system/src/main/java/com/qiaoba/module/system/mapper/SysRoleMenuMapper.java similarity index 100% rename from qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/mapper/SysRoleMenuMapper.java rename to qiaoba-module/qiaoba-module-system/src/main/java/com/qiaoba/module/system/mapper/SysRoleMenuMapper.java diff --git a/qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/mapper/SysUserMapper.java b/qiaoba-module/qiaoba-module-system/src/main/java/com/qiaoba/module/system/mapper/SysUserMapper.java similarity index 97% rename from qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/mapper/SysUserMapper.java rename to qiaoba-module/qiaoba-module-system/src/main/java/com/qiaoba/module/system/mapper/SysUserMapper.java index f5603e0..16c32af 100644 --- a/qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/mapper/SysUserMapper.java +++ b/qiaoba-module/qiaoba-module-system/src/main/java/com/qiaoba/module/system/mapper/SysUserMapper.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.qiaoba.api.system.entity.SysUser; import com.qiaoba.api.system.entity.param.SysUserParam; import com.qiaoba.api.system.entity.vo.SysUserVo; -import com.qiaoba.common.database.annotations.SelectOneRow; +import com.qiaoba.common.database.annotation.SelectOneRow; import com.qiaoba.module.system.templates.SysUserExport; import org.apache.ibatis.annotations.Param; diff --git a/qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/mapper/SysUserPostMapper.java b/qiaoba-module/qiaoba-module-system/src/main/java/com/qiaoba/module/system/mapper/SysUserPostMapper.java similarity index 100% rename from qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/mapper/SysUserPostMapper.java rename to qiaoba-module/qiaoba-module-system/src/main/java/com/qiaoba/module/system/mapper/SysUserPostMapper.java diff --git a/qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/mapper/SysUserRoleMapper.java b/qiaoba-module/qiaoba-module-system/src/main/java/com/qiaoba/module/system/mapper/SysUserRoleMapper.java similarity index 100% rename from qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/mapper/SysUserRoleMapper.java rename to qiaoba-module/qiaoba-module-system/src/main/java/com/qiaoba/module/system/mapper/SysUserRoleMapper.java diff --git a/qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/runner/SyncDataToCacheRunner.java b/qiaoba-module/qiaoba-module-system/src/main/java/com/qiaoba/module/system/runner/SyncDataToCacheRunner.java similarity index 97% rename from qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/runner/SyncDataToCacheRunner.java rename to qiaoba-module/qiaoba-module-system/src/main/java/com/qiaoba/module/system/runner/SyncDataToCacheRunner.java index 8193428..e02cad9 100644 --- a/qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/runner/SyncDataToCacheRunner.java +++ b/qiaoba-module/qiaoba-module-system/src/main/java/com/qiaoba/module/system/runner/SyncDataToCacheRunner.java @@ -4,7 +4,7 @@ import com.qiaoba.api.tenant.entity.SysTenant; import com.qiaoba.api.tenant.entity.param.SysTenantParam; import com.qiaoba.api.tenant.service.SysTenantApiService; import com.qiaoba.api.tenant.utils.TenantUtil; -import com.qiaoba.common.base.constants.TenantConstant; +import com.qiaoba.common.base.constant.TenantConstant; import com.qiaoba.common.base.context.BaseContext; import com.qiaoba.module.system.service.SysConfigService; import lombok.RequiredArgsConstructor; diff --git a/qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/service/SysConfigService.java b/qiaoba-module/qiaoba-module-system/src/main/java/com/qiaoba/module/system/service/SysConfigService.java similarity index 100% rename from qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/service/SysConfigService.java rename to qiaoba-module/qiaoba-module-system/src/main/java/com/qiaoba/module/system/service/SysConfigService.java diff --git a/qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/service/SysDeptService.java b/qiaoba-module/qiaoba-module-system/src/main/java/com/qiaoba/module/system/service/SysDeptService.java similarity index 100% rename from qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/service/SysDeptService.java rename to qiaoba-module/qiaoba-module-system/src/main/java/com/qiaoba/module/system/service/SysDeptService.java diff --git a/qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/service/SysDictDataService.java b/qiaoba-module/qiaoba-module-system/src/main/java/com/qiaoba/module/system/service/SysDictDataService.java similarity index 100% rename from qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/service/SysDictDataService.java rename to qiaoba-module/qiaoba-module-system/src/main/java/com/qiaoba/module/system/service/SysDictDataService.java diff --git a/qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/service/SysDictTypeService.java b/qiaoba-module/qiaoba-module-system/src/main/java/com/qiaoba/module/system/service/SysDictTypeService.java similarity index 100% rename from qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/service/SysDictTypeService.java rename to qiaoba-module/qiaoba-module-system/src/main/java/com/qiaoba/module/system/service/SysDictTypeService.java diff --git a/qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/service/SysMenuService.java b/qiaoba-module/qiaoba-module-system/src/main/java/com/qiaoba/module/system/service/SysMenuService.java similarity index 100% rename from qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/service/SysMenuService.java rename to qiaoba-module/qiaoba-module-system/src/main/java/com/qiaoba/module/system/service/SysMenuService.java diff --git a/qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/service/SysPostService.java b/qiaoba-module/qiaoba-module-system/src/main/java/com/qiaoba/module/system/service/SysPostService.java similarity index 100% rename from qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/service/SysPostService.java rename to qiaoba-module/qiaoba-module-system/src/main/java/com/qiaoba/module/system/service/SysPostService.java diff --git a/qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/service/SysProfileService.java b/qiaoba-module/qiaoba-module-system/src/main/java/com/qiaoba/module/system/service/SysProfileService.java similarity index 100% rename from qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/service/SysProfileService.java rename to qiaoba-module/qiaoba-module-system/src/main/java/com/qiaoba/module/system/service/SysProfileService.java diff --git a/qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/service/SysRoleDeptService.java b/qiaoba-module/qiaoba-module-system/src/main/java/com/qiaoba/module/system/service/SysRoleDeptService.java similarity index 100% rename from qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/service/SysRoleDeptService.java rename to qiaoba-module/qiaoba-module-system/src/main/java/com/qiaoba/module/system/service/SysRoleDeptService.java diff --git a/qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/service/SysRoleMenuService.java b/qiaoba-module/qiaoba-module-system/src/main/java/com/qiaoba/module/system/service/SysRoleMenuService.java similarity index 100% rename from qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/service/SysRoleMenuService.java rename to qiaoba-module/qiaoba-module-system/src/main/java/com/qiaoba/module/system/service/SysRoleMenuService.java diff --git a/qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/service/SysRoleService.java b/qiaoba-module/qiaoba-module-system/src/main/java/com/qiaoba/module/system/service/SysRoleService.java similarity index 100% rename from qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/service/SysRoleService.java rename to qiaoba-module/qiaoba-module-system/src/main/java/com/qiaoba/module/system/service/SysRoleService.java diff --git a/qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/service/SysUserImportService.java b/qiaoba-module/qiaoba-module-system/src/main/java/com/qiaoba/module/system/service/SysUserImportService.java similarity index 100% rename from qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/service/SysUserImportService.java rename to qiaoba-module/qiaoba-module-system/src/main/java/com/qiaoba/module/system/service/SysUserImportService.java diff --git a/qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/service/SysUserPostService.java b/qiaoba-module/qiaoba-module-system/src/main/java/com/qiaoba/module/system/service/SysUserPostService.java similarity index 100% rename from qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/service/SysUserPostService.java rename to qiaoba-module/qiaoba-module-system/src/main/java/com/qiaoba/module/system/service/SysUserPostService.java diff --git a/qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/service/SysUserRoleService.java b/qiaoba-module/qiaoba-module-system/src/main/java/com/qiaoba/module/system/service/SysUserRoleService.java similarity index 100% rename from qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/service/SysUserRoleService.java rename to qiaoba-module/qiaoba-module-system/src/main/java/com/qiaoba/module/system/service/SysUserRoleService.java diff --git a/qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/service/SysUserService.java b/qiaoba-module/qiaoba-module-system/src/main/java/com/qiaoba/module/system/service/SysUserService.java similarity index 100% rename from qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/service/SysUserService.java rename to qiaoba-module/qiaoba-module-system/src/main/java/com/qiaoba/module/system/service/SysUserService.java diff --git a/qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/service/impl/SysConfigServiceImpl.java b/qiaoba-module/qiaoba-module-system/src/main/java/com/qiaoba/module/system/service/impl/SysConfigServiceImpl.java similarity index 96% rename from qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/service/impl/SysConfigServiceImpl.java rename to qiaoba-module/qiaoba-module-system/src/main/java/com/qiaoba/module/system/service/impl/SysConfigServiceImpl.java index 6446edd..c8007d9 100644 --- a/qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/service/impl/SysConfigServiceImpl.java +++ b/qiaoba-module/qiaoba-module-system/src/main/java/com/qiaoba/module/system/service/impl/SysConfigServiceImpl.java @@ -7,9 +7,9 @@ import com.qiaoba.api.system.entity.SysConfig; import com.qiaoba.api.system.entity.param.SysConfigParam; import com.qiaoba.api.auth.utils.SecurityUtil; import com.qiaoba.common.base.code.ConfigErrorCode; -import com.qiaoba.common.base.constants.BaseConstant; -import com.qiaoba.common.base.constants.ConfigConstant; -import com.qiaoba.common.base.exceptions.ServiceException; +import com.qiaoba.common.base.constant.BaseConstant; +import com.qiaoba.common.base.constant.ConfigConstant; +import com.qiaoba.common.base.exception.ServiceException; import com.qiaoba.common.database.entity.PageQuery; import com.qiaoba.common.database.entity.TableDataInfo; import com.qiaoba.common.redis.service.RedisService; diff --git a/qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/service/impl/SysDeptServiceImpl.java b/qiaoba-module/qiaoba-module-system/src/main/java/com/qiaoba/module/system/service/impl/SysDeptServiceImpl.java similarity index 98% rename from qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/service/impl/SysDeptServiceImpl.java rename to qiaoba-module/qiaoba-module-system/src/main/java/com/qiaoba/module/system/service/impl/SysDeptServiceImpl.java index d8109bb..a442643 100644 --- a/qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/service/impl/SysDeptServiceImpl.java +++ b/qiaoba-module/qiaoba-module-system/src/main/java/com/qiaoba/module/system/service/impl/SysDeptServiceImpl.java @@ -10,9 +10,9 @@ import com.baomidou.mybatisplus.extension.toolkit.Db; import com.qiaoba.api.system.entity.SysDept; import com.qiaoba.api.system.entity.param.SysDeptParam; import com.qiaoba.api.auth.utils.SecurityUtil; -import com.qiaoba.common.base.constants.BaseConstant; +import com.qiaoba.common.base.constant.BaseConstant; import com.qiaoba.common.base.enums.BaseEnum; -import com.qiaoba.common.base.exceptions.ServiceException; +import com.qiaoba.common.base.exception.ServiceException; import com.qiaoba.module.system.mapper.SysDeptMapper; import com.qiaoba.module.system.service.SysDeptService; import lombok.RequiredArgsConstructor; diff --git a/qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/service/impl/SysDictDataServiceImpl.java b/qiaoba-module/qiaoba-module-system/src/main/java/com/qiaoba/module/system/service/impl/SysDictDataServiceImpl.java similarity index 96% rename from qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/service/impl/SysDictDataServiceImpl.java rename to qiaoba-module/qiaoba-module-system/src/main/java/com/qiaoba/module/system/service/impl/SysDictDataServiceImpl.java index 1c02461..011a28d 100644 --- a/qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/service/impl/SysDictDataServiceImpl.java +++ b/qiaoba-module/qiaoba-module-system/src/main/java/com/qiaoba/module/system/service/impl/SysDictDataServiceImpl.java @@ -5,12 +5,11 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.qiaoba.api.system.entity.SysDictData; -import com.qiaoba.api.system.entity.SysDictType; import com.qiaoba.api.system.entity.param.SysDictDataParam; import com.qiaoba.api.auth.utils.SecurityUtil; -import com.qiaoba.common.base.constants.BaseConstant; -import com.qiaoba.common.base.constants.DictConstant; -import com.qiaoba.common.base.exceptions.ServiceException; +import com.qiaoba.common.base.constant.BaseConstant; +import com.qiaoba.common.base.constant.DictConstant; +import com.qiaoba.common.base.exception.ServiceException; import com.qiaoba.common.database.entity.PageQuery; import com.qiaoba.common.database.entity.TableDataInfo; import com.qiaoba.common.redis.service.RedisService; diff --git a/qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/service/impl/SysDictTypeServiceImpl.java b/qiaoba-module/qiaoba-module-system/src/main/java/com/qiaoba/module/system/service/impl/SysDictTypeServiceImpl.java similarity index 98% rename from qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/service/impl/SysDictTypeServiceImpl.java rename to qiaoba-module/qiaoba-module-system/src/main/java/com/qiaoba/module/system/service/impl/SysDictTypeServiceImpl.java index e6be7c1..f1c3c3b 100644 --- a/qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/service/impl/SysDictTypeServiceImpl.java +++ b/qiaoba-module/qiaoba-module-system/src/main/java/com/qiaoba/module/system/service/impl/SysDictTypeServiceImpl.java @@ -6,7 +6,7 @@ import com.qiaoba.api.system.entity.SysDictType; import com.qiaoba.api.system.entity.param.SysDictTypeParam; import com.qiaoba.api.auth.utils.SecurityUtil; import com.qiaoba.common.base.code.DictErrorCode; -import com.qiaoba.common.base.exceptions.ServiceException; +import com.qiaoba.common.base.exception.ServiceException; import com.qiaoba.common.database.entity.PageQuery; import com.qiaoba.common.database.entity.TableDataInfo; import com.qiaoba.module.system.mapper.SysDictTypeMapper; diff --git a/qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/service/impl/SysMenuServiceImpl.java b/qiaoba-module/qiaoba-module-system/src/main/java/com/qiaoba/module/system/service/impl/SysMenuServiceImpl.java similarity index 96% rename from qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/service/impl/SysMenuServiceImpl.java rename to qiaoba-module/qiaoba-module-system/src/main/java/com/qiaoba/module/system/service/impl/SysMenuServiceImpl.java index 85b7e60..acaf907 100644 --- a/qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/service/impl/SysMenuServiceImpl.java +++ b/qiaoba-module/qiaoba-module-system/src/main/java/com/qiaoba/module/system/service/impl/SysMenuServiceImpl.java @@ -10,11 +10,11 @@ import com.qiaoba.api.system.entity.param.SysMenuParam; import com.qiaoba.api.system.entity.vo.RouterVo; import com.qiaoba.api.system.entity.vo.SysMenuVo; import com.qiaoba.api.auth.utils.SecurityUtil; -import com.qiaoba.common.base.constants.BaseConstant; -import com.qiaoba.common.base.exceptions.ServiceException; +import com.qiaoba.common.base.constant.BaseConstant; +import com.qiaoba.common.base.exception.ServiceException; import com.qiaoba.module.system.mapper.SysMenuMapper; import com.qiaoba.module.system.service.SysMenuService; -import com.qiaoba.module.system.utils.MenuUtil; +import com.qiaoba.module.system.util.MenuUtil; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; diff --git a/qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/service/impl/SysPostServiceImpl.java b/qiaoba-module/qiaoba-module-system/src/main/java/com/qiaoba/module/system/service/impl/SysPostServiceImpl.java similarity index 98% rename from qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/service/impl/SysPostServiceImpl.java rename to qiaoba-module/qiaoba-module-system/src/main/java/com/qiaoba/module/system/service/impl/SysPostServiceImpl.java index bf2d52b..bb45999 100644 --- a/qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/service/impl/SysPostServiceImpl.java +++ b/qiaoba-module/qiaoba-module-system/src/main/java/com/qiaoba/module/system/service/impl/SysPostServiceImpl.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.qiaoba.api.system.entity.SysPost; import com.qiaoba.api.system.entity.param.SysPostParam; import com.qiaoba.api.auth.utils.SecurityUtil; -import com.qiaoba.common.base.exceptions.ServiceException; +import com.qiaoba.common.base.exception.ServiceException; import com.qiaoba.common.database.entity.PageQuery; import com.qiaoba.common.database.entity.TableDataInfo; import com.qiaoba.module.system.mapper.SysPostMapper; diff --git a/qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/service/impl/SysProfileServiceImpl.java b/qiaoba-module/qiaoba-module-system/src/main/java/com/qiaoba/module/system/service/impl/SysProfileServiceImpl.java similarity index 97% rename from qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/service/impl/SysProfileServiceImpl.java rename to qiaoba-module/qiaoba-module-system/src/main/java/com/qiaoba/module/system/service/impl/SysProfileServiceImpl.java index 9d63d03..c9cb7a3 100644 --- a/qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/service/impl/SysProfileServiceImpl.java +++ b/qiaoba-module/qiaoba-module-system/src/main/java/com/qiaoba/module/system/service/impl/SysProfileServiceImpl.java @@ -5,7 +5,7 @@ import com.qiaoba.api.file.service.FileApiService; import com.qiaoba.api.system.entity.SysUser; import com.qiaoba.api.system.entity.dto.ResetUserBasicInfoDto; import com.qiaoba.api.auth.utils.SecurityUtil; -import com.qiaoba.common.base.exceptions.ServiceException; +import com.qiaoba.common.base.exception.ServiceException; import com.qiaoba.module.system.service.SysProfileService; import com.qiaoba.module.system.service.SysUserService; import lombok.RequiredArgsConstructor; diff --git a/qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/service/impl/SysRoleDeptServiceImpl.java b/qiaoba-module/qiaoba-module-system/src/main/java/com/qiaoba/module/system/service/impl/SysRoleDeptServiceImpl.java similarity index 100% rename from qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/service/impl/SysRoleDeptServiceImpl.java rename to qiaoba-module/qiaoba-module-system/src/main/java/com/qiaoba/module/system/service/impl/SysRoleDeptServiceImpl.java diff --git a/qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/service/impl/SysRoleMenuServiceImpl.java b/qiaoba-module/qiaoba-module-system/src/main/java/com/qiaoba/module/system/service/impl/SysRoleMenuServiceImpl.java similarity index 100% rename from qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/service/impl/SysRoleMenuServiceImpl.java rename to qiaoba-module/qiaoba-module-system/src/main/java/com/qiaoba/module/system/service/impl/SysRoleMenuServiceImpl.java diff --git a/qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/service/impl/SysRoleServiceImpl.java b/qiaoba-module/qiaoba-module-system/src/main/java/com/qiaoba/module/system/service/impl/SysRoleServiceImpl.java similarity index 99% rename from qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/service/impl/SysRoleServiceImpl.java rename to qiaoba-module/qiaoba-module-system/src/main/java/com/qiaoba/module/system/service/impl/SysRoleServiceImpl.java index ed00f65..a062c1c 100644 --- a/qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/service/impl/SysRoleServiceImpl.java +++ b/qiaoba-module/qiaoba-module-system/src/main/java/com/qiaoba/module/system/service/impl/SysRoleServiceImpl.java @@ -11,7 +11,7 @@ import com.qiaoba.api.system.entity.dto.DataScopeDto; import com.qiaoba.api.system.entity.dto.SysRoleDto; import com.qiaoba.api.system.entity.param.SysRoleParam; import com.qiaoba.api.auth.utils.SecurityUtil; -import com.qiaoba.common.base.exceptions.ServiceException; +import com.qiaoba.common.base.exception.ServiceException; import com.qiaoba.common.database.entity.PageQuery; import com.qiaoba.common.database.entity.TableDataInfo; import com.qiaoba.module.system.mapper.SysRoleMapper; diff --git a/qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/service/impl/SysUserDetailsServiceImpl.java b/qiaoba-module/qiaoba-module-system/src/main/java/com/qiaoba/module/system/service/impl/SysUserDetailsServiceImpl.java similarity index 100% rename from qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/service/impl/SysUserDetailsServiceImpl.java rename to qiaoba-module/qiaoba-module-system/src/main/java/com/qiaoba/module/system/service/impl/SysUserDetailsServiceImpl.java diff --git a/qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/service/impl/SysUserImportServiceImpl.java b/qiaoba-module/qiaoba-module-system/src/main/java/com/qiaoba/module/system/service/impl/SysUserImportServiceImpl.java similarity index 94% rename from qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/service/impl/SysUserImportServiceImpl.java rename to qiaoba-module/qiaoba-module-system/src/main/java/com/qiaoba/module/system/service/impl/SysUserImportServiceImpl.java index cc46136..cdaf81f 100644 --- a/qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/service/impl/SysUserImportServiceImpl.java +++ b/qiaoba-module/qiaoba-module-system/src/main/java/com/qiaoba/module/system/service/impl/SysUserImportServiceImpl.java @@ -3,9 +3,9 @@ package com.qiaoba.module.system.service.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.StrUtil; import com.qiaoba.api.system.entity.dto.SysUserDto; -import com.qiaoba.common.base.constants.BaseConstant; -import com.qiaoba.common.base.exceptions.ServiceException; -import com.qiaoba.common.base.utils.ObjectUtil; +import com.qiaoba.common.base.constant.BaseConstant; +import com.qiaoba.common.base.exception.ServiceException; +import com.qiaoba.common.base.util.ObjectUtil; import com.qiaoba.module.system.service.SysUserImportService; import com.qiaoba.module.system.service.SysUserService; import com.qiaoba.module.system.templates.SysUserImport; diff --git a/qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/service/impl/SysUserPostServiceImpl.java b/qiaoba-module/qiaoba-module-system/src/main/java/com/qiaoba/module/system/service/impl/SysUserPostServiceImpl.java similarity index 97% rename from qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/service/impl/SysUserPostServiceImpl.java rename to qiaoba-module/qiaoba-module-system/src/main/java/com/qiaoba/module/system/service/impl/SysUserPostServiceImpl.java index 8900893..302c4cc 100644 --- a/qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/service/impl/SysUserPostServiceImpl.java +++ b/qiaoba-module/qiaoba-module-system/src/main/java/com/qiaoba/module/system/service/impl/SysUserPostServiceImpl.java @@ -5,7 +5,7 @@ import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.toolkit.Db; import com.qiaoba.api.system.entity.SysUserPost; -import com.qiaoba.common.base.constants.BaseConstant; +import com.qiaoba.common.base.constant.BaseConstant; import com.qiaoba.module.system.mapper.SysUserPostMapper; import com.qiaoba.module.system.service.SysUserPostService; import lombok.RequiredArgsConstructor; diff --git a/qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/service/impl/SysUserRoleServiceImpl.java b/qiaoba-module/qiaoba-module-system/src/main/java/com/qiaoba/module/system/service/impl/SysUserRoleServiceImpl.java similarity index 98% rename from qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/service/impl/SysUserRoleServiceImpl.java rename to qiaoba-module/qiaoba-module-system/src/main/java/com/qiaoba/module/system/service/impl/SysUserRoleServiceImpl.java index c820258..504e8d2 100644 --- a/qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/service/impl/SysUserRoleServiceImpl.java +++ b/qiaoba-module/qiaoba-module-system/src/main/java/com/qiaoba/module/system/service/impl/SysUserRoleServiceImpl.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.toolkit.Db; import com.qiaoba.api.system.entity.SysUserRole; import com.qiaoba.api.auth.entity.dto.RoleDto; -import com.qiaoba.common.base.constants.BaseConstant; +import com.qiaoba.common.base.constant.BaseConstant; import com.qiaoba.common.base.enums.BaseEnum; import com.qiaoba.module.system.mapper.SysUserRoleMapper; import com.qiaoba.module.system.service.SysUserRoleService; diff --git a/qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/service/impl/SysUserServiceImpl.java b/qiaoba-module/qiaoba-module-system/src/main/java/com/qiaoba/module/system/service/impl/SysUserServiceImpl.java similarity index 99% rename from qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/service/impl/SysUserServiceImpl.java rename to qiaoba-module/qiaoba-module-system/src/main/java/com/qiaoba/module/system/service/impl/SysUserServiceImpl.java index bee9e97..704f6a7 100644 --- a/qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/service/impl/SysUserServiceImpl.java +++ b/qiaoba-module/qiaoba-module-system/src/main/java/com/qiaoba/module/system/service/impl/SysUserServiceImpl.java @@ -14,7 +14,7 @@ import com.qiaoba.api.system.entity.SysUserRole; import com.qiaoba.api.system.entity.dto.SysUserDto; import com.qiaoba.api.system.entity.param.SysUserParam; import com.qiaoba.api.system.entity.vo.SysUserVo; -import com.qiaoba.common.base.exceptions.ServiceException; +import com.qiaoba.common.base.exception.ServiceException; import com.qiaoba.common.database.entity.PageQuery; import com.qiaoba.common.database.entity.TableDataInfo; import com.qiaoba.module.system.mapper.SysUserMapper; diff --git a/qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/templates/SysUserExport.java b/qiaoba-module/qiaoba-module-system/src/main/java/com/qiaoba/module/system/templates/SysUserExport.java similarity index 100% rename from qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/templates/SysUserExport.java rename to qiaoba-module/qiaoba-module-system/src/main/java/com/qiaoba/module/system/templates/SysUserExport.java diff --git a/qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/templates/SysUserImport.java b/qiaoba-module/qiaoba-module-system/src/main/java/com/qiaoba/module/system/templates/SysUserImport.java similarity index 100% rename from qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/templates/SysUserImport.java rename to qiaoba-module/qiaoba-module-system/src/main/java/com/qiaoba/module/system/templates/SysUserImport.java diff --git a/qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/utils/MenuUtil.java b/qiaoba-module/qiaoba-module-system/src/main/java/com/qiaoba/module/system/util/MenuUtil.java similarity index 97% rename from qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/utils/MenuUtil.java rename to qiaoba-module/qiaoba-module-system/src/main/java/com/qiaoba/module/system/util/MenuUtil.java index f177fc1..f01689b 100644 --- a/qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/utils/MenuUtil.java +++ b/qiaoba-module/qiaoba-module-system/src/main/java/com/qiaoba/module/system/util/MenuUtil.java @@ -1,4 +1,4 @@ -package com.qiaoba.module.system.utils; +package com.qiaoba.module.system.util; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; @@ -6,8 +6,8 @@ import cn.hutool.http.HttpUtil; import com.qiaoba.api.system.entity.vo.MetaVo; import com.qiaoba.api.system.entity.vo.RouterVo; import com.qiaoba.api.system.entity.vo.SysMenuVo; -import com.qiaoba.common.base.constants.BaseConstant; -import com.qiaoba.common.base.constants.MenuConstant; +import com.qiaoba.common.base.constant.BaseConstant; +import com.qiaoba.common.base.constant.MenuConstant; import com.qiaoba.common.base.enums.BaseEnum; import java.util.ArrayList; diff --git a/qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/utils/TreeUtil.java b/qiaoba-module/qiaoba-module-system/src/main/java/com/qiaoba/module/system/util/TreeUtil.java similarity index 98% rename from qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/utils/TreeUtil.java rename to qiaoba-module/qiaoba-module-system/src/main/java/com/qiaoba/module/system/util/TreeUtil.java index 0a4e168..6732f63 100644 --- a/qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/utils/TreeUtil.java +++ b/qiaoba-module/qiaoba-module-system/src/main/java/com/qiaoba/module/system/util/TreeUtil.java @@ -1,4 +1,4 @@ -package com.qiaoba.module.system.utils; +package com.qiaoba.module.system.util; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ReflectUtil; diff --git a/qiaoba-modules/qiaoba-module-system/src/main/resources/mapper/SysConfigMapper.xml b/qiaoba-module/qiaoba-module-system/src/main/resources/mapper/SysConfigMapper.xml similarity index 100% rename from qiaoba-modules/qiaoba-module-system/src/main/resources/mapper/SysConfigMapper.xml rename to qiaoba-module/qiaoba-module-system/src/main/resources/mapper/SysConfigMapper.xml diff --git a/qiaoba-modules/qiaoba-module-system/src/main/resources/mapper/SysDeptMapper.xml b/qiaoba-module/qiaoba-module-system/src/main/resources/mapper/SysDeptMapper.xml similarity index 100% rename from qiaoba-modules/qiaoba-module-system/src/main/resources/mapper/SysDeptMapper.xml rename to qiaoba-module/qiaoba-module-system/src/main/resources/mapper/SysDeptMapper.xml diff --git a/qiaoba-modules/qiaoba-module-system/src/main/resources/mapper/SysDictDataMapper.xml b/qiaoba-module/qiaoba-module-system/src/main/resources/mapper/SysDictDataMapper.xml similarity index 100% rename from qiaoba-modules/qiaoba-module-system/src/main/resources/mapper/SysDictDataMapper.xml rename to qiaoba-module/qiaoba-module-system/src/main/resources/mapper/SysDictDataMapper.xml diff --git a/qiaoba-modules/qiaoba-module-system/src/main/resources/mapper/SysDictTypeMapper.xml b/qiaoba-module/qiaoba-module-system/src/main/resources/mapper/SysDictTypeMapper.xml similarity index 100% rename from qiaoba-modules/qiaoba-module-system/src/main/resources/mapper/SysDictTypeMapper.xml rename to qiaoba-module/qiaoba-module-system/src/main/resources/mapper/SysDictTypeMapper.xml diff --git a/qiaoba-modules/qiaoba-module-system/src/main/resources/mapper/SysMenuMapper.xml b/qiaoba-module/qiaoba-module-system/src/main/resources/mapper/SysMenuMapper.xml similarity index 100% rename from qiaoba-modules/qiaoba-module-system/src/main/resources/mapper/SysMenuMapper.xml rename to qiaoba-module/qiaoba-module-system/src/main/resources/mapper/SysMenuMapper.xml diff --git a/qiaoba-modules/qiaoba-module-system/src/main/resources/mapper/SysPostMapper.xml b/qiaoba-module/qiaoba-module-system/src/main/resources/mapper/SysPostMapper.xml similarity index 100% rename from qiaoba-modules/qiaoba-module-system/src/main/resources/mapper/SysPostMapper.xml rename to qiaoba-module/qiaoba-module-system/src/main/resources/mapper/SysPostMapper.xml diff --git a/qiaoba-modules/qiaoba-module-system/src/main/resources/mapper/SysRoleDeptMapper.xml b/qiaoba-module/qiaoba-module-system/src/main/resources/mapper/SysRoleDeptMapper.xml similarity index 100% rename from qiaoba-modules/qiaoba-module-system/src/main/resources/mapper/SysRoleDeptMapper.xml rename to qiaoba-module/qiaoba-module-system/src/main/resources/mapper/SysRoleDeptMapper.xml diff --git a/qiaoba-modules/qiaoba-module-system/src/main/resources/mapper/SysRoleMapper.xml b/qiaoba-module/qiaoba-module-system/src/main/resources/mapper/SysRoleMapper.xml similarity index 100% rename from qiaoba-modules/qiaoba-module-system/src/main/resources/mapper/SysRoleMapper.xml rename to qiaoba-module/qiaoba-module-system/src/main/resources/mapper/SysRoleMapper.xml diff --git a/qiaoba-modules/qiaoba-module-system/src/main/resources/mapper/SysRoleMenuMapper.xml b/qiaoba-module/qiaoba-module-system/src/main/resources/mapper/SysRoleMenuMapper.xml similarity index 100% rename from qiaoba-modules/qiaoba-module-system/src/main/resources/mapper/SysRoleMenuMapper.xml rename to qiaoba-module/qiaoba-module-system/src/main/resources/mapper/SysRoleMenuMapper.xml diff --git a/qiaoba-modules/qiaoba-module-system/src/main/resources/mapper/SysUserMapper.xml b/qiaoba-module/qiaoba-module-system/src/main/resources/mapper/SysUserMapper.xml similarity index 100% rename from qiaoba-modules/qiaoba-module-system/src/main/resources/mapper/SysUserMapper.xml rename to qiaoba-module/qiaoba-module-system/src/main/resources/mapper/SysUserMapper.xml diff --git a/qiaoba-modules/qiaoba-module-system/src/main/resources/mapper/SysUserPostMapper.xml b/qiaoba-module/qiaoba-module-system/src/main/resources/mapper/SysUserPostMapper.xml similarity index 100% rename from qiaoba-modules/qiaoba-module-system/src/main/resources/mapper/SysUserPostMapper.xml rename to qiaoba-module/qiaoba-module-system/src/main/resources/mapper/SysUserPostMapper.xml diff --git a/qiaoba-modules/qiaoba-module-system/src/main/resources/mapper/SysUserRoleMapper.xml b/qiaoba-module/qiaoba-module-system/src/main/resources/mapper/SysUserRoleMapper.xml similarity index 100% rename from qiaoba-modules/qiaoba-module-system/src/main/resources/mapper/SysUserRoleMapper.xml rename to qiaoba-module/qiaoba-module-system/src/main/resources/mapper/SysUserRoleMapper.xml diff --git a/qiaoba-modules/qiaoba-module-tenant/pom.xml b/qiaoba-module/qiaoba-module-tenant/pom.xml similarity index 100% rename from qiaoba-modules/qiaoba-module-tenant/pom.xml rename to qiaoba-module/qiaoba-module-tenant/pom.xml diff --git a/qiaoba-modules/qiaoba-module-tenant/src/main/java/com/qiaoba/module/tenant/controller/SysTenantController.java b/qiaoba-module/qiaoba-module-tenant/src/main/java/com/qiaoba/module/tenant/controller/SysTenantController.java similarity index 100% rename from qiaoba-modules/qiaoba-module-tenant/src/main/java/com/qiaoba/module/tenant/controller/SysTenantController.java rename to qiaoba-module/qiaoba-module-tenant/src/main/java/com/qiaoba/module/tenant/controller/SysTenantController.java diff --git a/qiaoba-modules/qiaoba-module-tenant/src/main/java/com/qiaoba/module/tenant/controller/SysTenantDatasourceController.java b/qiaoba-module/qiaoba-module-tenant/src/main/java/com/qiaoba/module/tenant/controller/SysTenantDatasourceController.java similarity index 100% rename from qiaoba-modules/qiaoba-module-tenant/src/main/java/com/qiaoba/module/tenant/controller/SysTenantDatasourceController.java rename to qiaoba-module/qiaoba-module-tenant/src/main/java/com/qiaoba/module/tenant/controller/SysTenantDatasourceController.java diff --git a/qiaoba-modules/qiaoba-module-tenant/src/main/java/com/qiaoba/module/tenant/controller/SysTenantInitController.java b/qiaoba-module/qiaoba-module-tenant/src/main/java/com/qiaoba/module/tenant/controller/SysTenantInitController.java similarity index 100% rename from qiaoba-modules/qiaoba-module-tenant/src/main/java/com/qiaoba/module/tenant/controller/SysTenantInitController.java rename to qiaoba-module/qiaoba-module-tenant/src/main/java/com/qiaoba/module/tenant/controller/SysTenantInitController.java diff --git a/qiaoba-modules/qiaoba-module-tenant/src/main/java/com/qiaoba/module/tenant/entity/dto/TenantSettingDto.java b/qiaoba-module/qiaoba-module-tenant/src/main/java/com/qiaoba/module/tenant/entity/dto/TenantSettingDto.java similarity index 100% rename from qiaoba-modules/qiaoba-module-tenant/src/main/java/com/qiaoba/module/tenant/entity/dto/TenantSettingDto.java rename to qiaoba-module/qiaoba-module-tenant/src/main/java/com/qiaoba/module/tenant/entity/dto/TenantSettingDto.java diff --git a/qiaoba-modules/qiaoba-module-tenant/src/main/java/com/qiaoba/module/tenant/entity/vo/TenantInitCheckVo.java b/qiaoba-module/qiaoba-module-tenant/src/main/java/com/qiaoba/module/tenant/entity/vo/TenantInitCheckVo.java similarity index 100% rename from qiaoba-modules/qiaoba-module-tenant/src/main/java/com/qiaoba/module/tenant/entity/vo/TenantInitCheckVo.java rename to qiaoba-module/qiaoba-module-tenant/src/main/java/com/qiaoba/module/tenant/entity/vo/TenantInitCheckVo.java diff --git a/qiaoba-modules/qiaoba-module-tenant/src/main/java/com/qiaoba/module/tenant/entity/vo/TenantInitVo.java b/qiaoba-module/qiaoba-module-tenant/src/main/java/com/qiaoba/module/tenant/entity/vo/TenantInitVo.java similarity index 100% rename from qiaoba-modules/qiaoba-module-tenant/src/main/java/com/qiaoba/module/tenant/entity/vo/TenantInitVo.java rename to qiaoba-module/qiaoba-module-tenant/src/main/java/com/qiaoba/module/tenant/entity/vo/TenantInitVo.java diff --git a/qiaoba-modules/qiaoba-module-tenant/src/main/java/com/qiaoba/module/tenant/entity/vo/TenantSettingVo.java b/qiaoba-module/qiaoba-module-tenant/src/main/java/com/qiaoba/module/tenant/entity/vo/TenantSettingVo.java similarity index 100% rename from qiaoba-modules/qiaoba-module-tenant/src/main/java/com/qiaoba/module/tenant/entity/vo/TenantSettingVo.java rename to qiaoba-module/qiaoba-module-tenant/src/main/java/com/qiaoba/module/tenant/entity/vo/TenantSettingVo.java diff --git a/qiaoba-modules/qiaoba-module-tenant/src/main/java/com/qiaoba/module/tenant/filters/DynamicDataSourceFilter.java b/qiaoba-module/qiaoba-module-tenant/src/main/java/com/qiaoba/module/tenant/filter/DynamicDataSourceFilter.java similarity index 95% rename from qiaoba-modules/qiaoba-module-tenant/src/main/java/com/qiaoba/module/tenant/filters/DynamicDataSourceFilter.java rename to qiaoba-module/qiaoba-module-tenant/src/main/java/com/qiaoba/module/tenant/filter/DynamicDataSourceFilter.java index 7d13b91..9c8805a 100644 --- a/qiaoba-modules/qiaoba-module-tenant/src/main/java/com/qiaoba/module/tenant/filters/DynamicDataSourceFilter.java +++ b/qiaoba-module/qiaoba-module-tenant/src/main/java/com/qiaoba/module/tenant/filter/DynamicDataSourceFilter.java @@ -1,4 +1,4 @@ -package com.qiaoba.module.tenant.filters; +package com.qiaoba.module.tenant.filter; import cn.hutool.core.collection.ListUtil; import cn.hutool.core.date.DateUtil; @@ -6,13 +6,13 @@ import com.qiaoba.api.tenant.entity.SysTenant; import com.qiaoba.api.tenant.enums.TenantStatusEnum; import com.qiaoba.api.tenant.utils.TenantUtil; import com.qiaoba.common.base.code.TenantErrorCode; -import com.qiaoba.common.base.constants.BaseConstant; -import com.qiaoba.common.base.constants.TenantConstant; +import com.qiaoba.common.base.constant.BaseConstant; +import com.qiaoba.common.base.constant.TenantConstant; import com.qiaoba.common.base.context.BaseContext; import com.qiaoba.common.base.order.FilterOrder; import com.qiaoba.common.database.config.DynamicDataSourceConfig; -import com.qiaoba.common.web.utils.ResponseUtil; -import com.qiaoba.common.web.utils.UriUtil; +import com.qiaoba.common.web.util.ResponseUtil; +import com.qiaoba.common.web.util.UriUtil; import com.qiaoba.module.tenant.service.SysTenantService; import lombok.extern.slf4j.Slf4j; import org.springframework.core.annotation.Order; diff --git a/qiaoba-modules/qiaoba-module-tenant/src/main/java/com/qiaoba/module/tenant/init/InitTablesStrategy.java b/qiaoba-module/qiaoba-module-tenant/src/main/java/com/qiaoba/module/tenant/init/InitTablesStrategy.java similarity index 100% rename from qiaoba-modules/qiaoba-module-tenant/src/main/java/com/qiaoba/module/tenant/init/InitTablesStrategy.java rename to qiaoba-module/qiaoba-module-tenant/src/main/java/com/qiaoba/module/tenant/init/InitTablesStrategy.java diff --git a/qiaoba-modules/qiaoba-module-tenant/src/main/java/com/qiaoba/module/tenant/init/InitTablesStrategyFactory.java b/qiaoba-module/qiaoba-module-tenant/src/main/java/com/qiaoba/module/tenant/init/InitTablesStrategyFactory.java similarity index 96% rename from qiaoba-modules/qiaoba-module-tenant/src/main/java/com/qiaoba/module/tenant/init/InitTablesStrategyFactory.java rename to qiaoba-module/qiaoba-module-tenant/src/main/java/com/qiaoba/module/tenant/init/InitTablesStrategyFactory.java index 10d7446..ccd79fe 100644 --- a/qiaoba-modules/qiaoba-module-tenant/src/main/java/com/qiaoba/module/tenant/init/InitTablesStrategyFactory.java +++ b/qiaoba-module/qiaoba-module-tenant/src/main/java/com/qiaoba/module/tenant/init/InitTablesStrategyFactory.java @@ -1,7 +1,7 @@ package com.qiaoba.module.tenant.init; import com.qiaoba.common.base.enums.DataBaseEnum; -import com.qiaoba.common.base.exceptions.ServiceException; +import com.qiaoba.common.base.exception.ServiceException; import com.qiaoba.module.tenant.init.impl.MysqlInitTablesStrategy; import com.qiaoba.module.tenant.init.impl.PgSqlInitTablesStrategy; import lombok.RequiredArgsConstructor; diff --git a/qiaoba-modules/qiaoba-module-tenant/src/main/java/com/qiaoba/module/tenant/init/impl/MysqlInitTablesStrategy.java b/qiaoba-module/qiaoba-module-tenant/src/main/java/com/qiaoba/module/tenant/init/impl/MysqlInitTablesStrategy.java similarity index 97% rename from qiaoba-modules/qiaoba-module-tenant/src/main/java/com/qiaoba/module/tenant/init/impl/MysqlInitTablesStrategy.java rename to qiaoba-module/qiaoba-module-tenant/src/main/java/com/qiaoba/module/tenant/init/impl/MysqlInitTablesStrategy.java index 2d346db..ad76dd7 100644 --- a/qiaoba-modules/qiaoba-module-tenant/src/main/java/com/qiaoba/module/tenant/init/impl/MysqlInitTablesStrategy.java +++ b/qiaoba-module/qiaoba-module-tenant/src/main/java/com/qiaoba/module/tenant/init/impl/MysqlInitTablesStrategy.java @@ -6,7 +6,7 @@ import cn.hutool.db.sql.SqlExecutor; import cn.hutool.http.HttpStatus; import com.qiaoba.common.base.code.DatasourceErrorCode; import com.qiaoba.common.database.context.TenantDbTypeContext; -import com.qiaoba.common.database.utils.DbUtil; +import com.qiaoba.common.database.util.DbUtil; import com.qiaoba.module.tenant.entity.vo.TenantInitVo; import com.qiaoba.module.tenant.init.InitTablesStrategy; import org.springframework.stereotype.Service; diff --git a/qiaoba-modules/qiaoba-module-tenant/src/main/java/com/qiaoba/module/tenant/init/impl/PgSqlInitTablesStrategy.java b/qiaoba-module/qiaoba-module-tenant/src/main/java/com/qiaoba/module/tenant/init/impl/PgSqlInitTablesStrategy.java similarity index 97% rename from qiaoba-modules/qiaoba-module-tenant/src/main/java/com/qiaoba/module/tenant/init/impl/PgSqlInitTablesStrategy.java rename to qiaoba-module/qiaoba-module-tenant/src/main/java/com/qiaoba/module/tenant/init/impl/PgSqlInitTablesStrategy.java index 6a8cdbe..27485bc 100644 --- a/qiaoba-modules/qiaoba-module-tenant/src/main/java/com/qiaoba/module/tenant/init/impl/PgSqlInitTablesStrategy.java +++ b/qiaoba-module/qiaoba-module-tenant/src/main/java/com/qiaoba/module/tenant/init/impl/PgSqlInitTablesStrategy.java @@ -5,7 +5,7 @@ import cn.hutool.core.util.StrUtil; import cn.hutool.http.HttpStatus; import com.qiaoba.common.base.code.DatasourceErrorCode; import com.qiaoba.common.base.enums.DataBaseEnum; -import com.qiaoba.common.database.utils.DbUtil; +import com.qiaoba.common.database.util.DbUtil; import com.qiaoba.module.tenant.entity.vo.TenantInitVo; import com.qiaoba.module.tenant.init.InitTablesStrategy; import org.springframework.stereotype.Service; diff --git a/qiaoba-modules/qiaoba-module-tenant/src/main/java/com/qiaoba/module/tenant/mapper/SysTenantDatasourceMapper.java b/qiaoba-module/qiaoba-module-tenant/src/main/java/com/qiaoba/module/tenant/mapper/SysTenantDatasourceMapper.java similarity index 76% rename from qiaoba-modules/qiaoba-module-tenant/src/main/java/com/qiaoba/module/tenant/mapper/SysTenantDatasourceMapper.java rename to qiaoba-module/qiaoba-module-tenant/src/main/java/com/qiaoba/module/tenant/mapper/SysTenantDatasourceMapper.java index d615acf..c2ff532 100644 --- a/qiaoba-modules/qiaoba-module-tenant/src/main/java/com/qiaoba/module/tenant/mapper/SysTenantDatasourceMapper.java +++ b/qiaoba-module/qiaoba-module-tenant/src/main/java/com/qiaoba/module/tenant/mapper/SysTenantDatasourceMapper.java @@ -22,6 +22,15 @@ public interface SysTenantDatasourceMapper extends BaseMapper selectTenantIds(); + /** + * 通过IP查询租户数据源信息 todo select * + * + * @param tenantId 租户ID + * @param ip ip + * @return 数据源信息 + */ + SysTenantDatasource selectByIp(@Param("tenantId") String tenantId, @Param("ip") String ip); + /** * 将租户下的除datasourceId之外的其他数据源设置为备用 * diff --git a/qiaoba-modules/qiaoba-module-tenant/src/main/java/com/qiaoba/module/tenant/mapper/SysTenantMapper.java b/qiaoba-module/qiaoba-module-tenant/src/main/java/com/qiaoba/module/tenant/mapper/SysTenantMapper.java similarity index 89% rename from qiaoba-modules/qiaoba-module-tenant/src/main/java/com/qiaoba/module/tenant/mapper/SysTenantMapper.java rename to qiaoba-module/qiaoba-module-tenant/src/main/java/com/qiaoba/module/tenant/mapper/SysTenantMapper.java index f9cebb4..b9e6749 100644 --- a/qiaoba-modules/qiaoba-module-tenant/src/main/java/com/qiaoba/module/tenant/mapper/SysTenantMapper.java +++ b/qiaoba-module/qiaoba-module-tenant/src/main/java/com/qiaoba/module/tenant/mapper/SysTenantMapper.java @@ -2,7 +2,7 @@ package com.qiaoba.module.tenant.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.qiaoba.api.tenant.entity.SysTenant; -import com.qiaoba.common.database.annotations.SelectOneRow; +import com.qiaoba.common.database.annotation.SelectOneRow; /** * 租户管理 数据层 diff --git a/qiaoba-modules/qiaoba-module-tenant/src/main/java/com/qiaoba/module/tenant/runner/SysTenantRunner.java b/qiaoba-module/qiaoba-module-tenant/src/main/java/com/qiaoba/module/tenant/runner/SysTenantRunner.java similarity index 93% rename from qiaoba-modules/qiaoba-module-tenant/src/main/java/com/qiaoba/module/tenant/runner/SysTenantRunner.java rename to qiaoba-module/qiaoba-module-tenant/src/main/java/com/qiaoba/module/tenant/runner/SysTenantRunner.java index 30eb5fd..c0773d6 100644 --- a/qiaoba-modules/qiaoba-module-tenant/src/main/java/com/qiaoba/module/tenant/runner/SysTenantRunner.java +++ b/qiaoba-module/qiaoba-module-tenant/src/main/java/com/qiaoba/module/tenant/runner/SysTenantRunner.java @@ -1,6 +1,6 @@ package com.qiaoba.module.tenant.runner; -import com.qiaoba.common.base.constants.TenantConstant; +import com.qiaoba.common.base.constant.TenantConstant; import com.qiaoba.common.base.context.BaseContext; import com.qiaoba.module.tenant.service.SysTenantService; import lombok.RequiredArgsConstructor; diff --git a/qiaoba-modules/qiaoba-module-tenant/src/main/java/com/qiaoba/module/tenant/service/SysTenantDatasourceService.java b/qiaoba-module/qiaoba-module-tenant/src/main/java/com/qiaoba/module/tenant/service/SysTenantDatasourceService.java similarity index 90% rename from qiaoba-modules/qiaoba-module-tenant/src/main/java/com/qiaoba/module/tenant/service/SysTenantDatasourceService.java rename to qiaoba-module/qiaoba-module-tenant/src/main/java/com/qiaoba/module/tenant/service/SysTenantDatasourceService.java index da5f133..ed1c950 100644 --- a/qiaoba-modules/qiaoba-module-tenant/src/main/java/com/qiaoba/module/tenant/service/SysTenantDatasourceService.java +++ b/qiaoba-module/qiaoba-module-tenant/src/main/java/com/qiaoba/module/tenant/service/SysTenantDatasourceService.java @@ -2,6 +2,7 @@ package com.qiaoba.module.tenant.service; import com.qiaoba.api.tenant.entity.SysTenantDatasource; import com.qiaoba.api.tenant.entity.param.SysTenantDatasourceParam; +import com.qiaoba.common.database.entity.DynamicDataSource; import java.util.List; @@ -103,4 +104,12 @@ public interface SysTenantDatasourceService { * @return 结果 */ int switchPrimary(String tenantId, String datasourceId); + + /** + * datasource2DynamicDataSource + * + * @param datasource 数据源 + * @return 数据源 + */ + DynamicDataSource transform(SysTenantDatasource datasource); } diff --git a/qiaoba-modules/qiaoba-module-tenant/src/main/java/com/qiaoba/module/tenant/service/SysTenantInitService.java b/qiaoba-module/qiaoba-module-tenant/src/main/java/com/qiaoba/module/tenant/service/SysTenantInitService.java similarity index 100% rename from qiaoba-modules/qiaoba-module-tenant/src/main/java/com/qiaoba/module/tenant/service/SysTenantInitService.java rename to qiaoba-module/qiaoba-module-tenant/src/main/java/com/qiaoba/module/tenant/service/SysTenantInitService.java diff --git a/qiaoba-modules/qiaoba-module-tenant/src/main/java/com/qiaoba/module/tenant/service/SysTenantService.java b/qiaoba-module/qiaoba-module-tenant/src/main/java/com/qiaoba/module/tenant/service/SysTenantService.java similarity index 100% rename from qiaoba-modules/qiaoba-module-tenant/src/main/java/com/qiaoba/module/tenant/service/SysTenantService.java rename to qiaoba-module/qiaoba-module-tenant/src/main/java/com/qiaoba/module/tenant/service/SysTenantService.java diff --git a/qiaoba-modules/qiaoba-module-tenant/src/main/java/com/qiaoba/module/tenant/service/impl/DynamicDatasourceServiceImpl.java b/qiaoba-module/qiaoba-module-tenant/src/main/java/com/qiaoba/module/tenant/service/impl/DynamicDatasourceServiceImpl.java similarity index 81% rename from qiaoba-modules/qiaoba-module-tenant/src/main/java/com/qiaoba/module/tenant/service/impl/DynamicDatasourceServiceImpl.java rename to qiaoba-module/qiaoba-module-tenant/src/main/java/com/qiaoba/module/tenant/service/impl/DynamicDatasourceServiceImpl.java index 9f6dd5b..02835e0 100644 --- a/qiaoba-modules/qiaoba-module-tenant/src/main/java/com/qiaoba/module/tenant/service/impl/DynamicDatasourceServiceImpl.java +++ b/qiaoba-module/qiaoba-module-tenant/src/main/java/com/qiaoba/module/tenant/service/impl/DynamicDatasourceServiceImpl.java @@ -6,7 +6,7 @@ import com.qiaoba.api.tenant.entity.SysTenantDatasource; import com.qiaoba.api.tenant.entity.param.SysTenantDatasourceParam; 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.base.exception.ServiceException; import com.qiaoba.common.database.entity.DynamicDataSource; import com.qiaoba.common.database.service.DynamicDatasourceService; import com.qiaoba.module.tenant.service.SysTenantDatasourceService; @@ -68,12 +68,6 @@ public class DynamicDatasourceServiceImpl implements DynamicDatasourceService { } private DynamicDataSource transform(SysTenantDatasource datasource) { - DynamicDataSource dynamicDataSource = BeanUtil.copyProperties(datasource, DynamicDataSource.class); - dynamicDataSource.setInitialSize(datasource.getInitCount()); - dynamicDataSource.setMinIdle(datasource.getMinCount()); - dynamicDataSource.setMaxActive(datasource.getMaxCount()); - dynamicDataSource.setDriver(DataBaseEnum.getDriver(datasource.getType())); - dynamicDataSource.setUrl(DataBaseEnum.getUrl(datasource.getType(), datasource.getIp(), datasource.getPort(), datasource.getDbName(), datasource.getSchemaName())); - return dynamicDataSource; + return sysTenantDatasourceService.transform(datasource); } } diff --git a/qiaoba-module/qiaoba-module-tenant/src/main/java/com/qiaoba/module/tenant/service/impl/SysTenantDatasourceServiceImpl.java b/qiaoba-module/qiaoba-module-tenant/src/main/java/com/qiaoba/module/tenant/service/impl/SysTenantDatasourceServiceImpl.java new file mode 100644 index 0000000..716f827 --- /dev/null +++ b/qiaoba-module/qiaoba-module-tenant/src/main/java/com/qiaoba/module/tenant/service/impl/SysTenantDatasourceServiceImpl.java @@ -0,0 +1,180 @@ +package com.qiaoba.module.tenant.service.impl; + +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.io.IoUtil; +import cn.hutool.core.util.StrUtil; +import com.alibaba.druid.pool.DruidDataSource; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.qiaoba.api.tenant.entity.SysTenantDatasource; +import com.qiaoba.api.tenant.entity.param.SysTenantDatasourceParam; +import com.qiaoba.common.base.code.DatasourceErrorCode; +import com.qiaoba.common.base.constant.BaseConstant; +import com.qiaoba.common.base.enums.BaseEnum; +import com.qiaoba.common.base.enums.DataBaseEnum; +import com.qiaoba.common.base.exception.ServiceException; +import com.qiaoba.common.database.config.DynamicDataSourceConfig; +import com.qiaoba.common.database.context.BackupDatasourceContext; +import com.qiaoba.common.database.context.PrimaryDatasourceContext; +import com.qiaoba.common.database.entity.DynamicDataSource; +import com.qiaoba.common.database.util.DatasourceUtil; +import com.qiaoba.common.database.util.JdbcUtil; +import com.qiaoba.module.tenant.mapper.SysTenantDatasourceMapper; +import com.qiaoba.module.tenant.service.SysTenantDatasourceService; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; +import java.util.Objects; + +/** + * 租户数据源 服务层实现 + * + * @author ailanyin + * @version 1.0 + * @since 2023/6/7 14:49 + */ +@Service +@RequiredArgsConstructor +public class SysTenantDatasourceServiceImpl implements SysTenantDatasourceService { + + private final SysTenantDatasourceMapper sysTenantDatasourceMapper; + + @Override + public SysTenantDatasource selectPrimary(String tenantId) { + return sysTenantDatasourceMapper.selectOne(paramToWrapper(new SysTenantDatasourceParam(tenantId, BaseEnum.YES.getCode()))); + } + + @Override + public SysTenantDatasource selectPrimary(String tenantId, boolean allowNull) { + SysTenantDatasource primary = selectPrimary(tenantId); + if (!allowNull && Objects.isNull(primary)) { + throw new ServiceException(DatasourceErrorCode.NOT_FIND.getCode(), DatasourceErrorCode.NOT_FIND.getMsg()); + } + return primary; + } + + @Override + public SysTenantDatasource selectByIp(String tenantId, String ip) { + SysTenantDatasourceParam param = new SysTenantDatasourceParam(tenantId); + param.setIp(ip); + return sysTenantDatasourceMapper.selectOne(paramToWrapper(param)); + } + + @Override + public int insert(SysTenantDatasource sysTenantDatasource) { + DynamicDataSource dynamicDataSource = transform(sysTenantDatasource); + boolean connect = JdbcUtil.checkConnect(dynamicDataSource.getDriver(), dynamicDataSource.getUrl(), dynamicDataSource.getUsername(), dynamicDataSource.getPassword()); + if (!connect) { + // 连接不可用 + throw new ServiceException(DatasourceErrorCode.CONNECT_ERROR.getCode(), DatasourceErrorCode.CONNECT_ERROR.getMsg()); + } + int result = sysTenantDatasourceMapper.insert(sysTenantDatasource); + if (result > BaseConstant.HANDLE_ERROR) { + // 添加到备用数据源 + BackupDatasourceContext.addBackupMap(sysTenantDatasource.getTenantId(), dynamicDataSource); + } + return result; + } + + @Override + public int updateById(SysTenantDatasource sysTenantDatasource) { + DynamicDataSource dynamicDataSource = transform(sysTenantDatasource); + boolean connect = JdbcUtil.checkConnect(dynamicDataSource.getDriver(), dynamicDataSource.getUrl(), dynamicDataSource.getUsername(), dynamicDataSource.getPassword()); + if (!connect) { + // 连接不可用 + throw new ServiceException(DatasourceErrorCode.CONNECT_ERROR.getCode(), DatasourceErrorCode.CONNECT_ERROR.getMsg()); + } + int result = sysTenantDatasourceMapper.updateById(sysTenantDatasource); + if (result > BaseConstant.HANDLE_ERROR) { + // 更新备用数据源 + BackupDatasourceContext.updateBackupMap(sysTenantDatasource.getTenantId(), dynamicDataSource); + } + return result; + } + + @Override + public int deleteByIds(List ids) { + // 删除备用Map + return sysTenantDatasourceMapper.deleteBatchIds(ids); + } + + @Override + public List selectList(String tenantId) { + return sysTenantDatasourceMapper.selectList(paramToWrapper(new SysTenantDatasourceParam(tenantId))); + } + + @Override + public List selectList(SysTenantDatasourceParam param) { + return sysTenantDatasourceMapper.selectList(paramToWrapper(param)); + } + + @Override + public List selectTenantIds() { + return sysTenantDatasourceMapper.selectTenantIds(); + } + + @Override + public void setBackupDatasourceExcludeId(String tenantId, String excludeId) { + sysTenantDatasourceMapper.setBackupDatasourceExcludeId(tenantId, excludeId, BaseEnum.NO.getCode()); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public int switchPrimary(String tenantId, String datasourceId) { + SysTenantDatasource datasource = sysTenantDatasourceMapper.selectById(datasourceId); + DynamicDataSource dynamicDataSource = transform(datasource); + Object dataSource = DatasourceUtil.buildDataSource(tenantId, dynamicDataSource); + if (Objects.isNull(dataSource)) { + // 连接不可用 + throw new ServiceException(DatasourceErrorCode.CONNECT_ERROR.getCode(), DatasourceErrorCode.CONNECT_ERROR.getMsg()); + } + // 更新其他的为非主要 + setBackupDatasourceExcludeId(tenantId, datasourceId); + // 更新他为主要 + datasource.setIsPrimary(BaseEnum.YES.getCode()); + int result = updateById(datasource); + // 刷新PrimaryDatasourceMap + if (result > BaseConstant.HANDLE_ERROR) { + // 更新新得数据源为租户主要数据源 + DatasourceUtil.changePrimaryDatasource(tenantId, dataSource); + // 将老的租户数据源设置为备用 + Object oldDataSource = PrimaryDatasourceContext.get(tenantId); + if (Objects.nonNull(oldDataSource)) { + DruidDataSource druidDataSource = ((DruidDataSource) oldDataSource); + String ip = DataBaseEnum.getIp(druidDataSource.getUrl(), druidDataSource.getDriverClassName()); + SysTenantDatasource sysTenantDatasource = sysTenantDatasourceMapper.selectByIp(tenantId, ip); + BackupDatasourceContext.addBackupMap(tenantId, transform(sysTenantDatasource)); + druidDataSource.close(); + } + } else { + IoUtil.close((DruidDataSource) dataSource); + } + return result; + } + + public int test(String tenantId, String datasourceId) { + List dataSources = BackupDatasourceContext.get(tenantId); + return 0; + } + + @Override + public DynamicDataSource transform(SysTenantDatasource datasource) { + DynamicDataSource dynamicDataSource = BeanUtil.copyProperties(datasource, DynamicDataSource.class); + dynamicDataSource.setInitialSize(datasource.getInitCount()); + dynamicDataSource.setMinIdle(datasource.getMinCount()); + dynamicDataSource.setMaxActive(datasource.getMaxCount()); + dynamicDataSource.setDriver(DataBaseEnum.getDriver(datasource.getType())); + dynamicDataSource.setUrl(DataBaseEnum.getUrl(datasource.getType(), datasource.getIp(), datasource.getPort(), datasource.getDbName(), datasource.getSchemaName())); + return dynamicDataSource; + } + + private QueryWrapper paramToWrapper(SysTenantDatasourceParam param) { + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.lambda() + .eq(StrUtil.isNotBlank(param.getTenantId()), SysTenantDatasource::getTenantId, param.getTenantId()) + .eq(StrUtil.isNotBlank(param.getIp()), SysTenantDatasource::getIp, param.getIp()) + .eq(StrUtil.isNotBlank(param.getIsPrimary()), SysTenantDatasource::getIsPrimary, param.getIsPrimary()); + return wrapper; + } +} diff --git a/qiaoba-modules/qiaoba-module-tenant/src/main/java/com/qiaoba/module/tenant/service/impl/SysTenantInitServiceImpl.java b/qiaoba-module/qiaoba-module-tenant/src/main/java/com/qiaoba/module/tenant/service/impl/SysTenantInitServiceImpl.java similarity index 97% rename from qiaoba-modules/qiaoba-module-tenant/src/main/java/com/qiaoba/module/tenant/service/impl/SysTenantInitServiceImpl.java rename to qiaoba-module/qiaoba-module-tenant/src/main/java/com/qiaoba/module/tenant/service/impl/SysTenantInitServiceImpl.java index f86438b..781529b 100644 --- a/qiaoba-modules/qiaoba-module-tenant/src/main/java/com/qiaoba/module/tenant/service/impl/SysTenantInitServiceImpl.java +++ b/qiaoba-module/qiaoba-module-tenant/src/main/java/com/qiaoba/module/tenant/service/impl/SysTenantInitServiceImpl.java @@ -11,20 +11,20 @@ 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.base.exception.ServiceException; import com.qiaoba.common.database.context.PrimaryDatasourceContext; import com.qiaoba.common.database.context.TenantDbTypeContext; import com.qiaoba.common.database.properties.TenantSchema; -import com.qiaoba.common.database.utils.DbUtil; -import com.qiaoba.common.database.utils.JdbcUtil; +import com.qiaoba.common.database.util.DbUtil; +import com.qiaoba.common.database.util.JdbcUtil; import com.qiaoba.module.tenant.entity.vo.TenantInitCheckVo; import com.qiaoba.module.tenant.entity.vo.TenantInitVo; import com.qiaoba.module.tenant.init.InitTablesStrategyFactory; import com.qiaoba.module.tenant.service.SysTenantDatasourceService; import com.qiaoba.module.tenant.service.SysTenantInitService; import com.qiaoba.module.tenant.service.SysTenantService; -import com.qiaoba.module.tenant.utils.InitDataUtil; -import com.qiaoba.module.tenant.utils.MenuUtil; +import com.qiaoba.module.tenant.util.InitDataUtil; +import com.qiaoba.module.tenant.util.MenuUtil; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; diff --git a/qiaoba-modules/qiaoba-module-tenant/src/main/java/com/qiaoba/module/tenant/service/impl/SysTenantServiceImpl.java b/qiaoba-module/qiaoba-module-tenant/src/main/java/com/qiaoba/module/tenant/service/impl/SysTenantServiceImpl.java similarity index 95% rename from qiaoba-modules/qiaoba-module-tenant/src/main/java/com/qiaoba/module/tenant/service/impl/SysTenantServiceImpl.java rename to qiaoba-module/qiaoba-module-tenant/src/main/java/com/qiaoba/module/tenant/service/impl/SysTenantServiceImpl.java index 0f3adeb..fd6d4e7 100644 --- a/qiaoba-modules/qiaoba-module-tenant/src/main/java/com/qiaoba/module/tenant/service/impl/SysTenantServiceImpl.java +++ b/qiaoba-module/qiaoba-module-tenant/src/main/java/com/qiaoba/module/tenant/service/impl/SysTenantServiceImpl.java @@ -7,16 +7,15 @@ import com.qiaoba.api.tenant.entity.param.SysTenantParam; import com.qiaoba.api.tenant.service.SysTenantApiService; import com.qiaoba.api.auth.utils.SecurityUtil; import com.qiaoba.common.base.code.TenantErrorCode; -import com.qiaoba.common.base.constants.BaseConstant; -import com.qiaoba.common.base.constants.TenantConstant; +import com.qiaoba.common.base.constant.BaseConstant; +import com.qiaoba.common.base.constant.TenantConstant; import com.qiaoba.common.base.context.BaseContext; import com.qiaoba.common.base.enums.BaseEnum; -import com.qiaoba.common.base.exceptions.ServiceException; +import com.qiaoba.common.base.exception.ServiceException; import com.qiaoba.common.database.entity.PageQuery; import com.qiaoba.common.database.entity.TableDataInfo; import com.qiaoba.common.redis.service.RedisService; import com.qiaoba.module.tenant.mapper.SysTenantMapper; -import com.qiaoba.module.tenant.service.SysTenantDatasourceService; import com.qiaoba.module.tenant.service.SysTenantService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/qiaoba-modules/qiaoba-module-tenant/src/main/java/com/qiaoba/module/tenant/utils/InitDataUtil.java b/qiaoba-module/qiaoba-module-tenant/src/main/java/com/qiaoba/module/tenant/util/InitDataUtil.java similarity index 97% rename from qiaoba-modules/qiaoba-module-tenant/src/main/java/com/qiaoba/module/tenant/utils/InitDataUtil.java rename to qiaoba-module/qiaoba-module-tenant/src/main/java/com/qiaoba/module/tenant/util/InitDataUtil.java index 02a0eb0..44c9185 100644 --- a/qiaoba-modules/qiaoba-module-tenant/src/main/java/com/qiaoba/module/tenant/utils/InitDataUtil.java +++ b/qiaoba-module/qiaoba-module-tenant/src/main/java/com/qiaoba/module/tenant/util/InitDataUtil.java @@ -1,9 +1,9 @@ -package com.qiaoba.module.tenant.utils; +package com.qiaoba.module.tenant.util; import cn.hutool.core.io.FileUtil; import cn.hutool.core.lang.Snowflake; import cn.hutool.core.util.StrUtil; -import com.qiaoba.common.database.utils.DbUtil; +import com.qiaoba.common.database.util.DbUtil; import org.springframework.core.io.ClassPathResource; import java.nio.charset.Charset; diff --git a/qiaoba-modules/qiaoba-module-tenant/src/main/java/com/qiaoba/module/tenant/utils/MenuUtil.java b/qiaoba-module/qiaoba-module-tenant/src/main/java/com/qiaoba/module/tenant/util/MenuUtil.java similarity index 98% rename from qiaoba-modules/qiaoba-module-tenant/src/main/java/com/qiaoba/module/tenant/utils/MenuUtil.java rename to qiaoba-module/qiaoba-module-tenant/src/main/java/com/qiaoba/module/tenant/util/MenuUtil.java index 40c0a0e..4f4fe28 100644 --- a/qiaoba-modules/qiaoba-module-tenant/src/main/java/com/qiaoba/module/tenant/utils/MenuUtil.java +++ b/qiaoba-module/qiaoba-module-tenant/src/main/java/com/qiaoba/module/tenant/util/MenuUtil.java @@ -1,10 +1,10 @@ -package com.qiaoba.module.tenant.utils; +package com.qiaoba.module.tenant.util; import cn.hutool.core.io.FileUtil; import cn.hutool.core.io.IoUtil; import cn.hutool.core.lang.Snowflake; import cn.hutool.core.util.StrUtil; -import com.qiaoba.common.database.utils.DbUtil; +import com.qiaoba.common.database.util.DbUtil; import org.springframework.core.io.ClassPathResource; import java.nio.charset.Charset; diff --git a/qiaoba-modules/qiaoba-module-tenant/src/main/resources/MySQL/data/sys_config_data b/qiaoba-module/qiaoba-module-tenant/src/main/resources/MySQL/data/sys_config_data similarity index 100% rename from qiaoba-modules/qiaoba-module-tenant/src/main/resources/MySQL/data/sys_config_data rename to qiaoba-module/qiaoba-module-tenant/src/main/resources/MySQL/data/sys_config_data diff --git a/qiaoba-modules/qiaoba-module-tenant/src/main/resources/MySQL/data/sys_menu/monitor/.gitkeep b/qiaoba-module/qiaoba-module-tenant/src/main/resources/MySQL/data/sys_menu/monitor/.gitkeep similarity index 100% rename from qiaoba-modules/qiaoba-module-tenant/src/main/resources/MySQL/data/sys_menu/monitor/.gitkeep rename to qiaoba-module/qiaoba-module-tenant/src/main/resources/MySQL/data/sys_menu/monitor/.gitkeep diff --git a/qiaoba-modules/qiaoba-module-tenant/src/main/resources/MySQL/data/sys_menu/monitor/online_user/button b/qiaoba-module/qiaoba-module-tenant/src/main/resources/MySQL/data/sys_menu/monitor/online_user/button similarity index 100% rename from qiaoba-modules/qiaoba-module-tenant/src/main/resources/MySQL/data/sys_menu/monitor/online_user/button rename to qiaoba-module/qiaoba-module-tenant/src/main/resources/MySQL/data/sys_menu/monitor/online_user/button diff --git a/qiaoba-modules/qiaoba-module-tenant/src/main/resources/MySQL/data/sys_menu/monitor/online_user/menu b/qiaoba-module/qiaoba-module-tenant/src/main/resources/MySQL/data/sys_menu/monitor/online_user/menu similarity index 100% rename from qiaoba-modules/qiaoba-module-tenant/src/main/resources/MySQL/data/sys_menu/monitor/online_user/menu rename to qiaoba-module/qiaoba-module-tenant/src/main/resources/MySQL/data/sys_menu/monitor/online_user/menu diff --git a/qiaoba-modules/qiaoba-module-tenant/src/main/resources/MySQL/data/sys_menu/system/config/button b/qiaoba-module/qiaoba-module-tenant/src/main/resources/MySQL/data/sys_menu/system/config/button similarity index 100% rename from qiaoba-modules/qiaoba-module-tenant/src/main/resources/MySQL/data/sys_menu/system/config/button rename to qiaoba-module/qiaoba-module-tenant/src/main/resources/MySQL/data/sys_menu/system/config/button diff --git a/qiaoba-modules/qiaoba-module-tenant/src/main/resources/MySQL/data/sys_menu/system/config/menu b/qiaoba-module/qiaoba-module-tenant/src/main/resources/MySQL/data/sys_menu/system/config/menu similarity index 100% rename from qiaoba-modules/qiaoba-module-tenant/src/main/resources/MySQL/data/sys_menu/system/config/menu rename to qiaoba-module/qiaoba-module-tenant/src/main/resources/MySQL/data/sys_menu/system/config/menu diff --git a/qiaoba-modules/qiaoba-module-tenant/src/main/resources/MySQL/data/sys_menu/system/dept/button b/qiaoba-module/qiaoba-module-tenant/src/main/resources/MySQL/data/sys_menu/system/dept/button similarity index 100% rename from qiaoba-modules/qiaoba-module-tenant/src/main/resources/MySQL/data/sys_menu/system/dept/button rename to qiaoba-module/qiaoba-module-tenant/src/main/resources/MySQL/data/sys_menu/system/dept/button diff --git a/qiaoba-modules/qiaoba-module-tenant/src/main/resources/MySQL/data/sys_menu/system/dept/menu b/qiaoba-module/qiaoba-module-tenant/src/main/resources/MySQL/data/sys_menu/system/dept/menu similarity index 100% rename from qiaoba-modules/qiaoba-module-tenant/src/main/resources/MySQL/data/sys_menu/system/dept/menu rename to qiaoba-module/qiaoba-module-tenant/src/main/resources/MySQL/data/sys_menu/system/dept/menu diff --git a/qiaoba-modules/qiaoba-module-tenant/src/main/resources/MySQL/data/sys_menu/system/dict/button b/qiaoba-module/qiaoba-module-tenant/src/main/resources/MySQL/data/sys_menu/system/dict/button similarity index 100% rename from qiaoba-modules/qiaoba-module-tenant/src/main/resources/MySQL/data/sys_menu/system/dict/button rename to qiaoba-module/qiaoba-module-tenant/src/main/resources/MySQL/data/sys_menu/system/dict/button diff --git a/qiaoba-modules/qiaoba-module-tenant/src/main/resources/MySQL/data/sys_menu/system/dict/menu b/qiaoba-module/qiaoba-module-tenant/src/main/resources/MySQL/data/sys_menu/system/dict/menu similarity index 100% rename from qiaoba-modules/qiaoba-module-tenant/src/main/resources/MySQL/data/sys_menu/system/dict/menu rename to qiaoba-module/qiaoba-module-tenant/src/main/resources/MySQL/data/sys_menu/system/dict/menu diff --git a/qiaoba-modules/qiaoba-module-tenant/src/main/resources/MySQL/data/sys_menu/system/menu/button b/qiaoba-module/qiaoba-module-tenant/src/main/resources/MySQL/data/sys_menu/system/menu/button similarity index 100% rename from qiaoba-modules/qiaoba-module-tenant/src/main/resources/MySQL/data/sys_menu/system/menu/button rename to qiaoba-module/qiaoba-module-tenant/src/main/resources/MySQL/data/sys_menu/system/menu/button diff --git a/qiaoba-modules/qiaoba-module-tenant/src/main/resources/MySQL/data/sys_menu/system/menu/menu b/qiaoba-module/qiaoba-module-tenant/src/main/resources/MySQL/data/sys_menu/system/menu/menu similarity index 100% rename from qiaoba-modules/qiaoba-module-tenant/src/main/resources/MySQL/data/sys_menu/system/menu/menu rename to qiaoba-module/qiaoba-module-tenant/src/main/resources/MySQL/data/sys_menu/system/menu/menu diff --git a/qiaoba-modules/qiaoba-module-tenant/src/main/resources/MySQL/data/sys_menu/system/post/button b/qiaoba-module/qiaoba-module-tenant/src/main/resources/MySQL/data/sys_menu/system/post/button similarity index 100% rename from qiaoba-modules/qiaoba-module-tenant/src/main/resources/MySQL/data/sys_menu/system/post/button rename to qiaoba-module/qiaoba-module-tenant/src/main/resources/MySQL/data/sys_menu/system/post/button diff --git a/qiaoba-modules/qiaoba-module-tenant/src/main/resources/MySQL/data/sys_menu/system/post/menu b/qiaoba-module/qiaoba-module-tenant/src/main/resources/MySQL/data/sys_menu/system/post/menu similarity index 100% rename from qiaoba-modules/qiaoba-module-tenant/src/main/resources/MySQL/data/sys_menu/system/post/menu rename to qiaoba-module/qiaoba-module-tenant/src/main/resources/MySQL/data/sys_menu/system/post/menu diff --git a/qiaoba-modules/qiaoba-module-tenant/src/main/resources/MySQL/data/sys_menu/system/role/button b/qiaoba-module/qiaoba-module-tenant/src/main/resources/MySQL/data/sys_menu/system/role/button similarity index 100% rename from qiaoba-modules/qiaoba-module-tenant/src/main/resources/MySQL/data/sys_menu/system/role/button rename to qiaoba-module/qiaoba-module-tenant/src/main/resources/MySQL/data/sys_menu/system/role/button diff --git a/qiaoba-modules/qiaoba-module-tenant/src/main/resources/MySQL/data/sys_menu/system/role/menu b/qiaoba-module/qiaoba-module-tenant/src/main/resources/MySQL/data/sys_menu/system/role/menu similarity index 100% rename from qiaoba-modules/qiaoba-module-tenant/src/main/resources/MySQL/data/sys_menu/system/role/menu rename to qiaoba-module/qiaoba-module-tenant/src/main/resources/MySQL/data/sys_menu/system/role/menu diff --git a/qiaoba-modules/qiaoba-module-tenant/src/main/resources/MySQL/data/sys_menu/system/user/button b/qiaoba-module/qiaoba-module-tenant/src/main/resources/MySQL/data/sys_menu/system/user/button similarity index 100% rename from qiaoba-modules/qiaoba-module-tenant/src/main/resources/MySQL/data/sys_menu/system/user/button rename to qiaoba-module/qiaoba-module-tenant/src/main/resources/MySQL/data/sys_menu/system/user/button diff --git a/qiaoba-modules/qiaoba-module-tenant/src/main/resources/MySQL/data/sys_menu/system/user/menu b/qiaoba-module/qiaoba-module-tenant/src/main/resources/MySQL/data/sys_menu/system/user/menu similarity index 100% rename from qiaoba-modules/qiaoba-module-tenant/src/main/resources/MySQL/data/sys_menu/system/user/menu rename to qiaoba-module/qiaoba-module-tenant/src/main/resources/MySQL/data/sys_menu/system/user/menu diff --git a/qiaoba-modules/qiaoba-module-tenant/src/main/resources/MySQL/data/sys_post_data b/qiaoba-module/qiaoba-module-tenant/src/main/resources/MySQL/data/sys_post_data similarity index 100% rename from qiaoba-modules/qiaoba-module-tenant/src/main/resources/MySQL/data/sys_post_data rename to qiaoba-module/qiaoba-module-tenant/src/main/resources/MySQL/data/sys_post_data diff --git a/qiaoba-modules/qiaoba-module-tenant/src/main/resources/MySQL/data/sys_role_data b/qiaoba-module/qiaoba-module-tenant/src/main/resources/MySQL/data/sys_role_data similarity index 100% rename from qiaoba-modules/qiaoba-module-tenant/src/main/resources/MySQL/data/sys_role_data rename to qiaoba-module/qiaoba-module-tenant/src/main/resources/MySQL/data/sys_role_data diff --git a/qiaoba-modules/qiaoba-module-tenant/src/main/resources/MySQL/data/sys_user_data b/qiaoba-module/qiaoba-module-tenant/src/main/resources/MySQL/data/sys_user_data similarity index 100% rename from qiaoba-modules/qiaoba-module-tenant/src/main/resources/MySQL/data/sys_user_data rename to qiaoba-module/qiaoba-module-tenant/src/main/resources/MySQL/data/sys_user_data diff --git a/qiaoba-modules/qiaoba-module-tenant/src/main/resources/MySQL/table/base_tables b/qiaoba-module/qiaoba-module-tenant/src/main/resources/MySQL/table/base_tables similarity index 100% rename from qiaoba-modules/qiaoba-module-tenant/src/main/resources/MySQL/table/base_tables rename to qiaoba-module/qiaoba-module-tenant/src/main/resources/MySQL/table/base_tables diff --git a/qiaoba-modules/qiaoba-module-tenant/src/main/resources/init/data/sys_config_data b/qiaoba-module/qiaoba-module-tenant/src/main/resources/init/data/sys_config_data similarity index 100% rename from qiaoba-modules/qiaoba-module-tenant/src/main/resources/init/data/sys_config_data rename to qiaoba-module/qiaoba-module-tenant/src/main/resources/init/data/sys_config_data diff --git a/qiaoba-modules/qiaoba-module-tenant/src/main/resources/init/data/sys_menu/monitor/.gitkeep b/qiaoba-module/qiaoba-module-tenant/src/main/resources/init/data/sys_menu/monitor/.gitkeep similarity index 100% rename from qiaoba-modules/qiaoba-module-tenant/src/main/resources/init/data/sys_menu/monitor/.gitkeep rename to qiaoba-module/qiaoba-module-tenant/src/main/resources/init/data/sys_menu/monitor/.gitkeep diff --git a/qiaoba-modules/qiaoba-module-tenant/src/main/resources/init/data/sys_menu/monitor/online_user/button b/qiaoba-module/qiaoba-module-tenant/src/main/resources/init/data/sys_menu/monitor/online_user/button similarity index 100% rename from qiaoba-modules/qiaoba-module-tenant/src/main/resources/init/data/sys_menu/monitor/online_user/button rename to qiaoba-module/qiaoba-module-tenant/src/main/resources/init/data/sys_menu/monitor/online_user/button diff --git a/qiaoba-modules/qiaoba-module-tenant/src/main/resources/init/data/sys_menu/monitor/online_user/menu b/qiaoba-module/qiaoba-module-tenant/src/main/resources/init/data/sys_menu/monitor/online_user/menu similarity index 100% rename from qiaoba-modules/qiaoba-module-tenant/src/main/resources/init/data/sys_menu/monitor/online_user/menu rename to qiaoba-module/qiaoba-module-tenant/src/main/resources/init/data/sys_menu/monitor/online_user/menu diff --git a/qiaoba-modules/qiaoba-module-tenant/src/main/resources/init/data/sys_menu/system/config/button b/qiaoba-module/qiaoba-module-tenant/src/main/resources/init/data/sys_menu/system/config/button similarity index 100% rename from qiaoba-modules/qiaoba-module-tenant/src/main/resources/init/data/sys_menu/system/config/button rename to qiaoba-module/qiaoba-module-tenant/src/main/resources/init/data/sys_menu/system/config/button diff --git a/qiaoba-modules/qiaoba-module-tenant/src/main/resources/init/data/sys_menu/system/config/menu b/qiaoba-module/qiaoba-module-tenant/src/main/resources/init/data/sys_menu/system/config/menu similarity index 100% rename from qiaoba-modules/qiaoba-module-tenant/src/main/resources/init/data/sys_menu/system/config/menu rename to qiaoba-module/qiaoba-module-tenant/src/main/resources/init/data/sys_menu/system/config/menu diff --git a/qiaoba-modules/qiaoba-module-tenant/src/main/resources/init/data/sys_menu/system/dept/button b/qiaoba-module/qiaoba-module-tenant/src/main/resources/init/data/sys_menu/system/dept/button similarity index 100% rename from qiaoba-modules/qiaoba-module-tenant/src/main/resources/init/data/sys_menu/system/dept/button rename to qiaoba-module/qiaoba-module-tenant/src/main/resources/init/data/sys_menu/system/dept/button diff --git a/qiaoba-modules/qiaoba-module-tenant/src/main/resources/init/data/sys_menu/system/dept/menu b/qiaoba-module/qiaoba-module-tenant/src/main/resources/init/data/sys_menu/system/dept/menu similarity index 100% rename from qiaoba-modules/qiaoba-module-tenant/src/main/resources/init/data/sys_menu/system/dept/menu rename to qiaoba-module/qiaoba-module-tenant/src/main/resources/init/data/sys_menu/system/dept/menu diff --git a/qiaoba-modules/qiaoba-module-tenant/src/main/resources/init/data/sys_menu/system/dict/button b/qiaoba-module/qiaoba-module-tenant/src/main/resources/init/data/sys_menu/system/dict/button similarity index 100% rename from qiaoba-modules/qiaoba-module-tenant/src/main/resources/init/data/sys_menu/system/dict/button rename to qiaoba-module/qiaoba-module-tenant/src/main/resources/init/data/sys_menu/system/dict/button diff --git a/qiaoba-modules/qiaoba-module-tenant/src/main/resources/init/data/sys_menu/system/dict/menu b/qiaoba-module/qiaoba-module-tenant/src/main/resources/init/data/sys_menu/system/dict/menu similarity index 100% rename from qiaoba-modules/qiaoba-module-tenant/src/main/resources/init/data/sys_menu/system/dict/menu rename to qiaoba-module/qiaoba-module-tenant/src/main/resources/init/data/sys_menu/system/dict/menu diff --git a/qiaoba-modules/qiaoba-module-tenant/src/main/resources/init/data/sys_menu/system/menu/button b/qiaoba-module/qiaoba-module-tenant/src/main/resources/init/data/sys_menu/system/menu/button similarity index 100% rename from qiaoba-modules/qiaoba-module-tenant/src/main/resources/init/data/sys_menu/system/menu/button rename to qiaoba-module/qiaoba-module-tenant/src/main/resources/init/data/sys_menu/system/menu/button diff --git a/qiaoba-modules/qiaoba-module-tenant/src/main/resources/init/data/sys_menu/system/menu/menu b/qiaoba-module/qiaoba-module-tenant/src/main/resources/init/data/sys_menu/system/menu/menu similarity index 100% rename from qiaoba-modules/qiaoba-module-tenant/src/main/resources/init/data/sys_menu/system/menu/menu rename to qiaoba-module/qiaoba-module-tenant/src/main/resources/init/data/sys_menu/system/menu/menu diff --git a/qiaoba-modules/qiaoba-module-tenant/src/main/resources/init/data/sys_menu/system/post/button b/qiaoba-module/qiaoba-module-tenant/src/main/resources/init/data/sys_menu/system/post/button similarity index 100% rename from qiaoba-modules/qiaoba-module-tenant/src/main/resources/init/data/sys_menu/system/post/button rename to qiaoba-module/qiaoba-module-tenant/src/main/resources/init/data/sys_menu/system/post/button diff --git a/qiaoba-modules/qiaoba-module-tenant/src/main/resources/init/data/sys_menu/system/post/menu b/qiaoba-module/qiaoba-module-tenant/src/main/resources/init/data/sys_menu/system/post/menu similarity index 100% rename from qiaoba-modules/qiaoba-module-tenant/src/main/resources/init/data/sys_menu/system/post/menu rename to qiaoba-module/qiaoba-module-tenant/src/main/resources/init/data/sys_menu/system/post/menu diff --git a/qiaoba-modules/qiaoba-module-tenant/src/main/resources/init/data/sys_menu/system/role/button b/qiaoba-module/qiaoba-module-tenant/src/main/resources/init/data/sys_menu/system/role/button similarity index 100% rename from qiaoba-modules/qiaoba-module-tenant/src/main/resources/init/data/sys_menu/system/role/button rename to qiaoba-module/qiaoba-module-tenant/src/main/resources/init/data/sys_menu/system/role/button diff --git a/qiaoba-modules/qiaoba-module-tenant/src/main/resources/init/data/sys_menu/system/role/menu b/qiaoba-module/qiaoba-module-tenant/src/main/resources/init/data/sys_menu/system/role/menu similarity index 100% rename from qiaoba-modules/qiaoba-module-tenant/src/main/resources/init/data/sys_menu/system/role/menu rename to qiaoba-module/qiaoba-module-tenant/src/main/resources/init/data/sys_menu/system/role/menu diff --git a/qiaoba-modules/qiaoba-module-tenant/src/main/resources/init/data/sys_menu/system/user/button b/qiaoba-module/qiaoba-module-tenant/src/main/resources/init/data/sys_menu/system/user/button similarity index 100% rename from qiaoba-modules/qiaoba-module-tenant/src/main/resources/init/data/sys_menu/system/user/button rename to qiaoba-module/qiaoba-module-tenant/src/main/resources/init/data/sys_menu/system/user/button diff --git a/qiaoba-modules/qiaoba-module-tenant/src/main/resources/init/data/sys_menu/system/user/menu b/qiaoba-module/qiaoba-module-tenant/src/main/resources/init/data/sys_menu/system/user/menu similarity index 100% rename from qiaoba-modules/qiaoba-module-tenant/src/main/resources/init/data/sys_menu/system/user/menu rename to qiaoba-module/qiaoba-module-tenant/src/main/resources/init/data/sys_menu/system/user/menu diff --git a/qiaoba-modules/qiaoba-module-tenant/src/main/resources/init/data/sys_post_data b/qiaoba-module/qiaoba-module-tenant/src/main/resources/init/data/sys_post_data similarity index 100% rename from qiaoba-modules/qiaoba-module-tenant/src/main/resources/init/data/sys_post_data rename to qiaoba-module/qiaoba-module-tenant/src/main/resources/init/data/sys_post_data diff --git a/qiaoba-modules/qiaoba-module-tenant/src/main/resources/init/data/sys_role_data b/qiaoba-module/qiaoba-module-tenant/src/main/resources/init/data/sys_role_data similarity index 100% rename from qiaoba-modules/qiaoba-module-tenant/src/main/resources/init/data/sys_role_data rename to qiaoba-module/qiaoba-module-tenant/src/main/resources/init/data/sys_role_data diff --git a/qiaoba-modules/qiaoba-module-tenant/src/main/resources/init/data/sys_user_data b/qiaoba-module/qiaoba-module-tenant/src/main/resources/init/data/sys_user_data similarity index 100% rename from qiaoba-modules/qiaoba-module-tenant/src/main/resources/init/data/sys_user_data rename to qiaoba-module/qiaoba-module-tenant/src/main/resources/init/data/sys_user_data diff --git a/qiaoba-modules/qiaoba-module-tenant/src/main/resources/init/table/PostgreSQL/create_tables b/qiaoba-module/qiaoba-module-tenant/src/main/resources/init/table/PostgreSQL/create_tables similarity index 100% rename from qiaoba-modules/qiaoba-module-tenant/src/main/resources/init/table/PostgreSQL/create_tables rename to qiaoba-module/qiaoba-module-tenant/src/main/resources/init/table/PostgreSQL/create_tables diff --git a/qiaoba-modules/qiaoba-module-tenant/src/main/resources/mapper/SysTenantDatasourceMapper.xml b/qiaoba-module/qiaoba-module-tenant/src/main/resources/mapper/SysTenantDatasourceMapper.xml similarity index 74% rename from qiaoba-modules/qiaoba-module-tenant/src/main/resources/mapper/SysTenantDatasourceMapper.xml rename to qiaoba-module/qiaoba-module-tenant/src/main/resources/mapper/SysTenantDatasourceMapper.xml index 85b9139..1f12023 100644 --- a/qiaoba-modules/qiaoba-module-tenant/src/main/resources/mapper/SysTenantDatasourceMapper.xml +++ b/qiaoba-module/qiaoba-module-tenant/src/main/resources/mapper/SysTenantDatasourceMapper.xml @@ -11,4 +11,7 @@ update sys_tenant_datasource set is_primary = #{code} where tenant_id = #{tenantId} and datasource_id != #{excludeId} + diff --git a/qiaoba-modules/qiaoba-module-tenant/src/main/resources/mapper/SysTenantMapper.xml b/qiaoba-module/qiaoba-module-tenant/src/main/resources/mapper/SysTenantMapper.xml similarity index 100% rename from qiaoba-modules/qiaoba-module-tenant/src/main/resources/mapper/SysTenantMapper.xml rename to qiaoba-module/qiaoba-module-tenant/src/main/resources/mapper/SysTenantMapper.xml 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 deleted file mode 100644 index 759e1f1..0000000 --- a/qiaoba-modules/qiaoba-module-tenant/src/main/java/com/qiaoba/module/tenant/service/impl/SysTenantDatasourceServiceImpl.java +++ /dev/null @@ -1,114 +0,0 @@ -package com.qiaoba.module.tenant.service.impl; - -import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.qiaoba.api.tenant.entity.SysTenantDatasource; -import com.qiaoba.api.tenant.entity.param.SysTenantDatasourceParam; -import com.qiaoba.common.base.code.DatasourceErrorCode; -import com.qiaoba.common.base.constants.BaseConstant; -import com.qiaoba.common.base.enums.BaseEnum; -import com.qiaoba.common.base.exceptions.ServiceException; -import com.qiaoba.module.tenant.mapper.SysTenantDatasourceMapper; -import com.qiaoba.module.tenant.service.SysTenantDatasourceService; -import lombok.RequiredArgsConstructor; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.List; -import java.util.Objects; - -/** - * 租户数据源 服务层实现 - * - * @author ailanyin - * @version 1.0 - * @since 2023/6/7 14:49 - */ -@Service -@RequiredArgsConstructor -public class SysTenantDatasourceServiceImpl implements SysTenantDatasourceService { - - private final SysTenantDatasourceMapper sysTenantDatasourceMapper; - - @Override - public SysTenantDatasource selectPrimary(String tenantId) { - return sysTenantDatasourceMapper.selectOne(paramToWrapper(new SysTenantDatasourceParam(tenantId, BaseEnum.YES.getCode()))); - } - - @Override - public SysTenantDatasource selectPrimary(String tenantId, boolean allowNull) { - SysTenantDatasource primary = selectPrimary(tenantId); - if (!allowNull && Objects.isNull(primary)) { - throw new ServiceException(DatasourceErrorCode.NOT_FIND.getCode(), DatasourceErrorCode.NOT_FIND.getMsg()); - } - return primary; - } - - @Override - public SysTenantDatasource selectByIp(String tenantId, String ip) { - SysTenantDatasourceParam param = new SysTenantDatasourceParam(tenantId); - param.setIp(ip); - return sysTenantDatasourceMapper.selectOne(paramToWrapper(param)); - } - - @Override - public int insert(SysTenantDatasource sysTenantDatasource) { - return sysTenantDatasourceMapper.insert(sysTenantDatasource); - } - - @Override - public int updateById(SysTenantDatasource sysTenantDatasource) { - return sysTenantDatasourceMapper.updateById(sysTenantDatasource); - } - - @Override - public int deleteByIds(List ids) { - return sysTenantDatasourceMapper.deleteBatchIds(ids); - } - - @Override - public List selectList(String tenantId) { - return sysTenantDatasourceMapper.selectList(paramToWrapper(new SysTenantDatasourceParam(tenantId))); - } - - @Override - public List selectList(SysTenantDatasourceParam param) { - return sysTenantDatasourceMapper.selectList(paramToWrapper(param)); - } - - @Override - public List selectTenantIds() { - return sysTenantDatasourceMapper.selectTenantIds(); - } - - @Override - public void setBackupDatasourceExcludeId(String tenantId, String excludeId) { - sysTenantDatasourceMapper.setBackupDatasourceExcludeId(tenantId, excludeId, BaseEnum.NO.getCode()); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public int switchPrimary(String tenantId, String datasourceId) { - // todo 检查连接可用性 - // 更新其他的为非主要 - setBackupDatasourceExcludeId(tenantId, datasourceId); - // 更新他为主要 - SysTenantDatasource datasource = sysTenantDatasourceMapper.selectById(datasourceId); - datasource.setIsPrimary(BaseEnum.YES.getCode()); - int result = updateById(datasource); - // 刷新PrimaryDatasourceMap - if (result > BaseConstant.HANDLE_ERROR) { - // todo 刷新PrimaryDatasourceMap - } - return result; - } - - private QueryWrapper paramToWrapper(SysTenantDatasourceParam param) { - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.lambda() - .eq(StrUtil.isNotBlank(param.getTenantId()), SysTenantDatasource::getTenantId, param.getTenantId()) - .eq(StrUtil.isNotBlank(param.getIp()), SysTenantDatasource::getIp, param.getIp()) - .eq(StrUtil.isNotBlank(param.getIsPrimary()), SysTenantDatasource::getIsPrimary, param.getIsPrimary()); - return wrapper; - } -}