From 34f2edcda2433c9cba98929aa8849f65a22e8f4c Mon Sep 17 00:00:00 2001 From: Odboy Date: Tue, 24 Jun 2025 18:02:15 +0800 Subject: [PATCH] =?UTF-8?q?refactor(system):=20=E9=87=8D=E6=9E=84=E7=B3=BB?= =?UTF-8?q?=E7=BB=9F=E6=A8=A1=E5=9D=97=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../odboy/monitor/HealthCheckPointerImpl.java | 2 +- ...oginCodeEnum.java => CaptchaCodeEnum.java} | 2 +- .../{system => }/SystemCaptchaBizEnum.java | 10 ++++----- .../{system => }/SystemDataScopeEnum.java | 2 +- .../{system => }/SystemAuthController.java | 16 +++++++------- .../{system => }/SystemCaptchaController.java | 6 ++--- .../{system => }/SystemDeptController.java | 10 ++++----- .../{system => }/SystemDictController.java | 10 ++++----- .../SystemDictDetailController.java | 10 ++++----- .../{system => }/SystemEmailController.java | 8 +++---- .../{system => }/SystemJobController.java | 10 ++++----- .../SystemLocalStorageController.java | 8 +++---- .../{system => }/SystemMenuController.java | 10 ++++----- .../{system => }/SystemMonitorController.java | 4 ++-- .../{system => }/SystemOnlineController.java | 6 ++--- .../{system => }/SystemQiniuController.java | 12 +++++----- .../SystemQuartzJobController.java | 12 +++++----- .../{system => }/SystemRoleController.java | 10 ++++----- .../{system => }/SystemUserController.java | 15 +++++++------ .../dataobject/{system => }/SystemDeptTb.java | 2 +- .../{system => }/SystemDictDetailTb.java | 2 +- .../dataobject/{system => }/SystemDictTb.java | 2 +- .../{system => }/SystemEmailConfigTb.java | 2 +- .../dataobject/{system => }/SystemJobTb.java | 2 +- .../{system => }/SystemLocalStorageTb.java | 2 +- .../dataobject/{system => }/SystemMenuTb.java | 2 +- .../{system => }/SystemQiniuConfigTb.java | 2 +- .../{system => }/SystemQiniuContentTb.java | 2 +- .../{system => }/SystemQuartzJobTb.java | 2 +- .../{system => }/SystemQuartzLogTb.java | 2 +- .../dataobject/{system => }/SystemRoleTb.java | 4 ++-- .../dataobject/{system => }/SystemUserTb.java | 2 +- .../{system => }/CreateSystemDeptArgs.java | 2 +- .../{system => }/CreateSystemDictArgs.java | 2 +- .../CreateSystemDictDetailArgs.java | 4 ++-- .../{system => }/CreateSystemJobArgs.java | 2 +- .../{system => }/CreateSystemRoleArgs.java | 4 ++-- .../{system => }/QuerySystemDeptArgs.java | 2 +- .../{system => }/QuerySystemDictArgs.java | 2 +- .../QuerySystemDictDetailArgs.java | 2 +- .../{system => }/QuerySystemJobArgs.java | 2 +- .../QuerySystemLocalStorageArgs.java | 2 +- .../{system => }/QuerySystemMenuArgs.java | 2 +- .../{system => }/QuerySystemQiniuArgs.java | 2 +- .../QuerySystemQuartzJobArgs.java | 2 +- .../{system => }/QuerySystemRoleArgs.java | 2 +- .../{system => }/QuerySystemUserArgs.java | 2 +- .../{system => }/SendSystemEmailArgs.java | 2 +- .../model/{system => }/SystemMenuMetaVo.java | 2 +- .../dal/model/{system => }/SystemMenuVo.java | 2 +- .../model/{system => }/SystemRoleCodeVo.java | 2 +- .../{system => }/SystemSimpleUserVo.java | 8 +++---- .../model/{system => }/SystemUserInfoVo.java | 2 +- .../model/{system => }/SystemUserJwtVo.java | 4 ++-- .../{system => }/SystemUserLoginArgs.java | 2 +- .../{system => }/SystemUserOnlineVo.java | 2 +- .../UpdateSystemQuartzJobArgs.java | 2 +- .../UpdateSystemUserPasswordArgs.java | 2 +- .../mysql/{system => }/SystemDeptMapper.java | 6 ++--- .../{system => }/SystemDictDetailMapper.java | 6 ++--- .../mysql/{system => }/SystemDictMapper.java | 6 ++--- .../{system => }/SystemEmailConfigMapper.java | 4 ++-- .../mysql/{system => }/SystemJobMapper.java | 6 ++--- .../SystemLocalStorageMapper.java | 6 ++--- .../mysql/{system => }/SystemMenuMapper.java | 6 ++--- .../{system => }/SystemQiniuConfigMapper.java | 4 ++-- .../SystemQiniuContentMapper.java | 6 ++--- .../{system => }/SystemQuartzJobMapper.java | 6 ++--- .../{system => }/SystemQuartzLogMapper.java | 6 ++--- .../{system => }/SystemRoleDeptMapper.java | 4 ++-- .../mysql/{system => }/SystemRoleMapper.java | 6 ++--- .../{system => }/SystemRoleMenuMapper.java | 4 ++-- .../{system => }/SystemUserJobMapper.java | 4 ++-- .../mysql/{system => }/SystemUserMapper.java | 6 ++--- .../{system => }/SystemUserRoleMapper.java | 4 ++-- .../redis/{system => }/SystemRedisKey.java | 2 +- .../redis/{system => }/SystemUserInfoDAO.java | 4 ++-- .../{system => }/SystemUserOnlineInfoDAO.java | 6 ++--- .../config/SpringSecurityConfig.java | 2 +- .../permission/config/TokenConfigurer.java | 2 +- .../permission/core/SecurityHelper.java | 2 +- .../permission/core/handler/TokenFilter.java | 4 ++-- .../core/handler/TokenProvider.java | 4 ++-- .../core/handler/UserDetailsHandler.java | 14 ++++++------ .../model/UserLoginCaptchaSettingModel.java | 4 ++-- .../quartz/core/ExecutionJobBean.java | 14 ++++++------ .../InitialActiveJobApplicationRunner.java | 4 ++-- .../framework/quartz/core/QuartzManage.java | 2 +- .../{system => }/SystemDataService.java | 10 ++++----- .../{system => }/SystemDeptService.java | 16 +++++++------- .../{system => }/SystemDictDetailService.java | 10 ++++----- .../{system => }/SystemDictService.java | 16 +++++++------- .../{system => }/SystemEmailService.java | 10 ++++----- .../{system => }/SystemJobService.java | 12 +++++----- .../SystemLocalStorageService.java | 8 +++---- .../{system => }/SystemMenuService.java | 17 +++++++------- .../{system => }/SystemMonitorService.java | 2 +- .../SystemQiniuConfigService.java | 6 ++--- .../SystemQiniuContentService.java | 10 ++++----- .../{system => }/SystemQuartzJobService.java | 14 ++++++------ .../{system => }/SystemRoleService.java | 22 +++++++++---------- .../{system => }/SystemUserService.java | 20 ++++++++--------- .../mapper/{system => }/SystemDeptMapper.xml | 6 ++--- .../{system => }/SystemDictDetailMapper.xml | 6 ++--- .../mapper/{system => }/SystemDictMapper.xml | 4 ++-- .../mapper/{system => }/SystemJobMapper.xml | 6 ++--- .../{system => }/SystemLocalStorageMapper.xml | 4 ++-- .../mapper/{system => }/SystemMenuMapper.xml | 8 +++---- .../{system => }/SystemQiniuContentMapper.xml | 6 ++--- .../{system => }/SystemQuartzJobMapper.xml | 6 ++--- .../{system => }/SystemQuartzLogMapper.xml | 4 ++-- .../{system => }/SystemRoleDeptMapper.xml | 2 +- .../mapper/{system => }/SystemRoleMapper.xml | 14 ++++++------ .../{system => }/SystemRoleMenuMapper.xml | 2 +- .../{system => }/SystemUserJobMapper.xml | 2 +- .../mapper/{system => }/SystemUserMapper.xml | 20 ++++++++--------- .../{system => }/SystemUserRoleMapper.xml | 2 +- ...ail.ftl => SystemEmailCaptchaTemplate.ftl} | 0 ...l => SystemQuartzJobTaskAlarmTemplate.ftl} | 0 119 files changed, 337 insertions(+), 337 deletions(-) rename cutejava/cutejava-system/src/main/java/cn/odboy/core/constant/{LoginCodeEnum.java => CaptchaCodeEnum.java} (90%) rename cutejava/cutejava-system/src/main/java/cn/odboy/core/constant/{system => }/SystemCaptchaBizEnum.java (71%) rename cutejava/cutejava-system/src/main/java/cn/odboy/core/constant/{system => }/SystemDataScopeEnum.java (95%) rename cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/{system => }/SystemAuthController.java (92%) rename cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/{system => }/SystemCaptchaController.java (91%) rename cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/{system => }/SystemDeptController.java (93%) rename cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/{system => }/SystemDictController.java (91%) rename cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/{system => }/SystemDictDetailController.java (90%) rename cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/{system => }/SystemEmailController.java (87%) rename cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/{system => }/SystemJobController.java (90%) rename cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/{system => }/SystemLocalStorageController.java (93%) rename cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/{system => }/SystemMenuController.java (95%) rename cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/{system => }/SystemMonitorController.java (91%) rename cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/{system => }/SystemOnlineController.java (92%) rename cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/{system => }/SystemQiniuController.java (91%) rename cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/{system => }/SystemQuartzJobController.java (93%) rename cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/{system => }/SystemRoleController.java (94%) rename cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/{system => }/SystemUserController.java (96%) rename cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/{system => }/SystemDeptTb.java (98%) rename cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/{system => }/SystemDictDetailTb.java (95%) rename cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/{system => }/SystemDictTb.java (94%) rename cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/{system => }/SystemEmailConfigTb.java (95%) rename cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/{system => }/SystemJobTb.java (96%) rename cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/{system => }/SystemLocalStorageTb.java (97%) rename cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/{system => }/SystemMenuTb.java (98%) rename cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/{system => }/SystemQiniuConfigTb.java (96%) rename cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/{system => }/SystemQiniuContentTb.java (96%) rename cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/{system => }/SystemQuartzJobTb.java (97%) rename cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/{system => }/SystemQuartzLogTb.java (96%) rename cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/{system => }/SystemRoleTb.java (94%) rename cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/{system => }/SystemUserTb.java (98%) rename cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/{system => }/CreateSystemDeptArgs.java (93%) rename cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/{system => }/CreateSystemDictArgs.java (89%) rename cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/{system => }/CreateSystemDictDetailArgs.java (85%) rename cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/{system => }/CreateSystemJobArgs.java (92%) rename cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/{system => }/CreateSystemRoleArgs.java (87%) rename cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/{system => }/QuerySystemDeptArgs.java (93%) rename cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/{system => }/QuerySystemDictArgs.java (90%) rename cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/{system => }/QuerySystemDictDetailArgs.java (91%) rename cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/{system => }/QuerySystemJobArgs.java (93%) rename cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/{system => }/QuerySystemLocalStorageArgs.java (92%) rename cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/{system => }/QuerySystemMenuArgs.java (91%) rename cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/{system => }/QuerySystemQiniuArgs.java (92%) rename cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/{system => }/QuerySystemQuartzJobArgs.java (93%) rename cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/{system => }/QuerySystemRoleArgs.java (93%) rename cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/{system => }/QuerySystemUserArgs.java (96%) rename cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/{system => }/SendSystemEmailArgs.java (94%) rename cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/{system => }/SystemMenuMetaVo.java (92%) rename cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/{system => }/SystemMenuVo.java (95%) rename cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/{system => }/SystemRoleCodeVo.java (91%) rename cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/{system => }/SystemSimpleUserVo.java (85%) rename cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/{system => }/SystemUserInfoVo.java (93%) rename cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/{system => }/SystemUserJwtVo.java (94%) rename cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/{system => }/SystemUserLoginArgs.java (92%) rename cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/{system => }/SystemUserOnlineVo.java (95%) rename cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/{system => }/UpdateSystemQuartzJobArgs.java (95%) rename cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/{system => }/UpdateSystemUserPasswordArgs.java (87%) rename cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/{system => }/SystemDeptMapper.java (81%) rename cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/{system => }/SystemDictDetailMapper.java (82%) rename cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/{system => }/SystemDictMapper.java (79%) rename cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/{system => }/SystemEmailConfigMapper.java (70%) rename cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/{system => }/SystemJobMapper.java (78%) rename cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/{system => }/SystemLocalStorageMapper.java (76%) rename cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/{system => }/SystemMenuMapper.java (86%) rename cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/{system => }/SystemQiniuConfigMapper.java (70%) rename cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/{system => }/SystemQiniuContentMapper.java (79%) rename cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/{system => }/SystemQuartzJobMapper.java (78%) rename cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/{system => }/SystemQuartzLogMapper.java (76%) rename cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/{system => }/SystemRoleDeptMapper.java (80%) rename cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/{system => }/SystemRoleMapper.java (84%) rename cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/{system => }/SystemRoleMenuMapper.java (84%) rename cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/{system => }/SystemUserJobMapper.java (80%) rename cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/{system => }/SystemUserMapper.java (90%) rename cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/{system => }/SystemUserRoleMapper.java (77%) rename cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/redis/{system => }/SystemRedisKey.java (95%) rename cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/redis/{system => }/SystemUserInfoDAO.java (94%) rename cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/redis/{system => }/SystemUserOnlineInfoDAO.java (96%) rename cutejava/cutejava-system/src/main/java/cn/odboy/core/service/{system => }/SystemDataService.java (89%) rename cutejava/cutejava-system/src/main/java/cn/odboy/core/service/{system => }/SystemDeptService.java (96%) rename cutejava/cutejava-system/src/main/java/cn/odboy/core/service/{system => }/SystemDictDetailService.java (88%) rename cutejava/cutejava-system/src/main/java/cn/odboy/core/service/{system => }/SystemDictService.java (89%) rename cutejava/cutejava-system/src/main/java/cn/odboy/core/service/{system => }/SystemEmailService.java (95%) rename cutejava/cutejava-system/src/main/java/cn/odboy/core/service/{system => }/SystemJobService.java (91%) rename cutejava/cutejava-system/src/main/java/cn/odboy/core/service/{system => }/SystemLocalStorageService.java (95%) rename cutejava/cutejava-system/src/main/java/cn/odboy/core/service/{system => }/SystemMenuService.java (96%) rename cutejava/cutejava-system/src/main/java/cn/odboy/core/service/{system => }/SystemMonitorService.java (99%) rename cutejava/cutejava-system/src/main/java/cn/odboy/core/service/{system => }/SystemQiniuConfigService.java (90%) rename cutejava/cutejava-system/src/main/java/cn/odboy/core/service/{system => }/SystemQiniuContentService.java (97%) rename cutejava/cutejava-system/src/main/java/cn/odboy/core/service/{system => }/SystemQuartzJobService.java (95%) rename cutejava/cutejava-system/src/main/java/cn/odboy/core/service/{system => }/SystemRoleService.java (92%) rename cutejava/cutejava-system/src/main/java/cn/odboy/core/service/{system => }/SystemUserService.java (95%) rename cutejava/cutejava-system/src/main/resources/mapper/{system => }/SystemDeptMapper.xml (96%) rename cutejava/cutejava-system/src/main/resources/mapper/{system => }/SystemDictDetailMapper.xml (93%) rename cutejava/cutejava-system/src/main/resources/mapper/{system => }/SystemDictMapper.xml (85%) rename cutejava/cutejava-system/src/main/resources/mapper/{system => }/SystemJobMapper.xml (88%) rename cutejava/cutejava-system/src/main/resources/mapper/{system => }/SystemLocalStorageMapper.xml (88%) rename cutejava/cutejava-system/src/main/resources/mapper/{system => }/SystemMenuMapper.xml (96%) rename cutejava/cutejava-system/src/main/resources/mapper/{system => }/SystemQiniuContentMapper.xml (83%) rename cutejava/cutejava-system/src/main/resources/mapper/{system => }/SystemQuartzJobMapper.xml (84%) rename cutejava/cutejava-system/src/main/resources/mapper/{system => }/SystemQuartzLogMapper.xml (87%) rename cutejava/cutejava-system/src/main/resources/mapper/{system => }/SystemRoleDeptMapper.xml (89%) rename cutejava/cutejava-system/src/main/resources/mapper/{system => }/SystemRoleMapper.xml (96%) rename cutejava/cutejava-system/src/main/resources/mapper/{system => }/SystemRoleMenuMapper.xml (92%) rename cutejava/cutejava-system/src/main/resources/mapper/{system => }/SystemUserJobMapper.xml (90%) rename cutejava/cutejava-system/src/main/resources/mapper/{system => }/SystemUserMapper.xml (96%) rename cutejava/cutejava-system/src/main/resources/mapper/{system => }/SystemUserRoleMapper.xml (89%) rename cutejava/cutejava-system/src/main/resources/template/{system/email.ftl => SystemEmailCaptchaTemplate.ftl} (100%) rename cutejava/cutejava-system/src/main/resources/template/{system/taskAlarm.ftl => SystemQuartzJobTaskAlarmTemplate.ftl} (100%) diff --git a/cutejava/cutejava-starter/src/main/java/cn/odboy/monitor/HealthCheckPointerImpl.java b/cutejava/cutejava-starter/src/main/java/cn/odboy/monitor/HealthCheckPointerImpl.java index ee73853a..5719305b 100644 --- a/cutejava/cutejava-starter/src/main/java/cn/odboy/monitor/HealthCheckPointerImpl.java +++ b/cutejava/cutejava-starter/src/main/java/cn/odboy/monitor/HealthCheckPointerImpl.java @@ -1,6 +1,6 @@ package cn.odboy.monitor; -import cn.odboy.core.service.system.SystemDictService; +import cn.odboy.core.service.SystemDictService; import cn.odboy.monitor.service.CsHealthCheckPointService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.ResponseEntity; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/constant/LoginCodeEnum.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/constant/CaptchaCodeEnum.java similarity index 90% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/constant/LoginCodeEnum.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/constant/CaptchaCodeEnum.java index 740e0274..afed51ae 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/constant/LoginCodeEnum.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/constant/CaptchaCodeEnum.java @@ -3,7 +3,7 @@ package cn.odboy.core.constant; /** * 验证码配置枚举 */ -public enum LoginCodeEnum { +public enum CaptchaCodeEnum { /** * 算数 */ diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/constant/system/SystemCaptchaBizEnum.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/constant/SystemCaptchaBizEnum.java similarity index 71% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/constant/system/SystemCaptchaBizEnum.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/constant/SystemCaptchaBizEnum.java index 1dd843d9..506a981b 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/constant/system/SystemCaptchaBizEnum.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/constant/SystemCaptchaBizEnum.java @@ -1,4 +1,4 @@ -package cn.odboy.core.constant.system; +package cn.odboy.core.constant; import lombok.AllArgsConstructor; import lombok.Getter; @@ -11,16 +11,16 @@ import lombok.Getter; public enum SystemCaptchaBizEnum { /* 通过手机号码重置邮箱 */ - PHONE_RESET_EMAIL_CODE("10000", "phone_reset_email_code_", "email.ftl", "通过手机号码重置邮箱"), + PHONE_RESET_EMAIL_CODE("10000", "phone_reset_email_code_", "SystemEmailCaptchaTemplate.ftl", "通过手机号码重置邮箱"), /* 通过旧邮箱重置邮箱 */ - EMAIL_RESET_EMAIL_CODE("10001", "email_reset_email_code_", "email.ftl", "通过旧邮箱重置邮箱"), + EMAIL_RESET_EMAIL_CODE("10001", "email_reset_email_code_", "SystemEmailCaptchaTemplate.ftl", "通过旧邮箱重置邮箱"), /* 通过手机号码重置密码 */ - PHONE_RESET_PWD_CODE("10002", "phone_reset_pwd_code_", "email.ftl", "通过手机号码重置密码"), + PHONE_RESET_PWD_CODE("10002", "phone_reset_pwd_code_", "SystemEmailCaptchaTemplate.ftl", "通过手机号码重置密码"), /* 通过邮箱重置密码 */ - EMAIL_RESET_PWD_CODE("10003", "email_reset_pwd_code_", "email.ftl", "通过邮箱重置密码"); + EMAIL_RESET_PWD_CODE("10003", "email_reset_pwd_code_", "SystemEmailCaptchaTemplate.ftl", "通过邮箱重置密码"); /** * 业务编码 diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/constant/system/SystemDataScopeEnum.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/constant/SystemDataScopeEnum.java similarity index 95% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/constant/system/SystemDataScopeEnum.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/constant/SystemDataScopeEnum.java index 0e830a00..630156f6 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/constant/system/SystemDataScopeEnum.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/constant/SystemDataScopeEnum.java @@ -1,4 +1,4 @@ -package cn.odboy.core.constant.system; +package cn.odboy.core.constant; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/SystemAuthController.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/SystemAuthController.java similarity index 92% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/SystemAuthController.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/SystemAuthController.java index 6805c327..5f7773d2 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/SystemAuthController.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/SystemAuthController.java @@ -1,15 +1,15 @@ -package cn.odboy.core.controller.system; +package cn.odboy.core.controller; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.IdUtil; import cn.odboy.annotation.AnonymousPostMapping; import cn.odboy.constant.SystemConst; -import cn.odboy.core.constant.LoginCodeEnum; -import cn.odboy.core.dal.model.system.SystemUserInfoVo; -import cn.odboy.core.dal.model.system.SystemUserJwtVo; -import cn.odboy.core.dal.model.system.SystemUserLoginArgs; -import cn.odboy.core.dal.redis.system.SystemRedisKey; -import cn.odboy.core.dal.redis.system.SystemUserOnlineInfoDAO; +import cn.odboy.core.constant.CaptchaCodeEnum; +import cn.odboy.core.dal.model.SystemUserInfoVo; +import cn.odboy.core.dal.model.SystemUserJwtVo; +import cn.odboy.core.dal.model.SystemUserLoginArgs; +import cn.odboy.core.dal.redis.SystemRedisKey; +import cn.odboy.core.dal.redis.SystemUserOnlineInfoDAO; import cn.odboy.core.framework.permission.core.SecurityHelper; import cn.odboy.core.framework.permission.core.handler.TokenProvider; import cn.odboy.core.framework.permission.core.handler.UserDetailsHandler; @@ -112,7 +112,7 @@ public class SystemAuthController { String uuid = SystemRedisKey.CAPTCHA_LOGIN + IdUtil.simpleUUID(); //当验证码类型为 arithmetic时且长度 >= 2 时，captcha.text()的结果有几率为浮点型 String captchaValue = captcha.text(); - if (captcha.getCharType() - 1 == LoginCodeEnum.ARITHMETIC.ordinal() && captchaValue.contains(SystemConst.SYMBOL_DOT)) { + if (captcha.getCharType() - 1 == CaptchaCodeEnum.ARITHMETIC.ordinal() && captchaValue.contains(SystemConst.SYMBOL_DOT)) { captchaValue = captchaValue.split("\\.")[0]; } // 保存 diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/SystemCaptchaController.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/SystemCaptchaController.java similarity index 91% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/SystemCaptchaController.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/SystemCaptchaController.java index e3cffaa2..583acaa3 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/SystemCaptchaController.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/SystemCaptchaController.java @@ -1,7 +1,7 @@ -package cn.odboy.core.controller.system; +package cn.odboy.core.controller; -import cn.odboy.core.constant.system.SystemCaptchaBizEnum; -import cn.odboy.core.service.system.SystemEmailService; +import cn.odboy.core.constant.SystemCaptchaBizEnum; +import cn.odboy.core.service.SystemEmailService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/SystemDeptController.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/SystemDeptController.java similarity index 93% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/SystemDeptController.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/SystemDeptController.java index 47dc902c..e2f5c6df 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/SystemDeptController.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/SystemDeptController.java @@ -1,10 +1,10 @@ -package cn.odboy.core.controller.system; +package cn.odboy.core.controller; import cn.odboy.base.CsResultVo; -import cn.odboy.core.dal.dataobject.system.SystemDeptTb; -import cn.odboy.core.dal.model.system.CreateSystemDeptArgs; -import cn.odboy.core.dal.model.system.QuerySystemDeptArgs; -import cn.odboy.core.service.system.SystemDeptService; +import cn.odboy.core.dal.dataobject.SystemDeptTb; +import cn.odboy.core.dal.model.CreateSystemDeptArgs; +import cn.odboy.core.dal.model.QuerySystemDeptArgs; +import cn.odboy.core.service.SystemDeptService; import cn.odboy.util.CsPageUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/SystemDictController.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/SystemDictController.java similarity index 91% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/SystemDictController.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/SystemDictController.java index 1e0763cc..b641f795 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/SystemDictController.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/SystemDictController.java @@ -1,10 +1,10 @@ -package cn.odboy.core.controller.system; +package cn.odboy.core.controller; import cn.odboy.base.CsResultVo; -import cn.odboy.core.dal.dataobject.system.SystemDictTb; -import cn.odboy.core.dal.model.system.CreateSystemDictArgs; -import cn.odboy.core.dal.model.system.QuerySystemDictArgs; -import cn.odboy.core.service.system.SystemDictService; +import cn.odboy.core.dal.dataobject.SystemDictTb; +import cn.odboy.core.dal.model.CreateSystemDictArgs; +import cn.odboy.core.dal.model.QuerySystemDictArgs; +import cn.odboy.core.service.SystemDictService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/SystemDictDetailController.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/SystemDictDetailController.java similarity index 90% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/SystemDictDetailController.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/SystemDictDetailController.java index 30c9038e..9fa9bced 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/SystemDictDetailController.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/SystemDictDetailController.java @@ -1,10 +1,10 @@ -package cn.odboy.core.controller.system; +package cn.odboy.core.controller; import cn.odboy.base.CsResultVo; -import cn.odboy.core.dal.dataobject.system.SystemDictDetailTb; -import cn.odboy.core.dal.model.system.CreateSystemDictDetailArgs; -import cn.odboy.core.dal.model.system.QuerySystemDictDetailArgs; -import cn.odboy.core.service.system.SystemDictDetailService; +import cn.odboy.core.dal.dataobject.SystemDictDetailTb; +import cn.odboy.core.dal.model.CreateSystemDictDetailArgs; +import cn.odboy.core.dal.model.QuerySystemDictDetailArgs; +import cn.odboy.core.service.SystemDictDetailService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/SystemEmailController.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/SystemEmailController.java similarity index 87% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/SystemEmailController.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/SystemEmailController.java index 745009d7..96472479 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/SystemEmailController.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/SystemEmailController.java @@ -1,8 +1,8 @@ -package cn.odboy.core.controller.system; +package cn.odboy.core.controller; -import cn.odboy.core.dal.dataobject.system.SystemEmailConfigTb; -import cn.odboy.core.dal.model.system.SendSystemEmailArgs; -import cn.odboy.core.service.system.SystemEmailService; +import cn.odboy.core.dal.dataobject.SystemEmailConfigTb; +import cn.odboy.core.dal.model.SendSystemEmailArgs; +import cn.odboy.core.service.SystemEmailService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/SystemJobController.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/SystemJobController.java similarity index 90% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/SystemJobController.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/SystemJobController.java index 6d4c4794..7a74e469 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/SystemJobController.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/SystemJobController.java @@ -1,10 +1,10 @@ -package cn.odboy.core.controller.system; +package cn.odboy.core.controller; import cn.odboy.base.CsResultVo; -import cn.odboy.core.dal.dataobject.system.SystemJobTb; -import cn.odboy.core.dal.model.system.CreateSystemJobArgs; -import cn.odboy.core.dal.model.system.QuerySystemJobArgs; -import cn.odboy.core.service.system.SystemJobService; +import cn.odboy.core.dal.dataobject.SystemJobTb; +import cn.odboy.core.dal.model.CreateSystemJobArgs; +import cn.odboy.core.dal.model.QuerySystemJobArgs; +import cn.odboy.core.service.SystemJobService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/SystemLocalStorageController.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/SystemLocalStorageController.java similarity index 93% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/SystemLocalStorageController.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/SystemLocalStorageController.java index 0b449cc2..9c90bb8a 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/SystemLocalStorageController.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/SystemLocalStorageController.java @@ -1,10 +1,10 @@ -package cn.odboy.core.controller.system; +package cn.odboy.core.controller; import cn.odboy.base.CsResultVo; import cn.odboy.constant.FileTypeEnum; -import cn.odboy.core.dal.dataobject.system.SystemLocalStorageTb; -import cn.odboy.core.dal.model.system.QuerySystemLocalStorageArgs; -import cn.odboy.core.service.system.SystemLocalStorageService; +import cn.odboy.core.dal.dataobject.SystemLocalStorageTb; +import cn.odboy.core.dal.model.QuerySystemLocalStorageArgs; +import cn.odboy.core.service.SystemLocalStorageService; import cn.odboy.exception.BadRequestException; import cn.odboy.util.FileUtil; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/SystemMenuController.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/SystemMenuController.java similarity index 95% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/SystemMenuController.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/SystemMenuController.java index 655e608e..2cb06907 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/SystemMenuController.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/SystemMenuController.java @@ -1,12 +1,12 @@ -package cn.odboy.core.controller.system; +package cn.odboy.core.controller; import cn.hutool.core.collection.CollectionUtil; import cn.odboy.base.CsResultVo; -import cn.odboy.core.dal.dataobject.system.SystemMenuTb; -import cn.odboy.core.dal.model.system.QuerySystemMenuArgs; -import cn.odboy.core.dal.model.system.SystemMenuVo; +import cn.odboy.core.dal.dataobject.SystemMenuTb; +import cn.odboy.core.dal.model.QuerySystemMenuArgs; +import cn.odboy.core.dal.model.SystemMenuVo; import cn.odboy.core.framework.permission.core.SecurityHelper; -import cn.odboy.core.service.system.SystemMenuService; +import cn.odboy.core.service.SystemMenuService; import cn.odboy.exception.BadRequestException; import cn.odboy.util.CsPageUtil; import io.swagger.annotations.Api; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/SystemMonitorController.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/SystemMonitorController.java similarity index 91% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/SystemMonitorController.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/SystemMonitorController.java index 13b447cc..44092239 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/SystemMonitorController.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/SystemMonitorController.java @@ -1,6 +1,6 @@ -package cn.odboy.core.controller.system; +package cn.odboy.core.controller; -import cn.odboy.core.service.system.SystemMonitorService; +import cn.odboy.core.service.SystemMonitorService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/SystemOnlineController.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/SystemOnlineController.java similarity index 92% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/SystemOnlineController.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/SystemOnlineController.java index c78a3d19..54cf7b2b 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/SystemOnlineController.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/SystemOnlineController.java @@ -1,8 +1,8 @@ -package cn.odboy.core.controller.system; +package cn.odboy.core.controller; import cn.odboy.base.CsResultVo; -import cn.odboy.core.dal.model.system.SystemUserOnlineVo; -import cn.odboy.core.dal.redis.system.SystemUserOnlineInfoDAO; +import cn.odboy.core.dal.model.SystemUserOnlineVo; +import cn.odboy.core.dal.redis.SystemUserOnlineInfoDAO; import cn.odboy.util.DesEncryptUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/SystemQiniuController.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/SystemQiniuController.java similarity index 91% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/SystemQiniuController.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/SystemQiniuController.java index 7e70ab44..785f13c9 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/SystemQiniuController.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/SystemQiniuController.java @@ -1,11 +1,11 @@ -package cn.odboy.core.controller.system; +package cn.odboy.core.controller; import cn.odboy.base.CsResultVo; -import cn.odboy.core.dal.dataobject.system.SystemQiniuConfigTb; -import cn.odboy.core.dal.dataobject.system.SystemQiniuContentTb; -import cn.odboy.core.dal.model.system.QuerySystemQiniuArgs; -import cn.odboy.core.service.system.SystemQiniuConfigService; -import cn.odboy.core.service.system.SystemQiniuContentService; +import cn.odboy.core.dal.dataobject.SystemQiniuConfigTb; +import cn.odboy.core.dal.dataobject.SystemQiniuContentTb; +import cn.odboy.core.dal.model.QuerySystemQiniuArgs; +import cn.odboy.core.service.SystemQiniuConfigService; +import cn.odboy.core.service.SystemQiniuContentService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/SystemQuartzJobController.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/SystemQuartzJobController.java similarity index 93% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/SystemQuartzJobController.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/SystemQuartzJobController.java index 2425b693..0869710c 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/SystemQuartzJobController.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/SystemQuartzJobController.java @@ -1,12 +1,12 @@ -package cn.odboy.core.controller.system; +package cn.odboy.core.controller; import cn.odboy.base.CsResultVo; import cn.odboy.context.SpringBeanHolder; -import cn.odboy.core.dal.dataobject.system.SystemQuartzJobTb; -import cn.odboy.core.dal.dataobject.system.SystemQuartzLogTb; -import cn.odboy.core.dal.model.system.QuerySystemQuartzJobArgs; -import cn.odboy.core.dal.model.system.UpdateSystemQuartzJobArgs; -import cn.odboy.core.service.system.SystemQuartzJobService; +import cn.odboy.core.dal.dataobject.SystemQuartzJobTb; +import cn.odboy.core.dal.dataobject.SystemQuartzLogTb; +import cn.odboy.core.dal.model.QuerySystemQuartzJobArgs; +import cn.odboy.core.dal.model.UpdateSystemQuartzJobArgs; +import cn.odboy.core.service.SystemQuartzJobService; import cn.odboy.exception.BadRequestException; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.annotations.Api; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/SystemRoleController.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/SystemRoleController.java similarity index 94% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/SystemRoleController.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/SystemRoleController.java index 693a8243..dde7511c 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/SystemRoleController.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/SystemRoleController.java @@ -1,12 +1,12 @@ -package cn.odboy.core.controller.system; +package cn.odboy.core.controller; import cn.hutool.core.lang.Dict; import cn.odboy.base.CsResultVo; -import cn.odboy.core.dal.dataobject.system.SystemRoleTb; -import cn.odboy.core.dal.model.system.CreateSystemRoleArgs; -import cn.odboy.core.dal.model.system.QuerySystemRoleArgs; +import cn.odboy.core.dal.dataobject.SystemRoleTb; +import cn.odboy.core.dal.model.CreateSystemRoleArgs; +import cn.odboy.core.dal.model.QuerySystemRoleArgs; import cn.odboy.core.framework.permission.core.SecurityHelper; -import cn.odboy.core.service.system.SystemRoleService; +import cn.odboy.core.service.SystemRoleService; import cn.odboy.exception.BadRequestException; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.annotations.Api; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/SystemUserController.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/SystemUserController.java similarity index 96% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/SystemUserController.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/SystemUserController.java index 11215c29..7d657131 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/SystemUserController.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/SystemUserController.java @@ -1,16 +1,17 @@ -package cn.odboy.core.controller.system; +package cn.odboy.core.controller; import cn.hutool.core.collection.CollectionUtil; import cn.odboy.base.CsResultVo; import cn.odboy.base.CsSelectOptionItemVo; -import cn.odboy.core.constant.system.SystemCaptchaBizEnum; -import cn.odboy.core.dal.dataobject.system.SystemDeptTb; -import cn.odboy.core.dal.dataobject.system.SystemRoleTb; -import cn.odboy.core.dal.dataobject.system.SystemUserTb; -import cn.odboy.core.dal.model.system.QuerySystemUserArgs; -import cn.odboy.core.dal.model.system.UpdateSystemUserPasswordArgs; +import cn.odboy.core.constant.SystemCaptchaBizEnum; +import cn.odboy.core.dal.dataobject.SystemDeptTb; +import cn.odboy.core.dal.dataobject.SystemRoleTb; +import cn.odboy.core.dal.dataobject.SystemUserTb; +import cn.odboy.core.dal.model.QuerySystemUserArgs; +import cn.odboy.core.dal.model.UpdateSystemUserPasswordArgs; import cn.odboy.core.framework.permission.core.SecurityHelper; import cn.odboy.core.framework.properties.AppProperties; +import cn.odboy.core.service.*; import cn.odboy.core.service.system.*; import cn.odboy.exception.BadRequestException; import cn.odboy.util.CsPageUtil; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/system/SystemDeptTb.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/SystemDeptTb.java similarity index 98% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/system/SystemDeptTb.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/SystemDeptTb.java index 713821ee..e83e0d8a 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/system/SystemDeptTb.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/SystemDeptTb.java @@ -1,4 +1,4 @@ -package cn.odboy.core.dal.dataobject.system; +package cn.odboy.core.dal.dataobject; import cn.odboy.base.CsBaseUserTimeTb; import com.alibaba.fastjson2.annotation.JSONField; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/system/SystemDictDetailTb.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/SystemDictDetailTb.java similarity index 95% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/system/SystemDictDetailTb.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/SystemDictDetailTb.java index aad39ce5..42be079b 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/system/SystemDictDetailTb.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/SystemDictDetailTb.java @@ -1,4 +1,4 @@ -package cn.odboy.core.dal.dataobject.system; +package cn.odboy.core.dal.dataobject; import cn.odboy.base.CsBaseUserTimeTb; import com.baomidou.mybatisplus.annotation.IdType; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/system/SystemDictTb.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/SystemDictTb.java similarity index 94% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/system/SystemDictTb.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/SystemDictTb.java index 04085cfd..bb768ccf 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/system/SystemDictTb.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/SystemDictTb.java @@ -1,4 +1,4 @@ -package cn.odboy.core.dal.dataobject.system; +package cn.odboy.core.dal.dataobject; import cn.odboy.base.CsBaseUserTimeTb; import com.baomidou.mybatisplus.annotation.*; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/system/SystemEmailConfigTb.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/SystemEmailConfigTb.java similarity index 95% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/system/SystemEmailConfigTb.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/SystemEmailConfigTb.java index 73c2b06c..0467f649 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/system/SystemEmailConfigTb.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/SystemEmailConfigTb.java @@ -1,4 +1,4 @@ -package cn.odboy.core.dal.dataobject.system; +package cn.odboy.core.dal.dataobject; import cn.odboy.base.CsSerializeObject; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/system/SystemJobTb.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/SystemJobTb.java similarity index 96% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/system/SystemJobTb.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/SystemJobTb.java index bd59bdca..8aa849f2 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/system/SystemJobTb.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/SystemJobTb.java @@ -1,4 +1,4 @@ -package cn.odboy.core.dal.dataobject.system; +package cn.odboy.core.dal.dataobject; import cn.odboy.base.CsBaseUserTimeTb; import com.baomidou.mybatisplus.annotation.IdType; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/system/SystemLocalStorageTb.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/SystemLocalStorageTb.java similarity index 97% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/system/SystemLocalStorageTb.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/SystemLocalStorageTb.java index 609a70fa..5bbcef00 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/system/SystemLocalStorageTb.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/SystemLocalStorageTb.java @@ -1,4 +1,4 @@ -package cn.odboy.core.dal.dataobject.system; +package cn.odboy.core.dal.dataobject; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/system/SystemMenuTb.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/SystemMenuTb.java similarity index 98% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/system/SystemMenuTb.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/SystemMenuTb.java index c4ad7a4c..f19836f6 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/system/SystemMenuTb.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/SystemMenuTb.java @@ -1,4 +1,4 @@ -package cn.odboy.core.dal.dataobject.system; +package cn.odboy.core.dal.dataobject; import cn.odboy.base.CsBaseUserTimeTb; import com.alibaba.fastjson2.annotation.JSONField; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/system/SystemQiniuConfigTb.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/SystemQiniuConfigTb.java similarity index 96% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/system/SystemQiniuConfigTb.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/SystemQiniuConfigTb.java index 5e3f63f7..69c17775 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/system/SystemQiniuConfigTb.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/SystemQiniuConfigTb.java @@ -1,4 +1,4 @@ -package cn.odboy.core.dal.dataobject.system; +package cn.odboy.core.dal.dataobject; import cn.odboy.base.CsSerializeObject; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/system/SystemQiniuContentTb.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/SystemQiniuContentTb.java similarity index 96% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/system/SystemQiniuContentTb.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/SystemQiniuContentTb.java index e1e02fdc..4c2b8c82 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/system/SystemQiniuContentTb.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/SystemQiniuContentTb.java @@ -1,4 +1,4 @@ -package cn.odboy.core.dal.dataobject.system; +package cn.odboy.core.dal.dataobject; import cn.odboy.base.CsSerializeObject; import com.baomidou.mybatisplus.annotation.*; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/system/SystemQuartzJobTb.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/SystemQuartzJobTb.java similarity index 97% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/system/SystemQuartzJobTb.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/SystemQuartzJobTb.java index 902d8937..7738c9e8 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/system/SystemQuartzJobTb.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/SystemQuartzJobTb.java @@ -1,4 +1,4 @@ -package cn.odboy.core.dal.dataobject.system; +package cn.odboy.core.dal.dataobject; import cn.odboy.base.CsBaseUserTimeTb; import com.baomidou.mybatisplus.annotation.*; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/system/SystemQuartzLogTb.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/SystemQuartzLogTb.java similarity index 96% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/system/SystemQuartzLogTb.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/SystemQuartzLogTb.java index 477be3a7..90170934 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/system/SystemQuartzLogTb.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/SystemQuartzLogTb.java @@ -1,4 +1,4 @@ -package cn.odboy.core.dal.dataobject.system; +package cn.odboy.core.dal.dataobject; import cn.odboy.base.CsSerializeObject; import com.baomidou.mybatisplus.annotation.*; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/system/SystemRoleTb.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/SystemRoleTb.java similarity index 94% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/system/SystemRoleTb.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/SystemRoleTb.java index a8b05e4a..767124f0 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/system/SystemRoleTb.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/SystemRoleTb.java @@ -1,7 +1,7 @@ -package cn.odboy.core.dal.dataobject.system; +package cn.odboy.core.dal.dataobject; import cn.odboy.base.CsBaseUserTimeTb; -import cn.odboy.core.constant.system.SystemDataScopeEnum; +import cn.odboy.core.constant.SystemDataScopeEnum; import com.baomidou.mybatisplus.annotation.*; import io.swagger.annotations.ApiModelProperty; import lombok.Getter; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/system/SystemUserTb.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/SystemUserTb.java similarity index 98% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/system/SystemUserTb.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/SystemUserTb.java index 06814195..656d8846 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/system/SystemUserTb.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/SystemUserTb.java @@ -1,4 +1,4 @@ -package cn.odboy.core.dal.dataobject.system; +package cn.odboy.core.dal.dataobject; import cn.odboy.base.CsBaseUserTimeTb; import com.baomidou.mybatisplus.annotation.IdType; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/system/CreateSystemDeptArgs.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/CreateSystemDeptArgs.java similarity index 93% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/system/CreateSystemDeptArgs.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/CreateSystemDeptArgs.java index 7604cbc4..30dc3165 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/system/CreateSystemDeptArgs.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/CreateSystemDeptArgs.java @@ -1,4 +1,4 @@ -package cn.odboy.core.dal.model.system; +package cn.odboy.core.dal.model; import cn.odboy.base.CsSerializeObject; import lombok.Data; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/system/CreateSystemDictArgs.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/CreateSystemDictArgs.java similarity index 89% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/system/CreateSystemDictArgs.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/CreateSystemDictArgs.java index c9e47106..30536932 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/system/CreateSystemDictArgs.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/CreateSystemDictArgs.java @@ -1,4 +1,4 @@ -package cn.odboy.core.dal.model.system; +package cn.odboy.core.dal.model; import cn.odboy.base.CsSerializeObject; import lombok.Data; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/system/CreateSystemDictDetailArgs.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/CreateSystemDictDetailArgs.java similarity index 85% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/system/CreateSystemDictDetailArgs.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/CreateSystemDictDetailArgs.java index a7318195..4d2ca19e 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/system/CreateSystemDictDetailArgs.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/CreateSystemDictDetailArgs.java @@ -1,7 +1,7 @@ -package cn.odboy.core.dal.model.system; +package cn.odboy.core.dal.model; import cn.odboy.base.CsSerializeObject; -import cn.odboy.core.dal.dataobject.system.SystemDictTb; +import cn.odboy.core.dal.dataobject.SystemDictTb; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/system/CreateSystemJobArgs.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/CreateSystemJobArgs.java similarity index 92% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/system/CreateSystemJobArgs.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/CreateSystemJobArgs.java index 900fc9c5..172aaf94 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/system/CreateSystemJobArgs.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/CreateSystemJobArgs.java @@ -1,4 +1,4 @@ -package cn.odboy.core.dal.model.system; +package cn.odboy.core.dal.model; import cn.odboy.base.CsSerializeObject; import lombok.Data; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/system/CreateSystemRoleArgs.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/CreateSystemRoleArgs.java similarity index 87% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/system/CreateSystemRoleArgs.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/CreateSystemRoleArgs.java index a9d35252..dd76f287 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/system/CreateSystemRoleArgs.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/CreateSystemRoleArgs.java @@ -1,7 +1,7 @@ -package cn.odboy.core.dal.model.system; +package cn.odboy.core.dal.model; import cn.odboy.base.CsSerializeObject; -import cn.odboy.core.dal.dataobject.system.SystemDeptTb; +import cn.odboy.core.dal.dataobject.SystemDeptTb; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/system/QuerySystemDeptArgs.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/QuerySystemDeptArgs.java similarity index 93% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/system/QuerySystemDeptArgs.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/QuerySystemDeptArgs.java index 5924ece8..3858f1cd 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/system/QuerySystemDeptArgs.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/QuerySystemDeptArgs.java @@ -1,4 +1,4 @@ -package cn.odboy.core.dal.model.system; +package cn.odboy.core.dal.model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/system/QuerySystemDictArgs.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/QuerySystemDictArgs.java similarity index 90% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/system/QuerySystemDictArgs.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/QuerySystemDictArgs.java index 49c5bca9..5262aa8b 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/system/QuerySystemDictArgs.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/QuerySystemDictArgs.java @@ -1,4 +1,4 @@ -package cn.odboy.core.dal.model.system; +package cn.odboy.core.dal.model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/system/QuerySystemDictDetailArgs.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/QuerySystemDictDetailArgs.java similarity index 91% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/system/QuerySystemDictDetailArgs.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/QuerySystemDictDetailArgs.java index 2db67c33..1c3dda94 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/system/QuerySystemDictDetailArgs.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/QuerySystemDictDetailArgs.java @@ -1,4 +1,4 @@ -package cn.odboy.core.dal.model.system; +package cn.odboy.core.dal.model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/system/QuerySystemJobArgs.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/QuerySystemJobArgs.java similarity index 93% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/system/QuerySystemJobArgs.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/QuerySystemJobArgs.java index 84aeae70..08f8766b 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/system/QuerySystemJobArgs.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/QuerySystemJobArgs.java @@ -1,4 +1,4 @@ -package cn.odboy.core.dal.model.system; +package cn.odboy.core.dal.model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/system/QuerySystemLocalStorageArgs.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/QuerySystemLocalStorageArgs.java similarity index 92% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/system/QuerySystemLocalStorageArgs.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/QuerySystemLocalStorageArgs.java index 9d2e35c3..bda8269e 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/system/QuerySystemLocalStorageArgs.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/QuerySystemLocalStorageArgs.java @@ -1,4 +1,4 @@ -package cn.odboy.core.dal.model.system; +package cn.odboy.core.dal.model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/system/QuerySystemMenuArgs.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/QuerySystemMenuArgs.java similarity index 91% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/system/QuerySystemMenuArgs.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/QuerySystemMenuArgs.java index 2d240be7..3a2af997 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/system/QuerySystemMenuArgs.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/QuerySystemMenuArgs.java @@ -1,4 +1,4 @@ -package cn.odboy.core.dal.model.system; +package cn.odboy.core.dal.model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/system/QuerySystemQiniuArgs.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/QuerySystemQiniuArgs.java similarity index 92% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/system/QuerySystemQiniuArgs.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/QuerySystemQiniuArgs.java index 6581e30d..fa6a2233 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/system/QuerySystemQiniuArgs.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/QuerySystemQiniuArgs.java @@ -1,4 +1,4 @@ -package cn.odboy.core.dal.model.system; +package cn.odboy.core.dal.model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/system/QuerySystemQuartzJobArgs.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/QuerySystemQuartzJobArgs.java similarity index 93% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/system/QuerySystemQuartzJobArgs.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/QuerySystemQuartzJobArgs.java index 02be3816..169a67f2 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/system/QuerySystemQuartzJobArgs.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/QuerySystemQuartzJobArgs.java @@ -1,4 +1,4 @@ -package cn.odboy.core.dal.model.system; +package cn.odboy.core.dal.model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/system/QuerySystemRoleArgs.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/QuerySystemRoleArgs.java similarity index 93% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/system/QuerySystemRoleArgs.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/QuerySystemRoleArgs.java index 6e54ce8b..7d6ee70f 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/system/QuerySystemRoleArgs.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/QuerySystemRoleArgs.java @@ -1,4 +1,4 @@ -package cn.odboy.core.dal.model.system; +package cn.odboy.core.dal.model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/system/QuerySystemUserArgs.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/QuerySystemUserArgs.java similarity index 96% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/system/QuerySystemUserArgs.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/QuerySystemUserArgs.java index 9be0a72b..f7bd0380 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/system/QuerySystemUserArgs.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/QuerySystemUserArgs.java @@ -1,4 +1,4 @@ -package cn.odboy.core.dal.model.system; +package cn.odboy.core.dal.model; import cn.odboy.base.CsSerializeObject; import io.swagger.annotations.ApiModelProperty; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/system/SendSystemEmailArgs.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/SendSystemEmailArgs.java similarity index 94% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/system/SendSystemEmailArgs.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/SendSystemEmailArgs.java index d995175b..f7f9d79f 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/system/SendSystemEmailArgs.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/SendSystemEmailArgs.java @@ -1,4 +1,4 @@ -package cn.odboy.core.dal.model.system; +package cn.odboy.core.dal.model; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/system/SystemMenuMetaVo.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/SystemMenuMetaVo.java similarity index 92% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/system/SystemMenuMetaVo.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/SystemMenuMetaVo.java index 6035c011..68abcb2b 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/system/SystemMenuMetaVo.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/SystemMenuMetaVo.java @@ -1,4 +1,4 @@ -package cn.odboy.core.dal.model.system; +package cn.odboy.core.dal.model; import cn.odboy.base.CsSerializeObject; import io.swagger.annotations.ApiModelProperty; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/system/SystemMenuVo.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/SystemMenuVo.java similarity index 95% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/system/SystemMenuVo.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/SystemMenuVo.java index f0bc7ecc..f07ee350 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/system/SystemMenuVo.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/SystemMenuVo.java @@ -1,4 +1,4 @@ -package cn.odboy.core.dal.model.system; +package cn.odboy.core.dal.model; import cn.odboy.base.CsSerializeObject; import io.swagger.annotations.ApiModelProperty; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/system/SystemRoleCodeVo.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/SystemRoleCodeVo.java similarity index 91% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/system/SystemRoleCodeVo.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/SystemRoleCodeVo.java index 928735bb..a6d0bc0a 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/system/SystemRoleCodeVo.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/SystemRoleCodeVo.java @@ -1,4 +1,4 @@ -package cn.odboy.core.dal.model.system; +package cn.odboy.core.dal.model; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/system/SystemSimpleUserVo.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/SystemSimpleUserVo.java similarity index 85% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/system/SystemSimpleUserVo.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/SystemSimpleUserVo.java index 6bf37ff5..28f30ac0 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/system/SystemSimpleUserVo.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/SystemSimpleUserVo.java @@ -1,9 +1,9 @@ -package cn.odboy.core.dal.model.system; +package cn.odboy.core.dal.model; import cn.odboy.base.CsSerializeObject; -import cn.odboy.core.dal.dataobject.system.SystemDeptTb; -import cn.odboy.core.dal.dataobject.system.SystemJobTb; -import cn.odboy.core.dal.dataobject.system.SystemRoleTb; +import cn.odboy.core.dal.dataobject.SystemDeptTb; +import cn.odboy.core.dal.dataobject.SystemJobTb; +import cn.odboy.core.dal.dataobject.SystemRoleTb; import com.baomidou.mybatisplus.annotation.TableField; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/system/SystemUserInfoVo.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/SystemUserInfoVo.java similarity index 93% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/system/SystemUserInfoVo.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/SystemUserInfoVo.java index 0f2cfe73..28077194 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/system/SystemUserInfoVo.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/SystemUserInfoVo.java @@ -1,4 +1,4 @@ -package cn.odboy.core.dal.model.system; +package cn.odboy.core.dal.model; import cn.odboy.base.CsSerializeObject; import lombok.Data; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/system/SystemUserJwtVo.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/SystemUserJwtVo.java similarity index 94% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/system/SystemUserJwtVo.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/SystemUserJwtVo.java index 4136ddac..d096dfe0 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/system/SystemUserJwtVo.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/SystemUserJwtVo.java @@ -1,6 +1,6 @@ -package cn.odboy.core.dal.model.system; +package cn.odboy.core.dal.model; -import cn.odboy.core.dal.dataobject.system.SystemUserTb; +import cn.odboy.core.dal.dataobject.SystemUserTb; import com.alibaba.fastjson2.annotation.JSONField; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/system/SystemUserLoginArgs.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/SystemUserLoginArgs.java similarity index 92% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/system/SystemUserLoginArgs.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/SystemUserLoginArgs.java index 3135bf7d..e1d92617 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/system/SystemUserLoginArgs.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/SystemUserLoginArgs.java @@ -1,4 +1,4 @@ -package cn.odboy.core.dal.model.system; +package cn.odboy.core.dal.model; import io.swagger.annotations.ApiModelProperty; import lombok.Getter; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/system/SystemUserOnlineVo.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/SystemUserOnlineVo.java similarity index 95% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/system/SystemUserOnlineVo.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/SystemUserOnlineVo.java index 669ee897..0b5e8fef 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/system/SystemUserOnlineVo.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/SystemUserOnlineVo.java @@ -1,4 +1,4 @@ -package cn.odboy.core.dal.model.system; +package cn.odboy.core.dal.model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/system/UpdateSystemQuartzJobArgs.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/UpdateSystemQuartzJobArgs.java similarity index 95% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/system/UpdateSystemQuartzJobArgs.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/UpdateSystemQuartzJobArgs.java index 5e35cfca..344a0176 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/system/UpdateSystemQuartzJobArgs.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/UpdateSystemQuartzJobArgs.java @@ -1,4 +1,4 @@ -package cn.odboy.core.dal.model.system; +package cn.odboy.core.dal.model; import cn.odboy.base.CsSerializeObject; import lombok.Data; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/system/UpdateSystemUserPasswordArgs.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/UpdateSystemUserPasswordArgs.java similarity index 87% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/system/UpdateSystemUserPasswordArgs.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/UpdateSystemUserPasswordArgs.java index 3f8f7863..e361c91b 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/system/UpdateSystemUserPasswordArgs.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/UpdateSystemUserPasswordArgs.java @@ -1,4 +1,4 @@ -package cn.odboy.core.dal.model.system; +package cn.odboy.core.dal.model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/system/SystemDeptMapper.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/SystemDeptMapper.java similarity index 81% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/system/SystemDeptMapper.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/SystemDeptMapper.java index 210b519f..06b054ea 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/system/SystemDeptMapper.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/SystemDeptMapper.java @@ -1,7 +1,7 @@ -package cn.odboy.core.dal.mysql.system; +package cn.odboy.core.dal.mysql; -import cn.odboy.core.dal.dataobject.system.SystemDeptTb; -import cn.odboy.core.dal.model.system.QuerySystemDeptArgs; +import cn.odboy.core.dal.dataobject.SystemDeptTb; +import cn.odboy.core.dal.model.QuerySystemDeptArgs; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/system/SystemDictDetailMapper.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/SystemDictDetailMapper.java similarity index 82% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/system/SystemDictDetailMapper.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/SystemDictDetailMapper.java index 92a625e7..4c8bb560 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/system/SystemDictDetailMapper.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/SystemDictDetailMapper.java @@ -1,7 +1,7 @@ -package cn.odboy.core.dal.mysql.system; +package cn.odboy.core.dal.mysql; -import cn.odboy.core.dal.dataobject.system.SystemDictDetailTb; -import cn.odboy.core.dal.model.system.QuerySystemDictDetailArgs; +import cn.odboy.core.dal.dataobject.SystemDictDetailTb; +import cn.odboy.core.dal.model.QuerySystemDictDetailArgs; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/system/SystemDictMapper.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/SystemDictMapper.java similarity index 79% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/system/SystemDictMapper.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/SystemDictMapper.java index d0749393..aa0a4705 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/system/SystemDictMapper.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/SystemDictMapper.java @@ -1,7 +1,7 @@ -package cn.odboy.core.dal.mysql.system; +package cn.odboy.core.dal.mysql; -import cn.odboy.core.dal.dataobject.system.SystemDictTb; -import cn.odboy.core.dal.model.system.QuerySystemDictArgs; +import cn.odboy.core.dal.dataobject.SystemDictTb; +import cn.odboy.core.dal.model.QuerySystemDictArgs; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/system/SystemEmailConfigMapper.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/SystemEmailConfigMapper.java similarity index 70% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/system/SystemEmailConfigMapper.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/SystemEmailConfigMapper.java index d2cf727e..1b284a40 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/system/SystemEmailConfigMapper.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/SystemEmailConfigMapper.java @@ -1,6 +1,6 @@ -package cn.odboy.core.dal.mysql.system; +package cn.odboy.core.dal.mysql; -import cn.odboy.core.dal.dataobject.system.SystemEmailConfigTb; +import cn.odboy.core.dal.dataobject.SystemEmailConfigTb; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/system/SystemJobMapper.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/SystemJobMapper.java similarity index 78% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/system/SystemJobMapper.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/SystemJobMapper.java index 4999973d..44d67be4 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/system/SystemJobMapper.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/SystemJobMapper.java @@ -1,7 +1,7 @@ -package cn.odboy.core.dal.mysql.system; +package cn.odboy.core.dal.mysql; -import cn.odboy.core.dal.dataobject.system.SystemJobTb; -import cn.odboy.core.dal.model.system.QuerySystemJobArgs; +import cn.odboy.core.dal.dataobject.SystemJobTb; +import cn.odboy.core.dal.model.QuerySystemJobArgs; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/system/SystemLocalStorageMapper.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/SystemLocalStorageMapper.java similarity index 76% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/system/SystemLocalStorageMapper.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/SystemLocalStorageMapper.java index cd87391f..16c28efd 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/system/SystemLocalStorageMapper.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/SystemLocalStorageMapper.java @@ -1,7 +1,7 @@ -package cn.odboy.core.dal.mysql.system; +package cn.odboy.core.dal.mysql; -import cn.odboy.core.dal.dataobject.system.SystemLocalStorageTb; -import cn.odboy.core.dal.model.system.QuerySystemLocalStorageArgs; +import cn.odboy.core.dal.dataobject.SystemLocalStorageTb; +import cn.odboy.core.dal.model.QuerySystemLocalStorageArgs; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/system/SystemMenuMapper.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/SystemMenuMapper.java similarity index 86% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/system/SystemMenuMapper.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/SystemMenuMapper.java index bf055058..22e1a0e9 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/system/SystemMenuMapper.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/SystemMenuMapper.java @@ -1,7 +1,7 @@ -package cn.odboy.core.dal.mysql.system; +package cn.odboy.core.dal.mysql; -import cn.odboy.core.dal.dataobject.system.SystemMenuTb; -import cn.odboy.core.dal.model.system.QuerySystemMenuArgs; +import cn.odboy.core.dal.dataobject.SystemMenuTb; +import cn.odboy.core.dal.model.QuerySystemMenuArgs; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/system/SystemQiniuConfigMapper.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/SystemQiniuConfigMapper.java similarity index 70% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/system/SystemQiniuConfigMapper.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/SystemQiniuConfigMapper.java index 17fb039d..eab3982b 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/system/SystemQiniuConfigMapper.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/SystemQiniuConfigMapper.java @@ -1,6 +1,6 @@ -package cn.odboy.core.dal.mysql.system; +package cn.odboy.core.dal.mysql; -import cn.odboy.core.dal.dataobject.system.SystemQiniuConfigTb; +import cn.odboy.core.dal.dataobject.SystemQiniuConfigTb; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/system/SystemQiniuContentMapper.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/SystemQiniuContentMapper.java similarity index 79% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/system/SystemQiniuContentMapper.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/SystemQiniuContentMapper.java index 5838f2a7..51022f1b 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/system/SystemQiniuContentMapper.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/SystemQiniuContentMapper.java @@ -1,7 +1,7 @@ -package cn.odboy.core.dal.mysql.system; +package cn.odboy.core.dal.mysql; -import cn.odboy.core.dal.dataobject.system.SystemQiniuContentTb; -import cn.odboy.core.dal.model.system.QuerySystemQiniuArgs; +import cn.odboy.core.dal.dataobject.SystemQiniuContentTb; +import cn.odboy.core.dal.model.QuerySystemQiniuArgs; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/system/SystemQuartzJobMapper.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/SystemQuartzJobMapper.java similarity index 78% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/system/SystemQuartzJobMapper.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/SystemQuartzJobMapper.java index 24253006..2b05b72b 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/system/SystemQuartzJobMapper.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/SystemQuartzJobMapper.java @@ -1,7 +1,7 @@ -package cn.odboy.core.dal.mysql.system; +package cn.odboy.core.dal.mysql; -import cn.odboy.core.dal.dataobject.system.SystemQuartzJobTb; -import cn.odboy.core.dal.model.system.QuerySystemQuartzJobArgs; +import cn.odboy.core.dal.dataobject.SystemQuartzJobTb; +import cn.odboy.core.dal.model.QuerySystemQuartzJobArgs; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/system/SystemQuartzLogMapper.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/SystemQuartzLogMapper.java similarity index 76% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/system/SystemQuartzLogMapper.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/SystemQuartzLogMapper.java index 4b7cf423..31a222ba 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/system/SystemQuartzLogMapper.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/SystemQuartzLogMapper.java @@ -1,7 +1,7 @@ -package cn.odboy.core.dal.mysql.system; +package cn.odboy.core.dal.mysql; -import cn.odboy.core.dal.dataobject.system.SystemQuartzLogTb; -import cn.odboy.core.dal.model.system.QuerySystemQuartzJobArgs; +import cn.odboy.core.dal.dataobject.SystemQuartzLogTb; +import cn.odboy.core.dal.model.QuerySystemQuartzJobArgs; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/system/SystemRoleDeptMapper.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/SystemRoleDeptMapper.java similarity index 80% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/system/SystemRoleDeptMapper.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/SystemRoleDeptMapper.java index 749724a8..efdb8d11 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/system/SystemRoleDeptMapper.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/SystemRoleDeptMapper.java @@ -1,6 +1,6 @@ -package cn.odboy.core.dal.mysql.system; +package cn.odboy.core.dal.mysql; -import cn.odboy.core.dal.dataobject.system.SystemDeptTb; +import cn.odboy.core.dal.dataobject.SystemDeptTb; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/system/SystemRoleMapper.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/SystemRoleMapper.java similarity index 84% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/system/SystemRoleMapper.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/SystemRoleMapper.java index 62ec8853..bc997e9c 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/system/SystemRoleMapper.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/SystemRoleMapper.java @@ -1,7 +1,7 @@ -package cn.odboy.core.dal.mysql.system; +package cn.odboy.core.dal.mysql; -import cn.odboy.core.dal.dataobject.system.SystemRoleTb; -import cn.odboy.core.dal.model.system.QuerySystemRoleArgs; +import cn.odboy.core.dal.dataobject.SystemRoleTb; +import cn.odboy.core.dal.model.QuerySystemRoleArgs; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/system/SystemRoleMenuMapper.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/SystemRoleMenuMapper.java similarity index 84% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/system/SystemRoleMenuMapper.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/SystemRoleMenuMapper.java index f15cc204..524c83f1 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/system/SystemRoleMenuMapper.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/SystemRoleMenuMapper.java @@ -1,6 +1,6 @@ -package cn.odboy.core.dal.mysql.system; +package cn.odboy.core.dal.mysql; -import cn.odboy.core.dal.dataobject.system.SystemMenuTb; +import cn.odboy.core.dal.dataobject.SystemMenuTb; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/system/SystemUserJobMapper.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/SystemUserJobMapper.java similarity index 80% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/system/SystemUserJobMapper.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/SystemUserJobMapper.java index 717bfac5..5a5831cb 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/system/SystemUserJobMapper.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/SystemUserJobMapper.java @@ -1,6 +1,6 @@ -package cn.odboy.core.dal.mysql.system; +package cn.odboy.core.dal.mysql; -import cn.odboy.core.dal.dataobject.system.SystemJobTb; +import cn.odboy.core.dal.dataobject.SystemJobTb; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/system/SystemUserMapper.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/SystemUserMapper.java similarity index 90% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/system/SystemUserMapper.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/SystemUserMapper.java index 8b71db15..ecfc3b9a 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/system/SystemUserMapper.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/SystemUserMapper.java @@ -1,7 +1,7 @@ -package cn.odboy.core.dal.mysql.system; +package cn.odboy.core.dal.mysql; -import cn.odboy.core.dal.dataobject.system.SystemUserTb; -import cn.odboy.core.dal.model.system.QuerySystemUserArgs; +import cn.odboy.core.dal.dataobject.SystemUserTb; +import cn.odboy.core.dal.model.QuerySystemUserArgs; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/system/SystemUserRoleMapper.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/SystemUserRoleMapper.java similarity index 77% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/system/SystemUserRoleMapper.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/SystemUserRoleMapper.java index 0ad3c37d..892f036f 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/system/SystemUserRoleMapper.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/SystemUserRoleMapper.java @@ -1,6 +1,6 @@ -package cn.odboy.core.dal.mysql.system; +package cn.odboy.core.dal.mysql; -import cn.odboy.core.dal.dataobject.system.SystemRoleTb; +import cn.odboy.core.dal.dataobject.SystemRoleTb; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/redis/system/SystemRedisKey.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/redis/SystemRedisKey.java similarity index 95% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/redis/system/SystemRedisKey.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/redis/SystemRedisKey.java index 1a9a489e..96b60edf 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/redis/system/SystemRedisKey.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/redis/SystemRedisKey.java @@ -1,4 +1,4 @@ -package cn.odboy.core.dal.redis.system; +package cn.odboy.core.dal.redis; /** * 关于缓存的Key集合 diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/redis/system/SystemUserInfoDAO.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/redis/SystemUserInfoDAO.java similarity index 94% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/redis/system/SystemUserInfoDAO.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/redis/SystemUserInfoDAO.java index c62a8b58..eb858825 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/redis/system/SystemUserInfoDAO.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/redis/SystemUserInfoDAO.java @@ -1,7 +1,7 @@ -package cn.odboy.core.dal.redis.system; +package cn.odboy.core.dal.redis; import cn.hutool.core.util.RandomUtil; -import cn.odboy.core.dal.model.system.SystemUserJwtVo; +import cn.odboy.core.dal.model.SystemUserJwtVo; import cn.odboy.redis.RedisHelper; import cn.odboy.util.StringUtil; import lombok.RequiredArgsConstructor; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/redis/system/SystemUserOnlineInfoDAO.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/redis/SystemUserOnlineInfoDAO.java similarity index 96% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/redis/system/SystemUserOnlineInfoDAO.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/redis/SystemUserOnlineInfoDAO.java index 2de61432..f7d8189d 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/redis/system/SystemUserOnlineInfoDAO.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/redis/SystemUserOnlineInfoDAO.java @@ -1,8 +1,8 @@ -package cn.odboy.core.dal.redis.system; +package cn.odboy.core.dal.redis; import cn.odboy.base.CsResultVo; -import cn.odboy.core.dal.model.system.SystemUserJwtVo; -import cn.odboy.core.dal.model.system.SystemUserOnlineVo; +import cn.odboy.core.dal.model.SystemUserJwtVo; +import cn.odboy.core.dal.model.SystemUserOnlineVo; import cn.odboy.core.framework.permission.core.handler.TokenProvider; import cn.odboy.core.framework.properties.AppProperties; import cn.odboy.redis.RedisHelper; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/permission/config/SpringSecurityConfig.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/permission/config/SpringSecurityConfig.java index 478d69c8..61ef5d4c 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/permission/config/SpringSecurityConfig.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/permission/config/SpringSecurityConfig.java @@ -1,7 +1,7 @@ package cn.odboy.core.framework.permission.config; import cn.odboy.constant.RequestMethodEnum; -import cn.odboy.core.dal.redis.system.SystemUserOnlineInfoDAO; +import cn.odboy.core.dal.redis.SystemUserOnlineInfoDAO; import cn.odboy.core.framework.permission.core.handler.JwtAccessDeniedHandler; import cn.odboy.core.framework.permission.core.handler.JwtAuthenticationEntryPoint; import cn.odboy.core.framework.permission.core.handler.TokenProvider; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/permission/config/TokenConfigurer.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/permission/config/TokenConfigurer.java index ea190f30..a2805026 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/permission/config/TokenConfigurer.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/permission/config/TokenConfigurer.java @@ -1,6 +1,6 @@ package cn.odboy.core.framework.permission.config; -import cn.odboy.core.dal.redis.system.SystemUserOnlineInfoDAO; +import cn.odboy.core.dal.redis.SystemUserOnlineInfoDAO; import cn.odboy.core.framework.permission.core.handler.TokenFilter; import cn.odboy.core.framework.permission.core.handler.TokenProvider; import lombok.RequiredArgsConstructor; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/permission/core/SecurityHelper.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/permission/core/SecurityHelper.java index 96e10f2d..965f9c4f 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/permission/core/SecurityHelper.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/permission/core/SecurityHelper.java @@ -5,7 +5,7 @@ import cn.hutool.jwt.JWT; import cn.hutool.jwt.JWTUtil; import cn.odboy.constant.SystemConst; import cn.odboy.context.SpringBeanHolder; -import cn.odboy.core.constant.system.SystemDataScopeEnum; +import cn.odboy.core.constant.SystemDataScopeEnum; import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONArray; import com.alibaba.fastjson2.JSONObject; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/permission/core/handler/TokenFilter.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/permission/core/handler/TokenFilter.java index 3d081faf..d7d95c4f 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/permission/core/handler/TokenFilter.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/permission/core/handler/TokenFilter.java @@ -2,8 +2,8 @@ package cn.odboy.core.framework.permission.core.handler; import cn.hutool.core.util.StrUtil; import cn.odboy.constant.SystemConst; -import cn.odboy.core.dal.model.system.SystemUserOnlineVo; -import cn.odboy.core.dal.redis.system.SystemUserOnlineInfoDAO; +import cn.odboy.core.dal.model.SystemUserOnlineVo; +import cn.odboy.core.dal.redis.SystemUserOnlineInfoDAO; import lombok.extern.slf4j.Slf4j; import org.springframework.security.core.Authentication; import org.springframework.security.core.context.SecurityContextHolder; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/permission/core/handler/TokenProvider.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/permission/core/handler/TokenProvider.java index 2126102e..e25b6052 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/permission/core/handler/TokenProvider.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/permission/core/handler/TokenProvider.java @@ -4,8 +4,8 @@ import cn.hutool.core.date.DateField; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.IdUtil; import cn.odboy.constant.SystemConst; -import cn.odboy.core.dal.model.system.SystemUserJwtVo; -import cn.odboy.core.dal.redis.system.SystemRedisKey; +import cn.odboy.core.dal.model.SystemUserJwtVo; +import cn.odboy.core.dal.redis.SystemRedisKey; import cn.odboy.core.framework.properties.AppProperties; import cn.odboy.redis.RedisHelper; import io.jsonwebtoken.Claims; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/permission/core/handler/UserDetailsHandler.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/permission/core/handler/UserDetailsHandler.java index e89dd6d7..f7103cf8 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/permission/core/handler/UserDetailsHandler.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/permission/core/handler/UserDetailsHandler.java @@ -1,12 +1,12 @@ package cn.odboy.core.framework.permission.core.handler; -import cn.odboy.core.dal.dataobject.system.SystemUserTb; -import cn.odboy.core.dal.model.system.SystemRoleCodeVo; -import cn.odboy.core.dal.model.system.SystemUserJwtVo; -import cn.odboy.core.dal.redis.system.SystemUserInfoDAO; -import cn.odboy.core.service.system.SystemDataService; -import cn.odboy.core.service.system.SystemRoleService; -import cn.odboy.core.service.system.SystemUserService; +import cn.odboy.core.dal.dataobject.SystemUserTb; +import cn.odboy.core.dal.model.SystemRoleCodeVo; +import cn.odboy.core.dal.model.SystemUserJwtVo; +import cn.odboy.core.dal.redis.SystemUserInfoDAO; +import cn.odboy.core.service.SystemDataService; +import cn.odboy.core.service.SystemRoleService; +import cn.odboy.core.service.SystemUserService; import cn.odboy.exception.BadRequestException; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/properties/model/UserLoginCaptchaSettingModel.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/properties/model/UserLoginCaptchaSettingModel.java index 1b54c11e..75255316 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/properties/model/UserLoginCaptchaSettingModel.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/properties/model/UserLoginCaptchaSettingModel.java @@ -1,6 +1,6 @@ package cn.odboy.core.framework.properties.model; -import cn.odboy.core.constant.LoginCodeEnum; +import cn.odboy.core.constant.CaptchaCodeEnum; import cn.odboy.exception.BadRequestException; import cn.odboy.util.StringUtil; import com.wf.captcha.*; @@ -18,7 +18,7 @@ import java.awt.*; @Getter @Setter public class UserLoginCaptchaSettingModel { - private LoginCodeEnum codeType; + private CaptchaCodeEnum codeType; /** * 验证码有效期 分钟 diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/quartz/core/ExecutionJobBean.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/quartz/core/ExecutionJobBean.java index 26ea5c92..976479af 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/quartz/core/ExecutionJobBean.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/quartz/core/ExecutionJobBean.java @@ -6,12 +6,12 @@ import cn.hutool.extra.template.TemplateConfig; import cn.hutool.extra.template.TemplateEngine; import cn.hutool.extra.template.TemplateUtil; import cn.odboy.context.SpringBeanHolder; -import cn.odboy.core.dal.dataobject.system.SystemQuartzJobTb; -import cn.odboy.core.dal.dataobject.system.SystemQuartzLogTb; -import cn.odboy.core.dal.model.system.SendSystemEmailArgs; -import cn.odboy.core.dal.mysql.system.SystemQuartzLogMapper; -import cn.odboy.core.service.system.SystemEmailService; -import cn.odboy.core.service.system.SystemQuartzJobService; +import cn.odboy.core.dal.dataobject.SystemQuartzJobTb; +import cn.odboy.core.dal.dataobject.SystemQuartzLogTb; +import cn.odboy.core.dal.model.SendSystemEmailArgs; +import cn.odboy.core.dal.mysql.SystemQuartzLogMapper; +import cn.odboy.core.service.SystemEmailService; +import cn.odboy.core.service.SystemQuartzJobService; import cn.odboy.redis.RedisHelper; import cn.odboy.util.StringUtil; import lombok.extern.slf4j.Slf4j; @@ -106,7 +106,7 @@ public class ExecutionJobBean extends QuartzJobBean { data.put("task", quartzJob); data.put("msg", msg); TemplateEngine engine = TemplateUtil.createEngine(new TemplateConfig("template", TemplateConfig.ResourceMode.CLASSPATH)); - Template template = engine.getTemplate("taskAlarm.ftl"); + Template template = engine.getTemplate("SystemQuartzJobTaskAlarmTemplate.ftl"); sendEmailRequest.setContent(template.render(data)); List emails = Arrays.asList(quartzJob.getEmail().split("[,，]")); sendEmailRequest.setTos(emails); diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/quartz/core/InitialActiveJobApplicationRunner.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/quartz/core/InitialActiveJobApplicationRunner.java index d7c77ee2..218b185f 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/quartz/core/InitialActiveJobApplicationRunner.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/quartz/core/InitialActiveJobApplicationRunner.java @@ -1,7 +1,7 @@ package cn.odboy.core.framework.quartz.core; -import cn.odboy.core.dal.dataobject.system.SystemQuartzJobTb; -import cn.odboy.core.dal.mysql.system.SystemQuartzJobMapper; +import cn.odboy.core.dal.dataobject.SystemQuartzJobTb; +import cn.odboy.core.dal.mysql.SystemQuartzJobMapper; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.boot.ApplicationArguments; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/quartz/core/QuartzManage.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/quartz/core/QuartzManage.java index ed876523..cc99280a 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/quartz/core/QuartzManage.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/quartz/core/QuartzManage.java @@ -1,6 +1,6 @@ package cn.odboy.core.framework.quartz.core; -import cn.odboy.core.dal.dataobject.system.SystemQuartzJobTb; +import cn.odboy.core.dal.dataobject.SystemQuartzJobTb; import cn.odboy.exception.BadRequestException; import lombok.extern.slf4j.Slf4j; import org.quartz.*; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/SystemDataService.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/SystemDataService.java similarity index 89% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/SystemDataService.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/service/SystemDataService.java index 8bf836b1..3e8d3787 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/SystemDataService.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/SystemDataService.java @@ -1,10 +1,10 @@ -package cn.odboy.core.service.system; +package cn.odboy.core.service; import cn.hutool.core.collection.CollUtil; -import cn.odboy.core.constant.system.SystemDataScopeEnum; -import cn.odboy.core.dal.dataobject.system.SystemDeptTb; -import cn.odboy.core.dal.dataobject.system.SystemRoleTb; -import cn.odboy.core.dal.dataobject.system.SystemUserTb; +import cn.odboy.core.constant.SystemDataScopeEnum; +import cn.odboy.core.dal.dataobject.SystemDeptTb; +import cn.odboy.core.dal.dataobject.SystemRoleTb; +import cn.odboy.core.dal.dataobject.SystemUserTb; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/SystemDeptService.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/SystemDeptService.java similarity index 96% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/SystemDeptService.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/service/SystemDeptService.java index 7f3ef885..891c0568 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/SystemDeptService.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/SystemDeptService.java @@ -1,17 +1,17 @@ -package cn.odboy.core.service.system; +package cn.odboy.core.service; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.ObjectUtil; import cn.odboy.base.CsResultVo; -import cn.odboy.core.constant.system.SystemDataScopeEnum; -import cn.odboy.core.dal.dataobject.system.SystemDeptTb; -import cn.odboy.core.dal.model.system.CreateSystemDeptArgs; -import cn.odboy.core.dal.model.system.QuerySystemDeptArgs; -import cn.odboy.core.dal.mysql.system.SystemDeptMapper; -import cn.odboy.core.dal.mysql.system.SystemRoleMapper; -import cn.odboy.core.dal.mysql.system.SystemUserMapper; +import cn.odboy.core.constant.SystemDataScopeEnum; +import cn.odboy.core.dal.dataobject.SystemDeptTb; +import cn.odboy.core.dal.model.CreateSystemDeptArgs; +import cn.odboy.core.dal.model.QuerySystemDeptArgs; +import cn.odboy.core.dal.mysql.SystemDeptMapper; +import cn.odboy.core.dal.mysql.SystemRoleMapper; +import cn.odboy.core.dal.mysql.SystemUserMapper; import cn.odboy.core.framework.permission.core.SecurityHelper; import cn.odboy.exception.BadRequestException; import cn.odboy.util.ClassUtil; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/SystemDictDetailService.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/SystemDictDetailService.java similarity index 88% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/SystemDictDetailService.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/service/SystemDictDetailService.java index 6ebf13f8..a917acff 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/SystemDictDetailService.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/SystemDictDetailService.java @@ -1,11 +1,11 @@ -package cn.odboy.core.service.system; +package cn.odboy.core.service; import cn.hutool.core.bean.BeanUtil; import cn.odboy.base.CsResultVo; -import cn.odboy.core.dal.dataobject.system.SystemDictDetailTb; -import cn.odboy.core.dal.model.system.CreateSystemDictDetailArgs; -import cn.odboy.core.dal.model.system.QuerySystemDictDetailArgs; -import cn.odboy.core.dal.mysql.system.SystemDictDetailMapper; +import cn.odboy.core.dal.dataobject.SystemDictDetailTb; +import cn.odboy.core.dal.model.CreateSystemDictDetailArgs; +import cn.odboy.core.dal.model.QuerySystemDictDetailArgs; +import cn.odboy.core.dal.mysql.SystemDictDetailMapper; import cn.odboy.util.CsPageUtil; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.RequiredArgsConstructor; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/SystemDictService.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/SystemDictService.java similarity index 89% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/SystemDictService.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/service/SystemDictService.java index 88158a0b..c41bc29f 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/SystemDictService.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/SystemDictService.java @@ -1,15 +1,15 @@ -package cn.odboy.core.service.system; +package cn.odboy.core.service; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; import cn.odboy.base.CsResultVo; -import cn.odboy.core.dal.dataobject.system.SystemDictDetailTb; -import cn.odboy.core.dal.dataobject.system.SystemDictTb; -import cn.odboy.core.dal.model.system.CreateSystemDictArgs; -import cn.odboy.core.dal.model.system.QuerySystemDictArgs; -import cn.odboy.core.dal.model.system.QuerySystemDictDetailArgs; -import cn.odboy.core.dal.mysql.system.SystemDictDetailMapper; -import cn.odboy.core.dal.mysql.system.SystemDictMapper; +import cn.odboy.core.dal.dataobject.SystemDictDetailTb; +import cn.odboy.core.dal.dataobject.SystemDictTb; +import cn.odboy.core.dal.model.CreateSystemDictArgs; +import cn.odboy.core.dal.model.QuerySystemDictArgs; +import cn.odboy.core.dal.model.QuerySystemDictDetailArgs; +import cn.odboy.core.dal.mysql.SystemDictDetailMapper; +import cn.odboy.core.dal.mysql.SystemDictMapper; import cn.odboy.util.CsPageUtil; import cn.odboy.util.FileUtil; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/SystemEmailService.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/SystemEmailService.java similarity index 95% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/SystemEmailService.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/service/SystemEmailService.java index e9898639..2ef2cfdd 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/SystemEmailService.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/SystemEmailService.java @@ -1,13 +1,13 @@ -package cn.odboy.core.service.system; +package cn.odboy.core.service; import cn.hutool.core.lang.Dict; import cn.hutool.core.util.RandomUtil; import cn.hutool.extra.mail.Mail; import cn.hutool.extra.mail.MailAccount; -import cn.odboy.core.constant.system.SystemCaptchaBizEnum; -import cn.odboy.core.dal.dataobject.system.SystemEmailConfigTb; -import cn.odboy.core.dal.model.system.SendSystemEmailArgs; -import cn.odboy.core.dal.mysql.system.SystemEmailConfigMapper; +import cn.odboy.core.constant.SystemCaptchaBizEnum; +import cn.odboy.core.dal.dataobject.SystemEmailConfigTb; +import cn.odboy.core.dal.model.SendSystemEmailArgs; +import cn.odboy.core.dal.mysql.SystemEmailConfigMapper; import cn.odboy.core.framework.templatefile.CsResourceTemplateUtil; import cn.odboy.exception.BadRequestException; import cn.odboy.redis.RedisHelper; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/SystemJobService.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/SystemJobService.java similarity index 91% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/SystemJobService.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/service/SystemJobService.java index 01fcab36..4272d591 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/SystemJobService.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/SystemJobService.java @@ -1,12 +1,12 @@ -package cn.odboy.core.service.system; +package cn.odboy.core.service; import cn.hutool.core.bean.BeanUtil; import cn.odboy.base.CsResultVo; -import cn.odboy.core.dal.dataobject.system.SystemJobTb; -import cn.odboy.core.dal.model.system.CreateSystemJobArgs; -import cn.odboy.core.dal.model.system.QuerySystemJobArgs; -import cn.odboy.core.dal.mysql.system.SystemJobMapper; -import cn.odboy.core.dal.mysql.system.SystemUserMapper; +import cn.odboy.core.dal.dataobject.SystemJobTb; +import cn.odboy.core.dal.model.CreateSystemJobArgs; +import cn.odboy.core.dal.model.QuerySystemJobArgs; +import cn.odboy.core.dal.mysql.SystemJobMapper; +import cn.odboy.core.dal.mysql.SystemUserMapper; import cn.odboy.exception.BadRequestException; import cn.odboy.util.CsPageUtil; import cn.odboy.util.FileUtil; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/SystemLocalStorageService.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/SystemLocalStorageService.java similarity index 95% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/SystemLocalStorageService.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/service/SystemLocalStorageService.java index f829e7c6..0bef266f 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/SystemLocalStorageService.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/SystemLocalStorageService.java @@ -1,10 +1,10 @@ -package cn.odboy.core.service.system; +package cn.odboy.core.service; import cn.hutool.core.util.ObjectUtil; import cn.odboy.base.CsResultVo; -import cn.odboy.core.dal.dataobject.system.SystemLocalStorageTb; -import cn.odboy.core.dal.model.system.QuerySystemLocalStorageArgs; -import cn.odboy.core.dal.mysql.system.SystemLocalStorageMapper; +import cn.odboy.core.dal.dataobject.SystemLocalStorageTb; +import cn.odboy.core.dal.model.QuerySystemLocalStorageArgs; +import cn.odboy.core.dal.mysql.SystemLocalStorageMapper; import cn.odboy.core.framework.properties.AppProperties; import cn.odboy.exception.BadRequestException; import cn.odboy.util.CsPageUtil; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/SystemMenuService.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/SystemMenuService.java similarity index 96% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/SystemMenuService.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/service/SystemMenuService.java index f9ddff98..43e893ba 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/SystemMenuService.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/SystemMenuService.java @@ -1,17 +1,16 @@ -package cn.odboy.core.service.system; +package cn.odboy.core.service; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.ObjectUtil; import cn.odboy.core.constant.TransferProtocolConst; -import cn.odboy.core.dal.dataobject.system.SystemMenuTb; -import cn.odboy.core.dal.dataobject.system.SystemRoleTb; -import cn.odboy.core.dal.model.system.QuerySystemMenuArgs; -import cn.odboy.core.dal.model.system.SystemMenuMetaVo; -import cn.odboy.core.dal.model.system.SystemMenuVo; -import cn.odboy.core.dal.mysql.system.SystemMenuMapper; -import cn.odboy.core.dal.mysql.system.SystemRoleMenuMapper; -import cn.odboy.core.dal.mysql.system.SystemUserMapper; +import cn.odboy.core.dal.dataobject.SystemMenuTb; +import cn.odboy.core.dal.dataobject.SystemRoleTb; +import cn.odboy.core.dal.model.QuerySystemMenuArgs; +import cn.odboy.core.dal.model.SystemMenuMetaVo; +import cn.odboy.core.dal.model.SystemMenuVo; +import cn.odboy.core.dal.mysql.SystemMenuMapper; +import cn.odboy.core.dal.mysql.SystemRoleMenuMapper; import cn.odboy.exception.BadRequestException; import cn.odboy.util.ClassUtil; import cn.odboy.util.FileUtil; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/SystemMonitorService.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/SystemMonitorService.java similarity index 99% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/SystemMonitorService.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/service/SystemMonitorService.java index 4265997f..0c00826c 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/SystemMonitorService.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/SystemMonitorService.java @@ -1,4 +1,4 @@ -package cn.odboy.core.service.system; +package cn.odboy.core.service; import cn.hutool.core.date.BetweenFormatter.Level; import cn.hutool.core.date.DateUtil; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/SystemQiniuConfigService.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/SystemQiniuConfigService.java similarity index 90% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/SystemQiniuConfigService.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/service/SystemQiniuConfigService.java index c1f16830..b116499e 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/SystemQiniuConfigService.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/SystemQiniuConfigService.java @@ -1,8 +1,8 @@ -package cn.odboy.core.service.system; +package cn.odboy.core.service; import cn.odboy.core.constant.TransferProtocolConst; -import cn.odboy.core.dal.dataobject.system.SystemQiniuConfigTb; -import cn.odboy.core.dal.mysql.system.SystemQiniuConfigMapper; +import cn.odboy.core.dal.dataobject.SystemQiniuConfigTb; +import cn.odboy.core.dal.mysql.SystemQiniuConfigMapper; import cn.odboy.exception.BadRequestException; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/SystemQiniuContentService.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/SystemQiniuContentService.java similarity index 97% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/SystemQiniuContentService.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/service/SystemQiniuContentService.java index e7068b10..dc0fb09d 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/SystemQiniuContentService.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/SystemQiniuContentService.java @@ -1,10 +1,10 @@ -package cn.odboy.core.service.system; +package cn.odboy.core.service; import cn.odboy.base.CsResultVo; -import cn.odboy.core.dal.dataobject.system.SystemQiniuConfigTb; -import cn.odboy.core.dal.dataobject.system.SystemQiniuContentTb; -import cn.odboy.core.dal.model.system.QuerySystemQiniuArgs; -import cn.odboy.core.dal.mysql.system.SystemQiniuContentMapper; +import cn.odboy.core.dal.dataobject.SystemQiniuConfigTb; +import cn.odboy.core.dal.dataobject.SystemQiniuContentTb; +import cn.odboy.core.dal.model.QuerySystemQiniuArgs; +import cn.odboy.core.dal.mysql.SystemQiniuContentMapper; import cn.odboy.core.util.QiniuUtil; import cn.odboy.exception.BadRequestException; import cn.odboy.util.CsPageUtil; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/SystemQuartzJobService.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/SystemQuartzJobService.java similarity index 95% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/SystemQuartzJobService.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/service/SystemQuartzJobService.java index d70b93cc..7c965483 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/SystemQuartzJobService.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/SystemQuartzJobService.java @@ -1,15 +1,15 @@ -package cn.odboy.core.service.system; +package cn.odboy.core.service; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; import cn.odboy.base.CsResultVo; -import cn.odboy.core.dal.dataobject.system.SystemQuartzJobTb; -import cn.odboy.core.dal.dataobject.system.SystemQuartzLogTb; -import cn.odboy.core.dal.model.system.QuerySystemQuartzJobArgs; -import cn.odboy.core.dal.model.system.UpdateSystemQuartzJobArgs; -import cn.odboy.core.dal.mysql.system.SystemQuartzJobMapper; -import cn.odboy.core.dal.mysql.system.SystemQuartzLogMapper; +import cn.odboy.core.dal.dataobject.SystemQuartzJobTb; +import cn.odboy.core.dal.dataobject.SystemQuartzLogTb; +import cn.odboy.core.dal.model.QuerySystemQuartzJobArgs; +import cn.odboy.core.dal.model.UpdateSystemQuartzJobArgs; +import cn.odboy.core.dal.mysql.SystemQuartzJobMapper; +import cn.odboy.core.dal.mysql.SystemQuartzLogMapper; import cn.odboy.core.framework.quartz.core.QuartzManage; import cn.odboy.exception.BadRequestException; import cn.odboy.redis.RedisHelper; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/SystemRoleService.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/SystemRoleService.java similarity index 92% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/SystemRoleService.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/service/SystemRoleService.java index efcd0208..746d48e0 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/SystemRoleService.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/SystemRoleService.java @@ -1,19 +1,19 @@ -package cn.odboy.core.service.system; +package cn.odboy.core.service; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollectionUtil; import cn.odboy.base.CsResultVo; -import cn.odboy.core.dal.dataobject.system.SystemMenuTb; -import cn.odboy.core.dal.dataobject.system.SystemRoleTb; -import cn.odboy.core.dal.dataobject.system.SystemUserTb; -import cn.odboy.core.dal.model.system.CreateSystemRoleArgs; -import cn.odboy.core.dal.model.system.QuerySystemRoleArgs; -import cn.odboy.core.dal.model.system.SystemRoleCodeVo; -import cn.odboy.core.dal.mysql.system.SystemRoleDeptMapper; -import cn.odboy.core.dal.mysql.system.SystemRoleMapper; -import cn.odboy.core.dal.mysql.system.SystemRoleMenuMapper; -import cn.odboy.core.dal.mysql.system.SystemUserMapper; +import cn.odboy.core.dal.dataobject.SystemMenuTb; +import cn.odboy.core.dal.dataobject.SystemRoleTb; +import cn.odboy.core.dal.dataobject.SystemUserTb; +import cn.odboy.core.dal.model.CreateSystemRoleArgs; +import cn.odboy.core.dal.model.QuerySystemRoleArgs; +import cn.odboy.core.dal.model.SystemRoleCodeVo; +import cn.odboy.core.dal.mysql.SystemRoleDeptMapper; +import cn.odboy.core.dal.mysql.SystemRoleMapper; +import cn.odboy.core.dal.mysql.SystemRoleMenuMapper; +import cn.odboy.core.dal.mysql.SystemUserMapper; import cn.odboy.exception.BadRequestException; import cn.odboy.util.CsPageUtil; import cn.odboy.util.FileUtil; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/SystemUserService.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/SystemUserService.java similarity index 95% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/SystemUserService.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/service/SystemUserService.java index c7e36257..cd3187ed 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/SystemUserService.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/SystemUserService.java @@ -1,16 +1,16 @@ -package cn.odboy.core.service.system; +package cn.odboy.core.service; import cn.hutool.core.util.StrUtil; import cn.odboy.base.CsResultVo; -import cn.odboy.core.dal.dataobject.system.SystemJobTb; -import cn.odboy.core.dal.dataobject.system.SystemRoleTb; -import cn.odboy.core.dal.dataobject.system.SystemUserTb; -import cn.odboy.core.dal.model.system.QuerySystemUserArgs; -import cn.odboy.core.dal.mysql.system.SystemUserJobMapper; -import cn.odboy.core.dal.mysql.system.SystemUserMapper; -import cn.odboy.core.dal.mysql.system.SystemUserRoleMapper; -import cn.odboy.core.dal.redis.system.SystemUserInfoDAO; -import cn.odboy.core.dal.redis.system.SystemUserOnlineInfoDAO; +import cn.odboy.core.dal.dataobject.SystemJobTb; +import cn.odboy.core.dal.dataobject.SystemRoleTb; +import cn.odboy.core.dal.dataobject.SystemUserTb; +import cn.odboy.core.dal.model.QuerySystemUserArgs; +import cn.odboy.core.dal.mysql.SystemUserJobMapper; +import cn.odboy.core.dal.mysql.SystemUserMapper; +import cn.odboy.core.dal.mysql.SystemUserRoleMapper; +import cn.odboy.core.dal.redis.SystemUserInfoDAO; +import cn.odboy.core.dal.redis.SystemUserOnlineInfoDAO; import cn.odboy.core.framework.permission.core.SecurityHelper; import cn.odboy.core.framework.properties.AppProperties; import cn.odboy.exception.BadRequestException; diff --git a/cutejava/cutejava-system/src/main/resources/mapper/system/SystemDeptMapper.xml b/cutejava/cutejava-system/src/main/resources/mapper/SystemDeptMapper.xml similarity index 96% rename from cutejava/cutejava-system/src/main/resources/mapper/system/SystemDeptMapper.xml rename to cutejava/cutejava-system/src/main/resources/mapper/SystemDeptMapper.xml index 460f2655..04ac84cd 100644 --- a/cutejava/cutejava-system/src/main/resources/mapper/system/SystemDeptMapper.xml +++ b/cutejava/cutejava-system/src/main/resources/mapper/SystemDeptMapper.xml @@ -1,7 +1,7 @@ - - + + @@ -85,7 +85,7 @@ from system_dept where pid is null - SELECT d.dept_id AS id, d.NAME, d.pid, diff --git a/cutejava/cutejava-system/src/main/resources/mapper/system/SystemDictDetailMapper.xml b/cutejava/cutejava-system/src/main/resources/mapper/SystemDictDetailMapper.xml similarity index 93% rename from cutejava/cutejava-system/src/main/resources/mapper/system/SystemDictDetailMapper.xml rename to cutejava/cutejava-system/src/main/resources/mapper/SystemDictDetailMapper.xml index 37c59987..f7c75908 100644 --- a/cutejava/cutejava-system/src/main/resources/mapper/system/SystemDictDetailMapper.xml +++ b/cutejava/cutejava-system/src/main/resources/mapper/SystemDictDetailMapper.xml @@ -1,7 +1,7 @@ - - + + @@ -11,7 +11,7 @@ - + diff --git a/cutejava/cutejava-system/src/main/resources/mapper/system/SystemDictMapper.xml b/cutejava/cutejava-system/src/main/resources/mapper/SystemDictMapper.xml similarity index 85% rename from cutejava/cutejava-system/src/main/resources/mapper/system/SystemDictMapper.xml rename to cutejava/cutejava-system/src/main/resources/mapper/SystemDictMapper.xml index 3c8026fb..fba9bd43 100644 --- a/cutejava/cutejava-system/src/main/resources/mapper/system/SystemDictMapper.xml +++ b/cutejava/cutejava-system/src/main/resources/mapper/SystemDictMapper.xml @@ -1,7 +1,7 @@ - - SELECT * from system_dict d diff --git a/cutejava/cutejava-system/src/main/resources/mapper/system/SystemJobMapper.xml b/cutejava/cutejava-system/src/main/resources/mapper/SystemJobMapper.xml similarity index 88% rename from cutejava/cutejava-system/src/main/resources/mapper/system/SystemJobMapper.xml rename to cutejava/cutejava-system/src/main/resources/mapper/SystemJobMapper.xml index 4a6dd664..421fb951 100644 --- a/cutejava/cutejava-system/src/main/resources/mapper/system/SystemJobMapper.xml +++ b/cutejava/cutejava-system/src/main/resources/mapper/SystemJobMapper.xml @@ -1,12 +1,12 @@ - - select id from system_job where name = #{name} - select * from system_job diff --git a/cutejava/cutejava-system/src/main/resources/mapper/system/SystemLocalStorageMapper.xml b/cutejava/cutejava-system/src/main/resources/mapper/SystemLocalStorageMapper.xml similarity index 88% rename from cutejava/cutejava-system/src/main/resources/mapper/system/SystemLocalStorageMapper.xml rename to cutejava/cutejava-system/src/main/resources/mapper/SystemLocalStorageMapper.xml index 5b211162..ef65a622 100644 --- a/cutejava/cutejava-system/src/main/resources/mapper/system/SystemLocalStorageMapper.xml +++ b/cutejava/cutejava-system/src/main/resources/mapper/SystemLocalStorageMapper.xml @@ -1,7 +1,7 @@ - - select * from system_local_storage diff --git a/cutejava/cutejava-system/src/main/resources/mapper/system/SystemMenuMapper.xml b/cutejava/cutejava-system/src/main/resources/mapper/SystemMenuMapper.xml similarity index 96% rename from cutejava/cutejava-system/src/main/resources/mapper/system/SystemMenuMapper.xml rename to cutejava/cutejava-system/src/main/resources/mapper/SystemMenuMapper.xml index f65516f7..5e5bbd8d 100644 --- a/cutejava/cutejava-system/src/main/resources/mapper/system/SystemMenuMapper.xml +++ b/cutejava/cutejava-system/src/main/resources/mapper/SystemMenuMapper.xml @@ -1,7 +1,7 @@ - - + + @@ -101,12 +101,12 @@ WHERE pid = #{pid} ORDER BY menu_sort - SELECT menu_id id FROM system_menu WHERE title = #{title} - SELECT menu_id id FROM system_menu WHERE name = #{name} diff --git a/cutejava/cutejava-system/src/main/resources/mapper/system/SystemQiniuContentMapper.xml b/cutejava/cutejava-system/src/main/resources/mapper/SystemQiniuContentMapper.xml similarity index 83% rename from cutejava/cutejava-system/src/main/resources/mapper/system/SystemQiniuContentMapper.xml rename to cutejava/cutejava-system/src/main/resources/mapper/SystemQiniuContentMapper.xml index b28c7175..4b9af19a 100644 --- a/cutejava/cutejava-system/src/main/resources/mapper/system/SystemQiniuContentMapper.xml +++ b/cutejava/cutejava-system/src/main/resources/mapper/SystemQiniuContentMapper.xml @@ -1,13 +1,13 @@ - - SELECT * FROM system_qiniu_content WHERE name = #{name} - SELECT * FROM system_qiniu_content diff --git a/cutejava/cutejava-system/src/main/resources/mapper/system/SystemQuartzJobMapper.xml b/cutejava/cutejava-system/src/main/resources/mapper/SystemQuartzJobMapper.xml similarity index 84% rename from cutejava/cutejava-system/src/main/resources/mapper/system/SystemQuartzJobMapper.xml rename to cutejava/cutejava-system/src/main/resources/mapper/SystemQuartzJobMapper.xml index a83d3bf0..8e96339b 100644 --- a/cutejava/cutejava-system/src/main/resources/mapper/system/SystemQuartzJobMapper.xml +++ b/cutejava/cutejava-system/src/main/resources/mapper/SystemQuartzJobMapper.xml @@ -1,7 +1,7 @@ - - SELECT * FROM system_quartz_job @@ -15,7 +15,7 @@ ORDER BY id DESC - SELECT * FROM system_quartz_job WHERE is_pause = 0 diff --git a/cutejava/cutejava-system/src/main/resources/mapper/system/SystemQuartzLogMapper.xml b/cutejava/cutejava-system/src/main/resources/mapper/SystemQuartzLogMapper.xml similarity index 87% rename from cutejava/cutejava-system/src/main/resources/mapper/system/SystemQuartzLogMapper.xml rename to cutejava/cutejava-system/src/main/resources/mapper/SystemQuartzLogMapper.xml index f169e8d3..05ff3f52 100644 --- a/cutejava/cutejava-system/src/main/resources/mapper/system/SystemQuartzLogMapper.xml +++ b/cutejava/cutejava-system/src/main/resources/mapper/SystemQuartzLogMapper.xml @@ -1,7 +1,7 @@ - - SELECT * FROM system_quartz_log diff --git a/cutejava/cutejava-system/src/main/resources/mapper/system/SystemRoleDeptMapper.xml b/cutejava/cutejava-system/src/main/resources/mapper/SystemRoleDeptMapper.xml similarity index 89% rename from cutejava/cutejava-system/src/main/resources/mapper/system/SystemRoleDeptMapper.xml rename to cutejava/cutejava-system/src/main/resources/mapper/SystemRoleDeptMapper.xml index 1bc42802..00d97b46 100644 --- a/cutejava/cutejava-system/src/main/resources/mapper/system/SystemRoleDeptMapper.xml +++ b/cutejava/cutejava-system/src/main/resources/mapper/SystemRoleDeptMapper.xml @@ -1,6 +1,6 @@ - + insert into system_roles_depts (role_id, dept_id) values diff --git a/cutejava/cutejava-system/src/main/resources/mapper/system/SystemRoleMapper.xml b/cutejava/cutejava-system/src/main/resources/mapper/SystemRoleMapper.xml similarity index 96% rename from cutejava/cutejava-system/src/main/resources/mapper/system/SystemRoleMapper.xml rename to cutejava/cutejava-system/src/main/resources/mapper/SystemRoleMapper.xml index aa3b4a1f..325efe6c 100644 --- a/cutejava/cutejava-system/src/main/resources/mapper/system/SystemRoleMapper.xml +++ b/cutejava/cutejava-system/src/main/resources/mapper/SystemRoleMapper.xml @@ -1,7 +1,7 @@ - - + + @@ -11,17 +11,17 @@ - + - + - select role_id as id, name, level from system_role order by level @@ -73,7 +73,7 @@ - select role_id as id from system_role where name = #{name} @@ -133,7 +133,7 @@ #{deptId} - SELECT role.role_id as id FROM system_role role, system_roles_menus rm diff --git a/cutejava/cutejava-system/src/main/resources/mapper/system/SystemRoleMenuMapper.xml b/cutejava/cutejava-system/src/main/resources/mapper/SystemRoleMenuMapper.xml similarity index 92% rename from cutejava/cutejava-system/src/main/resources/mapper/system/SystemRoleMenuMapper.xml rename to cutejava/cutejava-system/src/main/resources/mapper/SystemRoleMenuMapper.xml index 7e04174f..75324848 100644 --- a/cutejava/cutejava-system/src/main/resources/mapper/system/SystemRoleMenuMapper.xml +++ b/cutejava/cutejava-system/src/main/resources/mapper/SystemRoleMenuMapper.xml @@ -1,6 +1,6 @@ - + insert into system_roles_menus (role_id, menu_id) values diff --git a/cutejava/cutejava-system/src/main/resources/mapper/system/SystemUserJobMapper.xml b/cutejava/cutejava-system/src/main/resources/mapper/SystemUserJobMapper.xml similarity index 90% rename from cutejava/cutejava-system/src/main/resources/mapper/system/SystemUserJobMapper.xml rename to cutejava/cutejava-system/src/main/resources/mapper/SystemUserJobMapper.xml index 4a94a97e..6ea7af2c 100644 --- a/cutejava/cutejava-system/src/main/resources/mapper/system/SystemUserJobMapper.xml +++ b/cutejava/cutejava-system/src/main/resources/mapper/SystemUserJobMapper.xml @@ -1,6 +1,6 @@ - + insert into system_users_jobs (user_id, job_id) values diff --git a/cutejava/cutejava-system/src/main/resources/mapper/system/SystemUserMapper.xml b/cutejava/cutejava-system/src/main/resources/mapper/SystemUserMapper.xml similarity index 96% rename from cutejava/cutejava-system/src/main/resources/mapper/system/SystemUserMapper.xml rename to cutejava/cutejava-system/src/main/resources/mapper/SystemUserMapper.xml index f70977fe..da041d0c 100644 --- a/cutejava/cutejava-system/src/main/resources/mapper/system/SystemUserMapper.xml +++ b/cutejava/cutejava-system/src/main/resources/mapper/SystemUserMapper.xml @@ -1,7 +1,7 @@ - - + + @@ -19,15 +19,15 @@ - + - + - + @@ -135,12 +135,12 @@ left join system_dept d on u.dept_id = d.dept_id where u.username = #{username} - select user_id as id, username from system_user where email = #{email} - select user_id as id, username from system_user where phone = #{phone} @@ -156,7 +156,7 @@ set email = #{email} where username = #{username} - SELECT u.user_id as id, u.username FROM system_user u, system_users_roles r @@ -164,7 +164,7 @@ AND r.role_id = #{roleId} group by u.user_id - SELECT u.* FROM system_user u, system_users_roles r, @@ -174,7 +174,7 @@ AND d.dept_id = #{deptId} group by u.user_id - SELECT u.user_id as id, u.username FROM system_user u, system_users_roles ur, diff --git a/cutejava/cutejava-system/src/main/resources/mapper/system/SystemUserRoleMapper.xml b/cutejava/cutejava-system/src/main/resources/mapper/SystemUserRoleMapper.xml similarity index 89% rename from cutejava/cutejava-system/src/main/resources/mapper/system/SystemUserRoleMapper.xml rename to cutejava/cutejava-system/src/main/resources/mapper/SystemUserRoleMapper.xml index 6cec99d4..900f3012 100644 --- a/cutejava/cutejava-system/src/main/resources/mapper/system/SystemUserRoleMapper.xml +++ b/cutejava/cutejava-system/src/main/resources/mapper/SystemUserRoleMapper.xml @@ -1,6 +1,6 @@ - + insert into system_users_roles (user_id, role_id) values diff --git a/cutejava/cutejava-system/src/main/resources/template/system/email.ftl b/cutejava/cutejava-system/src/main/resources/template/SystemEmailCaptchaTemplate.ftl similarity index 100% rename from cutejava/cutejava-system/src/main/resources/template/system/email.ftl rename to cutejava/cutejava-system/src/main/resources/template/SystemEmailCaptchaTemplate.ftl diff --git a/cutejava/cutejava-system/src/main/resources/template/system/taskAlarm.ftl b/cutejava/cutejava-system/src/main/resources/template/SystemQuartzJobTaskAlarmTemplate.ftl similarity index 100% rename from cutejava/cutejava-system/src/main/resources/template/system/taskAlarm.ftl rename to cutejava/cutejava-system/src/main/resources/template/SystemQuartzJobTaskAlarmTemplate.ftl