add

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

pom.xml

@@ -9,9 +9,9 @@
     <packaging>pom</packaging>
     <version>1.0</version>
     <modules>
-        <module>qiaoba-modules</module>
-        <module>qiaoba-apis</module>
-        <module>qiaoba-commons</module>
+        <module>qiaoba-module</module>
+        <module>qiaoba-api</module>
+        <module>qiaoba-common</module>
         <module>qiaoba-application</module>
         <module>qiaoba-auth</module>
     </modules>

qiaoba-api/pom.xml

@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>qiaoba-apis</artifactId>
+    <artifactId>qiaoba-api</artifactId>
     <packaging>pom</packaging>
 
     <description>api模块, 用于抽取共用部分, 供其他模块调用</description>

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">
     <parent>
-        <artifactId>qiaoba-apis</artifactId>
+        <artifactId>qiaoba-api</artifactId>
         <groupId>com.qiaoba</groupId>
         <version>1.0</version>
     </parent>

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;
 

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">
     <parent>
-        <artifactId>qiaoba-apis</artifactId>
+        <artifactId>qiaoba-api</artifactId>
         <groupId>com.qiaoba</groupId>
         <version>1.0</version>
     </parent>

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">
     <parent>
-        <artifactId>qiaoba-apis</artifactId>
+        <artifactId>qiaoba-api</artifactId>
         <groupId>com.qiaoba</groupId>
         <version>1.0</version>
     </parent>
@@ -12,4 +12,4 @@
     <artifactId>qiaoba-api-job</artifactId>
 
 
-</project>
+</project>

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">
     <parent>
-        <artifactId>qiaoba-apis</artifactId>
+        <artifactId>qiaoba-api</artifactId>
         <groupId>com.qiaoba</groupId>
         <version>1.0</version>
     </parent>

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">
     <parent>
-        <artifactId>qiaoba-apis</artifactId>
+        <artifactId>qiaoba-api</artifactId>
         <groupId>com.qiaoba</groupId>
         <version>1.0</version>
     </parent>

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">
     <parent>
-        <artifactId>qiaoba-apis</artifactId>
+        <artifactId>qiaoba-api</artifactId>
         <groupId>com.qiaoba</groupId>
         <version>1.0</version>
     </parent>

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">
     <parent>
-        <artifactId>qiaoba-apis</artifactId>
+        <artifactId>qiaoba-api</artifactId>
         <groupId>com.qiaoba</groupId>
         <version>1.0</version>
     </parent>
@@ -21,4 +21,4 @@
             <artifactId>qiaoba-common-doc</artifactId>
         </dependency>
     </dependencies>
-</project>
+</project>

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;
 

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;

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;

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;

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;

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;

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;

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;

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;
 

qiaoba-common/pom.xml

@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>qiaoba-commons</artifactId>
+    <artifactId>qiaoba-common</artifactId>
     <packaging>pom</packaging>
     <modules>
         <module>qiaoba-common-base</module>

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">
     <parent>
-        <artifactId>qiaoba-commons</artifactId>
+        <artifactId>qiaoba-common</artifactId>
         <groupId>com.qiaoba</groupId>
         <version>1.0</version>
     </parent>