refactor: 重构Mapper

service/src/main/java/cn/bunny/services/aop/JobExecuteAspect.java

@@ -4,7 +4,7 @@ import cn.bunny.dao.constant.LocalDateTimeConstant;
 import cn.bunny.dao.entity.log.ScheduleExecuteLog;
 import cn.bunny.dao.enums.JobEnums;
 import cn.bunny.dao.model.quartz.ScheduleExecuteLogJson;
-import cn.bunny.services.mapper.ScheduleExecuteLogMapper;
+import cn.bunny.services.mapper.schedule.ScheduleExecuteLogMapper;
 import com.alibaba.fastjson2.JSON;
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.Around;

service/src/main/java/cn/bunny/services/aop/annotation/QuartzSchedulers.java

@@ -10,9 +10,9 @@ import java.lang.annotation.Target;
 public @interface QuartzSchedulers {
     String value() default "";
 
-    // 类型
+    /* 类型 */
     String type();
 
-    // 详情
+    /* 详情 */
     String description();
 }

service/src/main/java/cn/bunny/services/config/ControllerStringParamTrimConfig.java

@@ -38,8 +38,9 @@ public class ControllerStringParamTrimConfig {
                     .deserializerByType(String.class, new StdScalarDeserializer<String>(String.class) {
                         @Override
                         public String deserialize(JsonParser jsonParser, DeserializationContext ctx) throws IOException {
-                            // 去除全部空格
+                            // // 去除全部空格
                             // return StringUtils.trimAllWhitespace(jsonParser.getValueAsString());
+                            
                             // 仅去除前后空格
                             return jsonParser.getValueAsString().trim();
                         }

service/src/main/java/cn/bunny/services/config/Knife4jConfig.java

@@ -16,7 +16,7 @@ public class Knife4jConfig {
     @Bean
     public OpenAPI openAPI() {
         // 作者等信息
-        Contact contact = new Contact().name("Bunny").email("1319900154@qq.com").url("http://z-bunny.cn");
+        Contact contact = new Contact().name("Bunny").email("1319900154@qq.com").url("http://bunny-web.site");
         // 使用协议
         License license = new License().name("MIT").url("https://MUT.com");
         // 相关信息

service/src/main/java/cn/bunny/services/config/MybatisPlusConfig.java

@@ -23,8 +23,8 @@ public class MybatisPlusConfig {
         MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
         // 分页插件
         PaginationInnerInterceptor paginationInnerInterceptor = new PaginationInnerInterceptor(DbType.MYSQL);
-        // 设置最大分页为100
-        paginationInnerInterceptor.setMaxLimit(600L);
+        // 设置最大分页
+        paginationInnerInterceptor.setMaxLimit(400L);
         interceptor.addInnerInterceptor(paginationInnerInterceptor);
         // 乐观锁
         interceptor.addInnerInterceptor(new OptimisticLockerInnerInterceptor());

service/src/main/java/cn/bunny/services/config/RedisConfiguration.java

@@ -52,7 +52,7 @@ public class RedisConfiguration {
         redisTemplate.setHashValueSerializer(new GenericJackson2JsonRedisSerializer());
 
         // 开启Redis事务
-        // redisTemplate.setEnableTransactionSupport(true);
+        redisTemplate.setEnableTransactionSupport(true);
         return redisTemplate;
     }
 
@@ -129,8 +129,8 @@ public class RedisConfiguration {
         mapper.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY);
 
         // 记录序列化之后的数据类型，方便反序列化
-        // mapper.activateDefaultTyping(LaissezFaireSubTypeValidator.instance, ObjectMapper.DefaultTyping.NON_FINAL);
-        mapper.activateDefaultTyping(LaissezFaireSubTypeValidator.instance, ObjectMapper.DefaultTyping.EVERYTHING);
+        mapper.activateDefaultTyping(LaissezFaireSubTypeValidator.instance, ObjectMapper.DefaultTyping.NON_FINAL);
+        // mapper.activateDefaultTyping(LaissezFaireSubTypeValidator.instance, ObjectMapper.DefaultTyping.EVERYTHING);
 
         // 关闭默认的日期格式化方式，默认UTC日期格式 yyyy-MM-dd’T’HH:mm:ss.SSS
         mapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS);

service/src/main/java/cn/bunny/services/mapper/configuration/EmailTemplateMapper.java

@@ -1,4 +1,4 @@
-package cn.bunny.services.mapper;
+package cn.bunny.services.mapper.configuration;
 
 import cn.bunny.dao.dto.system.email.template.EmailTemplateDto;
 import cn.bunny.dao.entity.system.EmailTemplate;

service/src/main/java/cn/bunny/services/mapper/configuration/EmailUsersMapper.java

@@ -1,4 +1,4 @@
-package cn.bunny.services.mapper;
+package cn.bunny.services.mapper.configuration;
 
 import cn.bunny.dao.dto.system.email.user.EmailUsersDto;
 import cn.bunny.dao.entity.system.EmailUsers;

service/src/main/java/cn/bunny/services/mapper/configuration/I18nMapper.java

@@ -1,4 +1,4 @@
-package cn.bunny.services.mapper;
+package cn.bunny.services.mapper.configuration;
 
 import cn.bunny.dao.dto.i18n.I18nDto;
 import cn.bunny.dao.entity.i18n.I18n;

service/src/main/java/cn/bunny/services/mapper/configuration/I18nTypeMapper.java

@@ -1,4 +1,4 @@
-package cn.bunny.services.mapper;
+package cn.bunny.services.mapper.configuration;
 
 import cn.bunny.dao.dto.i18n.I18nTypeDto;
 import cn.bunny.dao.entity.i18n.I18nType;

service/src/main/java/cn/bunny/services/mapper/configuration/MenuIconMapper.java

@@ -1,4 +1,4 @@
-package cn.bunny.services.mapper;
+package cn.bunny.services.mapper.configuration;
 
 import cn.bunny.dao.dto.system.menuIcon.MenuIconDto;
 import cn.bunny.dao.entity.system.MenuIcon;

service/src/main/java/cn/bunny/services/mapper/log/UserLoginLogMapper.java

@@ -1,4 +1,4 @@
-package cn.bunny.services.mapper;
+package cn.bunny.services.mapper.log;
 
 import cn.bunny.dao.dto.log.UserLoginLogDto;
 import cn.bunny.dao.entity.log.UserLoginLog;

service/src/main/java/cn/bunny/services/mapper/message/MessageMapper.java

@@ -1,4 +1,4 @@
-package cn.bunny.services.mapper;
+package cn.bunny.services.mapper.message;
 
 import cn.bunny.dao.dto.system.message.MessageDto;
 import cn.bunny.dao.entity.system.Message;

service/src/main/java/cn/bunny/services/mapper/message/MessageReceivedMapper.java

@@ -1,4 +1,4 @@
-package cn.bunny.services.mapper;
+package cn.bunny.services.mapper.message;
 
 import cn.bunny.dao.dto.system.message.MessageReceivedDto;
 import cn.bunny.dao.dto.system.message.MessageUserDto;

service/src/main/java/cn/bunny/services/mapper/message/MessageTypeMapper.java

@@ -1,4 +1,4 @@
-package cn.bunny.services.mapper;
+package cn.bunny.services.mapper.message;
 
 import cn.bunny.dao.dto.system.message.MessageTypeDto;
 import cn.bunny.dao.entity.system.MessageType;

service/src/main/java/cn/bunny/services/mapper/schedule/ScheduleExecuteLogMapper.java

@@ -1,4 +1,4 @@
-package cn.bunny.services.mapper;
+package cn.bunny.services.mapper.schedule;
 
 import cn.bunny.dao.dto.log.ScheduleExecuteLogDto;
 import cn.bunny.dao.entity.log.ScheduleExecuteLog;

service/src/main/java/cn/bunny/services/mapper/schedule/SchedulersGroupMapper.java

@@ -1,4 +1,4 @@
-package cn.bunny.services.mapper;
+package cn.bunny.services.mapper.schedule;
 
 import cn.bunny.dao.dto.quartz.group.SchedulersGroupDto;
 import cn.bunny.dao.entity.quartz.SchedulersGroup;

service/src/main/java/cn/bunny/services/mapper/schedule/SchedulersMapper.java

@@ -1,4 +1,4 @@
-package cn.bunny.services.mapper;
+package cn.bunny.services.mapper.schedule;
 
 import cn.bunny.dao.dto.quartz.schedule.SchedulersDto;
 import cn.bunny.dao.entity.quartz.Schedulers;

service/src/main/java/cn/bunny/services/mapper/system/DeptMapper.java

@@ -1,4 +1,4 @@
-package cn.bunny.services.mapper;
+package cn.bunny.services.mapper.system;
 
 import cn.bunny.dao.dto.system.dept.DeptDto;
 import cn.bunny.dao.entity.system.Dept;

service/src/main/java/cn/bunny/services/mapper/system/FilesMapper.java

@@ -1,4 +1,4 @@
-package cn.bunny.services.mapper;
+package cn.bunny.services.mapper.system;
 
 import cn.bunny.dao.dto.system.files.FilesDto;
 import cn.bunny.dao.entity.system.Files;

service/src/main/java/cn/bunny/services/mapper/system/PowerMapper.java

@@ -1,4 +1,4 @@
-package cn.bunny.services.mapper;
+package cn.bunny.services.mapper.system;
 
 import cn.bunny.dao.dto.system.rolePower.power.PowerDto;
 import cn.bunny.dao.entity.system.Power;

service/src/main/java/cn/bunny/services/mapper/system/RoleMapper.java

@@ -1,4 +1,4 @@
-package cn.bunny.services.mapper;
+package cn.bunny.services.mapper.system;
 
 import cn.bunny.dao.dto.system.rolePower.role.RoleDto;
 import cn.bunny.dao.entity.system.Role;

service/src/main/java/cn/bunny/services/mapper/system/RolePowerMapper.java

@@ -1,4 +1,4 @@
-package cn.bunny.services.mapper;
+package cn.bunny.services.mapper.system;
 
 import cn.bunny.dao.entity.system.RolePower;
 import cn.bunny.dao.views.ViewRolePower;

service/src/main/java/cn/bunny/services/mapper/system/RouterMapper.java

@@ -1,4 +1,4 @@
-package cn.bunny.services.mapper;
+package cn.bunny.services.mapper.system;
 
 
 import cn.bunny.dao.dto.system.router.RouterManageDto;

service/src/main/java/cn/bunny/services/mapper/system/RouterRoleMapper.java

@@ -1,4 +1,4 @@
-package cn.bunny.services.mapper;
+package cn.bunny.services.mapper.system;
 
 import cn.bunny.dao.entity.system.RouterRole;
 import cn.bunny.dao.views.ViewRouterRole;

service/src/main/java/cn/bunny/services/mapper/system/UserDeptMapper.java

@@ -1,4 +1,4 @@
-package cn.bunny.services.mapper;
+package cn.bunny.services.mapper.system;
 
 import cn.bunny.dao.entity.system.UserDept;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;

service/src/main/java/cn/bunny/services/mapper/system/UserMapper.java

@@ -1,4 +1,4 @@
-package cn.bunny.services.mapper;
+package cn.bunny.services.mapper.system;
 
 import cn.bunny.dao.dto.system.user.AdminUserDto;
 import cn.bunny.dao.entity.system.AdminUser;

service/src/main/java/cn/bunny/services/mapper/system/UserRoleMapper.java

@@ -1,4 +1,4 @@
-package cn.bunny.services.mapper;
+package cn.bunny.services.mapper.system;
 
 import cn.bunny.dao.entity.system.UserRole;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;

service/src/main/java/cn/bunny/services/quartz/DatabaseBackupJob.java

@@ -17,6 +17,10 @@ import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
 
+/**
+ * WARNING ：
+ * 这个只是Demo
+ */
 @Slf4j
 // @QuartzSchedulers(type = "backup", description = "数据库备份(仅限本地docker中MySQL)")
 @Component

service/src/main/java/cn/bunny/services/security/config/WebSecurityConfig.java

@@ -2,7 +2,7 @@ package cn.bunny.services.security.config;
 
 import cn.bunny.dao.entity.system.AdminUser;
 import cn.bunny.dao.vo.result.ResultCodeEnum;
-import cn.bunny.services.mapper.UserMapper;
+import cn.bunny.services.mapper.system.UserMapper;
 import cn.bunny.services.security.custom.CustomAuthorizationManagerServiceImpl;
 import cn.bunny.services.security.filter.TokenLoginFilterService;
 import cn.bunny.services.security.handelr.SecurityAccessDeniedHandler;

service/src/main/java/cn/bunny/services/security/custom/CustomAuthorizationManagerServiceImpl.java

@@ -6,14 +6,13 @@ import cn.bunny.dao.entity.system.Role;
 import cn.bunny.dao.vo.result.ResultCodeEnum;
 import cn.bunny.dao.vo.system.user.LoginVo;
 import cn.bunny.services.context.BaseContext;
-import cn.bunny.services.mapper.PowerMapper;
-import cn.bunny.services.mapper.RoleMapper;
+import cn.bunny.services.mapper.system.PowerMapper;
+import cn.bunny.services.mapper.system.RoleMapper;
 import cn.bunny.services.utils.JwtHelper;
 import cn.bunny.services.utils.RoleUtil;
 import com.alibaba.fastjson2.JSON;
 import jakarta.servlet.http.HttpServletRequest;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.security.authorization.AuthorizationDecision;
 import org.springframework.security.authorization.AuthorizationManager;
@@ -35,15 +34,25 @@ import java.util.function.Supplier;
 @Slf4j
 public class CustomAuthorizationManagerServiceImpl implements AuthorizationManager<RequestAuthorizationContext> {
 
-    @Autowired
-    private PowerMapper powerMapper;
+    private final PowerMapper powerMapper;
 
-    @Autowired
-    private RoleMapper roleMapper;
+    private final RoleMapper roleMapper;
 
-    @Autowired
-    private RedisTemplate<String, Object> redisTemplate;
+    private final RedisTemplate<String, Object> redisTemplate;
 
+    public CustomAuthorizationManagerServiceImpl(PowerMapper powerMapper, RoleMapper roleMapper, RedisTemplate<String, Object> redisTemplate) {
+        this.powerMapper = powerMapper;
+        this.roleMapper = roleMapper;
+        this.redisTemplate = redisTemplate;
+    }
+
+    /**
+     * 检查请求的Token是否携带，并判断是否过期
+     *
+     * @param authentication Supplier
+     * @param context        RequestAuthorizationContext
+     * @return AuthorizationDecision
+     */
     @Override
     public AuthorizationDecision check(Supplier<Authentication> authentication, RequestAuthorizationContext context) {
         // 用户的token和用户id、请求Url

service/src/main/java/cn/bunny/services/security/filter/TokenLoginFilterService.java

@@ -28,7 +28,7 @@ import org.springframework.security.web.util.matcher.AntPathRequestMatcher;
  */
 public class TokenLoginFilterService extends UsernamePasswordAuthenticationFilter {
     private final UserService userService;
-    LoginDto loginDto;
+    private LoginDto loginDto;
 
     public TokenLoginFilterService(AuthenticationConfiguration authenticationConfiguration, UserService customUserDetailsService) throws Exception {
         this.setAuthenticationSuccessHandler(new SecurityAuthenticationSuccessHandler());

service/src/main/java/cn/bunny/services/service/configuration/impl/EmailTemplateServiceImpl.java

@@ -9,7 +9,7 @@ import cn.bunny.dao.vo.result.PageResult;
 import cn.bunny.dao.vo.result.ResultCodeEnum;
 import cn.bunny.dao.vo.system.email.EmailTemplateVo;
 import cn.bunny.services.exception.AuthCustomerException;
-import cn.bunny.services.mapper.EmailTemplateMapper;
+import cn.bunny.services.mapper.configuration.EmailTemplateMapper;
 import cn.bunny.services.service.configuration.EmailTemplateService;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;

service/src/main/java/cn/bunny/services/service/configuration/impl/EmailUsersServiceImpl.java

@@ -9,7 +9,7 @@ import cn.bunny.dao.vo.result.PageResult;
 import cn.bunny.dao.vo.result.ResultCodeEnum;
 import cn.bunny.dao.vo.system.email.EmailUsersVo;
 import cn.bunny.services.exception.AuthCustomerException;
-import cn.bunny.services.mapper.EmailUsersMapper;
+import cn.bunny.services.mapper.configuration.EmailUsersMapper;
 import cn.bunny.services.service.configuration.EmailUsersService;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;

service/src/main/java/cn/bunny/services/service/configuration/impl/I18nServiceImpl.java

@@ -9,8 +9,8 @@ import cn.bunny.dao.vo.i18n.I18nVo;
 import cn.bunny.dao.vo.result.PageResult;
 import cn.bunny.dao.vo.result.ResultCodeEnum;
 import cn.bunny.services.exception.AuthCustomerException;
-import cn.bunny.services.mapper.I18nMapper;
-import cn.bunny.services.mapper.I18nTypeMapper;
+import cn.bunny.services.mapper.configuration.I18nMapper;
+import cn.bunny.services.mapper.configuration.I18nTypeMapper;
 import cn.bunny.services.service.configuration.I18nService;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;

service/src/main/java/cn/bunny/services/service/configuration/impl/I18nTypeServiceImpl.java

@@ -7,7 +7,7 @@ import cn.bunny.dao.entity.i18n.I18nType;
 import cn.bunny.dao.vo.i18n.I18nTypeVo;
 import cn.bunny.dao.vo.result.ResultCodeEnum;
 import cn.bunny.services.exception.AuthCustomerException;
-import cn.bunny.services.mapper.I18nTypeMapper;
+import cn.bunny.services.mapper.configuration.I18nTypeMapper;
 import cn.bunny.services.service.configuration.I18nTypeService;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;

service/src/main/java/cn/bunny/services/service/configuration/impl/MenuIconServiceImpl.java

@@ -8,7 +8,7 @@ import cn.bunny.dao.vo.result.PageResult;
 import cn.bunny.dao.vo.result.ResultCodeEnum;
 import cn.bunny.dao.vo.system.MenuIconVo;
 import cn.bunny.services.exception.AuthCustomerException;
-import cn.bunny.services.mapper.MenuIconMapper;
+import cn.bunny.services.mapper.configuration.MenuIconMapper;
 import cn.bunny.services.service.configuration.MenuIconService;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;

service/src/main/java/cn/bunny/services/service/log/impl/UserLoginLogServiceImpl.java

@@ -6,7 +6,7 @@ import cn.bunny.dao.vo.log.UserLoginLogLocalVo;
 import cn.bunny.dao.vo.log.UserLoginLogVo;
 import cn.bunny.dao.vo.result.PageResult;
 import cn.bunny.services.context.BaseContext;
-import cn.bunny.services.mapper.UserLoginLogMapper;
+import cn.bunny.services.mapper.log.UserLoginLogMapper;
 import cn.bunny.services.service.log.UserLoginLogService;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

service/src/main/java/cn/bunny/services/service/message/impl/MessageReceivedServiceImpl.java

@@ -11,7 +11,7 @@ import cn.bunny.dao.vo.system.message.MessageReceivedWithMessageVo;
 import cn.bunny.dao.vo.system.message.MessageUserVo;
 import cn.bunny.services.context.BaseContext;
 import cn.bunny.services.exception.AuthCustomerException;
-import cn.bunny.services.mapper.MessageReceivedMapper;
+import cn.bunny.services.mapper.message.MessageReceivedMapper;
 import cn.bunny.services.service.message.MessageReceivedService;
 import cn.bunny.services.utils.UserUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;

service/src/main/java/cn/bunny/services/service/message/impl/MessageServiceImpl.java

@@ -14,9 +14,9 @@ import cn.bunny.dao.vo.system.message.MessageReceivedWithUserVo;
 import cn.bunny.dao.vo.system.message.MessageVo;
 import cn.bunny.services.context.BaseContext;
 import cn.bunny.services.exception.AuthCustomerException;
-import cn.bunny.services.mapper.MessageMapper;
-import cn.bunny.services.mapper.MessageReceivedMapper;
-import cn.bunny.services.mapper.UserMapper;
+import cn.bunny.services.mapper.message.MessageMapper;
+import cn.bunny.services.mapper.message.MessageReceivedMapper;
+import cn.bunny.services.mapper.system.UserMapper;
 import cn.bunny.services.service.message.MessageReceivedService;
 import cn.bunny.services.service.message.MessageService;
 import cn.bunny.services.utils.UserUtil;

service/src/main/java/cn/bunny/services/service/message/impl/MessageTypeServiceImpl.java

@@ -6,7 +6,7 @@ import cn.bunny.dao.dto.system.message.MessageTypeUpdateDto;
 import cn.bunny.dao.entity.system.MessageType;
 import cn.bunny.dao.vo.result.PageResult;
 import cn.bunny.dao.vo.system.message.MessageTypeVo;
-import cn.bunny.services.mapper.MessageTypeMapper;
+import cn.bunny.services.mapper.message.MessageTypeMapper;
 import cn.bunny.services.service.message.MessageTypeService;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;

service/src/main/java/cn/bunny/services/service/schedule/impl/ScheduleExecuteLogServiceImpl.java

@@ -4,7 +4,7 @@ import cn.bunny.dao.dto.log.ScheduleExecuteLogDto;
 import cn.bunny.dao.entity.log.ScheduleExecuteLog;
 import cn.bunny.dao.vo.log.QuartzExecuteLogVo;
 import cn.bunny.dao.vo.result.PageResult;
-import cn.bunny.services.mapper.ScheduleExecuteLogMapper;
+import cn.bunny.services.mapper.schedule.ScheduleExecuteLogMapper;
 import cn.bunny.services.service.schedule.ScheduleExecuteLogService;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

service/src/main/java/cn/bunny/services/service/schedule/impl/SchedulersGroupServiceImpl.java

@@ -6,7 +6,7 @@ import cn.bunny.dao.dto.quartz.group.SchedulersGroupUpdateDto;
 import cn.bunny.dao.entity.quartz.SchedulersGroup;
 import cn.bunny.dao.vo.quartz.SchedulersGroupVo;
 import cn.bunny.dao.vo.result.PageResult;
-import cn.bunny.services.mapper.SchedulersGroupMapper;
+import cn.bunny.services.mapper.schedule.SchedulersGroupMapper;
 import cn.bunny.services.service.schedule.SchedulersGroupService;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

service/src/main/java/cn/bunny/services/service/schedule/impl/SchedulersServiceImpl.java

@@ -11,7 +11,7 @@ import cn.bunny.dao.vo.result.ResultCodeEnum;
 import cn.bunny.services.aop.AnnotationScanner;
 import cn.bunny.services.aop.annotation.QuartzSchedulers;
 import cn.bunny.services.exception.AuthCustomerException;
-import cn.bunny.services.mapper.SchedulersMapper;
+import cn.bunny.services.mapper.schedule.SchedulersMapper;
 import cn.bunny.services.service.schedule.SchedulersService;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

service/src/main/java/cn/bunny/services/service/system/impl/DeptServiceImpl.java

@@ -8,8 +8,8 @@ import cn.bunny.dao.vo.result.PageResult;
 import cn.bunny.dao.vo.result.ResultCodeEnum;
 import cn.bunny.dao.vo.system.DeptVo;
 import cn.bunny.services.exception.AuthCustomerException;
-import cn.bunny.services.mapper.DeptMapper;
-import cn.bunny.services.mapper.UserDeptMapper;
+import cn.bunny.services.mapper.system.DeptMapper;
+import cn.bunny.services.mapper.system.UserDeptMapper;
 import cn.bunny.services.service.system.DeptService;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

service/src/main/java/cn/bunny/services/service/system/impl/FilesServiceImpl.java

@@ -12,7 +12,7 @@ import cn.bunny.dao.vo.system.files.FileInfoVo;
 import cn.bunny.dao.vo.system.files.FilesVo;
 import cn.bunny.services.context.BaseContext;
 import cn.bunny.services.exception.AuthCustomerException;
-import cn.bunny.services.mapper.FilesMapper;
+import cn.bunny.services.mapper.system.FilesMapper;
 import cn.bunny.services.service.system.FilesService;
 import cn.bunny.services.utils.FileUtil;
 import cn.bunny.services.utils.minio.MinioProperties;

service/src/main/java/cn/bunny/services/service/system/impl/PowerServiceImpl.java

@@ -9,8 +9,8 @@ import cn.bunny.dao.vo.result.PageResult;
 import cn.bunny.dao.vo.result.ResultCodeEnum;
 import cn.bunny.dao.vo.system.rolePower.PowerVo;
 import cn.bunny.services.exception.AuthCustomerException;
-import cn.bunny.services.mapper.PowerMapper;
-import cn.bunny.services.mapper.RolePowerMapper;
+import cn.bunny.services.mapper.system.PowerMapper;
+import cn.bunny.services.mapper.system.RolePowerMapper;
 import cn.bunny.services.service.system.PowerService;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;

service/src/main/java/cn/bunny/services/service/system/impl/RolePowerServiceImpl.java

@@ -4,9 +4,9 @@ import cn.bunny.dao.dto.system.rolePower.AssignPowersToRoleDto;
 import cn.bunny.dao.entity.system.AdminUser;
 import cn.bunny.dao.entity.system.RolePower;
 import cn.bunny.dao.entity.system.UserRole;
-import cn.bunny.services.mapper.RolePowerMapper;
-import cn.bunny.services.mapper.UserMapper;
-import cn.bunny.services.mapper.UserRoleMapper;
+import cn.bunny.services.mapper.system.RolePowerMapper;
+import cn.bunny.services.mapper.system.UserMapper;
+import cn.bunny.services.mapper.system.UserRoleMapper;
 import cn.bunny.services.service.system.RolePowerService;
 import cn.bunny.services.utils.RoleUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;

service/src/main/java/cn/bunny/services/service/system/impl/RoleServiceImpl.java

@@ -9,10 +9,10 @@ import cn.bunny.dao.vo.result.PageResult;
 import cn.bunny.dao.vo.result.ResultCodeEnum;
 import cn.bunny.dao.vo.system.rolePower.RoleVo;
 import cn.bunny.services.exception.AuthCustomerException;
-import cn.bunny.services.mapper.RoleMapper;
-import cn.bunny.services.mapper.RolePowerMapper;
-import cn.bunny.services.mapper.RouterRoleMapper;
-import cn.bunny.services.mapper.UserRoleMapper;
+import cn.bunny.services.mapper.system.RoleMapper;
+import cn.bunny.services.mapper.system.RolePowerMapper;
+import cn.bunny.services.mapper.system.RouterRoleMapper;
+import cn.bunny.services.mapper.system.UserRoleMapper;
 import cn.bunny.services.service.system.RoleService;
 import cn.bunny.services.utils.RoleUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;

service/src/main/java/cn/bunny/services/service/system/impl/RouterRoleServiceImpl.java

@@ -4,7 +4,7 @@ import cn.bunny.dao.dto.system.router.AssignRolesToRoutersDto;
 import cn.bunny.dao.entity.system.RouterRole;
 import cn.bunny.dao.vo.result.ResultCodeEnum;
 import cn.bunny.services.exception.AuthCustomerException;
-import cn.bunny.services.mapper.RouterRoleMapper;
+import cn.bunny.services.mapper.system.RouterRoleMapper;
 import cn.bunny.services.service.system.RouterRoleService;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;

service/src/main/java/cn/bunny/services/service/system/impl/RouterServiceImpl.java

@@ -15,10 +15,10 @@ import cn.bunny.dao.vo.system.router.RouterMeta;
 import cn.bunny.dao.vo.system.router.UserRouterVo;
 import cn.bunny.services.context.BaseContext;
 import cn.bunny.services.exception.AuthCustomerException;
-import cn.bunny.services.mapper.RoleMapper;
-import cn.bunny.services.mapper.RolePowerMapper;
-import cn.bunny.services.mapper.RouterMapper;
-import cn.bunny.services.mapper.RouterRoleMapper;
+import cn.bunny.services.mapper.system.RoleMapper;
+import cn.bunny.services.mapper.system.RolePowerMapper;
+import cn.bunny.services.mapper.system.RouterMapper;
+import cn.bunny.services.mapper.system.RouterRoleMapper;
 import cn.bunny.services.service.system.RouterService;
 import cn.bunny.services.utils.RoleUtil;
 import cn.bunny.services.utils.RouterServiceUtil;

service/src/main/java/cn/bunny/services/service/system/impl/UserDeptServiceImpl.java

@@ -1,7 +1,7 @@
 package cn.bunny.services.service.system.impl;
 
 import cn.bunny.dao.entity.system.UserDept;
-import cn.bunny.services.mapper.UserDeptMapper;
+import cn.bunny.services.mapper.system.UserDeptMapper;
 import cn.bunny.services.service.system.UserDeptService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;

service/src/main/java/cn/bunny/services/service/system/impl/UserRoleServiceImpl.java

@@ -8,8 +8,8 @@ import cn.bunny.dao.vo.result.ResultCodeEnum;
 import cn.bunny.dao.vo.system.user.LoginVo;
 import cn.bunny.services.context.BaseContext;
 import cn.bunny.services.exception.AuthCustomerException;
-import cn.bunny.services.mapper.UserMapper;
-import cn.bunny.services.mapper.UserRoleMapper;
+import cn.bunny.services.mapper.system.UserMapper;
+import cn.bunny.services.mapper.system.UserRoleMapper;
 import cn.bunny.services.service.system.UserRoleService;
 import cn.bunny.services.utils.UserUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;

service/src/main/java/cn/bunny/services/service/system/impl/UserServiceImpl.java

@@ -17,7 +17,12 @@ import cn.bunny.dao.vo.system.files.FileInfoVo;
 import cn.bunny.dao.vo.system.user.*;
 import cn.bunny.services.context.BaseContext;
 import cn.bunny.services.exception.AuthCustomerException;
-import cn.bunny.services.mapper.*;
+import cn.bunny.services.mapper.configuration.EmailTemplateMapper;
+import cn.bunny.services.mapper.log.UserLoginLogMapper;
+import cn.bunny.services.mapper.system.RoleMapper;
+import cn.bunny.services.mapper.system.UserDeptMapper;
+import cn.bunny.services.mapper.system.UserMapper;
+import cn.bunny.services.mapper.system.UserRoleMapper;
 import cn.bunny.services.service.system.FilesService;
 import cn.bunny.services.service.system.UserService;
 import cn.bunny.services.utils.JwtHelper;

service/src/main/java/cn/bunny/services/utils/RoleUtil.java

@@ -3,7 +3,7 @@ package cn.bunny.services.utils;
 import cn.bunny.dao.constant.RedisUserConstant;
 import cn.bunny.dao.entity.system.AdminUser;
 import cn.bunny.services.context.BaseContext;
-import cn.bunny.services.mapper.UserMapper;
+import cn.bunny.services.mapper.system.UserMapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisTemplate;

service/src/main/java/cn/bunny/services/utils/UserUtil.java

@@ -9,10 +9,10 @@ import cn.bunny.dao.entity.system.Power;
 import cn.bunny.dao.entity.system.Role;
 import cn.bunny.dao.vo.system.user.LoginVo;
 import cn.bunny.services.exception.AuthCustomerException;
-import cn.bunny.services.mapper.PowerMapper;
-import cn.bunny.services.mapper.RoleMapper;
-import cn.bunny.services.mapper.UserLoginLogMapper;
-import cn.bunny.services.mapper.UserMapper;
+import cn.bunny.services.mapper.log.UserLoginLogMapper;
+import cn.bunny.services.mapper.system.PowerMapper;
+import cn.bunny.services.mapper.system.RoleMapper;
+import cn.bunny.services.mapper.system.UserMapper;
 import cn.bunny.services.utils.ip.IpUtil;
 import cn.bunny.services.utils.minio.MinioUtil;
 import jakarta.servlet.http.HttpServletRequest;

service/src/main/java/cn/bunny/services/utils/email/AbstractSenderEmailTemplate.java

@@ -6,7 +6,7 @@ import cn.bunny.dao.model.email.EmailSend;
 import cn.bunny.dao.model.email.EmailSendInit;
 import cn.bunny.dao.vo.result.ResultCodeEnum;
 import cn.bunny.services.exception.AuthCustomerException;
-import cn.bunny.services.mapper.EmailUsersMapper;
+import cn.bunny.services.mapper.configuration.EmailUsersMapper;
 import cn.bunny.services.utils.mail.MailSenderUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import jakarta.mail.MessagingException;

service/src/main/java/cn/bunny/services/utils/email/ConcreteSenderEmailTemplate.java

@@ -1,7 +1,7 @@
 package cn.bunny.services.utils.email;
 
 import cn.bunny.dao.entity.system.EmailTemplate;
-import cn.bunny.services.mapper.EmailTemplateMapper;
+import cn.bunny.services.mapper.configuration.EmailTemplateMapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;

service/src/main/java/cn/bunny/services/utils/login/DefaultLoginStrategy.java

@@ -2,7 +2,7 @@ package cn.bunny.services.utils.login;
 
 import cn.bunny.dao.dto.system.user.LoginDto;
 import cn.bunny.dao.entity.system.AdminUser;
-import cn.bunny.services.mapper.UserMapper;
+import cn.bunny.services.mapper.system.UserMapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 
 /**

service/src/main/java/cn/bunny/services/utils/login/EmailLoginStrategy.java

@@ -4,7 +4,7 @@ import cn.bunny.dao.constant.RedisUserConstant;
 import cn.bunny.dao.dto.system.user.LoginDto;
 import cn.bunny.dao.entity.system.AdminUser;
 import cn.bunny.dao.vo.result.ResultCodeEnum;
-import cn.bunny.services.mapper.UserMapper;
+import cn.bunny.services.mapper.system.UserMapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.security.core.userdetails.UsernameNotFoundException;

service/src/main/resources/application.yml

@@ -75,7 +75,7 @@ spring:
     time-zone: GMT+8
 
 mybatis-plus:
-  mapper-locations: classpath:mapper/*.xml
+  mapper-locations: classpath:mapper/**/*.xml
   global-config:
     db-config:
       logic-delete-field: isDeleted

service/src/main/resources/mapper/configuration/EmailTemplateMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.bunny.services.mapper.EmailTemplateMapper">
+<mapper namespace="cn.bunny.services.mapper.configuration.EmailTemplateMapper">
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="cn.bunny.dao.entity.system.EmailTemplate">

service/src/main/resources/mapper/configuration/EmailUsersMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.bunny.services.mapper.EmailUsersMapper">
+<mapper namespace="cn.bunny.services.mapper.configuration.EmailUsersMapper">
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="cn.bunny.dao.entity.system.EmailUsers">

service/src/main/resources/mapper/configuration/I18nMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.bunny.services.mapper.I18nMapper">
+<mapper namespace="cn.bunny.services.mapper.configuration.I18nMapper">
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="cn.bunny.dao.entity.i18n.I18n">

service/src/main/resources/mapper/configuration/I18nTypeMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.bunny.services.mapper.I18nTypeMapper">
+<mapper namespace="cn.bunny.services.mapper.configuration.I18nTypeMapper">
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="cn.bunny.dao.entity.i18n.I18nType">

service/src/main/resources/mapper/configuration/MenuIconMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.bunny.services.mapper.MenuIconMapper">
+<mapper namespace="cn.bunny.services.mapper.configuration.MenuIconMapper">
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="cn.bunny.dao.entity.system.MenuIcon">

service/src/main/resources/mapper/log/UserLoginLogMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.bunny.services.mapper.UserLoginLogMapper">
+<mapper namespace="cn.bunny.services.mapper.log.UserLoginLogMapper">
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="cn.bunny.dao.entity.log.UserLoginLog">

service/src/main/resources/mapper/message/MessageMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.bunny.services.mapper.MessageMapper">
+<mapper namespace="cn.bunny.services.mapper.message.MessageMapper">
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="cn.bunny.dao.entity.system.Message">

service/src/main/resources/mapper/message/MessageReceivedMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.bunny.services.mapper.MessageReceivedMapper">
+<mapper namespace="cn.bunny.services.mapper.message.MessageReceivedMapper">
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="cn.bunny.dao.entity.system.MessageReceived">

service/src/main/resources/mapper/message/MessageTypeMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.bunny.services.mapper.MessageTypeMapper">
+<mapper namespace="cn.bunny.services.mapper.message.MessageTypeMapper">
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="cn.bunny.dao.entity.system.MessageType">

service/src/main/resources/mapper/schedule/ScheduleExecuteLogMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.bunny.services.mapper.ScheduleExecuteLogMapper">
+<mapper namespace="cn.bunny.services.mapper.schedule.ScheduleExecuteLogMapper">
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="cn.bunny.dao.entity.log.ScheduleExecuteLog">

service/src/main/resources/mapper/schedule/SchedulersGroupMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.bunny.services.mapper.SchedulersGroupMapper">
+<mapper namespace="cn.bunny.services.mapper.schedule.SchedulersGroupMapper">
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="cn.bunny.dao.entity.quartz.SchedulersGroup">

service/src/main/resources/mapper/schedule/SchedulersMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.bunny.services.mapper.SchedulersMapper">
+<mapper namespace="cn.bunny.services.mapper.schedule.SchedulersMapper">
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="cn.bunny.dao.entity.quartz.Schedulers">

service/src/main/resources/mapper/system/DeptMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.bunny.services.mapper.DeptMapper">
+<mapper namespace="cn.bunny.services.mapper.system.DeptMapper">
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="cn.bunny.dao.entity.system.Dept">

service/src/main/resources/mapper/system/FilesMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.bunny.services.mapper.FilesMapper">
+<mapper namespace="cn.bunny.services.mapper.system.FilesMapper">
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="cn.bunny.dao.entity.system.Files">

service/src/main/resources/mapper/system/PowerMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.bunny.services.mapper.PowerMapper">
+<mapper namespace="cn.bunny.services.mapper.system.PowerMapper">
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="cn.bunny.dao.entity.system.Power">

service/src/main/resources/mapper/system/RoleMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.bunny.services.mapper.RoleMapper">
+<mapper namespace="cn.bunny.services.mapper.system.RoleMapper">
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="cn.bunny.dao.entity.system.Role">

service/src/main/resources/mapper/system/RolePowerMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.bunny.services.mapper.RolePowerMapper">
+<mapper namespace="cn.bunny.services.mapper.system.RolePowerMapper">
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="cn.bunny.dao.entity.system.RolePower">

service/src/main/resources/mapper/system/RouterMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.bunny.services.mapper.RouterMapper">
+<mapper namespace="cn.bunny.services.mapper.system.RouterMapper">
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="cn.bunny.dao.entity.system.Router">

service/src/main/resources/mapper/system/RouterRoleMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.bunny.services.mapper.RouterRoleMapper">
+<mapper namespace="cn.bunny.services.mapper.system.RouterRoleMapper">
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="cn.bunny.dao.entity.system.RouterRole">

service/src/main/resources/mapper/system/UserDeptMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.bunny.services.mapper.UserDeptMapper">
+<mapper namespace="cn.bunny.services.mapper.system.UserDeptMapper">
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="cn.bunny.dao.entity.system.UserDept">

service/src/main/resources/mapper/system/UserMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.bunny.services.mapper.UserMapper">
+<mapper namespace="cn.bunny.services.mapper.system.UserMapper">
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="cn.bunny.dao.entity.system.AdminUser">

service/src/main/resources/mapper/system/UserRoleMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.bunny.services.mapper.UserRoleMapper">
+<mapper namespace="cn.bunny.services.mapper.system.UserRoleMapper">
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="cn.bunny.dao.entity.system.UserRole">

service/src/test/java/cn/bunny/services/controller/configuration/ConfigurationControllerTest.java

@@ -5,7 +5,7 @@ import cn.bunny.dao.entity.configuration.WebConfiguration;
 import cn.bunny.dao.entity.system.AdminUser;
 import cn.bunny.dao.vo.result.Result;
 import cn.bunny.dao.vo.system.user.LoginVo;
-import cn.bunny.services.mapper.UserMapper;
+import cn.bunny.services.mapper.system.UserMapper;
 import cn.bunny.services.utils.UserUtil;
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.TypeReference;

service/src/test/java/cn/bunny/services/utils/email/ConcreteSenderEmailTemplateTest.java

@@ -1,7 +1,7 @@
 package cn.bunny.services.utils.email;
 
 import cn.bunny.dao.entity.system.EmailTemplate;
-import cn.bunny.services.mapper.EmailTemplateMapper;
+import cn.bunny.services.mapper.configuration.EmailTemplateMapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;