From d8e5f09871f0d56d0efeb887625c5d9bcf78bf4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=98=BF=E6=B2=90?= Date: Fri, 20 Jan 2023 13:47:45 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81=E7=BB=93?= =?UTF-8?q?=E6=9E=84=EF=BC=8C=E6=9B=B4=E5=8A=A0=E5=90=88=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../maku/message/controller/SmsLogController.java | 2 +- .../message/controller/SmsPlatformController.java | 2 +- .../main/java/net/maku/message/dao/SmsLogDao.java | 2 +- .../java/net/maku/message/dao/SmsPlatformDao.java | 2 +- .../net/maku/message/entity/SmsPlatformEntity.java | 2 +- .../net/maku/message/service/SmsLogService.java | 4 +- .../maku/message/service/SmsPlatformService.java | 4 +- .../message/service/impl/SmsLogServiceImpl.java | 4 +- .../service/impl/SmsPlatformServiceImpl.java | 4 +- .../quartz/controller/ScheduleJobController.java | 2 +- .../controller/ScheduleJobLogController.java | 2 +- .../java/net/maku/quartz/dao/ScheduleJobDao.java | 2 +- .../net/maku/quartz/dao/ScheduleJobLogDao.java | 2 +- .../maku/quartz/service/ScheduleJobLogService.java | 4 +- .../maku/quartz/service/ScheduleJobService.java | 4 +- .../service/impl/ScheduleJobLogServiceImpl.java | 4 +- .../service/impl/ScheduleJobServiceImpl.java | 4 +- .../system/controller/SysAttachmentController.java | 2 +- .../system/controller/SysDictDataController.java | 2 +- .../system/controller/SysDictTypeController.java | 2 +- .../system/controller/SysLogLoginController.java | 2 +- .../system/controller/SysParamsController.java | 2 +- .../maku/system/controller/SysPostController.java | 2 +- .../maku/system/controller/SysRoleController.java | 2 +- .../maku/system/controller/SysUserController.java | 2 +- .../java/net/maku/system/dao/SysAttachmentDao.java | 2 +- .../java/net/maku/system/dao/SysDictDataDao.java | 2 +- .../java/net/maku/system/dao/SysDictTypeDao.java | 2 +- .../java/net/maku/system/dao/SysLogLoginDao.java | 2 +- .../main/java/net/maku/system/dao/SysMenuDao.java | 2 +- .../main/java/net/maku/system/dao/SysOrgDao.java | 2 +- .../java/net/maku/system/dao/SysParamsDao.java | 2 +- .../main/java/net/maku/system/dao/SysPostDao.java | 2 +- .../main/java/net/maku/system/dao/SysRoleDao.java | 2 +- .../net/maku/system/dao/SysRoleDataScopeDao.java | 2 +- .../java/net/maku/system/dao/SysRoleMenuDao.java | 2 +- .../main/java/net/maku/system/dao/SysUserDao.java | 2 +- .../java/net/maku/system/dao/SysUserPostDao.java | 2 +- .../java/net/maku/system/dao/SysUserRoleDao.java | 2 +- .../maku/system/entity/SysAttachmentEntity.java | 2 +- .../net/maku/system/entity/SysDictDataEntity.java | 2 +- .../net/maku/system/entity/SysDictTypeEntity.java | 2 +- .../java/net/maku/system/entity/SysMenuEntity.java | 2 +- .../java/net/maku/system/entity/SysOrgEntity.java | 2 +- .../net/maku/system/entity/SysParamsEntity.java | 2 +- .../java/net/maku/system/entity/SysPostEntity.java | 2 +- .../maku/system/entity/SysRoleDataScopeEntity.java | 2 +- .../java/net/maku/system/entity/SysRoleEntity.java | 2 +- .../net/maku/system/entity/SysRoleMenuEntity.java | 2 +- .../java/net/maku/system/entity/SysUserEntity.java | 2 +- .../net/maku/system/entity/SysUserPostEntity.java | 2 +- .../net/maku/system/entity/SysUserRoleEntity.java | 2 +- .../maku/system/service/SysAttachmentService.java | 4 +- .../maku/system/service/SysDictDataService.java | 4 +- .../maku/system/service/SysDictTypeService.java | 4 +- .../maku/system/service/SysLogLoginService.java | 4 +- .../net/maku/system/service/SysMenuService.java | 2 +- .../net/maku/system/service/SysOrgService.java | 2 +- .../net/maku/system/service/SysParamsService.java | 4 +- .../net/maku/system/service/SysPostService.java | 4 +- .../system/service/SysRoleDataScopeService.java | 2 +- .../maku/system/service/SysRoleMenuService.java | 2 +- .../net/maku/system/service/SysRoleService.java | 4 +- .../maku/system/service/SysUserPostService.java | 2 +- .../maku/system/service/SysUserRoleService.java | 2 +- .../net/maku/system/service/SysUserService.java | 4 +- .../service/impl/SysAttachmentServiceImpl.java | 4 +- .../service/impl/SysDictDataServiceImpl.java | 4 +- .../service/impl/SysDictTypeServiceImpl.java | 4 +- .../service/impl/SysLogLoginServiceImpl.java | 4 +- .../system/service/impl/SysMenuServiceImpl.java | 2 +- .../system/service/impl/SysOrgServiceImpl.java | 2 +- .../system/service/impl/SysParamsServiceImpl.java | 4 +- .../system/service/impl/SysPostServiceImpl.java | 4 +- .../service/impl/SysRoleDataScopeServiceImpl.java | 2 +- .../service/impl/SysRoleMenuServiceImpl.java | 2 +- .../system/service/impl/SysRoleServiceImpl.java | 4 +- .../service/impl/SysUserPostServiceImpl.java | 2 +- .../service/impl/SysUserRoleServiceImpl.java | 2 +- .../system/service/impl/SysUserServiceImpl.java | 4 +- .../maku/framework/common/config/CorsConfig.java | 28 ++++++ .../maku/framework/common/config/RedisConfig.java | 46 +++++++++ .../framework/common/config/SwaggerConfig.java | 43 ++++++++ .../net/maku/framework/common/dao/BaseDao.java | 13 --- .../maku/framework/common/entity/BaseEntity.java | 59 ----------- .../common/handler/FieldMetaObjectHandler.java | 52 ---------- .../framework/common/interceptor/DataScope.java | 16 --- .../interceptor/DataScopeInnerInterceptor.java | 81 --------------- .../net/maku/framework/common/page/PageResult.java | 34 ------- .../maku/framework/common/service/BaseService.java | 13 --- .../common/service/impl/BaseServiceImpl.java | 110 --------------------- .../maku/framework/common/utils/PageResult.java | 34 +++++++ .../java/net/maku/framework/config/CorsConfig.java | 28 ------ .../maku/framework/config/MybatisPlusConfig.java | 39 -------- .../net/maku/framework/config/RedisConfig.java | 46 --------- .../net/maku/framework/config/SwaggerConfig.java | 43 -------- .../mybatis/config/MybatisPlusConfig.java | 39 ++++++++ .../net/maku/framework/mybatis/dao/BaseDao.java | 13 +++ .../maku/framework/mybatis/entity/BaseEntity.java | 59 +++++++++++ .../mybatis/handler/FieldMetaObjectHandler.java | 52 ++++++++++ .../framework/mybatis/interceptor/DataScope.java | 16 +++ .../interceptor/DataScopeInnerInterceptor.java | 81 +++++++++++++++ .../framework/mybatis/service/BaseService.java | 13 +++ .../mybatis/service/impl/BaseServiceImpl.java | 110 +++++++++++++++++++++ 104 files changed, 638 insertions(+), 638 deletions(-) create mode 100644 maku-framework/src/main/java/net/maku/framework/common/config/CorsConfig.java create mode 100644 maku-framework/src/main/java/net/maku/framework/common/config/RedisConfig.java create mode 100644 maku-framework/src/main/java/net/maku/framework/common/config/SwaggerConfig.java delete mode 100644 maku-framework/src/main/java/net/maku/framework/common/dao/BaseDao.java delete mode 100644 maku-framework/src/main/java/net/maku/framework/common/entity/BaseEntity.java delete mode 100644 maku-framework/src/main/java/net/maku/framework/common/handler/FieldMetaObjectHandler.java delete mode 100644 maku-framework/src/main/java/net/maku/framework/common/interceptor/DataScope.java delete mode 100644 maku-framework/src/main/java/net/maku/framework/common/interceptor/DataScopeInnerInterceptor.java delete mode 100644 maku-framework/src/main/java/net/maku/framework/common/page/PageResult.java delete mode 100644 maku-framework/src/main/java/net/maku/framework/common/service/BaseService.java delete mode 100644 maku-framework/src/main/java/net/maku/framework/common/service/impl/BaseServiceImpl.java create mode 100644 maku-framework/src/main/java/net/maku/framework/common/utils/PageResult.java delete mode 100644 maku-framework/src/main/java/net/maku/framework/config/CorsConfig.java delete mode 100644 maku-framework/src/main/java/net/maku/framework/config/MybatisPlusConfig.java delete mode 100644 maku-framework/src/main/java/net/maku/framework/config/RedisConfig.java delete mode 100644 maku-framework/src/main/java/net/maku/framework/config/SwaggerConfig.java create mode 100644 maku-framework/src/main/java/net/maku/framework/mybatis/config/MybatisPlusConfig.java create mode 100644 maku-framework/src/main/java/net/maku/framework/mybatis/dao/BaseDao.java create mode 100644 maku-framework/src/main/java/net/maku/framework/mybatis/entity/BaseEntity.java create mode 100644 maku-framework/src/main/java/net/maku/framework/mybatis/handler/FieldMetaObjectHandler.java create mode 100644 maku-framework/src/main/java/net/maku/framework/mybatis/interceptor/DataScope.java create mode 100644 maku-framework/src/main/java/net/maku/framework/mybatis/interceptor/DataScopeInnerInterceptor.java create mode 100644 maku-framework/src/main/java/net/maku/framework/mybatis/service/BaseService.java create mode 100644 maku-framework/src/main/java/net/maku/framework/mybatis/service/impl/BaseServiceImpl.java diff --git a/maku-boot-module/maku-module-message/src/main/java/net/maku/message/controller/SmsLogController.java b/maku-boot-module/maku-module-message/src/main/java/net/maku/message/controller/SmsLogController.java index 251509a..6346e55 100644 --- a/maku-boot-module/maku-module-message/src/main/java/net/maku/message/controller/SmsLogController.java +++ b/maku-boot-module/maku-module-message/src/main/java/net/maku/message/controller/SmsLogController.java @@ -4,7 +4,7 @@ import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.validation.Valid; import lombok.AllArgsConstructor; -import net.maku.framework.common.page.PageResult; +import net.maku.framework.common.utils.PageResult; import net.maku.framework.common.utils.Result; import net.maku.message.convert.SmsLogConvert; import net.maku.message.entity.SmsLogEntity; diff --git a/maku-boot-module/maku-module-message/src/main/java/net/maku/message/controller/SmsPlatformController.java b/maku-boot-module/maku-module-message/src/main/java/net/maku/message/controller/SmsPlatformController.java index ef4d87f..1c1b30e 100644 --- a/maku-boot-module/maku-module-message/src/main/java/net/maku/message/controller/SmsPlatformController.java +++ b/maku-boot-module/maku-module-message/src/main/java/net/maku/message/controller/SmsPlatformController.java @@ -4,7 +4,7 @@ import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.validation.Valid; import lombok.AllArgsConstructor; -import net.maku.framework.common.page.PageResult; +import net.maku.framework.common.utils.PageResult; import net.maku.framework.common.utils.ExceptionUtils; import net.maku.framework.common.utils.Result; import net.maku.message.convert.SmsPlatformConvert; diff --git a/maku-boot-module/maku-module-message/src/main/java/net/maku/message/dao/SmsLogDao.java b/maku-boot-module/maku-module-message/src/main/java/net/maku/message/dao/SmsLogDao.java index 01a9968..cd15cd9 100644 --- a/maku-boot-module/maku-module-message/src/main/java/net/maku/message/dao/SmsLogDao.java +++ b/maku-boot-module/maku-module-message/src/main/java/net/maku/message/dao/SmsLogDao.java @@ -1,6 +1,6 @@ package net.maku.message.dao; -import net.maku.framework.common.dao.BaseDao; +import net.maku.framework.mybatis.dao.BaseDao; import net.maku.message.entity.SmsLogEntity; import org.apache.ibatis.annotations.Mapper; diff --git a/maku-boot-module/maku-module-message/src/main/java/net/maku/message/dao/SmsPlatformDao.java b/maku-boot-module/maku-module-message/src/main/java/net/maku/message/dao/SmsPlatformDao.java index 33c6643..1908b78 100644 --- a/maku-boot-module/maku-module-message/src/main/java/net/maku/message/dao/SmsPlatformDao.java +++ b/maku-boot-module/maku-module-message/src/main/java/net/maku/message/dao/SmsPlatformDao.java @@ -1,6 +1,6 @@ package net.maku.message.dao; -import net.maku.framework.common.dao.BaseDao; +import net.maku.framework.mybatis.dao.BaseDao; import net.maku.message.entity.SmsPlatformEntity; import org.apache.ibatis.annotations.Mapper; diff --git a/maku-boot-module/maku-module-message/src/main/java/net/maku/message/entity/SmsPlatformEntity.java b/maku-boot-module/maku-module-message/src/main/java/net/maku/message/entity/SmsPlatformEntity.java index d91a0c0..1931ce4 100644 --- a/maku-boot-module/maku-module-message/src/main/java/net/maku/message/entity/SmsPlatformEntity.java +++ b/maku-boot-module/maku-module-message/src/main/java/net/maku/message/entity/SmsPlatformEntity.java @@ -3,7 +3,7 @@ package net.maku.message.entity; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; -import net.maku.framework.common.entity.BaseEntity; +import net.maku.framework.mybatis.entity.BaseEntity; /** * 短信平台 diff --git a/maku-boot-module/maku-module-message/src/main/java/net/maku/message/service/SmsLogService.java b/maku-boot-module/maku-module-message/src/main/java/net/maku/message/service/SmsLogService.java index 9332abe..d539485 100644 --- a/maku-boot-module/maku-module-message/src/main/java/net/maku/message/service/SmsLogService.java +++ b/maku-boot-module/maku-module-message/src/main/java/net/maku/message/service/SmsLogService.java @@ -1,7 +1,7 @@ package net.maku.message.service; -import net.maku.framework.common.page.PageResult; -import net.maku.framework.common.service.BaseService; +import net.maku.framework.common.utils.PageResult; +import net.maku.framework.mybatis.service.BaseService; import net.maku.message.entity.SmsLogEntity; import net.maku.message.query.SmsLogQuery; import net.maku.message.vo.SmsLogVO; diff --git a/maku-boot-module/maku-module-message/src/main/java/net/maku/message/service/SmsPlatformService.java b/maku-boot-module/maku-module-message/src/main/java/net/maku/message/service/SmsPlatformService.java index a1a64fa..0cdb45a 100644 --- a/maku-boot-module/maku-module-message/src/main/java/net/maku/message/service/SmsPlatformService.java +++ b/maku-boot-module/maku-module-message/src/main/java/net/maku/message/service/SmsPlatformService.java @@ -1,7 +1,7 @@ package net.maku.message.service; -import net.maku.framework.common.page.PageResult; -import net.maku.framework.common.service.BaseService; +import net.maku.framework.common.utils.PageResult; +import net.maku.framework.mybatis.service.BaseService; import net.maku.message.entity.SmsPlatformEntity; import net.maku.message.query.SmsPlatformQuery; import net.maku.message.sms.config.SmsConfig; diff --git a/maku-boot-module/maku-module-message/src/main/java/net/maku/message/service/impl/SmsLogServiceImpl.java b/maku-boot-module/maku-module-message/src/main/java/net/maku/message/service/impl/SmsLogServiceImpl.java index efae8d8..37f2677 100644 --- a/maku-boot-module/maku-module-message/src/main/java/net/maku/message/service/impl/SmsLogServiceImpl.java +++ b/maku-boot-module/maku-module-message/src/main/java/net/maku/message/service/impl/SmsLogServiceImpl.java @@ -4,8 +4,8 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.AllArgsConstructor; -import net.maku.framework.common.page.PageResult; -import net.maku.framework.common.service.impl.BaseServiceImpl; +import net.maku.framework.common.utils.PageResult; +import net.maku.framework.mybatis.service.impl.BaseServiceImpl; import net.maku.message.convert.SmsLogConvert; import net.maku.message.dao.SmsLogDao; import net.maku.message.entity.SmsLogEntity; diff --git a/maku-boot-module/maku-module-message/src/main/java/net/maku/message/service/impl/SmsPlatformServiceImpl.java b/maku-boot-module/maku-module-message/src/main/java/net/maku/message/service/impl/SmsPlatformServiceImpl.java index 28c5c87..2ff3515 100644 --- a/maku-boot-module/maku-module-message/src/main/java/net/maku/message/service/impl/SmsPlatformServiceImpl.java +++ b/maku-boot-module/maku-module-message/src/main/java/net/maku/message/service/impl/SmsPlatformServiceImpl.java @@ -6,8 +6,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.AllArgsConstructor; import net.maku.framework.common.constant.Constant; -import net.maku.framework.common.page.PageResult; -import net.maku.framework.common.service.impl.BaseServiceImpl; +import net.maku.framework.common.utils.PageResult; +import net.maku.framework.mybatis.service.impl.BaseServiceImpl; import net.maku.message.cache.SmsPlatformCache; import net.maku.message.convert.SmsPlatformConvert; import net.maku.message.dao.SmsPlatformDao; diff --git a/maku-boot-module/maku-module-quartz/src/main/java/net/maku/quartz/controller/ScheduleJobController.java b/maku-boot-module/maku-module-quartz/src/main/java/net/maku/quartz/controller/ScheduleJobController.java index e0c8e20..f7ef1db 100644 --- a/maku-boot-module/maku-module-quartz/src/main/java/net/maku/quartz/controller/ScheduleJobController.java +++ b/maku-boot-module/maku-module-quartz/src/main/java/net/maku/quartz/controller/ScheduleJobController.java @@ -7,7 +7,7 @@ import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.validation.Valid; import lombok.AllArgsConstructor; import net.maku.framework.common.exception.ServerException; -import net.maku.framework.common.page.PageResult; +import net.maku.framework.common.utils.PageResult; import net.maku.framework.common.utils.Result; import net.maku.quartz.convert.ScheduleJobConvert; import net.maku.quartz.entity.ScheduleJobEntity; diff --git a/maku-boot-module/maku-module-quartz/src/main/java/net/maku/quartz/controller/ScheduleJobLogController.java b/maku-boot-module/maku-module-quartz/src/main/java/net/maku/quartz/controller/ScheduleJobLogController.java index 5f0f9a3..6018705 100644 --- a/maku-boot-module/maku-module-quartz/src/main/java/net/maku/quartz/controller/ScheduleJobLogController.java +++ b/maku-boot-module/maku-module-quartz/src/main/java/net/maku/quartz/controller/ScheduleJobLogController.java @@ -4,7 +4,7 @@ import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.validation.Valid; import lombok.AllArgsConstructor; -import net.maku.framework.common.page.PageResult; +import net.maku.framework.common.utils.PageResult; import net.maku.framework.common.utils.Result; import net.maku.quartz.convert.ScheduleJobLogConvert; import net.maku.quartz.entity.ScheduleJobLogEntity; diff --git a/maku-boot-module/maku-module-quartz/src/main/java/net/maku/quartz/dao/ScheduleJobDao.java b/maku-boot-module/maku-module-quartz/src/main/java/net/maku/quartz/dao/ScheduleJobDao.java index 2328b47..d9d65c6 100644 --- a/maku-boot-module/maku-module-quartz/src/main/java/net/maku/quartz/dao/ScheduleJobDao.java +++ b/maku-boot-module/maku-module-quartz/src/main/java/net/maku/quartz/dao/ScheduleJobDao.java @@ -1,6 +1,6 @@ package net.maku.quartz.dao; -import net.maku.framework.common.dao.BaseDao; +import net.maku.framework.mybatis.dao.BaseDao; import net.maku.quartz.entity.ScheduleJobEntity; import org.apache.ibatis.annotations.Mapper; diff --git a/maku-boot-module/maku-module-quartz/src/main/java/net/maku/quartz/dao/ScheduleJobLogDao.java b/maku-boot-module/maku-module-quartz/src/main/java/net/maku/quartz/dao/ScheduleJobLogDao.java index a03e425..3f2b7b2 100644 --- a/maku-boot-module/maku-module-quartz/src/main/java/net/maku/quartz/dao/ScheduleJobLogDao.java +++ b/maku-boot-module/maku-module-quartz/src/main/java/net/maku/quartz/dao/ScheduleJobLogDao.java @@ -1,6 +1,6 @@ package net.maku.quartz.dao; -import net.maku.framework.common.dao.BaseDao; +import net.maku.framework.mybatis.dao.BaseDao; import net.maku.quartz.entity.ScheduleJobLogEntity; import org.apache.ibatis.annotations.Mapper; diff --git a/maku-boot-module/maku-module-quartz/src/main/java/net/maku/quartz/service/ScheduleJobLogService.java b/maku-boot-module/maku-module-quartz/src/main/java/net/maku/quartz/service/ScheduleJobLogService.java index 71532de..fceb1c2 100644 --- a/maku-boot-module/maku-module-quartz/src/main/java/net/maku/quartz/service/ScheduleJobLogService.java +++ b/maku-boot-module/maku-module-quartz/src/main/java/net/maku/quartz/service/ScheduleJobLogService.java @@ -1,7 +1,7 @@ package net.maku.quartz.service; -import net.maku.framework.common.page.PageResult; -import net.maku.framework.common.service.BaseService; +import net.maku.framework.common.utils.PageResult; +import net.maku.framework.mybatis.service.BaseService; import net.maku.quartz.entity.ScheduleJobLogEntity; import net.maku.quartz.query.ScheduleJobLogQuery; import net.maku.quartz.vo.ScheduleJobLogVO; diff --git a/maku-boot-module/maku-module-quartz/src/main/java/net/maku/quartz/service/ScheduleJobService.java b/maku-boot-module/maku-module-quartz/src/main/java/net/maku/quartz/service/ScheduleJobService.java index bf4ed9e..5912555 100644 --- a/maku-boot-module/maku-module-quartz/src/main/java/net/maku/quartz/service/ScheduleJobService.java +++ b/maku-boot-module/maku-module-quartz/src/main/java/net/maku/quartz/service/ScheduleJobService.java @@ -1,7 +1,7 @@ package net.maku.quartz.service; -import net.maku.framework.common.page.PageResult; -import net.maku.framework.common.service.BaseService; +import net.maku.framework.common.utils.PageResult; +import net.maku.framework.mybatis.service.BaseService; import net.maku.quartz.entity.ScheduleJobEntity; import net.maku.quartz.query.ScheduleJobQuery; import net.maku.quartz.vo.ScheduleJobVO; diff --git a/maku-boot-module/maku-module-quartz/src/main/java/net/maku/quartz/service/impl/ScheduleJobLogServiceImpl.java b/maku-boot-module/maku-module-quartz/src/main/java/net/maku/quartz/service/impl/ScheduleJobLogServiceImpl.java index ed5d816..583939a 100644 --- a/maku-boot-module/maku-module-quartz/src/main/java/net/maku/quartz/service/impl/ScheduleJobLogServiceImpl.java +++ b/maku-boot-module/maku-module-quartz/src/main/java/net/maku/quartz/service/impl/ScheduleJobLogServiceImpl.java @@ -5,8 +5,8 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.AllArgsConstructor; -import net.maku.framework.common.page.PageResult; -import net.maku.framework.common.service.impl.BaseServiceImpl; +import net.maku.framework.common.utils.PageResult; +import net.maku.framework.mybatis.service.impl.BaseServiceImpl; import net.maku.quartz.convert.ScheduleJobLogConvert; import net.maku.quartz.dao.ScheduleJobLogDao; import net.maku.quartz.entity.ScheduleJobLogEntity; diff --git a/maku-boot-module/maku-module-quartz/src/main/java/net/maku/quartz/service/impl/ScheduleJobServiceImpl.java b/maku-boot-module/maku-module-quartz/src/main/java/net/maku/quartz/service/impl/ScheduleJobServiceImpl.java index 989662b..cbe67b5 100644 --- a/maku-boot-module/maku-module-quartz/src/main/java/net/maku/quartz/service/impl/ScheduleJobServiceImpl.java +++ b/maku-boot-module/maku-module-quartz/src/main/java/net/maku/quartz/service/impl/ScheduleJobServiceImpl.java @@ -6,8 +6,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import jakarta.annotation.PostConstruct; import lombok.AllArgsConstructor; -import net.maku.framework.common.page.PageResult; -import net.maku.framework.common.service.impl.BaseServiceImpl; +import net.maku.framework.common.utils.PageResult; +import net.maku.framework.mybatis.service.impl.BaseServiceImpl; import net.maku.quartz.convert.ScheduleJobConvert; import net.maku.quartz.dao.ScheduleJobDao; import net.maku.quartz.entity.ScheduleJobEntity; diff --git a/maku-boot-system/src/main/java/net/maku/system/controller/SysAttachmentController.java b/maku-boot-system/src/main/java/net/maku/system/controller/SysAttachmentController.java index 3fd4765..3352c37 100644 --- a/maku-boot-system/src/main/java/net/maku/system/controller/SysAttachmentController.java +++ b/maku-boot-system/src/main/java/net/maku/system/controller/SysAttachmentController.java @@ -4,7 +4,7 @@ import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.validation.Valid; import lombok.AllArgsConstructor; -import net.maku.framework.common.page.PageResult; +import net.maku.framework.common.utils.PageResult; import net.maku.framework.common.utils.Result; import net.maku.system.query.SysAttachmentQuery; import net.maku.system.service.SysAttachmentService; diff --git a/maku-boot-system/src/main/java/net/maku/system/controller/SysDictDataController.java b/maku-boot-system/src/main/java/net/maku/system/controller/SysDictDataController.java index 864439f..4164010 100644 --- a/maku-boot-system/src/main/java/net/maku/system/controller/SysDictDataController.java +++ b/maku-boot-system/src/main/java/net/maku/system/controller/SysDictDataController.java @@ -4,7 +4,7 @@ import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.validation.Valid; import lombok.AllArgsConstructor; -import net.maku.framework.common.page.PageResult; +import net.maku.framework.common.utils.PageResult; import net.maku.framework.common.utils.Result; import net.maku.system.convert.SysDictDataConvert; import net.maku.system.entity.SysDictDataEntity; diff --git a/maku-boot-system/src/main/java/net/maku/system/controller/SysDictTypeController.java b/maku-boot-system/src/main/java/net/maku/system/controller/SysDictTypeController.java index 43fb157..b29f903 100644 --- a/maku-boot-system/src/main/java/net/maku/system/controller/SysDictTypeController.java +++ b/maku-boot-system/src/main/java/net/maku/system/controller/SysDictTypeController.java @@ -4,7 +4,7 @@ import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.validation.Valid; import lombok.AllArgsConstructor; -import net.maku.framework.common.page.PageResult; +import net.maku.framework.common.utils.PageResult; import net.maku.framework.common.utils.Result; import net.maku.system.convert.SysDictTypeConvert; import net.maku.system.entity.SysDictTypeEntity; diff --git a/maku-boot-system/src/main/java/net/maku/system/controller/SysLogLoginController.java b/maku-boot-system/src/main/java/net/maku/system/controller/SysLogLoginController.java index ae31b11..4078452 100644 --- a/maku-boot-system/src/main/java/net/maku/system/controller/SysLogLoginController.java +++ b/maku-boot-system/src/main/java/net/maku/system/controller/SysLogLoginController.java @@ -4,7 +4,7 @@ import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.validation.Valid; import lombok.AllArgsConstructor; -import net.maku.framework.common.page.PageResult; +import net.maku.framework.common.utils.PageResult; import net.maku.framework.common.utils.Result; import net.maku.system.query.SysLogLoginQuery; import net.maku.system.service.SysLogLoginService; diff --git a/maku-boot-system/src/main/java/net/maku/system/controller/SysParamsController.java b/maku-boot-system/src/main/java/net/maku/system/controller/SysParamsController.java index 0ed47fe..b199c97 100644 --- a/maku-boot-system/src/main/java/net/maku/system/controller/SysParamsController.java +++ b/maku-boot-system/src/main/java/net/maku/system/controller/SysParamsController.java @@ -4,7 +4,7 @@ import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.validation.Valid; import lombok.AllArgsConstructor; -import net.maku.framework.common.page.PageResult; +import net.maku.framework.common.utils.PageResult; import net.maku.framework.common.utils.Result; import net.maku.system.convert.SysParamsConvert; import net.maku.system.entity.SysParamsEntity; diff --git a/maku-boot-system/src/main/java/net/maku/system/controller/SysPostController.java b/maku-boot-system/src/main/java/net/maku/system/controller/SysPostController.java index 6467b59..9a15e5d 100644 --- a/maku-boot-system/src/main/java/net/maku/system/controller/SysPostController.java +++ b/maku-boot-system/src/main/java/net/maku/system/controller/SysPostController.java @@ -4,7 +4,7 @@ import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.validation.Valid; import lombok.AllArgsConstructor; -import net.maku.framework.common.page.PageResult; +import net.maku.framework.common.utils.PageResult; import net.maku.framework.common.utils.Result; import net.maku.system.convert.SysPostConvert; import net.maku.system.entity.SysPostEntity; diff --git a/maku-boot-system/src/main/java/net/maku/system/controller/SysRoleController.java b/maku-boot-system/src/main/java/net/maku/system/controller/SysRoleController.java index 536a7b4..7cd8710 100644 --- a/maku-boot-system/src/main/java/net/maku/system/controller/SysRoleController.java +++ b/maku-boot-system/src/main/java/net/maku/system/controller/SysRoleController.java @@ -4,7 +4,7 @@ import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.validation.Valid; import lombok.AllArgsConstructor; -import net.maku.framework.common.page.PageResult; +import net.maku.framework.common.utils.PageResult; import net.maku.framework.common.utils.Result; import net.maku.framework.security.user.SecurityUser; import net.maku.framework.security.user.UserDetail; diff --git a/maku-boot-system/src/main/java/net/maku/system/controller/SysUserController.java b/maku-boot-system/src/main/java/net/maku/system/controller/SysUserController.java index c53e908..7721203 100644 --- a/maku-boot-system/src/main/java/net/maku/system/controller/SysUserController.java +++ b/maku-boot-system/src/main/java/net/maku/system/controller/SysUserController.java @@ -5,7 +5,7 @@ import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.validation.Valid; import lombok.AllArgsConstructor; -import net.maku.framework.common.page.PageResult; +import net.maku.framework.common.utils.PageResult; import net.maku.framework.common.utils.Result; import net.maku.framework.security.user.SecurityUser; import net.maku.framework.security.user.UserDetail; diff --git a/maku-boot-system/src/main/java/net/maku/system/dao/SysAttachmentDao.java b/maku-boot-system/src/main/java/net/maku/system/dao/SysAttachmentDao.java index a47304f..99c295d 100644 --- a/maku-boot-system/src/main/java/net/maku/system/dao/SysAttachmentDao.java +++ b/maku-boot-system/src/main/java/net/maku/system/dao/SysAttachmentDao.java @@ -1,6 +1,6 @@ package net.maku.system.dao; -import net.maku.framework.common.dao.BaseDao; +import net.maku.framework.mybatis.dao.BaseDao; import net.maku.system.entity.SysAttachmentEntity; import org.apache.ibatis.annotations.Mapper; diff --git a/maku-boot-system/src/main/java/net/maku/system/dao/SysDictDataDao.java b/maku-boot-system/src/main/java/net/maku/system/dao/SysDictDataDao.java index b1d8246..601757f 100644 --- a/maku-boot-system/src/main/java/net/maku/system/dao/SysDictDataDao.java +++ b/maku-boot-system/src/main/java/net/maku/system/dao/SysDictDataDao.java @@ -1,6 +1,6 @@ package net.maku.system.dao; -import net.maku.framework.common.dao.BaseDao; +import net.maku.framework.mybatis.dao.BaseDao; import net.maku.system.entity.SysDictDataEntity; import net.maku.system.vo.SysDictVO; import org.apache.ibatis.annotations.Mapper; diff --git a/maku-boot-system/src/main/java/net/maku/system/dao/SysDictTypeDao.java b/maku-boot-system/src/main/java/net/maku/system/dao/SysDictTypeDao.java index 39652e5..76f9fee 100644 --- a/maku-boot-system/src/main/java/net/maku/system/dao/SysDictTypeDao.java +++ b/maku-boot-system/src/main/java/net/maku/system/dao/SysDictTypeDao.java @@ -1,6 +1,6 @@ package net.maku.system.dao; -import net.maku.framework.common.dao.BaseDao; +import net.maku.framework.mybatis.dao.BaseDao; import net.maku.system.entity.SysDictTypeEntity; import org.apache.ibatis.annotations.Mapper; diff --git a/maku-boot-system/src/main/java/net/maku/system/dao/SysLogLoginDao.java b/maku-boot-system/src/main/java/net/maku/system/dao/SysLogLoginDao.java index 688d9ab..291d1c3 100644 --- a/maku-boot-system/src/main/java/net/maku/system/dao/SysLogLoginDao.java +++ b/maku-boot-system/src/main/java/net/maku/system/dao/SysLogLoginDao.java @@ -1,6 +1,6 @@ package net.maku.system.dao; -import net.maku.framework.common.dao.BaseDao; +import net.maku.framework.mybatis.dao.BaseDao; import net.maku.system.entity.SysLogLoginEntity; import org.apache.ibatis.annotations.Mapper; diff --git a/maku-boot-system/src/main/java/net/maku/system/dao/SysMenuDao.java b/maku-boot-system/src/main/java/net/maku/system/dao/SysMenuDao.java index 6f1e520..19c9f1d 100644 --- a/maku-boot-system/src/main/java/net/maku/system/dao/SysMenuDao.java +++ b/maku-boot-system/src/main/java/net/maku/system/dao/SysMenuDao.java @@ -1,6 +1,6 @@ package net.maku.system.dao; -import net.maku.framework.common.dao.BaseDao; +import net.maku.framework.mybatis.dao.BaseDao; import net.maku.system.entity.SysMenuEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/maku-boot-system/src/main/java/net/maku/system/dao/SysOrgDao.java b/maku-boot-system/src/main/java/net/maku/system/dao/SysOrgDao.java index 924f898..3d6f411 100644 --- a/maku-boot-system/src/main/java/net/maku/system/dao/SysOrgDao.java +++ b/maku-boot-system/src/main/java/net/maku/system/dao/SysOrgDao.java @@ -1,6 +1,6 @@ package net.maku.system.dao; -import net.maku.framework.common.dao.BaseDao; +import net.maku.framework.mybatis.dao.BaseDao; import net.maku.system.entity.SysOrgEntity; import org.apache.ibatis.annotations.Mapper; diff --git a/maku-boot-system/src/main/java/net/maku/system/dao/SysParamsDao.java b/maku-boot-system/src/main/java/net/maku/system/dao/SysParamsDao.java index 54a71de..57f44e8 100644 --- a/maku-boot-system/src/main/java/net/maku/system/dao/SysParamsDao.java +++ b/maku-boot-system/src/main/java/net/maku/system/dao/SysParamsDao.java @@ -1,7 +1,7 @@ package net.maku.system.dao; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import net.maku.framework.common.dao.BaseDao; +import net.maku.framework.mybatis.dao.BaseDao; import net.maku.system.entity.SysParamsEntity; import org.apache.ibatis.annotations.Mapper; diff --git a/maku-boot-system/src/main/java/net/maku/system/dao/SysPostDao.java b/maku-boot-system/src/main/java/net/maku/system/dao/SysPostDao.java index 861a41f..1498067 100644 --- a/maku-boot-system/src/main/java/net/maku/system/dao/SysPostDao.java +++ b/maku-boot-system/src/main/java/net/maku/system/dao/SysPostDao.java @@ -1,6 +1,6 @@ package net.maku.system.dao; -import net.maku.framework.common.dao.BaseDao; +import net.maku.framework.mybatis.dao.BaseDao; import net.maku.system.entity.SysPostEntity; import org.apache.ibatis.annotations.Mapper; diff --git a/maku-boot-system/src/main/java/net/maku/system/dao/SysRoleDao.java b/maku-boot-system/src/main/java/net/maku/system/dao/SysRoleDao.java index c952631..3e6831f 100644 --- a/maku-boot-system/src/main/java/net/maku/system/dao/SysRoleDao.java +++ b/maku-boot-system/src/main/java/net/maku/system/dao/SysRoleDao.java @@ -1,6 +1,6 @@ package net.maku.system.dao; -import net.maku.framework.common.dao.BaseDao; +import net.maku.framework.mybatis.dao.BaseDao; import net.maku.system.entity.SysRoleEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/maku-boot-system/src/main/java/net/maku/system/dao/SysRoleDataScopeDao.java b/maku-boot-system/src/main/java/net/maku/system/dao/SysRoleDataScopeDao.java index b657132..4aa20e3 100644 --- a/maku-boot-system/src/main/java/net/maku/system/dao/SysRoleDataScopeDao.java +++ b/maku-boot-system/src/main/java/net/maku/system/dao/SysRoleDataScopeDao.java @@ -1,6 +1,6 @@ package net.maku.system.dao; -import net.maku.framework.common.dao.BaseDao; +import net.maku.framework.mybatis.dao.BaseDao; import net.maku.system.entity.SysRoleDataScopeEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/maku-boot-system/src/main/java/net/maku/system/dao/SysRoleMenuDao.java b/maku-boot-system/src/main/java/net/maku/system/dao/SysRoleMenuDao.java index 9ef997a..ca5391f 100644 --- a/maku-boot-system/src/main/java/net/maku/system/dao/SysRoleMenuDao.java +++ b/maku-boot-system/src/main/java/net/maku/system/dao/SysRoleMenuDao.java @@ -1,6 +1,6 @@ package net.maku.system.dao; -import net.maku.framework.common.dao.BaseDao; +import net.maku.framework.mybatis.dao.BaseDao; import net.maku.system.entity.SysRoleMenuEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/maku-boot-system/src/main/java/net/maku/system/dao/SysUserDao.java b/maku-boot-system/src/main/java/net/maku/system/dao/SysUserDao.java index c4255ee..0c662b7 100644 --- a/maku-boot-system/src/main/java/net/maku/system/dao/SysUserDao.java +++ b/maku-boot-system/src/main/java/net/maku/system/dao/SysUserDao.java @@ -1,7 +1,7 @@ package net.maku.system.dao; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import net.maku.framework.common.dao.BaseDao; +import net.maku.framework.mybatis.dao.BaseDao; import net.maku.system.entity.SysUserEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/maku-boot-system/src/main/java/net/maku/system/dao/SysUserPostDao.java b/maku-boot-system/src/main/java/net/maku/system/dao/SysUserPostDao.java index 8b7eb63..e623823 100644 --- a/maku-boot-system/src/main/java/net/maku/system/dao/SysUserPostDao.java +++ b/maku-boot-system/src/main/java/net/maku/system/dao/SysUserPostDao.java @@ -1,6 +1,6 @@ package net.maku.system.dao; -import net.maku.framework.common.dao.BaseDao; +import net.maku.framework.mybatis.dao.BaseDao; import net.maku.system.entity.SysUserPostEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/maku-boot-system/src/main/java/net/maku/system/dao/SysUserRoleDao.java b/maku-boot-system/src/main/java/net/maku/system/dao/SysUserRoleDao.java index 05466ba..cb30ad2 100644 --- a/maku-boot-system/src/main/java/net/maku/system/dao/SysUserRoleDao.java +++ b/maku-boot-system/src/main/java/net/maku/system/dao/SysUserRoleDao.java @@ -1,6 +1,6 @@ package net.maku.system.dao; -import net.maku.framework.common.dao.BaseDao; +import net.maku.framework.mybatis.dao.BaseDao; import net.maku.system.entity.SysUserRoleEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/maku-boot-system/src/main/java/net/maku/system/entity/SysAttachmentEntity.java b/maku-boot-system/src/main/java/net/maku/system/entity/SysAttachmentEntity.java index e305614..5a6d92d 100644 --- a/maku-boot-system/src/main/java/net/maku/system/entity/SysAttachmentEntity.java +++ b/maku-boot-system/src/main/java/net/maku/system/entity/SysAttachmentEntity.java @@ -3,7 +3,7 @@ package net.maku.system.entity; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; -import net.maku.framework.common.entity.BaseEntity; +import net.maku.framework.mybatis.entity.BaseEntity; /** * 附件管理 diff --git a/maku-boot-system/src/main/java/net/maku/system/entity/SysDictDataEntity.java b/maku-boot-system/src/main/java/net/maku/system/entity/SysDictDataEntity.java index a605e09..8877af8 100644 --- a/maku-boot-system/src/main/java/net/maku/system/entity/SysDictDataEntity.java +++ b/maku-boot-system/src/main/java/net/maku/system/entity/SysDictDataEntity.java @@ -3,7 +3,7 @@ package net.maku.system.entity; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; -import net.maku.framework.common.entity.BaseEntity; +import net.maku.framework.mybatis.entity.BaseEntity; /** * 数据字典 diff --git a/maku-boot-system/src/main/java/net/maku/system/entity/SysDictTypeEntity.java b/maku-boot-system/src/main/java/net/maku/system/entity/SysDictTypeEntity.java index fdfcddf..d51880d 100644 --- a/maku-boot-system/src/main/java/net/maku/system/entity/SysDictTypeEntity.java +++ b/maku-boot-system/src/main/java/net/maku/system/entity/SysDictTypeEntity.java @@ -3,7 +3,7 @@ package net.maku.system.entity; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; -import net.maku.framework.common.entity.BaseEntity; +import net.maku.framework.mybatis.entity.BaseEntity; /** * 字典类型 diff --git a/maku-boot-system/src/main/java/net/maku/system/entity/SysMenuEntity.java b/maku-boot-system/src/main/java/net/maku/system/entity/SysMenuEntity.java index 0508295..f51ff41 100644 --- a/maku-boot-system/src/main/java/net/maku/system/entity/SysMenuEntity.java +++ b/maku-boot-system/src/main/java/net/maku/system/entity/SysMenuEntity.java @@ -3,7 +3,7 @@ package net.maku.system.entity; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; -import net.maku.framework.common.entity.BaseEntity; +import net.maku.framework.mybatis.entity.BaseEntity; /** * 菜单管理 diff --git a/maku-boot-system/src/main/java/net/maku/system/entity/SysOrgEntity.java b/maku-boot-system/src/main/java/net/maku/system/entity/SysOrgEntity.java index d4aa66b..564df65 100644 --- a/maku-boot-system/src/main/java/net/maku/system/entity/SysOrgEntity.java +++ b/maku-boot-system/src/main/java/net/maku/system/entity/SysOrgEntity.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; -import net.maku.framework.common.entity.BaseEntity; +import net.maku.framework.mybatis.entity.BaseEntity; /** * 机构管理 diff --git a/maku-boot-system/src/main/java/net/maku/system/entity/SysParamsEntity.java b/maku-boot-system/src/main/java/net/maku/system/entity/SysParamsEntity.java index f279b0c..b5a817c 100644 --- a/maku-boot-system/src/main/java/net/maku/system/entity/SysParamsEntity.java +++ b/maku-boot-system/src/main/java/net/maku/system/entity/SysParamsEntity.java @@ -3,7 +3,7 @@ package net.maku.system.entity; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; -import net.maku.framework.common.entity.BaseEntity; +import net.maku.framework.mybatis.entity.BaseEntity; /** * 参数管理 diff --git a/maku-boot-system/src/main/java/net/maku/system/entity/SysPostEntity.java b/maku-boot-system/src/main/java/net/maku/system/entity/SysPostEntity.java index aede02d..cff0507 100644 --- a/maku-boot-system/src/main/java/net/maku/system/entity/SysPostEntity.java +++ b/maku-boot-system/src/main/java/net/maku/system/entity/SysPostEntity.java @@ -3,7 +3,7 @@ package net.maku.system.entity; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; -import net.maku.framework.common.entity.BaseEntity; +import net.maku.framework.mybatis.entity.BaseEntity; /** * 岗位管理 diff --git a/maku-boot-system/src/main/java/net/maku/system/entity/SysRoleDataScopeEntity.java b/maku-boot-system/src/main/java/net/maku/system/entity/SysRoleDataScopeEntity.java index c8887a0..d1f7bc8 100644 --- a/maku-boot-system/src/main/java/net/maku/system/entity/SysRoleDataScopeEntity.java +++ b/maku-boot-system/src/main/java/net/maku/system/entity/SysRoleDataScopeEntity.java @@ -3,7 +3,7 @@ package net.maku.system.entity; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; -import net.maku.framework.common.entity.BaseEntity; +import net.maku.framework.mybatis.entity.BaseEntity; /** * 角色数据权限 diff --git a/maku-boot-system/src/main/java/net/maku/system/entity/SysRoleEntity.java b/maku-boot-system/src/main/java/net/maku/system/entity/SysRoleEntity.java index 003dec0..7cafc12 100644 --- a/maku-boot-system/src/main/java/net/maku/system/entity/SysRoleEntity.java +++ b/maku-boot-system/src/main/java/net/maku/system/entity/SysRoleEntity.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; -import net.maku.framework.common.entity.BaseEntity; +import net.maku.framework.mybatis.entity.BaseEntity; import net.maku.system.enums.DataScopeEnum; /** diff --git a/maku-boot-system/src/main/java/net/maku/system/entity/SysRoleMenuEntity.java b/maku-boot-system/src/main/java/net/maku/system/entity/SysRoleMenuEntity.java index f8198eb..4fe222a 100644 --- a/maku-boot-system/src/main/java/net/maku/system/entity/SysRoleMenuEntity.java +++ b/maku-boot-system/src/main/java/net/maku/system/entity/SysRoleMenuEntity.java @@ -3,7 +3,7 @@ package net.maku.system.entity; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; -import net.maku.framework.common.entity.BaseEntity; +import net.maku.framework.mybatis.entity.BaseEntity; /** * 角色菜单关系 diff --git a/maku-boot-system/src/main/java/net/maku/system/entity/SysUserEntity.java b/maku-boot-system/src/main/java/net/maku/system/entity/SysUserEntity.java index 0799f17..572ed89 100644 --- a/maku-boot-system/src/main/java/net/maku/system/entity/SysUserEntity.java +++ b/maku-boot-system/src/main/java/net/maku/system/entity/SysUserEntity.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; -import net.maku.framework.common.entity.BaseEntity; +import net.maku.framework.mybatis.entity.BaseEntity; import net.maku.system.enums.UserStatusEnum; @Data diff --git a/maku-boot-system/src/main/java/net/maku/system/entity/SysUserPostEntity.java b/maku-boot-system/src/main/java/net/maku/system/entity/SysUserPostEntity.java index 9b41a8c..066ffae 100644 --- a/maku-boot-system/src/main/java/net/maku/system/entity/SysUserPostEntity.java +++ b/maku-boot-system/src/main/java/net/maku/system/entity/SysUserPostEntity.java @@ -3,7 +3,7 @@ package net.maku.system.entity; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; -import net.maku.framework.common.entity.BaseEntity; +import net.maku.framework.mybatis.entity.BaseEntity; /** * 用户岗位关系 diff --git a/maku-boot-system/src/main/java/net/maku/system/entity/SysUserRoleEntity.java b/maku-boot-system/src/main/java/net/maku/system/entity/SysUserRoleEntity.java index 5d2e4b2..5a3d1d7 100644 --- a/maku-boot-system/src/main/java/net/maku/system/entity/SysUserRoleEntity.java +++ b/maku-boot-system/src/main/java/net/maku/system/entity/SysUserRoleEntity.java @@ -3,7 +3,7 @@ package net.maku.system.entity; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; -import net.maku.framework.common.entity.BaseEntity; +import net.maku.framework.mybatis.entity.BaseEntity; /** * 用户角色关系 diff --git a/maku-boot-system/src/main/java/net/maku/system/service/SysAttachmentService.java b/maku-boot-system/src/main/java/net/maku/system/service/SysAttachmentService.java index ee3b9ff..a196c78 100644 --- a/maku-boot-system/src/main/java/net/maku/system/service/SysAttachmentService.java +++ b/maku-boot-system/src/main/java/net/maku/system/service/SysAttachmentService.java @@ -1,7 +1,7 @@ package net.maku.system.service; -import net.maku.framework.common.page.PageResult; -import net.maku.framework.common.service.BaseService; +import net.maku.framework.common.utils.PageResult; +import net.maku.framework.mybatis.service.BaseService; import net.maku.system.entity.SysAttachmentEntity; import net.maku.system.query.SysAttachmentQuery; import net.maku.system.vo.SysAttachmentVO; diff --git a/maku-boot-system/src/main/java/net/maku/system/service/SysDictDataService.java b/maku-boot-system/src/main/java/net/maku/system/service/SysDictDataService.java index 4d2536e..639d3e9 100644 --- a/maku-boot-system/src/main/java/net/maku/system/service/SysDictDataService.java +++ b/maku-boot-system/src/main/java/net/maku/system/service/SysDictDataService.java @@ -1,7 +1,7 @@ package net.maku.system.service; -import net.maku.framework.common.page.PageResult; -import net.maku.framework.common.service.BaseService; +import net.maku.framework.common.utils.PageResult; +import net.maku.framework.mybatis.service.BaseService; import net.maku.system.entity.SysDictDataEntity; import net.maku.system.query.SysDictDataQuery; import net.maku.system.vo.SysDictDataVO; diff --git a/maku-boot-system/src/main/java/net/maku/system/service/SysDictTypeService.java b/maku-boot-system/src/main/java/net/maku/system/service/SysDictTypeService.java index 1b4cff3..379ac27 100644 --- a/maku-boot-system/src/main/java/net/maku/system/service/SysDictTypeService.java +++ b/maku-boot-system/src/main/java/net/maku/system/service/SysDictTypeService.java @@ -1,7 +1,7 @@ package net.maku.system.service; -import net.maku.framework.common.page.PageResult; -import net.maku.framework.common.service.BaseService; +import net.maku.framework.common.utils.PageResult; +import net.maku.framework.mybatis.service.BaseService; import net.maku.system.entity.SysDictTypeEntity; import net.maku.system.query.SysDictTypeQuery; import net.maku.system.vo.SysDictTypeVO; diff --git a/maku-boot-system/src/main/java/net/maku/system/service/SysLogLoginService.java b/maku-boot-system/src/main/java/net/maku/system/service/SysLogLoginService.java index 183ea3d..7e4b921 100644 --- a/maku-boot-system/src/main/java/net/maku/system/service/SysLogLoginService.java +++ b/maku-boot-system/src/main/java/net/maku/system/service/SysLogLoginService.java @@ -1,7 +1,7 @@ package net.maku.system.service; -import net.maku.framework.common.page.PageResult; -import net.maku.framework.common.service.BaseService; +import net.maku.framework.common.utils.PageResult; +import net.maku.framework.mybatis.service.BaseService; import net.maku.system.entity.SysLogLoginEntity; import net.maku.system.query.SysLogLoginQuery; import net.maku.system.vo.SysLogLoginVO; diff --git a/maku-boot-system/src/main/java/net/maku/system/service/SysMenuService.java b/maku-boot-system/src/main/java/net/maku/system/service/SysMenuService.java index 759ddd2..2576aa8 100644 --- a/maku-boot-system/src/main/java/net/maku/system/service/SysMenuService.java +++ b/maku-boot-system/src/main/java/net/maku/system/service/SysMenuService.java @@ -1,6 +1,6 @@ package net.maku.system.service; -import net.maku.framework.common.service.BaseService; +import net.maku.framework.mybatis.service.BaseService; import net.maku.framework.security.user.UserDetail; import net.maku.system.entity.SysMenuEntity; import net.maku.system.vo.SysMenuVO; diff --git a/maku-boot-system/src/main/java/net/maku/system/service/SysOrgService.java b/maku-boot-system/src/main/java/net/maku/system/service/SysOrgService.java index cb61338..e4835bb 100644 --- a/maku-boot-system/src/main/java/net/maku/system/service/SysOrgService.java +++ b/maku-boot-system/src/main/java/net/maku/system/service/SysOrgService.java @@ -1,6 +1,6 @@ package net.maku.system.service; -import net.maku.framework.common.service.BaseService; +import net.maku.framework.mybatis.service.BaseService; import net.maku.system.entity.SysOrgEntity; import net.maku.system.vo.SysOrgVO; diff --git a/maku-boot-system/src/main/java/net/maku/system/service/SysParamsService.java b/maku-boot-system/src/main/java/net/maku/system/service/SysParamsService.java index 322451e..19ad9db 100644 --- a/maku-boot-system/src/main/java/net/maku/system/service/SysParamsService.java +++ b/maku-boot-system/src/main/java/net/maku/system/service/SysParamsService.java @@ -1,7 +1,7 @@ package net.maku.system.service; -import net.maku.framework.common.page.PageResult; -import net.maku.framework.common.service.BaseService; +import net.maku.framework.common.utils.PageResult; +import net.maku.framework.mybatis.service.BaseService; import net.maku.system.entity.SysParamsEntity; import net.maku.system.query.SysParamsQuery; import net.maku.system.vo.SysParamsVO; diff --git a/maku-boot-system/src/main/java/net/maku/system/service/SysPostService.java b/maku-boot-system/src/main/java/net/maku/system/service/SysPostService.java index a445603..2fc3ce0 100644 --- a/maku-boot-system/src/main/java/net/maku/system/service/SysPostService.java +++ b/maku-boot-system/src/main/java/net/maku/system/service/SysPostService.java @@ -1,7 +1,7 @@ package net.maku.system.service; -import net.maku.framework.common.page.PageResult; -import net.maku.framework.common.service.BaseService; +import net.maku.framework.common.utils.PageResult; +import net.maku.framework.mybatis.service.BaseService; import net.maku.system.entity.SysPostEntity; import net.maku.system.query.SysPostQuery; import net.maku.system.vo.SysPostVO; diff --git a/maku-boot-system/src/main/java/net/maku/system/service/SysRoleDataScopeService.java b/maku-boot-system/src/main/java/net/maku/system/service/SysRoleDataScopeService.java index 3cb28ab..80c9342 100644 --- a/maku-boot-system/src/main/java/net/maku/system/service/SysRoleDataScopeService.java +++ b/maku-boot-system/src/main/java/net/maku/system/service/SysRoleDataScopeService.java @@ -1,6 +1,6 @@ package net.maku.system.service; -import net.maku.framework.common.service.BaseService; +import net.maku.framework.mybatis.service.BaseService; import net.maku.system.entity.SysRoleDataScopeEntity; import java.util.List; diff --git a/maku-boot-system/src/main/java/net/maku/system/service/SysRoleMenuService.java b/maku-boot-system/src/main/java/net/maku/system/service/SysRoleMenuService.java index 70d59f7..227a1fc 100644 --- a/maku-boot-system/src/main/java/net/maku/system/service/SysRoleMenuService.java +++ b/maku-boot-system/src/main/java/net/maku/system/service/SysRoleMenuService.java @@ -1,7 +1,7 @@ package net.maku.system.service; -import net.maku.framework.common.service.BaseService; +import net.maku.framework.mybatis.service.BaseService; import net.maku.system.entity.SysRoleMenuEntity; import java.util.List; diff --git a/maku-boot-system/src/main/java/net/maku/system/service/SysRoleService.java b/maku-boot-system/src/main/java/net/maku/system/service/SysRoleService.java index 969886a..c42a517 100644 --- a/maku-boot-system/src/main/java/net/maku/system/service/SysRoleService.java +++ b/maku-boot-system/src/main/java/net/maku/system/service/SysRoleService.java @@ -1,7 +1,7 @@ package net.maku.system.service; -import net.maku.framework.common.page.PageResult; -import net.maku.framework.common.service.BaseService; +import net.maku.framework.common.utils.PageResult; +import net.maku.framework.mybatis.service.BaseService; import net.maku.system.entity.SysRoleEntity; import net.maku.system.query.SysRoleQuery; import net.maku.system.vo.SysRoleDataScopeVO; diff --git a/maku-boot-system/src/main/java/net/maku/system/service/SysUserPostService.java b/maku-boot-system/src/main/java/net/maku/system/service/SysUserPostService.java index c78e8b5..06a46bf 100644 --- a/maku-boot-system/src/main/java/net/maku/system/service/SysUserPostService.java +++ b/maku-boot-system/src/main/java/net/maku/system/service/SysUserPostService.java @@ -1,6 +1,6 @@ package net.maku.system.service; -import net.maku.framework.common.service.BaseService; +import net.maku.framework.mybatis.service.BaseService; import net.maku.system.entity.SysUserPostEntity; import java.util.List; diff --git a/maku-boot-system/src/main/java/net/maku/system/service/SysUserRoleService.java b/maku-boot-system/src/main/java/net/maku/system/service/SysUserRoleService.java index 5e760ea..567f3c0 100644 --- a/maku-boot-system/src/main/java/net/maku/system/service/SysUserRoleService.java +++ b/maku-boot-system/src/main/java/net/maku/system/service/SysUserRoleService.java @@ -1,6 +1,6 @@ package net.maku.system.service; -import net.maku.framework.common.service.BaseService; +import net.maku.framework.mybatis.service.BaseService; import net.maku.system.entity.SysUserRoleEntity; import java.util.List; diff --git a/maku-boot-system/src/main/java/net/maku/system/service/SysUserService.java b/maku-boot-system/src/main/java/net/maku/system/service/SysUserService.java index 8c042f8..e7012f4 100644 --- a/maku-boot-system/src/main/java/net/maku/system/service/SysUserService.java +++ b/maku-boot-system/src/main/java/net/maku/system/service/SysUserService.java @@ -1,7 +1,7 @@ package net.maku.system.service; -import net.maku.framework.common.page.PageResult; -import net.maku.framework.common.service.BaseService; +import net.maku.framework.common.utils.PageResult; +import net.maku.framework.mybatis.service.BaseService; import net.maku.system.entity.SysUserEntity; import net.maku.system.query.SysRoleUserQuery; import net.maku.system.query.SysUserQuery; diff --git a/maku-boot-system/src/main/java/net/maku/system/service/impl/SysAttachmentServiceImpl.java b/maku-boot-system/src/main/java/net/maku/system/service/impl/SysAttachmentServiceImpl.java index 9e011ba..32bd2fd 100644 --- a/maku-boot-system/src/main/java/net/maku/system/service/impl/SysAttachmentServiceImpl.java +++ b/maku-boot-system/src/main/java/net/maku/system/service/impl/SysAttachmentServiceImpl.java @@ -5,8 +5,8 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.AllArgsConstructor; -import net.maku.framework.common.page.PageResult; -import net.maku.framework.common.service.impl.BaseServiceImpl; +import net.maku.framework.common.utils.PageResult; +import net.maku.framework.mybatis.service.impl.BaseServiceImpl; import net.maku.system.convert.SysAttachmentConvert; import net.maku.system.dao.SysAttachmentDao; import net.maku.system.entity.SysAttachmentEntity; diff --git a/maku-boot-system/src/main/java/net/maku/system/service/impl/SysDictDataServiceImpl.java b/maku-boot-system/src/main/java/net/maku/system/service/impl/SysDictDataServiceImpl.java index a483802..907c826 100644 --- a/maku-boot-system/src/main/java/net/maku/system/service/impl/SysDictDataServiceImpl.java +++ b/maku-boot-system/src/main/java/net/maku/system/service/impl/SysDictDataServiceImpl.java @@ -4,8 +4,8 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import lombok.AllArgsConstructor; -import net.maku.framework.common.page.PageResult; -import net.maku.framework.common.service.impl.BaseServiceImpl; +import net.maku.framework.common.utils.PageResult; +import net.maku.framework.mybatis.service.impl.BaseServiceImpl; import net.maku.system.convert.SysDictDataConvert; import net.maku.system.dao.SysDictDataDao; import net.maku.system.entity.SysDictDataEntity; diff --git a/maku-boot-system/src/main/java/net/maku/system/service/impl/SysDictTypeServiceImpl.java b/maku-boot-system/src/main/java/net/maku/system/service/impl/SysDictTypeServiceImpl.java index 70ffcc3..4a9eabd 100644 --- a/maku-boot-system/src/main/java/net/maku/system/service/impl/SysDictTypeServiceImpl.java +++ b/maku-boot-system/src/main/java/net/maku/system/service/impl/SysDictTypeServiceImpl.java @@ -9,8 +9,8 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.fhs.trans.service.impl.DictionaryTransService; import lombok.AllArgsConstructor; import net.maku.framework.common.exception.ServerException; -import net.maku.framework.common.page.PageResult; -import net.maku.framework.common.service.impl.BaseServiceImpl; +import net.maku.framework.common.utils.PageResult; +import net.maku.framework.mybatis.service.impl.BaseServiceImpl; import net.maku.system.convert.SysDictTypeConvert; import net.maku.system.dao.SysDictDataDao; import net.maku.system.dao.SysDictTypeDao; diff --git a/maku-boot-system/src/main/java/net/maku/system/service/impl/SysLogLoginServiceImpl.java b/maku-boot-system/src/main/java/net/maku/system/service/impl/SysLogLoginServiceImpl.java index ed33612..4f8d8f1 100644 --- a/maku-boot-system/src/main/java/net/maku/system/service/impl/SysLogLoginServiceImpl.java +++ b/maku-boot-system/src/main/java/net/maku/system/service/impl/SysLogLoginServiceImpl.java @@ -8,8 +8,8 @@ import com.fhs.trans.service.impl.TransService; import jakarta.servlet.http.HttpServletRequest; import lombok.AllArgsConstructor; import lombok.SneakyThrows; -import net.maku.framework.common.page.PageResult; -import net.maku.framework.common.service.impl.BaseServiceImpl; +import net.maku.framework.common.utils.PageResult; +import net.maku.framework.mybatis.service.impl.BaseServiceImpl; import net.maku.framework.common.utils.*; import net.maku.system.convert.SysLogLoginConvert; import net.maku.system.dao.SysLogLoginDao; diff --git a/maku-boot-system/src/main/java/net/maku/system/service/impl/SysMenuServiceImpl.java b/maku-boot-system/src/main/java/net/maku/system/service/impl/SysMenuServiceImpl.java index 69b0f93..326a84b 100644 --- a/maku-boot-system/src/main/java/net/maku/system/service/impl/SysMenuServiceImpl.java +++ b/maku-boot-system/src/main/java/net/maku/system/service/impl/SysMenuServiceImpl.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import lombok.AllArgsConstructor; import net.maku.framework.common.constant.Constant; import net.maku.framework.common.exception.ServerException; -import net.maku.framework.common.service.impl.BaseServiceImpl; +import net.maku.framework.mybatis.service.impl.BaseServiceImpl; import net.maku.framework.common.utils.TreeUtils; import net.maku.framework.security.user.UserDetail; import net.maku.system.convert.SysMenuConvert; diff --git a/maku-boot-system/src/main/java/net/maku/system/service/impl/SysOrgServiceImpl.java b/maku-boot-system/src/main/java/net/maku/system/service/impl/SysOrgServiceImpl.java index 6ca978a..ca260b6 100644 --- a/maku-boot-system/src/main/java/net/maku/system/service/impl/SysOrgServiceImpl.java +++ b/maku-boot-system/src/main/java/net/maku/system/service/impl/SysOrgServiceImpl.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import lombok.AllArgsConstructor; import net.maku.framework.common.constant.Constant; import net.maku.framework.common.exception.ServerException; -import net.maku.framework.common.service.impl.BaseServiceImpl; +import net.maku.framework.mybatis.service.impl.BaseServiceImpl; import net.maku.framework.common.utils.TreeUtils; import net.maku.system.convert.SysOrgConvert; import net.maku.system.dao.SysOrgDao; diff --git a/maku-boot-system/src/main/java/net/maku/system/service/impl/SysParamsServiceImpl.java b/maku-boot-system/src/main/java/net/maku/system/service/impl/SysParamsServiceImpl.java index 83bb4c5..dba060c 100644 --- a/maku-boot-system/src/main/java/net/maku/system/service/impl/SysParamsServiceImpl.java +++ b/maku-boot-system/src/main/java/net/maku/system/service/impl/SysParamsServiceImpl.java @@ -7,8 +7,8 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import jakarta.annotation.PostConstruct; import lombok.AllArgsConstructor; import net.maku.framework.common.exception.ServerException; -import net.maku.framework.common.page.PageResult; -import net.maku.framework.common.service.impl.BaseServiceImpl; +import net.maku.framework.common.utils.PageResult; +import net.maku.framework.mybatis.service.impl.BaseServiceImpl; import net.maku.framework.common.utils.JsonUtils; import net.maku.system.cache.SysParamsCache; import net.maku.system.convert.SysParamsConvert; diff --git a/maku-boot-system/src/main/java/net/maku/system/service/impl/SysPostServiceImpl.java b/maku-boot-system/src/main/java/net/maku/system/service/impl/SysPostServiceImpl.java index 583101c..20d4cda 100644 --- a/maku-boot-system/src/main/java/net/maku/system/service/impl/SysPostServiceImpl.java +++ b/maku-boot-system/src/main/java/net/maku/system/service/impl/SysPostServiceImpl.java @@ -5,8 +5,8 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import lombok.AllArgsConstructor; -import net.maku.framework.common.page.PageResult; -import net.maku.framework.common.service.impl.BaseServiceImpl; +import net.maku.framework.common.utils.PageResult; +import net.maku.framework.mybatis.service.impl.BaseServiceImpl; import net.maku.system.convert.SysPostConvert; import net.maku.system.dao.SysPostDao; import net.maku.system.entity.SysPostEntity; diff --git a/maku-boot-system/src/main/java/net/maku/system/service/impl/SysRoleDataScopeServiceImpl.java b/maku-boot-system/src/main/java/net/maku/system/service/impl/SysRoleDataScopeServiceImpl.java index f4f3ae2..f6a3f73 100644 --- a/maku-boot-system/src/main/java/net/maku/system/service/impl/SysRoleDataScopeServiceImpl.java +++ b/maku-boot-system/src/main/java/net/maku/system/service/impl/SysRoleDataScopeServiceImpl.java @@ -2,7 +2,7 @@ package net.maku.system.service.impl; import cn.hutool.core.collection.CollUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import net.maku.framework.common.service.impl.BaseServiceImpl; +import net.maku.framework.mybatis.service.impl.BaseServiceImpl; import net.maku.system.dao.SysRoleDataScopeDao; import net.maku.system.entity.SysRoleDataScopeEntity; import net.maku.system.service.SysRoleDataScopeService; diff --git a/maku-boot-system/src/main/java/net/maku/system/service/impl/SysRoleMenuServiceImpl.java b/maku-boot-system/src/main/java/net/maku/system/service/impl/SysRoleMenuServiceImpl.java index 6a17931..a2b2607 100644 --- a/maku-boot-system/src/main/java/net/maku/system/service/impl/SysRoleMenuServiceImpl.java +++ b/maku-boot-system/src/main/java/net/maku/system/service/impl/SysRoleMenuServiceImpl.java @@ -2,7 +2,7 @@ package net.maku.system.service.impl; import cn.hutool.core.collection.CollUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import net.maku.framework.common.service.impl.BaseServiceImpl; +import net.maku.framework.mybatis.service.impl.BaseServiceImpl; import net.maku.system.dao.SysRoleMenuDao; import net.maku.system.entity.SysRoleMenuEntity; import net.maku.system.service.SysRoleMenuService; diff --git a/maku-boot-system/src/main/java/net/maku/system/service/impl/SysRoleServiceImpl.java b/maku-boot-system/src/main/java/net/maku/system/service/impl/SysRoleServiceImpl.java index 4430da1..066e6f4 100644 --- a/maku-boot-system/src/main/java/net/maku/system/service/impl/SysRoleServiceImpl.java +++ b/maku-boot-system/src/main/java/net/maku/system/service/impl/SysRoleServiceImpl.java @@ -5,8 +5,8 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import lombok.AllArgsConstructor; -import net.maku.framework.common.page.PageResult; -import net.maku.framework.common.service.impl.BaseServiceImpl; +import net.maku.framework.common.utils.PageResult; +import net.maku.framework.mybatis.service.impl.BaseServiceImpl; import net.maku.system.convert.SysRoleConvert; import net.maku.system.dao.SysRoleDao; import net.maku.system.entity.SysRoleEntity; diff --git a/maku-boot-system/src/main/java/net/maku/system/service/impl/SysUserPostServiceImpl.java b/maku-boot-system/src/main/java/net/maku/system/service/impl/SysUserPostServiceImpl.java index 42b9045..3a782db 100644 --- a/maku-boot-system/src/main/java/net/maku/system/service/impl/SysUserPostServiceImpl.java +++ b/maku-boot-system/src/main/java/net/maku/system/service/impl/SysUserPostServiceImpl.java @@ -2,7 +2,7 @@ package net.maku.system.service.impl; import cn.hutool.core.collection.CollUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import net.maku.framework.common.service.impl.BaseServiceImpl; +import net.maku.framework.mybatis.service.impl.BaseServiceImpl; import net.maku.system.dao.SysUserPostDao; import net.maku.system.entity.SysUserPostEntity; import net.maku.system.service.SysUserPostService; diff --git a/maku-boot-system/src/main/java/net/maku/system/service/impl/SysUserRoleServiceImpl.java b/maku-boot-system/src/main/java/net/maku/system/service/impl/SysUserRoleServiceImpl.java index 4d30105..703f645 100644 --- a/maku-boot-system/src/main/java/net/maku/system/service/impl/SysUserRoleServiceImpl.java +++ b/maku-boot-system/src/main/java/net/maku/system/service/impl/SysUserRoleServiceImpl.java @@ -2,7 +2,7 @@ package net.maku.system.service.impl; import cn.hutool.core.collection.CollUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import net.maku.framework.common.service.impl.BaseServiceImpl; +import net.maku.framework.mybatis.service.impl.BaseServiceImpl; import net.maku.system.dao.SysUserRoleDao; import net.maku.system.entity.SysUserRoleEntity; import net.maku.system.service.SysUserRoleService; diff --git a/maku-boot-system/src/main/java/net/maku/system/service/impl/SysUserServiceImpl.java b/maku-boot-system/src/main/java/net/maku/system/service/impl/SysUserServiceImpl.java index 7d0b9c3..55cf6ec 100644 --- a/maku-boot-system/src/main/java/net/maku/system/service/impl/SysUserServiceImpl.java +++ b/maku-boot-system/src/main/java/net/maku/system/service/impl/SysUserServiceImpl.java @@ -8,8 +8,8 @@ import lombok.SneakyThrows; import net.maku.framework.common.constant.Constant; import net.maku.framework.common.excel.ExcelFinishCallBack; import net.maku.framework.common.exception.ServerException; -import net.maku.framework.common.page.PageResult; -import net.maku.framework.common.service.impl.BaseServiceImpl; +import net.maku.framework.common.utils.PageResult; +import net.maku.framework.mybatis.service.impl.BaseServiceImpl; import net.maku.framework.common.utils.DateUtils; import net.maku.framework.common.utils.ExcelUtils; import net.maku.system.convert.SysUserConvert; diff --git a/maku-framework/src/main/java/net/maku/framework/common/config/CorsConfig.java b/maku-framework/src/main/java/net/maku/framework/common/config/CorsConfig.java new file mode 100644 index 0000000..48b9588 --- /dev/null +++ b/maku-framework/src/main/java/net/maku/framework/common/config/CorsConfig.java @@ -0,0 +1,28 @@ +package net.maku.framework.common.config; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.web.cors.CorsConfiguration; +import org.springframework.web.cors.UrlBasedCorsConfigurationSource; +import org.springframework.web.filter.CorsFilter; + +/** + * 跨域配置 + * + * @author 阿沐 babamu@126.com + */ +@Configuration +public class CorsConfig { + + @Bean + public CorsFilter corsFilter() { + final UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource(); + final CorsConfiguration corsConfiguration = new CorsConfiguration(); + corsConfiguration.setAllowCredentials(true); + corsConfiguration.addAllowedHeader("*"); + corsConfiguration.addAllowedOriginPattern("*"); + corsConfiguration.addAllowedMethod("*"); + source.registerCorsConfiguration("/**", corsConfiguration); + return new CorsFilter(source); + } +} \ No newline at end of file diff --git a/maku-framework/src/main/java/net/maku/framework/common/config/RedisConfig.java b/maku-framework/src/main/java/net/maku/framework/common/config/RedisConfig.java new file mode 100644 index 0000000..16d61a1 --- /dev/null +++ b/maku-framework/src/main/java/net/maku/framework/common/config/RedisConfig.java @@ -0,0 +1,46 @@ +package net.maku.framework.common.config; + +import com.fasterxml.jackson.annotation.JsonAutoDetect; +import com.fasterxml.jackson.annotation.PropertyAccessor; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.jsontype.impl.LaissezFaireSubTypeValidator; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.data.redis.connection.RedisConnectionFactory; +import org.springframework.data.redis.core.RedisTemplate; +import org.springframework.data.redis.serializer.Jackson2JsonRedisSerializer; +import org.springframework.data.redis.serializer.RedisSerializer; + +/** + * Redis配置 + * + * @author 阿沐 babamu@126.com + */ +@Configuration +public class RedisConfig { + + @Bean + public Jackson2JsonRedisSerializer jackson2JsonRedisSerializer(){ + ObjectMapper objectMapper = new ObjectMapper(); + objectMapper.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY); + objectMapper.activateDefaultTyping(LaissezFaireSubTypeValidator.instance, ObjectMapper.DefaultTyping.NON_FINAL); + + Jackson2JsonRedisSerializer jackson2JsonRedisSerializer = new Jackson2JsonRedisSerializer<>(objectMapper, Object.class); + return jackson2JsonRedisSerializer; + } + + @Bean + public RedisTemplate redisTemplate(RedisConnectionFactory factory) { + RedisTemplate template = new RedisTemplate<>(); + // Key HashKey使用String序列化 + template.setKeySerializer(RedisSerializer.string()); + template.setHashKeySerializer(RedisSerializer.string()); + + // Value HashValue使用Jackson2JsonRedisSerializer序列化 + template.setValueSerializer(jackson2JsonRedisSerializer()); + template.setHashValueSerializer(jackson2JsonRedisSerializer()); + + template.setConnectionFactory(factory); + return template; + } +} diff --git a/maku-framework/src/main/java/net/maku/framework/common/config/SwaggerConfig.java b/maku-framework/src/main/java/net/maku/framework/common/config/SwaggerConfig.java new file mode 100644 index 0000000..746242c --- /dev/null +++ b/maku-framework/src/main/java/net/maku/framework/common/config/SwaggerConfig.java @@ -0,0 +1,43 @@ +package net.maku.framework.common.config; + +import io.swagger.v3.oas.models.OpenAPI; +import io.swagger.v3.oas.models.info.Contact; +import io.swagger.v3.oas.models.info.Info; +import io.swagger.v3.oas.models.info.License; +import org.springdoc.core.models.GroupedOpenApi; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +/** + * Swagger配置 + * + * @author 阿沐 babamu@126.com + */ +@Configuration +public class SwaggerConfig { + + @Bean + public GroupedOpenApi userApi() { + String[] paths = {"/**"}; + String[] packagedToMatch = {"net.maku"}; + return GroupedOpenApi.builder().group("MakuBoot") + .pathsToMatch(paths) + .packagesToScan(packagedToMatch).build(); + } + + @Bean + public OpenAPI customOpenAPI() { + Contact contact = new Contact(); + contact.setName("阿沐 babamu@126.com"); + + return new OpenAPI().info(new Info() + .title("MakuBoot") + .description("MakuBoot") + .contact(contact) + .version("3.0") + .termsOfService("https://maku.net") + .license(new License().name("MIT") + .url("https://maku.net"))); + } + +} \ No newline at end of file diff --git a/maku-framework/src/main/java/net/maku/framework/common/dao/BaseDao.java b/maku-framework/src/main/java/net/maku/framework/common/dao/BaseDao.java deleted file mode 100644 index ce38e5b..0000000 --- a/maku-framework/src/main/java/net/maku/framework/common/dao/BaseDao.java +++ /dev/null @@ -1,13 +0,0 @@ -package net.maku.framework.common.dao; - - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - * 基础Dao - * - * @author 阿沐 babamu@126.com - */ -public interface BaseDao extends BaseMapper { - -} diff --git a/maku-framework/src/main/java/net/maku/framework/common/entity/BaseEntity.java b/maku-framework/src/main/java/net/maku/framework/common/entity/BaseEntity.java deleted file mode 100644 index 171d41f..0000000 --- a/maku-framework/src/main/java/net/maku/framework/common/entity/BaseEntity.java +++ /dev/null @@ -1,59 +0,0 @@ -package net.maku.framework.common.entity; - -import com.baomidou.mybatisplus.annotation.*; -import com.fhs.core.trans.vo.TransPojo; -import lombok.Data; - -import java.util.Date; - -/** - * Entity基类 - * - * @author 阿沐 babamu@126.com - */ -@Data -public abstract class BaseEntity implements TransPojo { - /** - * id - */ - @TableId - private Long id; - - /** - * 创建者 - */ - @TableField(fill = FieldFill.INSERT) - private Long creator; - - /** - * 创建时间 - */ - @TableField(fill = FieldFill.INSERT) - private Date createTime; - - /** - * 更新者 - */ - @TableField(fill = FieldFill.INSERT_UPDATE) - private Long updater; - - /** - * 更新时间 - */ - @TableField(fill = FieldFill.INSERT_UPDATE) - private Date updateTime; - - /** - * 版本号 - */ - @Version - @TableField(fill = FieldFill.INSERT) - private Integer version; - - /** - * 删除标记 - */ - @TableLogic - @TableField(fill = FieldFill.INSERT) - private Integer deleted; -} diff --git a/maku-framework/src/main/java/net/maku/framework/common/handler/FieldMetaObjectHandler.java b/maku-framework/src/main/java/net/maku/framework/common/handler/FieldMetaObjectHandler.java deleted file mode 100644 index 6e55769..0000000 --- a/maku-framework/src/main/java/net/maku/framework/common/handler/FieldMetaObjectHandler.java +++ /dev/null @@ -1,52 +0,0 @@ -package net.maku.framework.common.handler; - -import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler; -import net.maku.framework.security.user.SecurityUser; -import net.maku.framework.security.user.UserDetail; -import org.apache.ibatis.reflection.MetaObject; - -import java.util.Date; - -/** - * mybatis-plus 自动填充字段 - * - * @author 阿沐 babamu@126.com - */ -public class FieldMetaObjectHandler implements MetaObjectHandler { - private final static String CREATE_TIME = "createTime"; - private final static String CREATOR = "creator"; - private final static String UPDATE_TIME = "updateTime"; - private final static String UPDATER = "updater"; - private final static String ORG_ID = "orgId"; - private final static String VERSION = "version"; - private final static String DELETED = "deleted"; - - @Override - public void insertFill(MetaObject metaObject) { - UserDetail user = SecurityUser.getUser(); - Date date = new Date(); - - // 创建者 - strictInsertFill(metaObject, CREATOR, Long.class, user.getId()); - // 创建时间 - strictInsertFill(metaObject, CREATE_TIME, Date.class, date); - // 更新者 - strictInsertFill(metaObject, UPDATER, Long.class, user.getId()); - // 更新时间 - strictInsertFill(metaObject, UPDATE_TIME, Date.class, date); - // 创建者所属机构 - strictInsertFill(metaObject, ORG_ID, Long.class, user.getOrgId()); - // 版本号 - strictInsertFill(metaObject, VERSION, Integer.class, 0); - // 删除标识 - strictInsertFill(metaObject, DELETED, Integer.class, 0); - } - - @Override - public void updateFill(MetaObject metaObject) { - // 更新者 - strictUpdateFill(metaObject, UPDATER, Long.class, SecurityUser.getUserId()); - // 更新时间 - strictUpdateFill(metaObject, UPDATE_TIME, Date.class, new Date()); - } -} \ No newline at end of file diff --git a/maku-framework/src/main/java/net/maku/framework/common/interceptor/DataScope.java b/maku-framework/src/main/java/net/maku/framework/common/interceptor/DataScope.java deleted file mode 100644 index 2cec15a..0000000 --- a/maku-framework/src/main/java/net/maku/framework/common/interceptor/DataScope.java +++ /dev/null @@ -1,16 +0,0 @@ -package net.maku.framework.common.interceptor; - -import lombok.AllArgsConstructor; -import lombok.Data; - -/** - * 数据范围 - * - * @author 阿沐 babamu@126.com - */ -@Data -@AllArgsConstructor -public class DataScope { - private String sqlFilter; - -} \ No newline at end of file diff --git a/maku-framework/src/main/java/net/maku/framework/common/interceptor/DataScopeInnerInterceptor.java b/maku-framework/src/main/java/net/maku/framework/common/interceptor/DataScopeInnerInterceptor.java deleted file mode 100644 index e00795c..0000000 --- a/maku-framework/src/main/java/net/maku/framework/common/interceptor/DataScopeInnerInterceptor.java +++ /dev/null @@ -1,81 +0,0 @@ -package net.maku.framework.common.interceptor; - -import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.core.toolkit.PluginUtils; -import com.baomidou.mybatisplus.extension.plugins.inner.InnerInterceptor; -import net.sf.jsqlparser.JSQLParserException; -import net.sf.jsqlparser.expression.Expression; -import net.sf.jsqlparser.expression.StringValue; -import net.sf.jsqlparser.expression.operators.conditional.AndExpression; -import net.sf.jsqlparser.parser.CCJSqlParserUtil; -import net.sf.jsqlparser.statement.select.PlainSelect; -import net.sf.jsqlparser.statement.select.Select; -import org.apache.ibatis.executor.Executor; -import org.apache.ibatis.mapping.BoundSql; -import org.apache.ibatis.mapping.MappedStatement; -import org.apache.ibatis.session.ResultHandler; -import org.apache.ibatis.session.RowBounds; - -import java.util.Map; - -/** - * 数据权限 - * - * @author 阿沐 babamu@126.com - */ -public class DataScopeInnerInterceptor implements InnerInterceptor { - - @Override - public void beforeQuery(Executor executor, MappedStatement ms, Object parameter, RowBounds rowBounds, ResultHandler resultHandler, BoundSql boundSql) { - DataScope scope = getDataScope(parameter); - // 不进行数据过滤 - if(scope == null || StrUtil.isBlank(scope.getSqlFilter())){ - return; - } - - // 拼接新SQL - String buildSql = getSelect(boundSql.getSql(), scope); - - // 重写SQL - PluginUtils.mpBoundSql(boundSql).sql(buildSql); - } - - private DataScope getDataScope(Object parameter){ - if (parameter == null){ - return null; - } - - // 判断参数里是否有DataScope对象 - if (parameter instanceof Map) { - Map parameterMap = (Map) parameter; - for (Map.Entry entry : parameterMap.entrySet()) { - if (entry.getValue() != null && entry.getValue() instanceof DataScope) { - return (DataScope) entry.getValue(); - } - } - } else if (parameter instanceof DataScope) { - return (DataScope) parameter; - } - - return null; - } - - private String getSelect(String buildSql, DataScope scope){ - try { - Select select = (Select) CCJSqlParserUtil.parse(buildSql); - PlainSelect plainSelect = (PlainSelect) select.getSelectBody(); - - Expression expression = plainSelect.getWhere(); - if(expression == null){ - plainSelect.setWhere(new StringValue(scope.getSqlFilter())); - }else{ - AndExpression andExpression = new AndExpression(expression, new StringValue(scope.getSqlFilter())); - plainSelect.setWhere(andExpression); - } - - return select.toString().replaceAll("'", ""); - }catch (JSQLParserException e){ - return buildSql; - } - } -} \ No newline at end of file diff --git a/maku-framework/src/main/java/net/maku/framework/common/page/PageResult.java b/maku-framework/src/main/java/net/maku/framework/common/page/PageResult.java deleted file mode 100644 index 9633a45..0000000 --- a/maku-framework/src/main/java/net/maku/framework/common/page/PageResult.java +++ /dev/null @@ -1,34 +0,0 @@ -package net.maku.framework.common.page; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -/** - * 分页工具类 - * - * @author 阿沐 babamu@126.com - */ -@Data -@Schema(description = "分页数据") -public class PageResult implements Serializable { - private static final long serialVersionUID = 1L; - - @Schema(description = "总记录数") - private int total; - - @Schema(description = "列表数据") - private List list; - - /** - * 分页 - * @param list 列表数据 - * @param total 总记录数 - */ - public PageResult(List list, long total) { - this.list = list; - this.total = (int)total; - } -} \ No newline at end of file diff --git a/maku-framework/src/main/java/net/maku/framework/common/service/BaseService.java b/maku-framework/src/main/java/net/maku/framework/common/service/BaseService.java deleted file mode 100644 index fcd3722..0000000 --- a/maku-framework/src/main/java/net/maku/framework/common/service/BaseService.java +++ /dev/null @@ -1,13 +0,0 @@ -package net.maku.framework.common.service; - -import com.baomidou.mybatisplus.extension.service.IService; - -/** - * 基础服务接口，所有Service接口都要继承 - * - * @author 阿沐 babamu@126.com - */ -public interface BaseService extends IService { - - -} \ No newline at end of file diff --git a/maku-framework/src/main/java/net/maku/framework/common/service/impl/BaseServiceImpl.java b/maku-framework/src/main/java/net/maku/framework/common/service/impl/BaseServiceImpl.java deleted file mode 100644 index f98bdd5..0000000 --- a/maku-framework/src/main/java/net/maku/framework/common/service/impl/BaseServiceImpl.java +++ /dev/null @@ -1,110 +0,0 @@ -package net.maku.framework.common.service.impl; - -import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.metadata.OrderItem; -import com.baomidou.mybatisplus.core.toolkit.StringUtils; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import net.maku.framework.common.constant.Constant; -import net.maku.framework.common.interceptor.DataScope; -import net.maku.framework.common.query.Query; -import net.maku.framework.common.service.BaseService; -import net.maku.framework.security.user.SecurityUser; -import net.maku.framework.security.user.UserDetail; - -import java.util.List; - - -/** - * 基础服务类，所有Service都要继承 - * - * @author 阿沐 babamu@126.com - */ -public class BaseServiceImpl, T> extends ServiceImpl implements BaseService { - - /** - * 获取分页对象 - * - * @param query 分页参数 - */ - protected IPage getPage(Query query) { - Page page = new Page<>(query.getPage(), query.getLimit()); - - // 排序 - if (StringUtils.isNotBlank(query.getOrder())) { - if (query.isAsc()) { - return page.addOrder(OrderItem.asc(query.getOrder())); - } else { - return page.addOrder(OrderItem.desc(query.getOrder())); - } - } - - return page; - } - - /** - * MyBatis-Plus 数据权限 - */ - protected void dataScopeWrapper(LambdaQueryWrapper queryWrapper) { - DataScope dataScope = getDataScope(null, null); - if (dataScope != null) { - queryWrapper.apply(dataScope.getSqlFilter()); - } - } - - /** - * 原生SQL 数据权限 - * - * @param tableAlias 表别名，多表关联时，需要填写表别名 - * @param orgIdAlias 机构ID别名，null：表示org_id - * @return 返回数据权限 - */ - protected DataScope getDataScope(String tableAlias, String orgIdAlias) { - UserDetail user = SecurityUser.getUser(); - // 如果是超级管理员，则不进行数据过滤 - if (user.getSuperAdmin().equals(Constant.SUPER_ADMIN)) { - return null; - } - - // 如果为null，则设置成空字符串 - if (tableAlias == null) { - tableAlias = ""; - } - - // 获取表的别名 - if (StringUtils.isNotBlank(tableAlias)) { - tableAlias += "."; - } - - StringBuilder sqlFilter = new StringBuilder(); - sqlFilter.append(" ("); - - // 数据权限范围 - List dataScopeList = user.getDataScopeList(); - // 全部数据权限 - if (dataScopeList == null) { - return null; - } - // 数据过滤 - if (dataScopeList.size() > 0) { - if (StringUtils.isBlank(orgIdAlias)) { - orgIdAlias = "org_id"; - } - sqlFilter.append(tableAlias).append(orgIdAlias); - - sqlFilter.append(" in(").append(StrUtil.join(",", dataScopeList)).append(")"); - - sqlFilter.append(" or "); - } - - // 查询本人数据 - sqlFilter.append(tableAlias).append("creator").append("=").append(user.getId()); - - sqlFilter.append(")"); - - return new DataScope(sqlFilter.toString()); - } -} \ No newline at end of file diff --git a/maku-framework/src/main/java/net/maku/framework/common/utils/PageResult.java b/maku-framework/src/main/java/net/maku/framework/common/utils/PageResult.java new file mode 100644 index 0000000..cc41e25 --- /dev/null +++ b/maku-framework/src/main/java/net/maku/framework/common/utils/PageResult.java @@ -0,0 +1,34 @@ +package net.maku.framework.common.utils; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * 分页工具类 + * + * @author 阿沐 babamu@126.com + */ +@Data +@Schema(description = "分页数据") +public class PageResult implements Serializable { + private static final long serialVersionUID = 1L; + + @Schema(description = "总记录数") + private int total; + + @Schema(description = "列表数据") + private List list; + + /** + * 分页 + * @param list 列表数据 + * @param total 总记录数 + */ + public PageResult(List list, long total) { + this.list = list; + this.total = (int)total; + } +} \ No newline at end of file diff --git a/maku-framework/src/main/java/net/maku/framework/config/CorsConfig.java b/maku-framework/src/main/java/net/maku/framework/config/CorsConfig.java deleted file mode 100644 index 1329254..0000000 --- a/maku-framework/src/main/java/net/maku/framework/config/CorsConfig.java +++ /dev/null @@ -1,28 +0,0 @@ -package net.maku.framework.config; - -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.web.cors.CorsConfiguration; -import org.springframework.web.cors.UrlBasedCorsConfigurationSource; -import org.springframework.web.filter.CorsFilter; - -/** - * 跨域配置 - * - * @author 阿沐 babamu@126.com - */ -@Configuration -public class CorsConfig { - - @Bean - public CorsFilter corsFilter() { - final UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource(); - final CorsConfiguration corsConfiguration = new CorsConfiguration(); - corsConfiguration.setAllowCredentials(true); - corsConfiguration.addAllowedHeader("*"); - corsConfiguration.addAllowedOriginPattern("*"); - corsConfiguration.addAllowedMethod("*"); - source.registerCorsConfiguration("/**", corsConfiguration); - return new CorsFilter(source); - } -} \ No newline at end of file diff --git a/maku-framework/src/main/java/net/maku/framework/config/MybatisPlusConfig.java b/maku-framework/src/main/java/net/maku/framework/config/MybatisPlusConfig.java deleted file mode 100644 index 2c3dd51..0000000 --- a/maku-framework/src/main/java/net/maku/framework/config/MybatisPlusConfig.java +++ /dev/null @@ -1,39 +0,0 @@ -package net.maku.framework.config; - -import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor; -import com.baomidou.mybatisplus.extension.plugins.inner.BlockAttackInnerInterceptor; -import com.baomidou.mybatisplus.extension.plugins.inner.OptimisticLockerInnerInterceptor; -import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor; -import net.maku.framework.common.handler.FieldMetaObjectHandler; -import net.maku.framework.common.interceptor.DataScopeInnerInterceptor; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; - -/** - * mybatis-plus 配置 - * - * @author 阿沐 babamu@126.com - */ -@Configuration -public class MybatisPlusConfig { - - @Bean - public MybatisPlusInterceptor mybatisPlusInterceptor() { - MybatisPlusInterceptor mybatisPlusInterceptor = new MybatisPlusInterceptor(); - // 数据权限 - mybatisPlusInterceptor.addInnerInterceptor(new DataScopeInnerInterceptor()); - // 分页插件 - mybatisPlusInterceptor.addInnerInterceptor(new PaginationInnerInterceptor()); - // 乐观锁 - mybatisPlusInterceptor.addInnerInterceptor(new OptimisticLockerInnerInterceptor()); - // 防止全表更新与删除 - mybatisPlusInterceptor.addInnerInterceptor(new BlockAttackInnerInterceptor()); - - return mybatisPlusInterceptor; - } - - @Bean - public FieldMetaObjectHandler fieldMetaObjectHandler(){ - return new FieldMetaObjectHandler(); - } -} diff --git a/maku-framework/src/main/java/net/maku/framework/config/RedisConfig.java b/maku-framework/src/main/java/net/maku/framework/config/RedisConfig.java deleted file mode 100644 index 94a524c..0000000 --- a/maku-framework/src/main/java/net/maku/framework/config/RedisConfig.java +++ /dev/null @@ -1,46 +0,0 @@ -package net.maku.framework.config; - -import com.fasterxml.jackson.annotation.JsonAutoDetect; -import com.fasterxml.jackson.annotation.PropertyAccessor; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.jsontype.impl.LaissezFaireSubTypeValidator; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.data.redis.connection.RedisConnectionFactory; -import org.springframework.data.redis.core.RedisTemplate; -import org.springframework.data.redis.serializer.Jackson2JsonRedisSerializer; -import org.springframework.data.redis.serializer.RedisSerializer; - -/** - * Redis配置 - * - * @author 阿沐 babamu@126.com - */ -@Configuration -public class RedisConfig { - - @Bean - public Jackson2JsonRedisSerializer jackson2JsonRedisSerializer(){ - ObjectMapper objectMapper = new ObjectMapper(); - objectMapper.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY); - objectMapper.activateDefaultTyping(LaissezFaireSubTypeValidator.instance, ObjectMapper.DefaultTyping.NON_FINAL); - - Jackson2JsonRedisSerializer jackson2JsonRedisSerializer = new Jackson2JsonRedisSerializer<>(objectMapper, Object.class); - return jackson2JsonRedisSerializer; - } - - @Bean - public RedisTemplate redisTemplate(RedisConnectionFactory factory) { - RedisTemplate template = new RedisTemplate<>(); - // Key HashKey使用String序列化 - template.setKeySerializer(RedisSerializer.string()); - template.setHashKeySerializer(RedisSerializer.string()); - - // Value HashValue使用Jackson2JsonRedisSerializer序列化 - template.setValueSerializer(jackson2JsonRedisSerializer()); - template.setHashValueSerializer(jackson2JsonRedisSerializer()); - - template.setConnectionFactory(factory); - return template; - } -} diff --git a/maku-framework/src/main/java/net/maku/framework/config/SwaggerConfig.java b/maku-framework/src/main/java/net/maku/framework/config/SwaggerConfig.java deleted file mode 100644 index d3b98df..0000000 --- a/maku-framework/src/main/java/net/maku/framework/config/SwaggerConfig.java +++ /dev/null @@ -1,43 +0,0 @@ -package net.maku.framework.config; - -import io.swagger.v3.oas.models.OpenAPI; -import io.swagger.v3.oas.models.info.Contact; -import io.swagger.v3.oas.models.info.Info; -import io.swagger.v3.oas.models.info.License; -import org.springdoc.core.models.GroupedOpenApi; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; - -/** - * Swagger配置 - * - * @author 阿沐 babamu@126.com - */ -@Configuration -public class SwaggerConfig { - - @Bean - public GroupedOpenApi userApi() { - String[] paths = {"/**"}; - String[] packagedToMatch = {"net.maku"}; - return GroupedOpenApi.builder().group("MakuBoot") - .pathsToMatch(paths) - .packagesToScan(packagedToMatch).build(); - } - - @Bean - public OpenAPI customOpenAPI() { - Contact contact = new Contact(); - contact.setName("阿沐 babamu@126.com"); - - return new OpenAPI().info(new Info() - .title("MakuBoot") - .description("MakuBoot") - .contact(contact) - .version("2.0") - .termsOfService("https://maku.net") - .license(new License().name("MIT") - .url("https://maku.net"))); - } - -} \ No newline at end of file diff --git a/maku-framework/src/main/java/net/maku/framework/mybatis/config/MybatisPlusConfig.java b/maku-framework/src/main/java/net/maku/framework/mybatis/config/MybatisPlusConfig.java new file mode 100644 index 0000000..62b595d --- /dev/null +++ b/maku-framework/src/main/java/net/maku/framework/mybatis/config/MybatisPlusConfig.java @@ -0,0 +1,39 @@ +package net.maku.framework.mybatis.config; + +import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor; +import com.baomidou.mybatisplus.extension.plugins.inner.BlockAttackInnerInterceptor; +import com.baomidou.mybatisplus.extension.plugins.inner.OptimisticLockerInnerInterceptor; +import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor; +import net.maku.framework.mybatis.handler.FieldMetaObjectHandler; +import net.maku.framework.mybatis.interceptor.DataScopeInnerInterceptor; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +/** + * mybatis-plus 配置 + * + * @author 阿沐 babamu@126.com + */ +@Configuration +public class MybatisPlusConfig { + + @Bean + public MybatisPlusInterceptor mybatisPlusInterceptor() { + MybatisPlusInterceptor mybatisPlusInterceptor = new MybatisPlusInterceptor(); + // 数据权限 + mybatisPlusInterceptor.addInnerInterceptor(new DataScopeInnerInterceptor()); + // 分页插件 + mybatisPlusInterceptor.addInnerInterceptor(new PaginationInnerInterceptor()); + // 乐观锁 + mybatisPlusInterceptor.addInnerInterceptor(new OptimisticLockerInnerInterceptor()); + // 防止全表更新与删除 + mybatisPlusInterceptor.addInnerInterceptor(new BlockAttackInnerInterceptor()); + + return mybatisPlusInterceptor; + } + + @Bean + public FieldMetaObjectHandler fieldMetaObjectHandler(){ + return new FieldMetaObjectHandler(); + } +} diff --git a/maku-framework/src/main/java/net/maku/framework/mybatis/dao/BaseDao.java b/maku-framework/src/main/java/net/maku/framework/mybatis/dao/BaseDao.java new file mode 100644 index 0000000..ad26d2b --- /dev/null +++ b/maku-framework/src/main/java/net/maku/framework/mybatis/dao/BaseDao.java @@ -0,0 +1,13 @@ +package net.maku.framework.mybatis.dao; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * 基础Dao + * + * @author 阿沐 babamu@126.com + */ +public interface BaseDao extends BaseMapper { + +} diff --git a/maku-framework/src/main/java/net/maku/framework/mybatis/entity/BaseEntity.java b/maku-framework/src/main/java/net/maku/framework/mybatis/entity/BaseEntity.java new file mode 100644 index 0000000..5831d3c --- /dev/null +++ b/maku-framework/src/main/java/net/maku/framework/mybatis/entity/BaseEntity.java @@ -0,0 +1,59 @@ +package net.maku.framework.mybatis.entity; + +import com.baomidou.mybatisplus.annotation.*; +import com.fhs.core.trans.vo.TransPojo; +import lombok.Data; + +import java.util.Date; + +/** + * Entity基类 + * + * @author 阿沐 babamu@126.com + */ +@Data +public abstract class BaseEntity implements TransPojo { + /** + * id + */ + @TableId + private Long id; + + /** + * 创建者 + */ + @TableField(fill = FieldFill.INSERT) + private Long creator; + + /** + * 创建时间 + */ + @TableField(fill = FieldFill.INSERT) + private Date createTime; + + /** + * 更新者 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + private Long updater; + + /** + * 更新时间 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + private Date updateTime; + + /** + * 版本号 + */ + @Version + @TableField(fill = FieldFill.INSERT) + private Integer version; + + /** + * 删除标记 + */ + @TableLogic + @TableField(fill = FieldFill.INSERT) + private Integer deleted; +} diff --git a/maku-framework/src/main/java/net/maku/framework/mybatis/handler/FieldMetaObjectHandler.java b/maku-framework/src/main/java/net/maku/framework/mybatis/handler/FieldMetaObjectHandler.java new file mode 100644 index 0000000..2676d7c --- /dev/null +++ b/maku-framework/src/main/java/net/maku/framework/mybatis/handler/FieldMetaObjectHandler.java @@ -0,0 +1,52 @@ +package net.maku.framework.mybatis.handler; + +import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler; +import net.maku.framework.security.user.SecurityUser; +import net.maku.framework.security.user.UserDetail; +import org.apache.ibatis.reflection.MetaObject; + +import java.util.Date; + +/** + * mybatis-plus 自动填充字段 + * + * @author 阿沐 babamu@126.com + */ +public class FieldMetaObjectHandler implements MetaObjectHandler { + private final static String CREATE_TIME = "createTime"; + private final static String CREATOR = "creator"; + private final static String UPDATE_TIME = "updateTime"; + private final static String UPDATER = "updater"; + private final static String ORG_ID = "orgId"; + private final static String VERSION = "version"; + private final static String DELETED = "deleted"; + + @Override + public void insertFill(MetaObject metaObject) { + UserDetail user = SecurityUser.getUser(); + Date date = new Date(); + + // 创建者 + strictInsertFill(metaObject, CREATOR, Long.class, user.getId()); + // 创建时间 + strictInsertFill(metaObject, CREATE_TIME, Date.class, date); + // 更新者 + strictInsertFill(metaObject, UPDATER, Long.class, user.getId()); + // 更新时间 + strictInsertFill(metaObject, UPDATE_TIME, Date.class, date); + // 创建者所属机构 + strictInsertFill(metaObject, ORG_ID, Long.class, user.getOrgId()); + // 版本号 + strictInsertFill(metaObject, VERSION, Integer.class, 0); + // 删除标识 + strictInsertFill(metaObject, DELETED, Integer.class, 0); + } + + @Override + public void updateFill(MetaObject metaObject) { + // 更新者 + strictUpdateFill(metaObject, UPDATER, Long.class, SecurityUser.getUserId()); + // 更新时间 + strictUpdateFill(metaObject, UPDATE_TIME, Date.class, new Date()); + } +} \ No newline at end of file diff --git a/maku-framework/src/main/java/net/maku/framework/mybatis/interceptor/DataScope.java b/maku-framework/src/main/java/net/maku/framework/mybatis/interceptor/DataScope.java new file mode 100644 index 0000000..801b8a0 --- /dev/null +++ b/maku-framework/src/main/java/net/maku/framework/mybatis/interceptor/DataScope.java @@ -0,0 +1,16 @@ +package net.maku.framework.mybatis.interceptor; + +import lombok.AllArgsConstructor; +import lombok.Data; + +/** + * 数据范围 + * + * @author 阿沐 babamu@126.com + */ +@Data +@AllArgsConstructor +public class DataScope { + private String sqlFilter; + +} \ No newline at end of file diff --git a/maku-framework/src/main/java/net/maku/framework/mybatis/interceptor/DataScopeInnerInterceptor.java b/maku-framework/src/main/java/net/maku/framework/mybatis/interceptor/DataScopeInnerInterceptor.java new file mode 100644 index 0000000..c763711 --- /dev/null +++ b/maku-framework/src/main/java/net/maku/framework/mybatis/interceptor/DataScopeInnerInterceptor.java @@ -0,0 +1,81 @@ +package net.maku.framework.mybatis.interceptor; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.toolkit.PluginUtils; +import com.baomidou.mybatisplus.extension.plugins.inner.InnerInterceptor; +import net.sf.jsqlparser.JSQLParserException; +import net.sf.jsqlparser.expression.Expression; +import net.sf.jsqlparser.expression.StringValue; +import net.sf.jsqlparser.expression.operators.conditional.AndExpression; +import net.sf.jsqlparser.parser.CCJSqlParserUtil; +import net.sf.jsqlparser.statement.select.PlainSelect; +import net.sf.jsqlparser.statement.select.Select; +import org.apache.ibatis.executor.Executor; +import org.apache.ibatis.mapping.BoundSql; +import org.apache.ibatis.mapping.MappedStatement; +import org.apache.ibatis.session.ResultHandler; +import org.apache.ibatis.session.RowBounds; + +import java.util.Map; + +/** + * 数据权限 + * + * @author 阿沐 babamu@126.com + */ +public class DataScopeInnerInterceptor implements InnerInterceptor { + + @Override + public void beforeQuery(Executor executor, MappedStatement ms, Object parameter, RowBounds rowBounds, ResultHandler resultHandler, BoundSql boundSql) { + DataScope scope = getDataScope(parameter); + // 不进行数据过滤 + if(scope == null || StrUtil.isBlank(scope.getSqlFilter())){ + return; + } + + // 拼接新SQL + String buildSql = getSelect(boundSql.getSql(), scope); + + // 重写SQL + PluginUtils.mpBoundSql(boundSql).sql(buildSql); + } + + private DataScope getDataScope(Object parameter){ + if (parameter == null){ + return null; + } + + // 判断参数里是否有DataScope对象 + if (parameter instanceof Map) { + Map parameterMap = (Map) parameter; + for (Map.Entry entry : parameterMap.entrySet()) { + if (entry.getValue() != null && entry.getValue() instanceof DataScope) { + return (DataScope) entry.getValue(); + } + } + } else if (parameter instanceof DataScope) { + return (DataScope) parameter; + } + + return null; + } + + private String getSelect(String buildSql, DataScope scope){ + try { + Select select = (Select) CCJSqlParserUtil.parse(buildSql); + PlainSelect plainSelect = (PlainSelect) select.getSelectBody(); + + Expression expression = plainSelect.getWhere(); + if(expression == null){ + plainSelect.setWhere(new StringValue(scope.getSqlFilter())); + }else{ + AndExpression andExpression = new AndExpression(expression, new StringValue(scope.getSqlFilter())); + plainSelect.setWhere(andExpression); + } + + return select.toString().replaceAll("'", ""); + }catch (JSQLParserException e){ + return buildSql; + } + } +} \ No newline at end of file diff --git a/maku-framework/src/main/java/net/maku/framework/mybatis/service/BaseService.java b/maku-framework/src/main/java/net/maku/framework/mybatis/service/BaseService.java new file mode 100644 index 0000000..0631541 --- /dev/null +++ b/maku-framework/src/main/java/net/maku/framework/mybatis/service/BaseService.java @@ -0,0 +1,13 @@ +package net.maku.framework.mybatis.service; + +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * 基础服务接口，所有Service接口都要继承 + * + * @author 阿沐 babamu@126.com + */ +public interface BaseService extends IService { + + +} \ No newline at end of file diff --git a/maku-framework/src/main/java/net/maku/framework/mybatis/service/impl/BaseServiceImpl.java b/maku-framework/src/main/java/net/maku/framework/mybatis/service/impl/BaseServiceImpl.java new file mode 100644 index 0000000..ff3a00f --- /dev/null +++ b/maku-framework/src/main/java/net/maku/framework/mybatis/service/impl/BaseServiceImpl.java @@ -0,0 +1,110 @@ +package net.maku.framework.mybatis.service.impl; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.metadata.OrderItem; +import com.baomidou.mybatisplus.core.toolkit.StringUtils; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import net.maku.framework.common.constant.Constant; +import net.maku.framework.mybatis.interceptor.DataScope; +import net.maku.framework.common.query.Query; +import net.maku.framework.mybatis.service.BaseService; +import net.maku.framework.security.user.SecurityUser; +import net.maku.framework.security.user.UserDetail; + +import java.util.List; + + +/** + * 基础服务类，所有Service都要继承 + * + * @author 阿沐 babamu@126.com + */ +public class BaseServiceImpl, T> extends ServiceImpl implements BaseService { + + /** + * 获取分页对象 + * + * @param query 分页参数 + */ + protected IPage getPage(Query query) { + Page page = new Page<>(query.getPage(), query.getLimit()); + + // 排序 + if (StringUtils.isNotBlank(query.getOrder())) { + if (query.isAsc()) { + return page.addOrder(OrderItem.asc(query.getOrder())); + } else { + return page.addOrder(OrderItem.desc(query.getOrder())); + } + } + + return page; + } + + /** + * MyBatis-Plus 数据权限 + */ + protected void dataScopeWrapper(LambdaQueryWrapper queryWrapper) { + DataScope dataScope = getDataScope(null, null); + if (dataScope != null) { + queryWrapper.apply(dataScope.getSqlFilter()); + } + } + + /** + * 原生SQL 数据权限 + * + * @param tableAlias 表别名，多表关联时，需要填写表别名 + * @param orgIdAlias 机构ID别名，null：表示org_id + * @return 返回数据权限 + */ + protected DataScope getDataScope(String tableAlias, String orgIdAlias) { + UserDetail user = SecurityUser.getUser(); + // 如果是超级管理员，则不进行数据过滤 + if (user.getSuperAdmin().equals(Constant.SUPER_ADMIN)) { + return null; + } + + // 如果为null，则设置成空字符串 + if (tableAlias == null) { + tableAlias = ""; + } + + // 获取表的别名 + if (StringUtils.isNotBlank(tableAlias)) { + tableAlias += "."; + } + + StringBuilder sqlFilter = new StringBuilder(); + sqlFilter.append(" ("); + + // 数据权限范围 + List dataScopeList = user.getDataScopeList(); + // 全部数据权限 + if (dataScopeList == null) { + return null; + } + // 数据过滤 + if (dataScopeList.size() > 0) { + if (StringUtils.isBlank(orgIdAlias)) { + orgIdAlias = "org_id"; + } + sqlFilter.append(tableAlias).append(orgIdAlias); + + sqlFilter.append(" in(").append(StrUtil.join(",", dataScopeList)).append(")"); + + sqlFilter.append(" or "); + } + + // 查询本人数据 + sqlFilter.append(tableAlias).append("creator").append("=").append(user.getId()); + + sqlFilter.append(")"); + + return new DataScope(sqlFilter.toString()); + } +} \ No newline at end of file