diff --git a/service/src/main/java/cn/bunny/services/aop/JobExecuteAspect.java b/service/src/main/java/cn/bunny/services/aop/JobExecuteAspect.java index cb30b16..20a5921 100644 --- a/service/src/main/java/cn/bunny/services/aop/JobExecuteAspect.java +++ b/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; diff --git a/service/src/main/java/cn/bunny/services/aop/annotation/QuartzSchedulers.java b/service/src/main/java/cn/bunny/services/aop/annotation/QuartzSchedulers.java index 42bbdab..da387d8 100644 --- a/service/src/main/java/cn/bunny/services/aop/annotation/QuartzSchedulers.java +++ b/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(); } diff --git a/service/src/main/java/cn/bunny/services/config/ControllerStringParamTrimConfig.java b/service/src/main/java/cn/bunny/services/config/ControllerStringParamTrimConfig.java index cec6403..2f39290 100644 --- a/service/src/main/java/cn/bunny/services/config/ControllerStringParamTrimConfig.java +++ b/service/src/main/java/cn/bunny/services/config/ControllerStringParamTrimConfig.java @@ -38,8 +38,9 @@ public class ControllerStringParamTrimConfig { .deserializerByType(String.class, new StdScalarDeserializer(String.class) { @Override public String deserialize(JsonParser jsonParser, DeserializationContext ctx) throws IOException { - // 去除全部空格 + // // 去除全部空格 // return StringUtils.trimAllWhitespace(jsonParser.getValueAsString()); + // 仅去除前后空格 return jsonParser.getValueAsString().trim(); } diff --git a/service/src/main/java/cn/bunny/services/config/Knife4jConfig.java b/service/src/main/java/cn/bunny/services/config/Knife4jConfig.java index c2daf93..3e01696 100644 --- a/service/src/main/java/cn/bunny/services/config/Knife4jConfig.java +++ b/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"); // 相关信息 diff --git a/service/src/main/java/cn/bunny/services/config/MybatisPlusConfig.java b/service/src/main/java/cn/bunny/services/config/MybatisPlusConfig.java index 5dca69f..1d21c31 100644 --- a/service/src/main/java/cn/bunny/services/config/MybatisPlusConfig.java +++ b/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()); diff --git a/service/src/main/java/cn/bunny/services/config/RedisConfiguration.java b/service/src/main/java/cn/bunny/services/config/RedisConfiguration.java index b18a840..a0008ce 100644 --- a/service/src/main/java/cn/bunny/services/config/RedisConfiguration.java +++ b/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); diff --git a/service/src/main/java/cn/bunny/services/mapper/EmailTemplateMapper.java b/service/src/main/java/cn/bunny/services/mapper/configuration/EmailTemplateMapper.java similarity index 95% rename from service/src/main/java/cn/bunny/services/mapper/EmailTemplateMapper.java rename to service/src/main/java/cn/bunny/services/mapper/configuration/EmailTemplateMapper.java index f88a363..8590002 100644 --- a/service/src/main/java/cn/bunny/services/mapper/EmailTemplateMapper.java +++ b/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; diff --git a/service/src/main/java/cn/bunny/services/mapper/EmailUsersMapper.java b/service/src/main/java/cn/bunny/services/mapper/configuration/EmailUsersMapper.java similarity index 96% rename from service/src/main/java/cn/bunny/services/mapper/EmailUsersMapper.java rename to service/src/main/java/cn/bunny/services/mapper/configuration/EmailUsersMapper.java index 95a092a..0a9d249 100644 --- a/service/src/main/java/cn/bunny/services/mapper/EmailUsersMapper.java +++ b/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; diff --git a/service/src/main/java/cn/bunny/services/mapper/I18nMapper.java b/service/src/main/java/cn/bunny/services/mapper/configuration/I18nMapper.java similarity index 95% rename from service/src/main/java/cn/bunny/services/mapper/I18nMapper.java rename to service/src/main/java/cn/bunny/services/mapper/configuration/I18nMapper.java index 5cb4030..a80a9ce 100644 --- a/service/src/main/java/cn/bunny/services/mapper/I18nMapper.java +++ b/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; diff --git a/service/src/main/java/cn/bunny/services/mapper/I18nTypeMapper.java b/service/src/main/java/cn/bunny/services/mapper/configuration/I18nTypeMapper.java similarity index 94% rename from service/src/main/java/cn/bunny/services/mapper/I18nTypeMapper.java rename to service/src/main/java/cn/bunny/services/mapper/configuration/I18nTypeMapper.java index e0ab2f7..081613d 100644 --- a/service/src/main/java/cn/bunny/services/mapper/I18nTypeMapper.java +++ b/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; diff --git a/service/src/main/java/cn/bunny/services/mapper/MenuIconMapper.java b/service/src/main/java/cn/bunny/services/mapper/configuration/MenuIconMapper.java similarity index 95% rename from service/src/main/java/cn/bunny/services/mapper/MenuIconMapper.java rename to service/src/main/java/cn/bunny/services/mapper/configuration/MenuIconMapper.java index 9c0c3e0..6cf5c50 100644 --- a/service/src/main/java/cn/bunny/services/mapper/MenuIconMapper.java +++ b/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; diff --git a/service/src/main/java/cn/bunny/services/mapper/UserLoginLogMapper.java b/service/src/main/java/cn/bunny/services/mapper/log/UserLoginLogMapper.java similarity index 97% rename from service/src/main/java/cn/bunny/services/mapper/UserLoginLogMapper.java rename to service/src/main/java/cn/bunny/services/mapper/log/UserLoginLogMapper.java index fa58afc..a77f3aa 100644 --- a/service/src/main/java/cn/bunny/services/mapper/UserLoginLogMapper.java +++ b/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; diff --git a/service/src/main/java/cn/bunny/services/mapper/MessageMapper.java b/service/src/main/java/cn/bunny/services/mapper/message/MessageMapper.java similarity index 97% rename from service/src/main/java/cn/bunny/services/mapper/MessageMapper.java rename to service/src/main/java/cn/bunny/services/mapper/message/MessageMapper.java index 0b919a3..837b592 100644 --- a/service/src/main/java/cn/bunny/services/mapper/MessageMapper.java +++ b/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; diff --git a/service/src/main/java/cn/bunny/services/mapper/MessageReceivedMapper.java b/service/src/main/java/cn/bunny/services/mapper/message/MessageReceivedMapper.java similarity index 97% rename from service/src/main/java/cn/bunny/services/mapper/MessageReceivedMapper.java rename to service/src/main/java/cn/bunny/services/mapper/message/MessageReceivedMapper.java index aee5afb..1c752af 100644 --- a/service/src/main/java/cn/bunny/services/mapper/MessageReceivedMapper.java +++ b/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; diff --git a/service/src/main/java/cn/bunny/services/mapper/MessageTypeMapper.java b/service/src/main/java/cn/bunny/services/mapper/message/MessageTypeMapper.java similarity index 96% rename from service/src/main/java/cn/bunny/services/mapper/MessageTypeMapper.java rename to service/src/main/java/cn/bunny/services/mapper/message/MessageTypeMapper.java index eec4db1..4e7b752 100644 --- a/service/src/main/java/cn/bunny/services/mapper/MessageTypeMapper.java +++ b/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; diff --git a/service/src/main/java/cn/bunny/services/mapper/ScheduleExecuteLogMapper.java b/service/src/main/java/cn/bunny/services/mapper/schedule/ScheduleExecuteLogMapper.java similarity index 96% rename from service/src/main/java/cn/bunny/services/mapper/ScheduleExecuteLogMapper.java rename to service/src/main/java/cn/bunny/services/mapper/schedule/ScheduleExecuteLogMapper.java index 05ee979..11de5b0 100644 --- a/service/src/main/java/cn/bunny/services/mapper/ScheduleExecuteLogMapper.java +++ b/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; diff --git a/service/src/main/java/cn/bunny/services/mapper/SchedulersGroupMapper.java b/service/src/main/java/cn/bunny/services/mapper/schedule/SchedulersGroupMapper.java similarity index 96% rename from service/src/main/java/cn/bunny/services/mapper/SchedulersGroupMapper.java rename to service/src/main/java/cn/bunny/services/mapper/schedule/SchedulersGroupMapper.java index cf6cb3e..31017e6 100644 --- a/service/src/main/java/cn/bunny/services/mapper/SchedulersGroupMapper.java +++ b/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; diff --git a/service/src/main/java/cn/bunny/services/mapper/SchedulersMapper.java b/service/src/main/java/cn/bunny/services/mapper/schedule/SchedulersMapper.java similarity index 95% rename from service/src/main/java/cn/bunny/services/mapper/SchedulersMapper.java rename to service/src/main/java/cn/bunny/services/mapper/schedule/SchedulersMapper.java index f5469a5..2346778 100644 --- a/service/src/main/java/cn/bunny/services/mapper/SchedulersMapper.java +++ b/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; diff --git a/service/src/main/java/cn/bunny/services/mapper/DeptMapper.java b/service/src/main/java/cn/bunny/services/mapper/system/DeptMapper.java similarity index 96% rename from service/src/main/java/cn/bunny/services/mapper/DeptMapper.java rename to service/src/main/java/cn/bunny/services/mapper/system/DeptMapper.java index 2ca3011..04d4ae5 100644 --- a/service/src/main/java/cn/bunny/services/mapper/DeptMapper.java +++ b/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; diff --git a/service/src/main/java/cn/bunny/services/mapper/FilesMapper.java b/service/src/main/java/cn/bunny/services/mapper/system/FilesMapper.java similarity index 96% rename from service/src/main/java/cn/bunny/services/mapper/FilesMapper.java rename to service/src/main/java/cn/bunny/services/mapper/system/FilesMapper.java index 59a3557..316d2c3 100644 --- a/service/src/main/java/cn/bunny/services/mapper/FilesMapper.java +++ b/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; diff --git a/service/src/main/java/cn/bunny/services/mapper/PowerMapper.java b/service/src/main/java/cn/bunny/services/mapper/system/PowerMapper.java similarity index 96% rename from service/src/main/java/cn/bunny/services/mapper/PowerMapper.java rename to service/src/main/java/cn/bunny/services/mapper/system/PowerMapper.java index b7bdb93..8caaa06 100644 --- a/service/src/main/java/cn/bunny/services/mapper/PowerMapper.java +++ b/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; diff --git a/service/src/main/java/cn/bunny/services/mapper/RoleMapper.java b/service/src/main/java/cn/bunny/services/mapper/system/RoleMapper.java similarity index 97% rename from service/src/main/java/cn/bunny/services/mapper/RoleMapper.java rename to service/src/main/java/cn/bunny/services/mapper/system/RoleMapper.java index 2759590..7af905f 100644 --- a/service/src/main/java/cn/bunny/services/mapper/RoleMapper.java +++ b/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; diff --git a/service/src/main/java/cn/bunny/services/mapper/RolePowerMapper.java b/service/src/main/java/cn/bunny/services/mapper/system/RolePowerMapper.java similarity index 96% rename from service/src/main/java/cn/bunny/services/mapper/RolePowerMapper.java rename to service/src/main/java/cn/bunny/services/mapper/system/RolePowerMapper.java index 8de93dd..1ab1f3d 100644 --- a/service/src/main/java/cn/bunny/services/mapper/RolePowerMapper.java +++ b/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; diff --git a/service/src/main/java/cn/bunny/services/mapper/RouterMapper.java b/service/src/main/java/cn/bunny/services/mapper/system/RouterMapper.java similarity index 97% rename from service/src/main/java/cn/bunny/services/mapper/RouterMapper.java rename to service/src/main/java/cn/bunny/services/mapper/system/RouterMapper.java index bd6e198..3c07bbb 100644 --- a/service/src/main/java/cn/bunny/services/mapper/RouterMapper.java +++ b/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; diff --git a/service/src/main/java/cn/bunny/services/mapper/RouterRoleMapper.java b/service/src/main/java/cn/bunny/services/mapper/system/RouterRoleMapper.java similarity index 96% rename from service/src/main/java/cn/bunny/services/mapper/RouterRoleMapper.java rename to service/src/main/java/cn/bunny/services/mapper/system/RouterRoleMapper.java index 9528033..2c181d5 100644 --- a/service/src/main/java/cn/bunny/services/mapper/RouterRoleMapper.java +++ b/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; diff --git a/service/src/main/java/cn/bunny/services/mapper/UserDeptMapper.java b/service/src/main/java/cn/bunny/services/mapper/system/UserDeptMapper.java similarity index 94% rename from service/src/main/java/cn/bunny/services/mapper/UserDeptMapper.java rename to service/src/main/java/cn/bunny/services/mapper/system/UserDeptMapper.java index 5c84afb..dab9d3f 100644 --- a/service/src/main/java/cn/bunny/services/mapper/UserDeptMapper.java +++ b/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; diff --git a/service/src/main/java/cn/bunny/services/mapper/UserMapper.java b/service/src/main/java/cn/bunny/services/mapper/system/UserMapper.java similarity index 96% rename from service/src/main/java/cn/bunny/services/mapper/UserMapper.java rename to service/src/main/java/cn/bunny/services/mapper/system/UserMapper.java index 52dd4e9..312e153 100644 --- a/service/src/main/java/cn/bunny/services/mapper/UserMapper.java +++ b/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; diff --git a/service/src/main/java/cn/bunny/services/mapper/UserRoleMapper.java b/service/src/main/java/cn/bunny/services/mapper/system/UserRoleMapper.java similarity index 94% rename from service/src/main/java/cn/bunny/services/mapper/UserRoleMapper.java rename to service/src/main/java/cn/bunny/services/mapper/system/UserRoleMapper.java index 19cd7d1..6424b70 100644 --- a/service/src/main/java/cn/bunny/services/mapper/UserRoleMapper.java +++ b/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; diff --git a/service/src/main/java/cn/bunny/services/quartz/DatabaseBackupJob.java b/service/src/main/java/cn/bunny/services/quartz/DatabaseBackupJob.java index 7b478bb..9238b1f 100644 --- a/service/src/main/java/cn/bunny/services/quartz/DatabaseBackupJob.java +++ b/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 diff --git a/service/src/main/java/cn/bunny/services/security/config/WebSecurityConfig.java b/service/src/main/java/cn/bunny/services/security/config/WebSecurityConfig.java index fb45663..873f5ea 100644 --- a/service/src/main/java/cn/bunny/services/security/config/WebSecurityConfig.java +++ b/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; diff --git a/service/src/main/java/cn/bunny/services/security/custom/CustomAuthorizationManagerServiceImpl.java b/service/src/main/java/cn/bunny/services/security/custom/CustomAuthorizationManagerServiceImpl.java index c833013..b5b38a5 100644 --- a/service/src/main/java/cn/bunny/services/security/custom/CustomAuthorizationManagerServiceImpl.java +++ b/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 { - @Autowired - private PowerMapper powerMapper; + private final PowerMapper powerMapper; - @Autowired - private RoleMapper roleMapper; + private final RoleMapper roleMapper; - @Autowired - private RedisTemplate redisTemplate; + private final RedisTemplate redisTemplate; + public CustomAuthorizationManagerServiceImpl(PowerMapper powerMapper, RoleMapper roleMapper, RedisTemplate 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, RequestAuthorizationContext context) { // 用户的token和用户id、请求Url diff --git a/service/src/main/java/cn/bunny/services/security/filter/TokenLoginFilterService.java b/service/src/main/java/cn/bunny/services/security/filter/TokenLoginFilterService.java index 4894d7d..71e6f49 100644 --- a/service/src/main/java/cn/bunny/services/security/filter/TokenLoginFilterService.java +++ b/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()); diff --git a/service/src/main/java/cn/bunny/services/service/configuration/impl/EmailTemplateServiceImpl.java b/service/src/main/java/cn/bunny/services/service/configuration/impl/EmailTemplateServiceImpl.java index f482691..edebcc7 100644 --- a/service/src/main/java/cn/bunny/services/service/configuration/impl/EmailTemplateServiceImpl.java +++ b/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; diff --git a/service/src/main/java/cn/bunny/services/service/configuration/impl/EmailUsersServiceImpl.java b/service/src/main/java/cn/bunny/services/service/configuration/impl/EmailUsersServiceImpl.java index a5b23ea..e50e597 100644 --- a/service/src/main/java/cn/bunny/services/service/configuration/impl/EmailUsersServiceImpl.java +++ b/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; diff --git a/service/src/main/java/cn/bunny/services/service/configuration/impl/I18nServiceImpl.java b/service/src/main/java/cn/bunny/services/service/configuration/impl/I18nServiceImpl.java index 1165e3c..ef51a16 100644 --- a/service/src/main/java/cn/bunny/services/service/configuration/impl/I18nServiceImpl.java +++ b/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; diff --git a/service/src/main/java/cn/bunny/services/service/configuration/impl/I18nTypeServiceImpl.java b/service/src/main/java/cn/bunny/services/service/configuration/impl/I18nTypeServiceImpl.java index 7efb1fd..298e1c0 100644 --- a/service/src/main/java/cn/bunny/services/service/configuration/impl/I18nTypeServiceImpl.java +++ b/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; diff --git a/service/src/main/java/cn/bunny/services/service/configuration/impl/MenuIconServiceImpl.java b/service/src/main/java/cn/bunny/services/service/configuration/impl/MenuIconServiceImpl.java index 23ff8ce..3bff3e1 100644 --- a/service/src/main/java/cn/bunny/services/service/configuration/impl/MenuIconServiceImpl.java +++ b/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; diff --git a/service/src/main/java/cn/bunny/services/service/log/impl/UserLoginLogServiceImpl.java b/service/src/main/java/cn/bunny/services/service/log/impl/UserLoginLogServiceImpl.java index 82fd503..056cb70 100644 --- a/service/src/main/java/cn/bunny/services/service/log/impl/UserLoginLogServiceImpl.java +++ b/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; diff --git a/service/src/main/java/cn/bunny/services/service/message/impl/MessageReceivedServiceImpl.java b/service/src/main/java/cn/bunny/services/service/message/impl/MessageReceivedServiceImpl.java index 97039e4..aee4485 100644 --- a/service/src/main/java/cn/bunny/services/service/message/impl/MessageReceivedServiceImpl.java +++ b/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; diff --git a/service/src/main/java/cn/bunny/services/service/message/impl/MessageServiceImpl.java b/service/src/main/java/cn/bunny/services/service/message/impl/MessageServiceImpl.java index b323a71..61f83e6 100644 --- a/service/src/main/java/cn/bunny/services/service/message/impl/MessageServiceImpl.java +++ b/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; diff --git a/service/src/main/java/cn/bunny/services/service/message/impl/MessageTypeServiceImpl.java b/service/src/main/java/cn/bunny/services/service/message/impl/MessageTypeServiceImpl.java index e83b207..c9ef318 100644 --- a/service/src/main/java/cn/bunny/services/service/message/impl/MessageTypeServiceImpl.java +++ b/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; diff --git a/service/src/main/java/cn/bunny/services/service/schedule/impl/ScheduleExecuteLogServiceImpl.java b/service/src/main/java/cn/bunny/services/service/schedule/impl/ScheduleExecuteLogServiceImpl.java index 7abd217..2c43a9e 100644 --- a/service/src/main/java/cn/bunny/services/service/schedule/impl/ScheduleExecuteLogServiceImpl.java +++ b/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; diff --git a/service/src/main/java/cn/bunny/services/service/schedule/impl/SchedulersGroupServiceImpl.java b/service/src/main/java/cn/bunny/services/service/schedule/impl/SchedulersGroupServiceImpl.java index 99e986b..3b08536 100644 --- a/service/src/main/java/cn/bunny/services/service/schedule/impl/SchedulersGroupServiceImpl.java +++ b/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; diff --git a/service/src/main/java/cn/bunny/services/service/schedule/impl/SchedulersServiceImpl.java b/service/src/main/java/cn/bunny/services/service/schedule/impl/SchedulersServiceImpl.java index cc67fd7..1e618bf 100644 --- a/service/src/main/java/cn/bunny/services/service/schedule/impl/SchedulersServiceImpl.java +++ b/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; diff --git a/service/src/main/java/cn/bunny/services/service/system/impl/DeptServiceImpl.java b/service/src/main/java/cn/bunny/services/service/system/impl/DeptServiceImpl.java index e26b2cd..e3e814f 100644 --- a/service/src/main/java/cn/bunny/services/service/system/impl/DeptServiceImpl.java +++ b/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; diff --git a/service/src/main/java/cn/bunny/services/service/system/impl/FilesServiceImpl.java b/service/src/main/java/cn/bunny/services/service/system/impl/FilesServiceImpl.java index fdb71ab..d292cf8 100644 --- a/service/src/main/java/cn/bunny/services/service/system/impl/FilesServiceImpl.java +++ b/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; diff --git a/service/src/main/java/cn/bunny/services/service/system/impl/PowerServiceImpl.java b/service/src/main/java/cn/bunny/services/service/system/impl/PowerServiceImpl.java index 58d680d..af57f3b 100644 --- a/service/src/main/java/cn/bunny/services/service/system/impl/PowerServiceImpl.java +++ b/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; diff --git a/service/src/main/java/cn/bunny/services/service/system/impl/RolePowerServiceImpl.java b/service/src/main/java/cn/bunny/services/service/system/impl/RolePowerServiceImpl.java index 1dd1300..362316a 100644 --- a/service/src/main/java/cn/bunny/services/service/system/impl/RolePowerServiceImpl.java +++ b/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; diff --git a/service/src/main/java/cn/bunny/services/service/system/impl/RoleServiceImpl.java b/service/src/main/java/cn/bunny/services/service/system/impl/RoleServiceImpl.java index 458d02d..18e6bff 100644 --- a/service/src/main/java/cn/bunny/services/service/system/impl/RoleServiceImpl.java +++ b/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; diff --git a/service/src/main/java/cn/bunny/services/service/system/impl/RouterRoleServiceImpl.java b/service/src/main/java/cn/bunny/services/service/system/impl/RouterRoleServiceImpl.java index ac06655..224cccb 100644 --- a/service/src/main/java/cn/bunny/services/service/system/impl/RouterRoleServiceImpl.java +++ b/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; diff --git a/service/src/main/java/cn/bunny/services/service/system/impl/RouterServiceImpl.java b/service/src/main/java/cn/bunny/services/service/system/impl/RouterServiceImpl.java index 0db2bc6..28507ff 100644 --- a/service/src/main/java/cn/bunny/services/service/system/impl/RouterServiceImpl.java +++ b/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; diff --git a/service/src/main/java/cn/bunny/services/service/system/impl/UserDeptServiceImpl.java b/service/src/main/java/cn/bunny/services/service/system/impl/UserDeptServiceImpl.java index 9a598b7..8a686b2 100644 --- a/service/src/main/java/cn/bunny/services/service/system/impl/UserDeptServiceImpl.java +++ b/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; diff --git a/service/src/main/java/cn/bunny/services/service/system/impl/UserRoleServiceImpl.java b/service/src/main/java/cn/bunny/services/service/system/impl/UserRoleServiceImpl.java index 732fceb..2252c68 100644 --- a/service/src/main/java/cn/bunny/services/service/system/impl/UserRoleServiceImpl.java +++ b/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; diff --git a/service/src/main/java/cn/bunny/services/service/system/impl/UserServiceImpl.java b/service/src/main/java/cn/bunny/services/service/system/impl/UserServiceImpl.java index b90ea5a..8d5200b 100644 --- a/service/src/main/java/cn/bunny/services/service/system/impl/UserServiceImpl.java +++ b/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; diff --git a/service/src/main/java/cn/bunny/services/utils/RoleUtil.java b/service/src/main/java/cn/bunny/services/utils/RoleUtil.java index 0f881ed..7dc9a91 100644 --- a/service/src/main/java/cn/bunny/services/utils/RoleUtil.java +++ b/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; diff --git a/service/src/main/java/cn/bunny/services/utils/UserUtil.java b/service/src/main/java/cn/bunny/services/utils/UserUtil.java index 19f4ee1..ed88da1 100644 --- a/service/src/main/java/cn/bunny/services/utils/UserUtil.java +++ b/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; diff --git a/service/src/main/java/cn/bunny/services/utils/email/AbstractSenderEmailTemplate.java b/service/src/main/java/cn/bunny/services/utils/email/AbstractSenderEmailTemplate.java index 2eba3f3..71d9c2b 100644 --- a/service/src/main/java/cn/bunny/services/utils/email/AbstractSenderEmailTemplate.java +++ b/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; diff --git a/service/src/main/java/cn/bunny/services/utils/email/ConcreteSenderEmailTemplate.java b/service/src/main/java/cn/bunny/services/utils/email/ConcreteSenderEmailTemplate.java index b199c85..469b92c 100644 --- a/service/src/main/java/cn/bunny/services/utils/email/ConcreteSenderEmailTemplate.java +++ b/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; diff --git a/service/src/main/java/cn/bunny/services/utils/login/DefaultLoginStrategy.java b/service/src/main/java/cn/bunny/services/utils/login/DefaultLoginStrategy.java index 4f216a5..6389cbb 100644 --- a/service/src/main/java/cn/bunny/services/utils/login/DefaultLoginStrategy.java +++ b/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; /** diff --git a/service/src/main/java/cn/bunny/services/utils/login/EmailLoginStrategy.java b/service/src/main/java/cn/bunny/services/utils/login/EmailLoginStrategy.java index b4d21a5..09be6f7 100644 --- a/service/src/main/java/cn/bunny/services/utils/login/EmailLoginStrategy.java +++ b/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; diff --git a/service/src/main/resources/application.yml b/service/src/main/resources/application.yml index e6ca447..fe1bcbf 100644 --- a/service/src/main/resources/application.yml +++ b/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 diff --git a/service/src/main/resources/mapper/EmailTemplateMapper.xml b/service/src/main/resources/mapper/configuration/EmailTemplateMapper.xml similarity index 97% rename from service/src/main/resources/mapper/EmailTemplateMapper.xml rename to service/src/main/resources/mapper/configuration/EmailTemplateMapper.xml index c3b0d56..e17adc6 100644 --- a/service/src/main/resources/mapper/EmailTemplateMapper.xml +++ b/service/src/main/resources/mapper/configuration/EmailTemplateMapper.xml @@ -1,6 +1,6 @@ - + diff --git a/service/src/main/resources/mapper/EmailUsersMapper.xml b/service/src/main/resources/mapper/configuration/EmailUsersMapper.xml similarity index 97% rename from service/src/main/resources/mapper/EmailUsersMapper.xml rename to service/src/main/resources/mapper/configuration/EmailUsersMapper.xml index 47a33de..9cadb3d 100644 --- a/service/src/main/resources/mapper/EmailUsersMapper.xml +++ b/service/src/main/resources/mapper/configuration/EmailUsersMapper.xml @@ -1,6 +1,6 @@ - + diff --git a/service/src/main/resources/mapper/I18nMapper.xml b/service/src/main/resources/mapper/configuration/I18nMapper.xml similarity index 96% rename from service/src/main/resources/mapper/I18nMapper.xml rename to service/src/main/resources/mapper/configuration/I18nMapper.xml index 65bfbb2..d531099 100644 --- a/service/src/main/resources/mapper/I18nMapper.xml +++ b/service/src/main/resources/mapper/configuration/I18nMapper.xml @@ -1,6 +1,6 @@ - + diff --git a/service/src/main/resources/mapper/I18nTypeMapper.xml b/service/src/main/resources/mapper/configuration/I18nTypeMapper.xml similarity index 96% rename from service/src/main/resources/mapper/I18nTypeMapper.xml rename to service/src/main/resources/mapper/configuration/I18nTypeMapper.xml index 3a4e4b4..888109b 100644 --- a/service/src/main/resources/mapper/I18nTypeMapper.xml +++ b/service/src/main/resources/mapper/configuration/I18nTypeMapper.xml @@ -1,6 +1,6 @@ - + diff --git a/service/src/main/resources/mapper/MenuIconMapper.xml b/service/src/main/resources/mapper/configuration/MenuIconMapper.xml similarity index 96% rename from service/src/main/resources/mapper/MenuIconMapper.xml rename to service/src/main/resources/mapper/configuration/MenuIconMapper.xml index 741ce5b..6249595 100644 --- a/service/src/main/resources/mapper/MenuIconMapper.xml +++ b/service/src/main/resources/mapper/configuration/MenuIconMapper.xml @@ -1,6 +1,6 @@ - + diff --git a/service/src/main/resources/mapper/UserLoginLogMapper.xml b/service/src/main/resources/mapper/log/UserLoginLogMapper.xml similarity index 97% rename from service/src/main/resources/mapper/UserLoginLogMapper.xml rename to service/src/main/resources/mapper/log/UserLoginLogMapper.xml index 3a04cd3..90eaa70 100644 --- a/service/src/main/resources/mapper/UserLoginLogMapper.xml +++ b/service/src/main/resources/mapper/log/UserLoginLogMapper.xml @@ -1,6 +1,6 @@ - + diff --git a/service/src/main/resources/mapper/MessageMapper.xml b/service/src/main/resources/mapper/message/MessageMapper.xml similarity index 98% rename from service/src/main/resources/mapper/MessageMapper.xml rename to service/src/main/resources/mapper/message/MessageMapper.xml index e375d47..395dea4 100644 --- a/service/src/main/resources/mapper/MessageMapper.xml +++ b/service/src/main/resources/mapper/message/MessageMapper.xml @@ -1,6 +1,6 @@ - + diff --git a/service/src/main/resources/mapper/MessageReceivedMapper.xml b/service/src/main/resources/mapper/message/MessageReceivedMapper.xml similarity index 98% rename from service/src/main/resources/mapper/MessageReceivedMapper.xml rename to service/src/main/resources/mapper/message/MessageReceivedMapper.xml index af6229d..426a11b 100644 --- a/service/src/main/resources/mapper/MessageReceivedMapper.xml +++ b/service/src/main/resources/mapper/message/MessageReceivedMapper.xml @@ -1,6 +1,6 @@ - + diff --git a/service/src/main/resources/mapper/MessageTypeMapper.xml b/service/src/main/resources/mapper/message/MessageTypeMapper.xml similarity index 97% rename from service/src/main/resources/mapper/MessageTypeMapper.xml rename to service/src/main/resources/mapper/message/MessageTypeMapper.xml index 11923e2..c8b7aab 100644 --- a/service/src/main/resources/mapper/MessageTypeMapper.xml +++ b/service/src/main/resources/mapper/message/MessageTypeMapper.xml @@ -1,6 +1,6 @@ - + diff --git a/service/src/main/resources/mapper/ScheduleExecuteLogMapper.xml b/service/src/main/resources/mapper/schedule/ScheduleExecuteLogMapper.xml similarity index 97% rename from service/src/main/resources/mapper/ScheduleExecuteLogMapper.xml rename to service/src/main/resources/mapper/schedule/ScheduleExecuteLogMapper.xml index 3c4979d..40ba81b 100644 --- a/service/src/main/resources/mapper/ScheduleExecuteLogMapper.xml +++ b/service/src/main/resources/mapper/schedule/ScheduleExecuteLogMapper.xml @@ -1,6 +1,6 @@ - + diff --git a/service/src/main/resources/mapper/SchedulersGroupMapper.xml b/service/src/main/resources/mapper/schedule/SchedulersGroupMapper.xml similarity index 96% rename from service/src/main/resources/mapper/SchedulersGroupMapper.xml rename to service/src/main/resources/mapper/schedule/SchedulersGroupMapper.xml index 0fd85be..2aad41f 100644 --- a/service/src/main/resources/mapper/SchedulersGroupMapper.xml +++ b/service/src/main/resources/mapper/schedule/SchedulersGroupMapper.xml @@ -1,6 +1,6 @@ - + diff --git a/service/src/main/resources/mapper/SchedulersMapper.xml b/service/src/main/resources/mapper/schedule/SchedulersMapper.xml similarity index 96% rename from service/src/main/resources/mapper/SchedulersMapper.xml rename to service/src/main/resources/mapper/schedule/SchedulersMapper.xml index 7b54a97..7358d07 100644 --- a/service/src/main/resources/mapper/SchedulersMapper.xml +++ b/service/src/main/resources/mapper/schedule/SchedulersMapper.xml @@ -1,6 +1,6 @@ - + diff --git a/service/src/main/resources/mapper/DeptMapper.xml b/service/src/main/resources/mapper/system/DeptMapper.xml similarity index 97% rename from service/src/main/resources/mapper/DeptMapper.xml rename to service/src/main/resources/mapper/system/DeptMapper.xml index be45ccb..4f85ac5 100644 --- a/service/src/main/resources/mapper/DeptMapper.xml +++ b/service/src/main/resources/mapper/system/DeptMapper.xml @@ -1,6 +1,6 @@ - + diff --git a/service/src/main/resources/mapper/FilesMapper.xml b/service/src/main/resources/mapper/system/FilesMapper.xml similarity index 97% rename from service/src/main/resources/mapper/FilesMapper.xml rename to service/src/main/resources/mapper/system/FilesMapper.xml index 26e4409..029a496 100644 --- a/service/src/main/resources/mapper/FilesMapper.xml +++ b/service/src/main/resources/mapper/system/FilesMapper.xml @@ -1,6 +1,6 @@ - + diff --git a/service/src/main/resources/mapper/PowerMapper.xml b/service/src/main/resources/mapper/system/PowerMapper.xml similarity index 97% rename from service/src/main/resources/mapper/PowerMapper.xml rename to service/src/main/resources/mapper/system/PowerMapper.xml index 0d85acd..f096654 100644 --- a/service/src/main/resources/mapper/PowerMapper.xml +++ b/service/src/main/resources/mapper/system/PowerMapper.xml @@ -1,6 +1,6 @@ - + diff --git a/service/src/main/resources/mapper/RoleMapper.xml b/service/src/main/resources/mapper/system/RoleMapper.xml similarity index 97% rename from service/src/main/resources/mapper/RoleMapper.xml rename to service/src/main/resources/mapper/system/RoleMapper.xml index 15e172e..995f901 100644 --- a/service/src/main/resources/mapper/RoleMapper.xml +++ b/service/src/main/resources/mapper/system/RoleMapper.xml @@ -1,6 +1,6 @@ - + diff --git a/service/src/main/resources/mapper/RolePowerMapper.xml b/service/src/main/resources/mapper/system/RolePowerMapper.xml similarity index 97% rename from service/src/main/resources/mapper/RolePowerMapper.xml rename to service/src/main/resources/mapper/system/RolePowerMapper.xml index c85860f..6fd019b 100644 --- a/service/src/main/resources/mapper/RolePowerMapper.xml +++ b/service/src/main/resources/mapper/system/RolePowerMapper.xml @@ -1,6 +1,6 @@ - + diff --git a/service/src/main/resources/mapper/RouterMapper.xml b/service/src/main/resources/mapper/system/RouterMapper.xml similarity index 98% rename from service/src/main/resources/mapper/RouterMapper.xml rename to service/src/main/resources/mapper/system/RouterMapper.xml index c35ed9c..b17a7e4 100644 --- a/service/src/main/resources/mapper/RouterMapper.xml +++ b/service/src/main/resources/mapper/system/RouterMapper.xml @@ -1,6 +1,6 @@ - + diff --git a/service/src/main/resources/mapper/RouterRoleMapper.xml b/service/src/main/resources/mapper/system/RouterRoleMapper.xml similarity index 97% rename from service/src/main/resources/mapper/RouterRoleMapper.xml rename to service/src/main/resources/mapper/system/RouterRoleMapper.xml index d0fe0b7..959287b 100644 --- a/service/src/main/resources/mapper/RouterRoleMapper.xml +++ b/service/src/main/resources/mapper/system/RouterRoleMapper.xml @@ -1,6 +1,6 @@ - + diff --git a/service/src/main/resources/mapper/UserDeptMapper.xml b/service/src/main/resources/mapper/system/UserDeptMapper.xml similarity index 95% rename from service/src/main/resources/mapper/UserDeptMapper.xml rename to service/src/main/resources/mapper/system/UserDeptMapper.xml index 04edd87..48f4043 100644 --- a/service/src/main/resources/mapper/UserDeptMapper.xml +++ b/service/src/main/resources/mapper/system/UserDeptMapper.xml @@ -1,6 +1,6 @@ - + diff --git a/service/src/main/resources/mapper/UserMapper.xml b/service/src/main/resources/mapper/system/UserMapper.xml similarity index 98% rename from service/src/main/resources/mapper/UserMapper.xml rename to service/src/main/resources/mapper/system/UserMapper.xml index 0d55753..28cc5ea 100644 --- a/service/src/main/resources/mapper/UserMapper.xml +++ b/service/src/main/resources/mapper/system/UserMapper.xml @@ -1,6 +1,6 @@ - + diff --git a/service/src/main/resources/mapper/UserRoleMapper.xml b/service/src/main/resources/mapper/system/UserRoleMapper.xml similarity index 95% rename from service/src/main/resources/mapper/UserRoleMapper.xml rename to service/src/main/resources/mapper/system/UserRoleMapper.xml index c43ee3b..bc4625b 100644 --- a/service/src/main/resources/mapper/UserRoleMapper.xml +++ b/service/src/main/resources/mapper/system/UserRoleMapper.xml @@ -1,6 +1,6 @@ - + diff --git a/service/src/test/java/cn/bunny/services/controller/configuration/ConfigurationControllerTest.java b/service/src/test/java/cn/bunny/services/controller/configuration/ConfigurationControllerTest.java index c19e36e..bc4ae2a 100644 --- a/service/src/test/java/cn/bunny/services/controller/configuration/ConfigurationControllerTest.java +++ b/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; diff --git a/service/src/test/java/cn/bunny/services/utils/email/ConcreteSenderEmailTemplateTest.java b/service/src/test/java/cn/bunny/services/utils/email/ConcreteSenderEmailTemplateTest.java index 73a364e..c7ddb6a 100644 --- a/service/src/test/java/cn/bunny/services/utils/email/ConcreteSenderEmailTemplateTest.java +++ b/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;