work/book-api
4
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化代码结构，更加合理

This commit is contained in:
阿沐 2023-01-20 13:47:45 +08:00
parent a097dc5e9d
commit d8e5f09871
104 changed files with 638 additions and 638 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
maku-boot-module/maku-module-message/src/main/java/net/maku/message/controller/SmsLogController.java
View File

@ -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;

2
maku-boot-module/maku-module-message/src/main/java/net/maku/message/controller/SmsPlatformController.java
View File

@ -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;

2
maku-boot-module/maku-module-message/src/main/java/net/maku/message/dao/SmsLogDao.java
View File

@ -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;

2
maku-boot-module/maku-module-message/src/main/java/net/maku/message/dao/SmsPlatformDao.java
View File

@ -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;

2
maku-boot-module/maku-module-message/src/main/java/net/maku/message/entity/SmsPlatformEntity.java
View File

@ -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;
/**
* 短信平台

4
maku-boot-module/maku-module-message/src/main/java/net/maku/message/service/SmsLogService.java
View File

@ -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;

4
maku-boot-module/maku-module-message/src/main/java/net/maku/message/service/SmsPlatformService.java
View File

@ -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;

4
maku-boot-module/maku-module-message/src/main/java/net/maku/message/service/impl/SmsLogServiceImpl.java
View File

@ -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;

4
maku-boot-module/maku-module-message/src/main/java/net/maku/message/service/impl/SmsPlatformServiceImpl.java
View File

@ -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;

2
maku-boot-module/maku-module-quartz/src/main/java/net/maku/quartz/controller/ScheduleJobController.java
View File

@ -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;

2
maku-boot-module/maku-module-quartz/src/main/java/net/maku/quartz/controller/ScheduleJobLogController.java
View File

@ -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;

2
maku-boot-module/maku-module-quartz/src/main/java/net/maku/quartz/dao/ScheduleJobDao.java
View File

@ -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;

2
maku-boot-module/maku-module-quartz/src/main/java/net/maku/quartz/dao/ScheduleJobLogDao.java
View File

@ -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;

4
maku-boot-module/maku-module-quartz/src/main/java/net/maku/quartz/service/ScheduleJobLogService.java
View File

@ -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;

4
maku-boot-module/maku-module-quartz/src/main/java/net/maku/quartz/service/ScheduleJobService.java
View File

@ -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;

4
maku-boot-module/maku-module-quartz/src/main/java/net/maku/quartz/service/impl/ScheduleJobLogServiceImpl.java
View File

@ -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;

4
maku-boot-module/maku-module-quartz/src/main/java/net/maku/quartz/service/impl/ScheduleJobServiceImpl.java
View File

@ -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;

2
maku-boot-system/src/main/java/net/maku/system/controller/SysAttachmentController.java
View File

@ -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;

2
maku-boot-system/src/main/java/net/maku/system/controller/SysDictDataController.java
View File

@ -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;

2
maku-boot-system/src/main/java/net/maku/system/controller/SysDictTypeController.java
View File

@ -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;

2
maku-boot-system/src/main/java/net/maku/system/controller/SysLogLoginController.java
View File

@ -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;

2
maku-boot-system/src/main/java/net/maku/system/controller/SysParamsController.java
View File

@ -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;

2
maku-boot-system/src/main/java/net/maku/system/controller/SysPostController.java
View File

@ -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;

2
maku-boot-system/src/main/java/net/maku/system/controller/SysRoleController.java
View File

@ -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;

2
maku-boot-system/src/main/java/net/maku/system/controller/SysUserController.java
View File

@ -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;

2
maku-boot-system/src/main/java/net/maku/system/dao/SysAttachmentDao.java
View File

@ -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;

2
maku-boot-system/src/main/java/net/maku/system/dao/SysDictDataDao.java
View File

@ -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;

2
maku-boot-system/src/main/java/net/maku/system/dao/SysDictTypeDao.java
View File

@ -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;

2
maku-boot-system/src/main/java/net/maku/system/dao/SysLogLoginDao.java
View File

@ -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;

2
maku-boot-system/src/main/java/net/maku/system/dao/SysMenuDao.java
View File

@ -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;

2
maku-boot-system/src/main/java/net/maku/system/dao/SysOrgDao.java
View File

@ -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;

2
maku-boot-system/src/main/java/net/maku/system/dao/SysParamsDao.java
View File

@ -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;

2
maku-boot-system/src/main/java/net/maku/system/dao/SysPostDao.java
View File

@ -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;

2
maku-boot-system/src/main/java/net/maku/system/dao/SysRoleDao.java
View File

@ -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;

2
maku-boot-system/src/main/java/net/maku/system/dao/SysRoleDataScopeDao.java
View File

@ -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;

2
maku-boot-system/src/main/java/net/maku/system/dao/SysRoleMenuDao.java
View File

@ -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;

2
maku-boot-system/src/main/java/net/maku/system/dao/SysUserDao.java
View File

@ -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;

2
maku-boot-system/src/main/java/net/maku/system/dao/SysUserPostDao.java
View File

@ -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;

2
maku-boot-system/src/main/java/net/maku/system/dao/SysUserRoleDao.java
View File

@ -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;

2
maku-boot-system/src/main/java/net/maku/system/entity/SysAttachmentEntity.java
View File

@ -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;
/**
* 附件管理

2
maku-boot-system/src/main/java/net/maku/system/entity/SysDictDataEntity.java
View File

@ -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;
/**
* 数据字典

2
maku-boot-system/src/main/java/net/maku/system/entity/SysDictTypeEntity.java
View File

@ -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;
/**
* 字典类型

2
maku-boot-system/src/main/java/net/maku/system/entity/SysMenuEntity.java
View File

@ -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;
/**
* 菜单管理

2
maku-boot-system/src/main/java/net/maku/system/entity/SysOrgEntity.java
View File

@ -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;
/**
* 机构管理

2
maku-boot-system/src/main/java/net/maku/system/entity/SysParamsEntity.java
View File

@ -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;
/**
* 参数管理

2
maku-boot-system/src/main/java/net/maku/system/entity/SysPostEntity.java
View File

@ -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;
/**
* 岗位管理

2
maku-boot-system/src/main/java/net/maku/system/entity/SysRoleDataScopeEntity.java
View File

@ -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;
/**
* 角色数据权限

2
maku-boot-system/src/main/java/net/maku/system/entity/SysRoleEntity.java
View File

@ -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;
/**

2
maku-boot-system/src/main/java/net/maku/system/entity/SysRoleMenuEntity.java
View File

@ -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;
/**
* 角色菜单关系

2
maku-boot-system/src/main/java/net/maku/system/entity/SysUserEntity.java
View File

@ -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

2
maku-boot-system/src/main/java/net/maku/system/entity/SysUserPostEntity.java
View File

@ -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;
/**
* 用户岗位关系

2
maku-boot-system/src/main/java/net/maku/system/entity/SysUserRoleEntity.java
View File

@ -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;
/**
* 用户角色关系

4
maku-boot-system/src/main/java/net/maku/system/service/SysAttachmentService.java
View File

@ -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;

4
maku-boot-system/src/main/java/net/maku/system/service/SysDictDataService.java
View File

@ -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;

4
maku-boot-system/src/main/java/net/maku/system/service/SysDictTypeService.java
View File

@ -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;

4
maku-boot-system/src/main/java/net/maku/system/service/SysLogLoginService.java
View File

@ -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;

2
maku-boot-system/src/main/java/net/maku/system/service/SysMenuService.java
View File

@ -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;

2
maku-boot-system/src/main/java/net/maku/system/service/SysOrgService.java
View File

@ -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;

4
maku-boot-system/src/main/java/net/maku/system/service/SysParamsService.java
View File

@ -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;

4
maku-boot-system/src/main/java/net/maku/system/service/SysPostService.java
View File

@ -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;

2
maku-boot-system/src/main/java/net/maku/system/service/SysRoleDataScopeService.java
View File

@ -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;

2
maku-boot-system/src/main/java/net/maku/system/service/SysRoleMenuService.java
View File

@ -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;

4
maku-boot-system/src/main/java/net/maku/system/service/SysRoleService.java
View File

@ -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;

2
maku-boot-system/src/main/java/net/maku/system/service/SysUserPostService.java
View File

@ -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;

2
maku-boot-system/src/main/java/net/maku/system/service/SysUserRoleService.java
View File

@ -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;

4
maku-boot-system/src/main/java/net/maku/system/service/SysUserService.java
View File

@ -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;

4
maku-boot-system/src/main/java/net/maku/system/service/impl/SysAttachmentServiceImpl.java
View File

@ -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;

4
maku-boot-system/src/main/java/net/maku/system/service/impl/SysDictDataServiceImpl.java
View File

@ -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;

4
maku-boot-system/src/main/java/net/maku/system/service/impl/SysDictTypeServiceImpl.java
View File

@ -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;

4
maku-boot-system/src/main/java/net/maku/system/service/impl/SysLogLoginServiceImpl.java
View File

@ -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;

2
maku-boot-system/src/main/java/net/maku/system/service/impl/SysMenuServiceImpl.java
View File

@ -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;

2
maku-boot-system/src/main/java/net/maku/system/service/impl/SysOrgServiceImpl.java
View File

@ -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;

4
maku-boot-system/src/main/java/net/maku/system/service/impl/SysParamsServiceImpl.java
View File

@ -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;

4
maku-boot-system/src/main/java/net/maku/system/service/impl/SysPostServiceImpl.java
View File

@ -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;

2
maku-boot-system/src/main/java/net/maku/system/service/impl/SysRoleDataScopeServiceImpl.java
View File

@ -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;

2
maku-boot-system/src/main/java/net/maku/system/service/impl/SysRoleMenuServiceImpl.java
View File

@ -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;

4
maku-boot-system/src/main/java/net/maku/system/service/impl/SysRoleServiceImpl.java
View File

@ -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;

2
maku-boot-system/src/main/java/net/maku/system/service/impl/SysUserPostServiceImpl.java
View File

@ -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;

2
maku-boot-system/src/main/java/net/maku/system/service/impl/SysUserRoleServiceImpl.java
View File

@ -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;

4
maku-boot-system/src/main/java/net/maku/system/service/impl/SysUserServiceImpl.java
View File

@ -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;

2
maku-framework/src/main/java/net/maku/framework/config/CorsConfig.java → maku-framework/src/main/java/net/maku/framework/common/config/CorsConfig.java
View File

@ -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;

2
maku-framework/src/main/java/net/maku/framework/config/RedisConfig.java → maku-framework/src/main/java/net/maku/framework/common/config/RedisConfig.java
View File

@ -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;

4
maku-framework/src/main/java/net/maku/framework/config/SwaggerConfig.java → maku-framework/src/main/java/net/maku/framework/common/config/SwaggerConfig.java
View File

@ -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")));

2
maku-framework/src/main/java/net/maku/framework/common/page/PageResult.java → maku-framework/src/main/java/net/maku/framework/common/utils/PageResult.java
View File

@ -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;

6
maku-framework/src/main/java/net/maku/framework/config/MybatisPlusConfig.java → maku-framework/src/main/java/net/maku/framework/mybatis/config/MybatisPlusConfig.java
View File

@ -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;

2
maku-framework/src/main/java/net/maku/framework/common/dao/BaseDao.java → maku-framework/src/main/java/net/maku/framework/mybatis/dao/BaseDao.java
View File

@ -1,4 +1,4 @@
package net.maku.framework.common.dao;
package net.maku.framework.mybatis.dao;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;

2
maku-framework/src/main/java/net/maku/framework/common/entity/BaseEntity.java → maku-framework/src/main/java/net/maku/framework/mybatis/entity/BaseEntity.java
View File

@ -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;

2
maku-framework/src/main/java/net/maku/framework/common/handler/FieldMetaObjectHandler.java → maku-framework/src/main/java/net/maku/framework/mybatis/handler/FieldMetaObjectHandler.java
View File

@ -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;

2
maku-framework/src/main/java/net/maku/framework/common/interceptor/DataScope.java → maku-framework/src/main/java/net/maku/framework/mybatis/interceptor/DataScope.java
View File

@ -1,4 +1,4 @@
package net.maku.framework.common.interceptor;
package net.maku.framework.mybatis.interceptor;
import lombok.AllArgsConstructor;
import lombok.Data;

2
maku-framework/src/main/java/net/maku/framework/common/interceptor/DataScopeInnerInterceptor.java → maku-framework/src/main/java/net/maku/framework/mybatis/interceptor/DataScopeInnerInterceptor.java
View File

@ -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;

2
maku-framework/src/main/java/net/maku/framework/common/service/BaseService.java → maku-framework/src/main/java/net/maku/framework/mybatis/service/BaseService.java
View File

@ -1,4 +1,4 @@
package net.maku.framework.common.service;
package net.maku.framework.mybatis.service;
import com.baomidou.mybatisplus.extension.service.IService;

6
maku-framework/src/main/java/net/maku/framework/common/service/impl/BaseServiceImpl.java → maku-framework/src/main/java/net/maku/framework/mybatis/service/impl/BaseServiceImpl.java
View File

@ -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;