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/config/CorsConfig.java b/maku-framework/src/main/java/net/maku/framework/common/config/CorsConfig.java similarity index 95% rename from maku-framework/src/main/java/net/maku/framework/config/CorsConfig.java rename to maku-framework/src/main/java/net/maku/framework/common/config/CorsConfig.java index 1329254..48b9588 100644 --- a/maku-framework/src/main/java/net/maku/framework/config/CorsConfig.java +++ b/maku-framework/src/main/java/net/maku/framework/common/config/CorsConfig.java @@ -1,4 +1,4 @@ -package net.maku.framework.config; +package net.maku.framework.common.config; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/maku-framework/src/main/java/net/maku/framework/config/RedisConfig.java b/maku-framework/src/main/java/net/maku/framework/common/config/RedisConfig.java similarity index 97% rename from maku-framework/src/main/java/net/maku/framework/config/RedisConfig.java rename to maku-framework/src/main/java/net/maku/framework/common/config/RedisConfig.java index 94a524c..16d61a1 100644 --- a/maku-framework/src/main/java/net/maku/framework/config/RedisConfig.java +++ b/maku-framework/src/main/java/net/maku/framework/common/config/RedisConfig.java @@ -1,4 +1,4 @@ -package net.maku.framework.config; +package net.maku.framework.common.config; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.PropertyAccessor; diff --git a/maku-framework/src/main/java/net/maku/framework/config/SwaggerConfig.java b/maku-framework/src/main/java/net/maku/framework/common/config/SwaggerConfig.java similarity index 94% rename from maku-framework/src/main/java/net/maku/framework/config/SwaggerConfig.java rename to maku-framework/src/main/java/net/maku/framework/common/config/SwaggerConfig.java index d3b98df..746242c 100644 --- a/maku-framework/src/main/java/net/maku/framework/config/SwaggerConfig.java +++ b/maku-framework/src/main/java/net/maku/framework/common/config/SwaggerConfig.java @@ -1,4 +1,4 @@ -package net.maku.framework.config; +package net.maku.framework.common.config; import io.swagger.v3.oas.models.OpenAPI; import io.swagger.v3.oas.models.info.Contact; @@ -34,7 +34,7 @@ public class SwaggerConfig { .title("MakuBoot") .description("MakuBoot") .contact(contact) - .version("2.0") + .version("3.0") .termsOfService("https://maku.net") .license(new License().name("MIT") .url("https://maku.net"))); 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/utils/PageResult.java similarity index 94% rename from maku-framework/src/main/java/net/maku/framework/common/page/PageResult.java rename to maku-framework/src/main/java/net/maku/framework/common/utils/PageResult.java index 9633a45..cc41e25 100644 --- a/maku-framework/src/main/java/net/maku/framework/common/page/PageResult.java +++ b/maku-framework/src/main/java/net/maku/framework/common/utils/PageResult.java @@ -1,4 +1,4 @@ -package net.maku.framework.common.page; +package net.maku.framework.common.utils; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/maku-framework/src/main/java/net/maku/framework/config/MybatisPlusConfig.java b/maku-framework/src/main/java/net/maku/framework/mybatis/config/MybatisPlusConfig.java similarity index 88% rename from maku-framework/src/main/java/net/maku/framework/config/MybatisPlusConfig.java rename to maku-framework/src/main/java/net/maku/framework/mybatis/config/MybatisPlusConfig.java index 2c3dd51..62b595d 100644 --- a/maku-framework/src/main/java/net/maku/framework/config/MybatisPlusConfig.java +++ b/maku-framework/src/main/java/net/maku/framework/mybatis/config/MybatisPlusConfig.java @@ -1,11 +1,11 @@ -package net.maku.framework.config; +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.common.handler.FieldMetaObjectHandler; -import net.maku.framework.common.interceptor.DataScopeInnerInterceptor; +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; diff --git a/maku-framework/src/main/java/net/maku/framework/common/dao/BaseDao.java b/maku-framework/src/main/java/net/maku/framework/mybatis/dao/BaseDao.java similarity index 81% rename from maku-framework/src/main/java/net/maku/framework/common/dao/BaseDao.java rename to maku-framework/src/main/java/net/maku/framework/mybatis/dao/BaseDao.java index ce38e5b..ad26d2b 100644 --- a/maku-framework/src/main/java/net/maku/framework/common/dao/BaseDao.java +++ b/maku-framework/src/main/java/net/maku/framework/mybatis/dao/BaseDao.java @@ -1,4 +1,4 @@ -package net.maku.framework.common.dao; +package net.maku.framework.mybatis.dao; import com.baomidou.mybatisplus.core.mapper.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/mybatis/entity/BaseEntity.java similarity index 95% rename from maku-framework/src/main/java/net/maku/framework/common/entity/BaseEntity.java rename to maku-framework/src/main/java/net/maku/framework/mybatis/entity/BaseEntity.java index 171d41f..5831d3c 100644 --- a/maku-framework/src/main/java/net/maku/framework/common/entity/BaseEntity.java +++ b/maku-framework/src/main/java/net/maku/framework/mybatis/entity/BaseEntity.java @@ -1,4 +1,4 @@ -package net.maku.framework.common.entity; +package net.maku.framework.mybatis.entity; import com.baomidou.mybatisplus.annotation.*; import com.fhs.core.trans.vo.TransPojo; diff --git a/maku-framework/src/main/java/net/maku/framework/common/handler/FieldMetaObjectHandler.java b/maku-framework/src/main/java/net/maku/framework/mybatis/handler/FieldMetaObjectHandler.java similarity index 97% rename from maku-framework/src/main/java/net/maku/framework/common/handler/FieldMetaObjectHandler.java rename to maku-framework/src/main/java/net/maku/framework/mybatis/handler/FieldMetaObjectHandler.java index 6e55769..2676d7c 100644 --- a/maku-framework/src/main/java/net/maku/framework/common/handler/FieldMetaObjectHandler.java +++ b/maku-framework/src/main/java/net/maku/framework/mybatis/handler/FieldMetaObjectHandler.java @@ -1,4 +1,4 @@ -package net.maku.framework.common.handler; +package net.maku.framework.mybatis.handler; import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler; import net.maku.framework.security.user.SecurityUser; diff --git a/maku-framework/src/main/java/net/maku/framework/common/interceptor/DataScope.java b/maku-framework/src/main/java/net/maku/framework/mybatis/interceptor/DataScope.java similarity index 80% rename from maku-framework/src/main/java/net/maku/framework/common/interceptor/DataScope.java rename to maku-framework/src/main/java/net/maku/framework/mybatis/interceptor/DataScope.java index 2cec15a..801b8a0 100644 --- a/maku-framework/src/main/java/net/maku/framework/common/interceptor/DataScope.java +++ b/maku-framework/src/main/java/net/maku/framework/mybatis/interceptor/DataScope.java @@ -1,4 +1,4 @@ -package net.maku.framework.common.interceptor; +package net.maku.framework.mybatis.interceptor; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/maku-framework/src/main/java/net/maku/framework/common/interceptor/DataScopeInnerInterceptor.java b/maku-framework/src/main/java/net/maku/framework/mybatis/interceptor/DataScopeInnerInterceptor.java similarity index 98% rename from maku-framework/src/main/java/net/maku/framework/common/interceptor/DataScopeInnerInterceptor.java rename to maku-framework/src/main/java/net/maku/framework/mybatis/interceptor/DataScopeInnerInterceptor.java index e00795c..c763711 100644 --- a/maku-framework/src/main/java/net/maku/framework/common/interceptor/DataScopeInnerInterceptor.java +++ b/maku-framework/src/main/java/net/maku/framework/mybatis/interceptor/DataScopeInnerInterceptor.java @@ -1,4 +1,4 @@ -package net.maku.framework.common.interceptor; +package net.maku.framework.mybatis.interceptor; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.toolkit.PluginUtils; diff --git a/maku-framework/src/main/java/net/maku/framework/common/service/BaseService.java b/maku-framework/src/main/java/net/maku/framework/mybatis/service/BaseService.java similarity index 82% rename from maku-framework/src/main/java/net/maku/framework/common/service/BaseService.java rename to maku-framework/src/main/java/net/maku/framework/mybatis/service/BaseService.java index fcd3722..0631541 100644 --- a/maku-framework/src/main/java/net/maku/framework/common/service/BaseService.java +++ b/maku-framework/src/main/java/net/maku/framework/mybatis/service/BaseService.java @@ -1,4 +1,4 @@ -package net.maku.framework.common.service; +package net.maku.framework.mybatis.service; import com.baomidou.mybatisplus.extension.service.IService; 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/mybatis/service/impl/BaseServiceImpl.java similarity index 95% rename from maku-framework/src/main/java/net/maku/framework/common/service/impl/BaseServiceImpl.java rename to maku-framework/src/main/java/net/maku/framework/mybatis/service/impl/BaseServiceImpl.java index f98bdd5..ff3a00f 100644 --- a/maku-framework/src/main/java/net/maku/framework/common/service/impl/BaseServiceImpl.java +++ b/maku-framework/src/main/java/net/maku/framework/mybatis/service/impl/BaseServiceImpl.java @@ -1,4 +1,4 @@ -package net.maku.framework.common.service.impl; +package net.maku.framework.mybatis.service.impl; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -9,9 +9,9 @@ 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.mybatis.interceptor.DataScope; import net.maku.framework.common.query.Query; -import net.maku.framework.common.service.BaseService; +import net.maku.framework.mybatis.service.BaseService; import net.maku.framework.security.user.SecurityUser; import net.maku.framework.security.user.UserDetail;