diff --git a/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/framework/redis/RedisConfiguration.java b/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/framework/redis/RedisConfiguration.java index 4b36f312..7c2055c2 100644 --- a/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/framework/redis/RedisConfiguration.java +++ b/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/framework/redis/RedisConfiguration.java @@ -13,7 +13,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package cn.odboy.framework.redis; import com.alibaba.fastjson2.JSON; @@ -28,6 +27,7 @@ import org.apache.commons.codec.digest.MurmurHash3; import org.springframework.boot.autoconfigure.AutoConfigureBefore; import org.springframework.boot.autoconfigure.data.redis.RedisAutoConfiguration; import org.springframework.cache.Cache; +import org.springframework.cache.annotation.CachingConfigurerSupport; import org.springframework.cache.annotation.EnableCaching; import org.springframework.cache.interceptor.CacheErrorHandler; import org.springframework.cache.interceptor.KeyGenerator; @@ -47,14 +47,19 @@ import org.springframework.data.redis.serializer.StringRedisSerializer; @Configuration @EnableCaching @AutoConfigureBefore(RedisAutoConfiguration.class) -public class RedisConfiguration { +public class RedisConfiguration extends CachingConfigurerSupport { /** * 自动识别json对象白名单配置（仅允许解析的包名, 范围越小越安全）
未配置可能导致, 登录失败, 反复登录等问题 */ private static final String[] WHITELIST_STR = - {"org.springframework", "cn.odboy.system.dal.dataobject", "cn.odboy.system.dal.model", - "cn.odboy.task.dal.dataobject", "cn.odboy.task.dal.model",}; + { + "org.springframework", + "cn.odboy.system.dal.dataobject", + "cn.odboy.system.dal.model", + "cn.odboy.task.dal.dataobject", + "cn.odboy.task.dal.model", + }; /** * 设置 redis 数据默认过期时间，默认2小时 设置@cacheable 序列化方式 @@ -63,9 +68,7 @@ public class RedisConfiguration { public RedisCacheConfiguration redisCacheConfiguration() { FastJsonRedisSerializer fastJsonRedisSerializer = new FastJsonRedisSerializer<>(Object.class); RedisCacheConfiguration configuration = RedisCacheConfiguration.defaultCacheConfig(); - configuration = configuration.serializeValuesWith( - RedisSerializationContext.SerializationPair.fromSerializer(fastJsonRedisSerializer)) - .entryTtl(Duration.ofHours(2)); + configuration = configuration.serializeValuesWith(RedisSerializationContext.SerializationPair.fromSerializer(fastJsonRedisSerializer)).entryTtl(Duration.ofHours(2)); return configuration; } @@ -103,8 +106,8 @@ public class RedisConfiguration { /** * 自定义缓存key生成策略 */ - @Bean + @Override public KeyGenerator keyGenerator() { return (target, method, params) -> { Map container = new HashMap<>(8); @@ -127,6 +130,7 @@ public class RedisConfiguration { } @Bean + @SuppressWarnings({"unchecked", "all"}) public CacheErrorHandler errorHandler() { return new SimpleCacheErrorHandler() { @Override diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemAuthController.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemAuthController.java index 86e4b385..d9ae5bc5 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemAuthController.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemAuthController.java @@ -16,11 +16,11 @@ package cn.odboy.system.controller; import cn.odboy.annotation.AnonymousPostMapping; -import cn.odboy.system.dal.model.SystemUserLoginArgs; +import cn.odboy.system.dal.model.response.SystemAuthVo; +import cn.odboy.system.dal.model.request.SystemUserLoginArgs; import cn.odboy.system.service.SystemAuthService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import java.util.Map; import jakarta.servlet.http.HttpServletRequest; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; @@ -44,9 +44,8 @@ public class SystemAuthController { @ApiOperation("登录授权") @AnonymousPostMapping(value = "/login") - public ResponseEntity> login(@Validated @RequestBody SystemUserLoginArgs loginRequest, - HttpServletRequest request) throws Exception { - Map loginInfo = systemAuthService.doLogin(loginRequest, request); + public ResponseEntity login(@Validated @RequestBody SystemUserLoginArgs loginRequest, HttpServletRequest request) throws Exception { + SystemAuthVo loginInfo = systemAuthService.doLogin(loginRequest, request); return ResponseEntity.ok(loginInfo); } diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemCaptchaController.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemCaptchaController.java index bf11f569..bdb74a90 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemCaptchaController.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemCaptchaController.java @@ -16,7 +16,7 @@ package cn.odboy.system.controller; import cn.odboy.system.constant.SystemCaptchaBizEnum; -import cn.odboy.system.dal.model.SystemCheckEmailCaptchaArgs; +import cn.odboy.system.dal.model.request.SystemCheckEmailCaptchaArgs; import cn.odboy.system.framework.operalog.OperationLog; import cn.odboy.system.service.SystemEmailService; import io.swagger.annotations.Api; diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDeptController.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDeptController.java index 382e7b2a..13bbcbdc 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDeptController.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDeptController.java @@ -18,9 +18,9 @@ package cn.odboy.system.controller; import cn.odboy.base.KitPageArgs; import cn.odboy.base.KitPageResult; import cn.odboy.system.dal.dataobject.SystemDeptTb; -import cn.odboy.system.dal.model.SystemCreateDeptArgs; -import cn.odboy.system.dal.model.SystemDeptVo; -import cn.odboy.system.dal.model.SystemQueryDeptArgs; +import cn.odboy.system.dal.model.request.SystemCreateDeptArgs; +import cn.odboy.system.dal.model.response.SystemDeptVo; +import cn.odboy.system.dal.model.request.SystemQueryDeptArgs; import cn.odboy.system.framework.operalog.OperationLog; import cn.odboy.system.service.SystemDeptService; import cn.odboy.util.KitPageUtil; diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDictController.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDictController.java index b139f01e..ad4ec0d8 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDictController.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDictController.java @@ -18,8 +18,8 @@ package cn.odboy.system.controller; import cn.odboy.base.KitPageArgs; import cn.odboy.base.KitPageResult; import cn.odboy.system.dal.dataobject.SystemDictTb; -import cn.odboy.system.dal.model.SystemCreateDictArgs; -import cn.odboy.system.dal.model.SystemQueryDictArgs; +import cn.odboy.system.dal.model.request.SystemCreateDictArgs; +import cn.odboy.system.dal.model.request.SystemQueryDictArgs; import cn.odboy.system.framework.operalog.OperationLog; import cn.odboy.system.service.SystemDictService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDictDetailController.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDictDetailController.java index 3fa08d5b..750612c3 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDictDetailController.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDictDetailController.java @@ -18,9 +18,9 @@ package cn.odboy.system.controller; import cn.odboy.base.KitPageArgs; import cn.odboy.base.KitPageResult; import cn.odboy.system.dal.dataobject.SystemDictDetailTb; -import cn.odboy.system.dal.model.SystemCreateDictDetailArgs; -import cn.odboy.system.dal.model.SystemDictDetailVo; -import cn.odboy.system.dal.model.SystemQueryDictDetailArgs; +import cn.odboy.system.dal.model.request.SystemCreateDictDetailArgs; +import cn.odboy.system.dal.model.response.SystemDictDetailVo; +import cn.odboy.system.dal.model.request.SystemQueryDictDetailArgs; import cn.odboy.system.framework.operalog.OperationLog; import cn.odboy.system.service.SystemDictDetailService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemEmailController.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemEmailController.java index 1d7f7abb..8dec8974 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemEmailController.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemEmailController.java @@ -16,7 +16,7 @@ package cn.odboy.system.controller; import cn.odboy.system.dal.dataobject.SystemEmailConfigTb; -import cn.odboy.system.dal.model.SystemSendEmailArgs; +import cn.odboy.system.dal.model.request.SystemSendEmailArgs; import cn.odboy.system.framework.operalog.OperationLog; import cn.odboy.system.service.SystemEmailService; import io.swagger.annotations.Api; diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemJobController.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemJobController.java index dec7f439..e32ac99d 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemJobController.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemJobController.java @@ -18,8 +18,8 @@ package cn.odboy.system.controller; import cn.odboy.base.KitPageArgs; import cn.odboy.base.KitPageResult; import cn.odboy.system.dal.dataobject.SystemJobTb; -import cn.odboy.system.dal.model.SystemCreateJobArgs; -import cn.odboy.system.dal.model.SystemQueryJobArgs; +import cn.odboy.system.dal.model.request.SystemCreateJobArgs; +import cn.odboy.system.dal.model.request.SystemQueryJobArgs; import cn.odboy.system.framework.operalog.OperationLog; import cn.odboy.system.service.SystemJobService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemLocalStorageController.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemLocalStorageController.java index 3fade377..abe94506 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemLocalStorageController.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemLocalStorageController.java @@ -18,7 +18,7 @@ package cn.odboy.system.controller; import cn.odboy.base.KitPageArgs; import cn.odboy.base.KitPageResult; import cn.odboy.system.dal.dataobject.SystemLocalStorageTb; -import cn.odboy.system.dal.model.SystemQueryStorageArgs; +import cn.odboy.system.dal.model.request.SystemQueryStorageArgs; import cn.odboy.system.framework.operalog.OperationLog; import cn.odboy.system.service.SystemLocalStorageService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemMenuController.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemMenuController.java index b1e40bee..e95c7b6e 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemMenuController.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemMenuController.java @@ -19,9 +19,9 @@ import cn.odboy.base.KitPageArgs; import cn.odboy.base.KitPageResult; import cn.odboy.framework.exception.BadRequestException; import cn.odboy.system.dal.dataobject.SystemMenuTb; -import cn.odboy.system.dal.model.SystemMenuRouterVo; -import cn.odboy.system.dal.model.SystemMenuVo; -import cn.odboy.system.dal.model.SystemQueryMenuArgs; +import cn.odboy.system.dal.model.response.SystemMenuRouterVo; +import cn.odboy.system.dal.model.response.SystemMenuVo; +import cn.odboy.system.dal.model.request.SystemQueryMenuArgs; import cn.odboy.system.framework.operalog.OperationLog; import cn.odboy.system.service.SystemMenuService; import cn.odboy.util.KitPageUtil; diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemOnlineController.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemOnlineController.java index fea7e687..a33cbb6a 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemOnlineController.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemOnlineController.java @@ -17,7 +17,7 @@ package cn.odboy.system.controller; import cn.odboy.base.KitPageArgs; import cn.odboy.base.KitPageResult; -import cn.odboy.system.dal.model.SystemUserOnlineVo; +import cn.odboy.system.dal.model.response.SystemUserOnlineVo; import cn.odboy.system.dal.redis.SystemUserOnlineInfoDAO; import cn.odboy.system.framework.operalog.OperationLog; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemOperationLogController.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemOperationLogController.java index 2499cbcb..ac087351 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemOperationLogController.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemOperationLogController.java @@ -3,7 +3,7 @@ package cn.odboy.system.controller; import cn.odboy.base.KitPageArgs; import cn.odboy.base.KitPageResult; import cn.odboy.system.dal.dataobject.SystemOperationLogTb; -import cn.odboy.system.dal.model.SystemQueryOperationLogArgs; +import cn.odboy.system.dal.model.request.SystemQueryOperationLogArgs; import cn.odboy.system.service.SystemOperationLogService; import cn.odboy.util.KitPageUtil; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemOssStorageController.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemOssStorageController.java index acef9122..b0845b52 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemOssStorageController.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemOssStorageController.java @@ -18,8 +18,8 @@ package cn.odboy.system.controller; import cn.odboy.base.KitPageArgs; import cn.odboy.base.KitPageResult; import cn.odboy.system.dal.dataobject.SystemOssStorageTb; -import cn.odboy.system.dal.model.SystemOssStorageVo; -import cn.odboy.system.dal.model.SystemQueryStorageArgs; +import cn.odboy.system.dal.model.response.SystemOssStorageVo; +import cn.odboy.system.dal.model.request.SystemQueryStorageArgs; import cn.odboy.system.framework.operalog.OperationLog; import cn.odboy.system.service.SystemOssStorageService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemQuartzJobController.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemQuartzJobController.java index 10ee1714..96953918 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemQuartzJobController.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemQuartzJobController.java @@ -19,9 +19,9 @@ import cn.odboy.base.KitPageArgs; import cn.odboy.base.KitPageResult; import cn.odboy.system.dal.dataobject.SystemQuartzJobTb; import cn.odboy.system.dal.dataobject.SystemQuartzLogTb; -import cn.odboy.system.dal.model.SystemQuartzJobVo; -import cn.odboy.system.dal.model.SystemQueryQuartzJobArgs; -import cn.odboy.system.dal.model.SystemUpdateQuartzJobArgs; +import cn.odboy.system.dal.model.response.SystemQuartzJobVo; +import cn.odboy.system.dal.model.request.SystemQueryQuartzJobArgs; +import cn.odboy.system.dal.model.request.SystemUpdateQuartzJobArgs; import cn.odboy.system.framework.operalog.OperationLog; import cn.odboy.system.service.SystemQuartzJobService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemRoleController.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemRoleController.java index 619cfd11..5917f720 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemRoleController.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemRoleController.java @@ -19,9 +19,9 @@ import cn.hutool.core.lang.Dict; import cn.odboy.base.KitPageArgs; import cn.odboy.base.KitPageResult; import cn.odboy.system.dal.dataobject.SystemRoleTb; -import cn.odboy.system.dal.model.SystemCreateRoleArgs; -import cn.odboy.system.dal.model.SystemQueryRoleArgs; -import cn.odboy.system.dal.model.SystemRoleVo; +import cn.odboy.system.dal.model.request.SystemCreateRoleArgs; +import cn.odboy.system.dal.model.request.SystemQueryRoleArgs; +import cn.odboy.system.dal.model.response.SystemRoleVo; import cn.odboy.system.framework.operalog.OperationLog; import cn.odboy.system.service.SystemRoleService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemUserController.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemUserController.java index 95d997ed..aa1358c9 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemUserController.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemUserController.java @@ -19,10 +19,10 @@ import cn.odboy.base.KitPageArgs; import cn.odboy.base.KitPageResult; import cn.odboy.base.KitSelectOptionVo; import cn.odboy.system.dal.dataobject.SystemUserTb; -import cn.odboy.system.dal.model.SystemQueryUserArgs; -import cn.odboy.system.dal.model.SystemUpdateUserPasswordArgs; -import cn.odboy.system.dal.model.SystemUserJwtVo; -import cn.odboy.system.dal.model.SystemUserVo; +import cn.odboy.system.dal.model.request.SystemQueryUserArgs; +import cn.odboy.system.dal.model.request.SystemUpdateUserPasswordArgs; +import cn.odboy.system.dal.model.response.SystemUserJwtVo; +import cn.odboy.system.dal.model.response.SystemUserVo; import cn.odboy.system.framework.operalog.OperationLog; import cn.odboy.system.framework.permission.core.KitSecurityHelper; import cn.odboy.system.service.SystemAuthService; diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemDeptExportRowVo.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemDeptExportRowVo.java similarity index 90% rename from cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemDeptExportRowVo.java rename to cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemDeptExportRowVo.java index c61b6a5e..02a9da71 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemDeptExportRowVo.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemDeptExportRowVo.java @@ -1,4 +1,4 @@ -package cn.odboy.system.dal.model; +package cn.odboy.system.dal.model.export; import cn.idev.excel.annotation.ExcelProperty; import cn.odboy.base.KitObject; diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemDictExportRowVo.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemDictExportRowVo.java similarity index 92% rename from cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemDictExportRowVo.java rename to cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemDictExportRowVo.java index c91c290c..0cd7ff7d 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemDictExportRowVo.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemDictExportRowVo.java @@ -1,4 +1,4 @@ -package cn.odboy.system.dal.model; +package cn.odboy.system.dal.model.export; import cn.idev.excel.annotation.ExcelProperty; import cn.odboy.base.KitObject; diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemJobExportRowVo.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemJobExportRowVo.java similarity index 90% rename from cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemJobExportRowVo.java rename to cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemJobExportRowVo.java index 64bce6e2..d4e6f2cd 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemJobExportRowVo.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemJobExportRowVo.java @@ -1,4 +1,4 @@ -package cn.odboy.system.dal.model; +package cn.odboy.system.dal.model.export; import cn.idev.excel.annotation.ExcelProperty; import cn.odboy.base.KitObject; diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemLocalStorageExportRowVo.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemLocalStorageExportRowVo.java similarity index 93% rename from cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemLocalStorageExportRowVo.java rename to cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemLocalStorageExportRowVo.java index 9554c3b9..5148a50e 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemLocalStorageExportRowVo.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemLocalStorageExportRowVo.java @@ -1,4 +1,4 @@ -package cn.odboy.system.dal.model; +package cn.odboy.system.dal.model.export; import cn.idev.excel.annotation.ExcelProperty; import cn.odboy.base.KitObject; diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemMenuExportRowVo.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemMenuExportRowVo.java similarity index 93% rename from cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemMenuExportRowVo.java rename to cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemMenuExportRowVo.java index e23f61de..21c2f4e2 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemMenuExportRowVo.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemMenuExportRowVo.java @@ -1,4 +1,4 @@ -package cn.odboy.system.dal.model; +package cn.odboy.system.dal.model.export; import cn.idev.excel.annotation.ExcelProperty; import cn.odboy.base.KitObject; diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemOssStorageExportRowVo.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemOssStorageExportRowVo.java similarity index 94% rename from cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemOssStorageExportRowVo.java rename to cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemOssStorageExportRowVo.java index a196dc95..da9d765d 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemOssStorageExportRowVo.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemOssStorageExportRowVo.java @@ -1,4 +1,4 @@ -package cn.odboy.system.dal.model; +package cn.odboy.system.dal.model.export; import cn.idev.excel.annotation.ExcelProperty; import cn.odboy.base.KitObject; diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQuartzJobExportRowVo.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemQuartzJobExportRowVo.java similarity index 94% rename from cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQuartzJobExportRowVo.java rename to cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemQuartzJobExportRowVo.java index e7d622f1..1f35df7e 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQuartzJobExportRowVo.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemQuartzJobExportRowVo.java @@ -1,4 +1,4 @@ -package cn.odboy.system.dal.model; +package cn.odboy.system.dal.model.export; import cn.idev.excel.annotation.ExcelProperty; import cn.odboy.base.KitObject; diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQuartzLogExportRowVo.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemQuartzLogExportRowVo.java similarity index 94% rename from cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQuartzLogExportRowVo.java rename to cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemQuartzLogExportRowVo.java index d78de3c1..de272d53 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQuartzLogExportRowVo.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemQuartzLogExportRowVo.java @@ -1,4 +1,4 @@ -package cn.odboy.system.dal.model; +package cn.odboy.system.dal.model.export; import cn.idev.excel.annotation.ExcelProperty; import cn.odboy.base.KitObject; diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemRoleExportRowVo.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemRoleExportRowVo.java similarity index 91% rename from cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemRoleExportRowVo.java rename to cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemRoleExportRowVo.java index b8c95352..549ff2e8 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemRoleExportRowVo.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemRoleExportRowVo.java @@ -1,4 +1,4 @@ -package cn.odboy.system.dal.model; +package cn.odboy.system.dal.model.export; import cn.idev.excel.annotation.ExcelProperty; import cn.odboy.base.KitObject; diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemUserExportRowVo.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemUserExportRowVo.java similarity index 94% rename from cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemUserExportRowVo.java rename to cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemUserExportRowVo.java index 9bbd2def..cb91d952 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemUserExportRowVo.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemUserExportRowVo.java @@ -1,4 +1,4 @@ -package cn.odboy.system.dal.model; +package cn.odboy.system.dal.model.export; import cn.idev.excel.annotation.ExcelProperty; import cn.odboy.base.KitObject; diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemUserOnlineExportRowVo.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemUserOnlineExportRowVo.java similarity index 92% rename from cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemUserOnlineExportRowVo.java rename to cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemUserOnlineExportRowVo.java index e85c86c4..15c386c0 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemUserOnlineExportRowVo.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemUserOnlineExportRowVo.java @@ -1,4 +1,4 @@ -package cn.odboy.system.dal.model; +package cn.odboy.system.dal.model.export; import cn.idev.excel.annotation.ExcelProperty; import cn.odboy.base.KitObject; diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemCheckEmailCaptchaArgs.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemCheckEmailCaptchaArgs.java similarity index 95% rename from cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemCheckEmailCaptchaArgs.java rename to cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemCheckEmailCaptchaArgs.java index a5304b3c..b5d776b1 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemCheckEmailCaptchaArgs.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemCheckEmailCaptchaArgs.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.odboy.system.dal.model; +package cn.odboy.system.dal.model.request; import cn.odboy.base.KitObject; import jakarta.validation.constraints.NotBlank; diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemCreateDeptArgs.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemCreateDeptArgs.java similarity index 96% rename from cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemCreateDeptArgs.java rename to cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemCreateDeptArgs.java index c9f7b1ce..48f2b339 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemCreateDeptArgs.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemCreateDeptArgs.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.odboy.system.dal.model; +package cn.odboy.system.dal.model.request; import cn.odboy.base.KitObject; import jakarta.validation.constraints.NotBlank; diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemCreateDictArgs.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemCreateDictArgs.java similarity index 95% rename from cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemCreateDictArgs.java rename to cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemCreateDictArgs.java index 5f0b51c1..545425df 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemCreateDictArgs.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemCreateDictArgs.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.odboy.system.dal.model; +package cn.odboy.system.dal.model.request; import cn.odboy.base.KitObject; import jakarta.validation.constraints.NotBlank; diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemCreateDictDetailArgs.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemCreateDictDetailArgs.java similarity index 96% rename from cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemCreateDictDetailArgs.java rename to cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemCreateDictDetailArgs.java index 42489afa..99eeb7c7 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemCreateDictDetailArgs.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemCreateDictDetailArgs.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.odboy.system.dal.model; +package cn.odboy.system.dal.model.request; import cn.odboy.base.KitObject; import cn.odboy.system.dal.dataobject.SystemDictTb; diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemCreateJobArgs.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemCreateJobArgs.java similarity index 96% rename from cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemCreateJobArgs.java rename to cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemCreateJobArgs.java index 91f1a908..3a162e65 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemCreateJobArgs.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemCreateJobArgs.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.odboy.system.dal.model; +package cn.odboy.system.dal.model.request; import cn.odboy.base.KitObject; import jakarta.validation.constraints.NotBlank; diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemCreateRoleArgs.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemCreateRoleArgs.java similarity index 96% rename from cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemCreateRoleArgs.java rename to cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemCreateRoleArgs.java index d32fa14d..4a8f6496 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemCreateRoleArgs.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemCreateRoleArgs.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.odboy.system.dal.model; +package cn.odboy.system.dal.model.request; import cn.odboy.base.KitObject; import cn.odboy.system.dal.dataobject.SystemDeptTb; diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryDeptArgs.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemQueryDeptArgs.java similarity index 96% rename from cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryDeptArgs.java rename to cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemQueryDeptArgs.java index ebf9b33a..008cc29a 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryDeptArgs.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemQueryDeptArgs.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.odboy.system.dal.model; +package cn.odboy.system.dal.model.request; import io.swagger.annotations.ApiModelProperty; import java.util.Date; diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryDictArgs.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemQueryDictArgs.java similarity index 95% rename from cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryDictArgs.java rename to cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemQueryDictArgs.java index 7dcedb88..e47babbc 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryDictArgs.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemQueryDictArgs.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.odboy.system.dal.model; +package cn.odboy.system.dal.model.request; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryDictDetailArgs.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemQueryDictDetailArgs.java similarity index 95% rename from cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryDictDetailArgs.java rename to cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemQueryDictDetailArgs.java index 8514fe81..d05f55de 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryDictDetailArgs.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemQueryDictDetailArgs.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.odboy.system.dal.model; +package cn.odboy.system.dal.model.request; import cn.odboy.base.KitObject; import io.swagger.annotations.ApiModelProperty; diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryJobArgs.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemQueryJobArgs.java similarity index 96% rename from cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryJobArgs.java rename to cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemQueryJobArgs.java index 9a5c0f31..53e393bc 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryJobArgs.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemQueryJobArgs.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.odboy.system.dal.model; +package cn.odboy.system.dal.model.request; import io.swagger.annotations.ApiModelProperty; import java.util.Date; diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryMenuArgs.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemQueryMenuArgs.java similarity index 95% rename from cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryMenuArgs.java rename to cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemQueryMenuArgs.java index 3794be08..f7a45ff9 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryMenuArgs.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemQueryMenuArgs.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.odboy.system.dal.model; +package cn.odboy.system.dal.model.request; import io.swagger.annotations.ApiModelProperty; import java.util.Date; diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryOperationLogArgs.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemQueryOperationLogArgs.java similarity index 78% rename from cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryOperationLogArgs.java rename to cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemQueryOperationLogArgs.java index a37ed9bc..2d26cc23 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryOperationLogArgs.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemQueryOperationLogArgs.java @@ -1,4 +1,4 @@ -package cn.odboy.system.dal.model; +package cn.odboy.system.dal.model.request; import cn.odboy.base.KitObject; import lombok.Getter; diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryQuartzJobArgs.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemQueryQuartzJobArgs.java similarity index 96% rename from cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryQuartzJobArgs.java rename to cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemQueryQuartzJobArgs.java index 86a6d78b..88ee8d81 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryQuartzJobArgs.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemQueryQuartzJobArgs.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.odboy.system.dal.model; +package cn.odboy.system.dal.model.request; import io.swagger.annotations.ApiModelProperty; import java.util.Date; diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryRoleArgs.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemQueryRoleArgs.java similarity index 96% rename from cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryRoleArgs.java rename to cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemQueryRoleArgs.java index 49841012..a08f9acd 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryRoleArgs.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemQueryRoleArgs.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.odboy.system.dal.model; +package cn.odboy.system.dal.model.request; import io.swagger.annotations.ApiModelProperty; import java.util.Date; diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryStorageArgs.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemQueryStorageArgs.java similarity index 96% rename from cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryStorageArgs.java rename to cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemQueryStorageArgs.java index 4dad3f32..4e524e5d 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryStorageArgs.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemQueryStorageArgs.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.odboy.system.dal.model; +package cn.odboy.system.dal.model.request; import io.swagger.annotations.ApiModelProperty; import java.util.Date; diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryUserArgs.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemQueryUserArgs.java similarity index 97% rename from cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryUserArgs.java rename to cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemQueryUserArgs.java index cce81cc7..f74843f3 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryUserArgs.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemQueryUserArgs.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.odboy.system.dal.model; +package cn.odboy.system.dal.model.request; import cn.odboy.base.KitObject; import io.swagger.annotations.ApiModelProperty; diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemSendEmailArgs.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemSendEmailArgs.java similarity index 96% rename from cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemSendEmailArgs.java rename to cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemSendEmailArgs.java index 57af4839..3069250f 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemSendEmailArgs.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemSendEmailArgs.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.odboy.system.dal.model; +package cn.odboy.system.dal.model.request; import io.swagger.annotations.ApiModelProperty; import java.util.List; diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemUpdateQuartzJobArgs.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemUpdateQuartzJobArgs.java similarity index 96% rename from cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemUpdateQuartzJobArgs.java rename to cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemUpdateQuartzJobArgs.java index 93cbb2ea..c568980c 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemUpdateQuartzJobArgs.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemUpdateQuartzJobArgs.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.odboy.system.dal.model; +package cn.odboy.system.dal.model.request; import cn.odboy.base.KitObject; import jakarta.validation.constraints.NotBlank; diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemUpdateUserPasswordArgs.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemUpdateUserPasswordArgs.java similarity index 95% rename from cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemUpdateUserPasswordArgs.java rename to cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemUpdateUserPasswordArgs.java index 5dabd94c..d8284b75 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemUpdateUserPasswordArgs.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemUpdateUserPasswordArgs.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.odboy.system.dal.model; +package cn.odboy.system.dal.model.request; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemUserLoginArgs.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemUserLoginArgs.java similarity index 96% rename from cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemUserLoginArgs.java rename to cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemUserLoginArgs.java index e0ce1fb8..1b629817 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemUserLoginArgs.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemUserLoginArgs.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.odboy.system.dal.model; +package cn.odboy.system.dal.model.request; import io.swagger.annotations.ApiModelProperty; import jakarta.validation.constraints.NotBlank; diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemAuthVo.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemAuthVo.java similarity index 85% rename from cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemAuthVo.java rename to cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemAuthVo.java index 8baf9b76..9024d26e 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemAuthVo.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemAuthVo.java @@ -1,4 +1,4 @@ -package cn.odboy.system.dal.model; +package cn.odboy.system.dal.model.response; import cn.odboy.base.KitObject; import lombok.Getter; diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemCaptchaVo.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemCaptchaVo.java similarity index 86% rename from cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemCaptchaVo.java rename to cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemCaptchaVo.java index bcf6c401..6f6dc84a 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemCaptchaVo.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemCaptchaVo.java @@ -1,4 +1,4 @@ -package cn.odboy.system.dal.model; +package cn.odboy.system.dal.model.response; import cn.odboy.base.KitObject; import lombok.Getter; diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemDeptVo.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemDeptVo.java similarity index 97% rename from cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemDeptVo.java rename to cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemDeptVo.java index d8ded17c..609bf9a5 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemDeptVo.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemDeptVo.java @@ -1,4 +1,4 @@ -package cn.odboy.system.dal.model; +package cn.odboy.system.dal.model.response; import cn.odboy.base.KitBaseUserTimeTb; import cn.odboy.system.dal.dataobject.SystemRoleTb; diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemDictDetailVo.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemDictDetailVo.java similarity index 96% rename from cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemDictDetailVo.java rename to cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemDictDetailVo.java index 72f43d2f..76da62c0 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemDictDetailVo.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemDictDetailVo.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.odboy.system.dal.model; +package cn.odboy.system.dal.model.response; import cn.odboy.base.KitBaseUserTimeTb; import cn.odboy.system.dal.dataobject.SystemDictTb; diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemMenuMetaVo.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemMenuMetaVo.java similarity index 96% rename from cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemMenuMetaVo.java rename to cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemMenuMetaVo.java index a0ae90a6..a49bd485 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemMenuMetaVo.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemMenuMetaVo.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.odboy.system.dal.model; +package cn.odboy.system.dal.model.response; import cn.odboy.base.KitObject; import io.swagger.annotations.ApiModelProperty; diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemMenuRouterVo.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemMenuRouterVo.java similarity index 97% rename from cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemMenuRouterVo.java rename to cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemMenuRouterVo.java index e8c5ff8d..d98c65ff 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemMenuRouterVo.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemMenuRouterVo.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.odboy.system.dal.model; +package cn.odboy.system.dal.model.response; import cn.odboy.base.KitObject; import io.swagger.annotations.ApiModelProperty; diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemMenuVo.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemMenuVo.java similarity index 98% rename from cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemMenuVo.java rename to cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemMenuVo.java index c777afbd..ff454173 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemMenuVo.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemMenuVo.java @@ -1,4 +1,4 @@ -package cn.odboy.system.dal.model; +package cn.odboy.system.dal.model.response; import cn.odboy.base.KitBaseUserTimeTb; import cn.odboy.system.dal.dataobject.SystemRoleTb; diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemOssStorageVo.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemOssStorageVo.java similarity index 97% rename from cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemOssStorageVo.java rename to cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemOssStorageVo.java index 6f4461f2..503cfddf 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemOssStorageVo.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemOssStorageVo.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.odboy.system.dal.model; +package cn.odboy.system.dal.model.response; import cn.odboy.base.KitBaseUserTimeTb; import io.swagger.annotations.ApiModelProperty; diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemProductLineTreeVo.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemProductLineTreeVo.java similarity index 95% rename from cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemProductLineTreeVo.java rename to cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemProductLineTreeVo.java index b6914b56..91527bee 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemProductLineTreeVo.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemProductLineTreeVo.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.odboy.system.dal.model; +package cn.odboy.system.dal.model.response; import cn.odboy.base.KitObject; import java.util.List; diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemProductLineVo.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemProductLineVo.java similarity index 95% rename from cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemProductLineVo.java rename to cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemProductLineVo.java index dcc3713b..e358907b 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemProductLineVo.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemProductLineVo.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.odboy.system.dal.model; +package cn.odboy.system.dal.model.response; import cn.odboy.base.KitObject; import lombok.Getter; diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQuartzJobVo.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemQuartzJobVo.java similarity index 96% rename from cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQuartzJobVo.java rename to cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemQuartzJobVo.java index c049049e..e95fc3ee 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQuartzJobVo.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemQuartzJobVo.java @@ -1,4 +1,4 @@ -package cn.odboy.system.dal.model; +package cn.odboy.system.dal.model.response; import cn.odboy.base.KitBaseUserTimeTb; import io.swagger.annotations.ApiModelProperty; diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemRoleCodeVo.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemRoleCodeVo.java similarity index 95% rename from cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemRoleCodeVo.java rename to cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemRoleCodeVo.java index ebb0d609..2fb55924 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemRoleCodeVo.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemRoleCodeVo.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.odboy.system.dal.model; +package cn.odboy.system.dal.model.response; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemRoleVo.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemRoleVo.java similarity index 97% rename from cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemRoleVo.java rename to cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemRoleVo.java index d99bb541..b57a5e97 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemRoleVo.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemRoleVo.java @@ -1,4 +1,4 @@ -package cn.odboy.system.dal.model; +package cn.odboy.system.dal.model.response; import cn.odboy.base.KitBaseUserTimeTb; import cn.odboy.system.constant.SystemDataScopeEnum; diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemSimpleUserVo.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemSimpleUserVo.java similarity index 97% rename from cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemSimpleUserVo.java rename to cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemSimpleUserVo.java index 2f2d1f50..fd60f0c1 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemSimpleUserVo.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemSimpleUserVo.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.odboy.system.dal.model; +package cn.odboy.system.dal.model.response; import cn.odboy.base.KitObject; import cn.odboy.system.dal.dataobject.SystemDeptTb; diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemUserInfoVo.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemUserInfoVo.java similarity index 96% rename from cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemUserInfoVo.java rename to cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemUserInfoVo.java index 7de0b8dc..1d435bc4 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemUserInfoVo.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemUserInfoVo.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.odboy.system.dal.model; +package cn.odboy.system.dal.model.response; import cn.odboy.base.KitObject; import java.util.List; diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemUserJwtVo.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemUserJwtVo.java similarity index 97% rename from cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemUserJwtVo.java rename to cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemUserJwtVo.java index 53d69c63..9d47f2ef 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemUserJwtVo.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemUserJwtVo.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.odboy.system.dal.model; +package cn.odboy.system.dal.model.response; import com.alibaba.fastjson2.annotation.JSONField; import io.swagger.annotations.ApiModelProperty; diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemUserOnlineVo.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemUserOnlineVo.java similarity index 96% rename from cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemUserOnlineVo.java rename to cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemUserOnlineVo.java index 8944c354..90d0ad67 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemUserOnlineVo.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemUserOnlineVo.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.odboy.system.dal.model; +package cn.odboy.system.dal.model.response; import io.swagger.annotations.ApiModelProperty; import java.util.Date; diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemUserVo.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemUserVo.java similarity index 98% rename from cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemUserVo.java rename to cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemUserVo.java index ecbdffd5..27ee7456 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemUserVo.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemUserVo.java @@ -1,4 +1,4 @@ -package cn.odboy.system.dal.model; +package cn.odboy.system.dal.model.response; import cn.odboy.system.dal.dataobject.SystemJobTb; import cn.odboy.system.dal.dataobject.SystemRoleTb; diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/mysql/SystemDictDetailMapper.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/mysql/SystemDictDetailMapper.java index b8916b24..255f4607 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/mysql/SystemDictDetailMapper.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/mysql/SystemDictDetailMapper.java @@ -16,7 +16,7 @@ package cn.odboy.system.dal.mysql; import cn.odboy.system.dal.dataobject.SystemDictDetailTb; -import cn.odboy.system.dal.model.SystemQueryDictDetailArgs; +import cn.odboy.system.dal.model.request.SystemQueryDictDetailArgs; 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-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/mysql/SystemQuartzJobMapper.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/mysql/SystemQuartzJobMapper.java index a2a0bbe3..c420ffe1 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/mysql/SystemQuartzJobMapper.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/mysql/SystemQuartzJobMapper.java @@ -16,7 +16,7 @@ package cn.odboy.system.dal.mysql; import cn.odboy.system.dal.dataobject.SystemQuartzJobTb; -import cn.odboy.system.dal.model.SystemQuartzJobVo; +import cn.odboy.system.dal.model.response.SystemQuartzJobVo; import cn.odboy.util.KitBeanUtil; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/redis/SystemUserInfoDAO.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/redis/SystemUserInfoDAO.java index aea97b10..ccb32148 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/redis/SystemUserInfoDAO.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/redis/SystemUserInfoDAO.java @@ -3,7 +3,7 @@ package cn.odboy.system.dal.redis; import cn.hutool.core.util.RandomUtil; import cn.hutool.core.util.StrUtil; import cn.odboy.framework.redis.KitRedisHelper; -import cn.odboy.system.dal.model.SystemUserJwtVo; +import cn.odboy.system.dal.model.response.SystemUserJwtVo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Component; diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/redis/SystemUserOnlineInfoDAO.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/redis/SystemUserOnlineInfoDAO.java index 2e007759..a010ff44 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/redis/SystemUserOnlineInfoDAO.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/redis/SystemUserOnlineInfoDAO.java @@ -4,9 +4,9 @@ import cn.hutool.core.util.StrUtil; import cn.odboy.base.KitPageResult; import cn.odboy.framework.properties.AppProperties; import cn.odboy.framework.redis.KitRedisHelper; -import cn.odboy.system.dal.model.SystemUserJwtVo; -import cn.odboy.system.dal.model.SystemUserOnlineExportRowVo; -import cn.odboy.system.dal.model.SystemUserOnlineVo; +import cn.odboy.system.dal.model.response.SystemUserJwtVo; +import cn.odboy.system.dal.model.export.SystemUserOnlineExportRowVo; +import cn.odboy.system.dal.model.response.SystemUserOnlineVo; import cn.odboy.system.framework.permission.core.handler.TokenProvider; import cn.odboy.util.KitBeanUtil; import cn.odboy.util.KitBrowserUtil; diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/framework/permission/core/handler/TokenFilter.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/framework/permission/core/handler/TokenFilter.java index 4dfeeb41..629cf88a 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/framework/permission/core/handler/TokenFilter.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/framework/permission/core/handler/TokenFilter.java @@ -18,7 +18,7 @@ package cn.odboy.system.framework.permission.core.handler; import cn.hutool.core.util.StrUtil; import cn.odboy.constant.SystemConst; -import cn.odboy.system.dal.model.SystemUserOnlineVo; +import cn.odboy.system.dal.model.response.SystemUserOnlineVo; import cn.odboy.system.dal.redis.SystemUserOnlineInfoDAO; import jakarta.servlet.FilterChain; import jakarta.servlet.ServletException; diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/framework/permission/core/handler/TokenProvider.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/framework/permission/core/handler/TokenProvider.java index a02ed79c..c713c8c4 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/framework/permission/core/handler/TokenProvider.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/framework/permission/core/handler/TokenProvider.java @@ -22,7 +22,7 @@ import cn.hutool.core.util.IdUtil; import cn.odboy.constant.SystemConst; import cn.odboy.framework.properties.AppProperties; import cn.odboy.framework.redis.KitRedisHelper; -import cn.odboy.system.dal.model.SystemUserJwtVo; +import cn.odboy.system.dal.model.response.SystemUserJwtVo; import cn.odboy.system.dal.redis.SystemCacheKey; import io.jsonwebtoken.Claims; import io.jsonwebtoken.JwtParser; diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/framework/permission/core/handler/UserDetailsHandler.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/framework/permission/core/handler/UserDetailsHandler.java index d7519022..c2bb3944 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/framework/permission/core/handler/UserDetailsHandler.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/framework/permission/core/handler/UserDetailsHandler.java @@ -16,9 +16,9 @@ package cn.odboy.system.framework.permission.core.handler; import cn.odboy.framework.exception.BadRequestException; -import cn.odboy.system.dal.model.SystemRoleCodeVo; -import cn.odboy.system.dal.model.SystemUserJwtVo; -import cn.odboy.system.dal.model.SystemUserVo; +import cn.odboy.system.dal.model.response.SystemRoleCodeVo; +import cn.odboy.system.dal.model.response.SystemUserJwtVo; +import cn.odboy.system.dal.model.response.SystemUserVo; import cn.odboy.system.dal.redis.SystemUserInfoDAO; import cn.odboy.system.service.SystemDataService; import cn.odboy.system.service.SystemRoleService; diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/framework/quartz/ActiveJobRegister.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/framework/quartz/ActiveJobRegister.java index d5556faa..5ddc3b19 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/framework/quartz/ActiveJobRegister.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/framework/quartz/ActiveJobRegister.java @@ -15,7 +15,7 @@ */ package cn.odboy.system.framework.quartz; -import cn.odboy.system.dal.model.SystemQuartzJobVo; +import cn.odboy.system.dal.model.response.SystemQuartzJobVo; import cn.odboy.system.service.SystemQuartzJobService; import java.util.List; import lombok.extern.slf4j.Slf4j; diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/framework/quartz/ExecutionJobBean.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/framework/quartz/ExecutionJobBean.java index f2c15a9a..15da77d0 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/framework/quartz/ExecutionJobBean.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/framework/quartz/ExecutionJobBean.java @@ -26,8 +26,8 @@ import cn.odboy.framework.quartz.core.QuartzRunnable; import cn.odboy.framework.redis.KitRedisHelper; import cn.odboy.system.dal.dataobject.SystemQuartzJobTb; import cn.odboy.system.dal.dataobject.SystemQuartzLogTb; -import cn.odboy.system.dal.model.SystemQuartzJobVo; -import cn.odboy.system.dal.model.SystemSendEmailArgs; +import cn.odboy.system.dal.model.response.SystemQuartzJobVo; +import cn.odboy.system.dal.model.request.SystemSendEmailArgs; import cn.odboy.system.dal.mysql.SystemQuartzLogMapper; import cn.odboy.system.service.SystemEmailService; import cn.odboy.system.service.SystemQuartzJobService; diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/framework/quartz/QuartzManage.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/framework/quartz/QuartzManage.java index f6911e90..6b80b97d 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/framework/quartz/QuartzManage.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/framework/quartz/QuartzManage.java @@ -17,7 +17,7 @@ package cn.odboy.system.framework.quartz; import cn.odboy.framework.exception.BadRequestException; import cn.odboy.system.dal.dataobject.SystemQuartzJobTb; -import cn.odboy.system.dal.model.SystemQuartzJobVo; +import cn.odboy.system.dal.model.response.SystemQuartzJobVo; import java.util.Date; import jakarta.annotation.Resource; import lombok.extern.slf4j.Slf4j; diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/openapi/SystemCaptchaOpenController.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/openapi/SystemCaptchaOpenController.java index 64b6c9f8..973d6d2a 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/openapi/SystemCaptchaOpenController.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/openapi/SystemCaptchaOpenController.java @@ -16,10 +16,10 @@ package cn.odboy.system.openapi; import cn.odboy.annotation.AnonymousPostMapping; -import cn.odboy.system.service.SystemAuthService; +import cn.odboy.system.dal.model.response.SystemCaptchaVo; +import cn.odboy.system.service.SystemCaptchaService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import java.util.Map; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.RequestMapping; @@ -31,12 +31,12 @@ import org.springframework.web.bind.annotation.RestController; public class SystemCaptchaOpenController { @Autowired - private SystemAuthService systemAuthService; + private SystemCaptchaService systemCaptchaService; @ApiOperation("获取验证码") @AnonymousPostMapping(value = "/getCode") - public ResponseEntity> getCode() { - Map imgResult = systemAuthService.getCaptchaInfo(); + public ResponseEntity getCode() { + SystemCaptchaVo imgResult = systemCaptchaService.getLoginCaptcha(); return ResponseEntity.ok(imgResult); } } diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemAuthService.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemAuthService.java index c0e444c0..2c4a0d09 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemAuthService.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemAuthService.java @@ -1,26 +1,19 @@ package cn.odboy.system.service; -import cn.hutool.core.util.IdUtil; -import cn.hutool.core.util.StrUtil; -import cn.odboy.constant.CaptchaCodeEnum; import cn.odboy.constant.SystemConst; import cn.odboy.framework.exception.BadRequestException; import cn.odboy.framework.properties.AppProperties; import cn.odboy.framework.redis.KitRedisHelper; -import cn.odboy.system.dal.model.SystemUserInfoVo; -import cn.odboy.system.dal.model.SystemUserJwtVo; -import cn.odboy.system.dal.model.SystemUserLoginArgs; -import cn.odboy.system.dal.redis.SystemCacheKey; +import cn.odboy.system.dal.model.response.SystemAuthVo; +import cn.odboy.system.dal.model.response.SystemUserInfoVo; +import cn.odboy.system.dal.model.response.SystemUserJwtVo; +import cn.odboy.system.dal.model.request.SystemUserLoginArgs; import cn.odboy.system.dal.redis.SystemUserOnlineInfoDAO; import cn.odboy.system.framework.permission.core.KitSecurityHelper; import cn.odboy.system.framework.permission.core.handler.TokenProvider; import cn.odboy.system.framework.permission.core.handler.UserDetailsHandler; import cn.odboy.util.KitBeanUtil; import cn.odboy.util.KitRsaEncryptUtil; -import com.wf.captcha.base.Captcha; -import java.util.HashMap; -import java.util.Map; -import java.util.concurrent.TimeUnit; import jakarta.servlet.http.HttpServletRequest; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; @@ -35,29 +28,23 @@ public class SystemAuthService { @Autowired private KitRedisHelper redisHelper; @Autowired + private AppProperties properties; + @Autowired private SystemUserOnlineInfoDAO systemUserOnlineInfoDAO; @Autowired private TokenProvider tokenProvider; @Autowired - private AppProperties properties; - @Autowired private PasswordEncoder passwordEncoder; @Autowired private UserDetailsHandler userDetailsService; + @Autowired + private SystemCaptchaService systemCaptchaService; - public Map doLogin(SystemUserLoginArgs loginRequest, HttpServletRequest request) throws Exception { + public SystemAuthVo doLogin(SystemUserLoginArgs loginRequest, HttpServletRequest request) throws Exception { // 密码解密 String password = KitRsaEncryptUtil.decryptByPrivateKey(properties.getRsa().getPrivateKey(), loginRequest.getPassword()); - // 查询验证码 - String code = redisHelper.get(loginRequest.getUuid(), String.class); - // 清除验证码 - redisHelper.del(loginRequest.getUuid()); - if (StrUtil.isBlank(code)) { - throw new BadRequestException("验证码不存在或已过期"); - } - if (StrUtil.isBlank(loginRequest.getCode()) || !loginRequest.getCode().equalsIgnoreCase(code)) { - throw new BadRequestException("验证码错误"); - } + // 校验验证码 + systemCaptchaService.validate(loginRequest.getUuid(), loginRequest.getCode()); // 获取用户信息 SystemUserJwtVo jwtUser = userDetailsService.loadUserByUsername(loginRequest.getUsername()); // 验证用户密码 @@ -69,11 +56,10 @@ public class SystemAuthService { // 生成令牌 String token = tokenProvider.createToken(jwtUser); // 返回 token 与 用户信息 - Map authInfo = new HashMap<>(2) {{ - put("token", String.format("%s %s", SystemConst.TOKEN_PREFIX, token)); - // 这里是为了清空密码 - put("user", KitBeanUtil.copyToClass(jwtUser, SystemUserInfoVo.class)); - }}; + SystemAuthVo authInfo = new SystemAuthVo(); + authInfo.setToken(String.format("%s %s", SystemConst.TOKEN_PREFIX, token)); + // 这里是为了清空密码 + authInfo.setUser(KitBeanUtil.copyToClass(jwtUser, SystemUserInfoVo.class)); if (properties.getLogin().isSingle()) { // 踢掉之前已经登录的token systemUserOnlineInfoDAO.kickOutByUsername(loginRequest.getUsername()); @@ -92,26 +78,6 @@ public class SystemAuthService { return jwtUser; } - public Map getCaptchaInfo() { - // 获取运算的结果 - Captcha captcha = properties.getLogin().getCaptchaSetting().getCaptcha(); - String uuid = SystemCacheKey.CAPTCHA_LOGIN + IdUtil.simpleUUID(); - //当验证码类型为 arithmetic时且长度 >= 2 时, captcha.text()的结果有几率为浮点型 - String captchaValue = captcha.text(); - if (captcha.getCharType() - 1 == CaptchaCodeEnum.ARITHMETIC.ordinal() && - captchaValue.contains(SystemConst.SYMBOL_DOT)) { - captchaValue = captchaValue.split("\\.")[0]; - } - // 保存 - redisHelper.set(uuid, captchaValue, properties.getLogin().getCaptchaSetting().getExpiration(), - TimeUnit.MINUTES); - // 验证码信息 - return new HashMap<>(2) {{ - put("img", captcha.toBase64()); - put("uuid", uuid); - }}; - } - public void doLogout(HttpServletRequest request) { String token = tokenProvider.getToken(request); systemUserOnlineInfoDAO.logoutByToken(token); diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemCaptchaService.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemCaptchaService.java index 29517b16..1de7cbcd 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemCaptchaService.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemCaptchaService.java @@ -7,7 +7,7 @@ import cn.odboy.constant.SystemConst; import cn.odboy.framework.exception.BadRequestException; import cn.odboy.framework.properties.AppProperties; import cn.odboy.framework.redis.KitRedisHelper; -import cn.odboy.system.dal.model.SystemCaptchaVo; +import cn.odboy.system.dal.model.response.SystemCaptchaVo; import cn.odboy.system.dal.redis.SystemCacheKey; import com.wf.captcha.base.Captcha; import java.util.concurrent.TimeUnit; diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDataService.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDataService.java index 2384e4cd..caf6a3b6 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDataService.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDataService.java @@ -18,9 +18,9 @@ package cn.odboy.system.service; import cn.hutool.core.collection.CollUtil; import cn.odboy.system.constant.SystemDataScopeEnum; import cn.odboy.system.dal.dataobject.SystemDeptTb; -import cn.odboy.system.dal.model.SystemDeptVo; -import cn.odboy.system.dal.model.SystemRoleVo; -import cn.odboy.system.dal.model.SystemUserVo; +import cn.odboy.system.dal.model.response.SystemDeptVo; +import cn.odboy.system.dal.model.response.SystemRoleVo; +import cn.odboy.system.dal.model.response.SystemUserVo; import java.util.ArrayList; import java.util.List; import java.util.Objects; diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDeptService.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDeptService.java index 113b2099..fb37d9d1 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDeptService.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDeptService.java @@ -24,12 +24,12 @@ import cn.odboy.framework.exception.BadRequestException; import cn.odboy.system.constant.SystemDataScopeEnum; import cn.odboy.system.constant.SystemZhConst; import cn.odboy.system.dal.dataobject.SystemDeptTb; -import cn.odboy.system.dal.model.SystemCreateDeptArgs; -import cn.odboy.system.dal.model.SystemDeptExportRowVo; -import cn.odboy.system.dal.model.SystemDeptVo; -import cn.odboy.system.dal.model.SystemProductLineTreeVo; -import cn.odboy.system.dal.model.SystemProductLineVo; -import cn.odboy.system.dal.model.SystemQueryDeptArgs; +import cn.odboy.system.dal.model.request.SystemCreateDeptArgs; +import cn.odboy.system.dal.model.export.SystemDeptExportRowVo; +import cn.odboy.system.dal.model.response.SystemDeptVo; +import cn.odboy.system.dal.model.response.SystemProductLineTreeVo; +import cn.odboy.system.dal.model.response.SystemProductLineVo; +import cn.odboy.system.dal.model.request.SystemQueryDeptArgs; import cn.odboy.system.dal.mysql.SystemDeptMapper; import cn.odboy.system.framework.permission.core.KitSecurityHelper; import cn.odboy.util.KitBeanUtil; diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDictDetailService.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDictDetailService.java index ac725c76..558f2950 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDictDetailService.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDictDetailService.java @@ -20,9 +20,9 @@ import cn.hutool.core.util.StrUtil; import cn.odboy.base.KitPageResult; import cn.odboy.system.dal.dataobject.SystemDictDetailTb; import cn.odboy.system.dal.dataobject.SystemDictTb; -import cn.odboy.system.dal.model.SystemCreateDictDetailArgs; -import cn.odboy.system.dal.model.SystemDictDetailVo; -import cn.odboy.system.dal.model.SystemQueryDictDetailArgs; +import cn.odboy.system.dal.model.request.SystemCreateDictDetailArgs; +import cn.odboy.system.dal.model.response.SystemDictDetailVo; +import cn.odboy.system.dal.model.request.SystemQueryDictDetailArgs; import cn.odboy.system.dal.mysql.SystemDictDetailMapper; import cn.odboy.system.dal.mysql.SystemDictMapper; import cn.odboy.util.KitBeanUtil; diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDictService.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDictService.java index df5932a5..4e6f6433 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDictService.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDictService.java @@ -19,10 +19,10 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import cn.odboy.base.KitPageResult; import cn.odboy.system.dal.dataobject.SystemDictTb; -import cn.odboy.system.dal.model.SystemCreateDictArgs; -import cn.odboy.system.dal.model.SystemDictDetailVo; -import cn.odboy.system.dal.model.SystemDictExportRowVo; -import cn.odboy.system.dal.model.SystemQueryDictArgs; +import cn.odboy.system.dal.model.request.SystemCreateDictArgs; +import cn.odboy.system.dal.model.response.SystemDictDetailVo; +import cn.odboy.system.dal.model.export.SystemDictExportRowVo; +import cn.odboy.system.dal.model.request.SystemQueryDictArgs; import cn.odboy.system.dal.mysql.SystemDictMapper; import cn.odboy.util.KitBeanUtil; import cn.odboy.util.KitPageUtil; diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemEmailService.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemEmailService.java index 2a40d0cf..00e9a965 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemEmailService.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemEmailService.java @@ -24,8 +24,8 @@ import cn.odboy.framework.properties.AppProperties; import cn.odboy.framework.redis.KitRedisHelper; import cn.odboy.system.constant.SystemCaptchaBizEnum; import cn.odboy.system.dal.dataobject.SystemEmailConfigTb; -import cn.odboy.system.dal.model.SystemCheckEmailCaptchaArgs; -import cn.odboy.system.dal.model.SystemSendEmailArgs; +import cn.odboy.system.dal.model.request.SystemCheckEmailCaptchaArgs; +import cn.odboy.system.dal.model.request.SystemSendEmailArgs; import cn.odboy.system.dal.mysql.SystemEmailConfigMapper; import cn.odboy.util.KitDesEncryptUtil; import cn.odboy.util.KitResourceTemplateUtil; diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemJobService.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemJobService.java index ecfe7596..a6af2d67 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemJobService.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemJobService.java @@ -20,9 +20,9 @@ import cn.hutool.core.util.StrUtil; import cn.odboy.base.KitPageResult; import cn.odboy.framework.exception.BadRequestException; import cn.odboy.system.dal.dataobject.SystemJobTb; -import cn.odboy.system.dal.model.SystemCreateJobArgs; -import cn.odboy.system.dal.model.SystemJobExportRowVo; -import cn.odboy.system.dal.model.SystemQueryJobArgs; +import cn.odboy.system.dal.model.request.SystemCreateJobArgs; +import cn.odboy.system.dal.model.export.SystemJobExportRowVo; +import cn.odboy.system.dal.model.request.SystemQueryJobArgs; import cn.odboy.system.dal.mysql.SystemJobMapper; import cn.odboy.util.KitBeanUtil; import cn.odboy.util.KitPageUtil; diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemLocalStorageService.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemLocalStorageService.java index feb4f387..ab83bcb3 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemLocalStorageService.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemLocalStorageService.java @@ -27,8 +27,8 @@ import cn.odboy.framework.exception.BadRequestException; import cn.odboy.framework.properties.AppProperties; import cn.odboy.framework.server.core.KitFileLocalUploadHelper; import cn.odboy.system.dal.dataobject.SystemLocalStorageTb; -import cn.odboy.system.dal.model.SystemLocalStorageExportRowVo; -import cn.odboy.system.dal.model.SystemQueryStorageArgs; +import cn.odboy.system.dal.model.export.SystemLocalStorageExportRowVo; +import cn.odboy.system.dal.model.request.SystemQueryStorageArgs; import cn.odboy.system.dal.mysql.SystemLocalStorageMapper; import cn.odboy.util.KitBeanUtil; import cn.odboy.util.KitFileUtil; diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemMenuService.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemMenuService.java index 9fc343ac..2d90df6e 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemMenuService.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemMenuService.java @@ -23,12 +23,12 @@ import cn.odboy.framework.exception.BadRequestException; import cn.odboy.system.constant.SystemYesOrNoChConst; import cn.odboy.system.constant.TransferProtocolConst; import cn.odboy.system.dal.dataobject.SystemMenuTb; -import cn.odboy.system.dal.model.SystemMenuExportRowVo; -import cn.odboy.system.dal.model.SystemMenuMetaVo; -import cn.odboy.system.dal.model.SystemMenuRouterVo; -import cn.odboy.system.dal.model.SystemMenuVo; -import cn.odboy.system.dal.model.SystemQueryMenuArgs; -import cn.odboy.system.dal.model.SystemRoleVo; +import cn.odboy.system.dal.model.export.SystemMenuExportRowVo; +import cn.odboy.system.dal.model.response.SystemMenuMetaVo; +import cn.odboy.system.dal.model.response.SystemMenuRouterVo; +import cn.odboy.system.dal.model.response.SystemMenuVo; +import cn.odboy.system.dal.model.request.SystemQueryMenuArgs; +import cn.odboy.system.dal.model.response.SystemRoleVo; import cn.odboy.system.dal.mysql.SystemMenuMapper; import cn.odboy.system.framework.permission.core.KitSecurityHelper; import cn.odboy.util.KitBeanUtil; diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemOperationLogService.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemOperationLogService.java index e1799f47..917696ca 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemOperationLogService.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemOperationLogService.java @@ -2,7 +2,7 @@ package cn.odboy.system.service; import cn.odboy.base.KitPageArgs; import cn.odboy.system.dal.dataobject.SystemOperationLogTb; -import cn.odboy.system.dal.model.SystemQueryOperationLogArgs; +import cn.odboy.system.dal.model.request.SystemQueryOperationLogArgs; import cn.odboy.system.dal.mysql.SystemOperationLogMapper; import cn.odboy.system.framework.permission.core.KitSecurityHelper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemOssStorageService.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemOssStorageService.java index e0bf5d71..a35a2e54 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemOssStorageService.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemOssStorageService.java @@ -17,8 +17,8 @@ package cn.odboy.system.service; import cn.odboy.base.KitPageResult; import cn.odboy.system.dal.dataobject.SystemOssStorageTb; -import cn.odboy.system.dal.model.SystemOssStorageVo; -import cn.odboy.system.dal.model.SystemQueryStorageArgs; +import cn.odboy.system.dal.model.response.SystemOssStorageVo; +import cn.odboy.system.dal.model.request.SystemQueryStorageArgs; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemQuartzJobService.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemQuartzJobService.java index c354699a..6e859ebb 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemQuartzJobService.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemQuartzJobService.java @@ -24,11 +24,11 @@ import cn.odboy.framework.exception.BadRequestException; import cn.odboy.framework.redis.KitRedisHelper; import cn.odboy.system.dal.dataobject.SystemQuartzJobTb; import cn.odboy.system.dal.dataobject.SystemQuartzLogTb; -import cn.odboy.system.dal.model.SystemQuartzJobExportRowVo; -import cn.odboy.system.dal.model.SystemQuartzJobVo; -import cn.odboy.system.dal.model.SystemQuartzLogExportRowVo; -import cn.odboy.system.dal.model.SystemQueryQuartzJobArgs; -import cn.odboy.system.dal.model.SystemUpdateQuartzJobArgs; +import cn.odboy.system.dal.model.export.SystemQuartzJobExportRowVo; +import cn.odboy.system.dal.model.response.SystemQuartzJobVo; +import cn.odboy.system.dal.model.export.SystemQuartzLogExportRowVo; +import cn.odboy.system.dal.model.request.SystemQueryQuartzJobArgs; +import cn.odboy.system.dal.model.request.SystemUpdateQuartzJobArgs; import cn.odboy.system.dal.mysql.SystemQuartzJobMapper; import cn.odboy.system.dal.mysql.SystemQuartzLogMapper; import cn.odboy.system.framework.quartz.QuartzManage; diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemRoleMenuService.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemRoleMenuService.java index f1a49e8f..2dde9009 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemRoleMenuService.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemRoleMenuService.java @@ -18,7 +18,7 @@ package cn.odboy.system.service; import cn.hutool.core.collection.CollUtil; import cn.odboy.system.dal.dataobject.SystemMenuTb; import cn.odboy.system.dal.dataobject.SystemRoleMenuTb; -import cn.odboy.system.dal.model.SystemMenuVo; +import cn.odboy.system.dal.model.response.SystemMenuVo; import cn.odboy.system.dal.mysql.SystemMenuMapper; import cn.odboy.system.dal.mysql.SystemRoleMenuMapper; import cn.odboy.util.KitBeanUtil; diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemRoleService.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemRoleService.java index 160ec15a..63b064ad 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemRoleService.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemRoleService.java @@ -23,12 +23,12 @@ import cn.odboy.base.KitPageResult; import cn.odboy.framework.exception.BadRequestException; import cn.odboy.system.dal.dataobject.SystemRoleTb; import cn.odboy.system.dal.dataobject.SystemUserTb; -import cn.odboy.system.dal.model.SystemCreateRoleArgs; -import cn.odboy.system.dal.model.SystemMenuVo; -import cn.odboy.system.dal.model.SystemQueryRoleArgs; -import cn.odboy.system.dal.model.SystemRoleCodeVo; -import cn.odboy.system.dal.model.SystemRoleExportRowVo; -import cn.odboy.system.dal.model.SystemRoleVo; +import cn.odboy.system.dal.model.request.SystemCreateRoleArgs; +import cn.odboy.system.dal.model.response.SystemMenuVo; +import cn.odboy.system.dal.model.request.SystemQueryRoleArgs; +import cn.odboy.system.dal.model.response.SystemRoleCodeVo; +import cn.odboy.system.dal.model.export.SystemRoleExportRowVo; +import cn.odboy.system.dal.model.response.SystemRoleVo; import cn.odboy.system.dal.mysql.SystemRoleMapper; import cn.odboy.system.framework.permission.core.KitSecurityHelper; import cn.odboy.util.KitBeanUtil; diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemUserRoleService.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemUserRoleService.java index b5f37ffe..e389bda9 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemUserRoleService.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemUserRoleService.java @@ -20,9 +20,9 @@ import cn.odboy.framework.exception.BadRequestException; import cn.odboy.system.dal.dataobject.SystemDeptTb; import cn.odboy.system.dal.dataobject.SystemRoleTb; import cn.odboy.system.dal.dataobject.SystemUserRoleTb; -import cn.odboy.system.dal.model.SystemMenuVo; -import cn.odboy.system.dal.model.SystemRoleVo; -import cn.odboy.system.dal.model.SystemUserVo; +import cn.odboy.system.dal.model.response.SystemMenuVo; +import cn.odboy.system.dal.model.response.SystemRoleVo; +import cn.odboy.system.dal.model.response.SystemUserVo; import cn.odboy.system.dal.mysql.SystemRoleMapper; import cn.odboy.system.dal.mysql.SystemUserRoleMapper; import cn.odboy.system.framework.permission.core.KitSecurityHelper; diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemUserService.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemUserService.java index d1fc7e6e..4525308e 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemUserService.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemUserService.java @@ -31,12 +31,12 @@ import cn.odboy.system.dal.dataobject.SystemRoleTb; import cn.odboy.system.dal.dataobject.SystemUserJobTb; import cn.odboy.system.dal.dataobject.SystemUserRoleTb; import cn.odboy.system.dal.dataobject.SystemUserTb; -import cn.odboy.system.dal.model.SystemDeptVo; -import cn.odboy.system.dal.model.SystemQueryUserArgs; -import cn.odboy.system.dal.model.SystemRoleVo; -import cn.odboy.system.dal.model.SystemUpdateUserPasswordArgs; -import cn.odboy.system.dal.model.SystemUserExportRowVo; -import cn.odboy.system.dal.model.SystemUserVo; +import cn.odboy.system.dal.model.response.SystemDeptVo; +import cn.odboy.system.dal.model.request.SystemQueryUserArgs; +import cn.odboy.system.dal.model.response.SystemRoleVo; +import cn.odboy.system.dal.model.request.SystemUpdateUserPasswordArgs; +import cn.odboy.system.dal.model.export.SystemUserExportRowVo; +import cn.odboy.system.dal.model.response.SystemUserVo; import cn.odboy.system.dal.mysql.SystemUserMapper; import cn.odboy.system.dal.redis.SystemUserInfoDAO; import cn.odboy.system.dal.redis.SystemUserOnlineInfoDAO; diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/impl/SystemMinioStorageServiceImpl.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/impl/SystemMinioStorageServiceImpl.java index 848de53e..dc7bab7c 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/impl/SystemMinioStorageServiceImpl.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/impl/SystemMinioStorageServiceImpl.java @@ -23,9 +23,9 @@ import cn.odboy.framework.properties.AppProperties; import cn.odboy.framework.properties.model.StorageOSSModel; import cn.odboy.framework.server.core.KitFileLocalUploadHelper; import cn.odboy.system.dal.dataobject.SystemOssStorageTb; -import cn.odboy.system.dal.model.SystemOssStorageExportRowVo; -import cn.odboy.system.dal.model.SystemOssStorageVo; -import cn.odboy.system.dal.model.SystemQueryStorageArgs; +import cn.odboy.system.dal.model.export.SystemOssStorageExportRowVo; +import cn.odboy.system.dal.model.response.SystemOssStorageVo; +import cn.odboy.system.dal.model.request.SystemQueryStorageArgs; import cn.odboy.system.dal.mysql.SystemOssStorageMapper; import cn.odboy.system.framework.storage.minio.MinioRepository; import cn.odboy.system.service.SystemOssStorageService; diff --git a/cutejava-springboot3/cutejava-starter/src/test/java/cn/odboy/SystemApplicationTests.java b/cutejava-springboot3/cutejava-starter/src/test/java/cn/odboy/SystemApplicationTests.java index c6471be7..c9e6daeb 100644 --- a/cutejava-springboot3/cutejava-starter/src/test/java/cn/odboy/SystemApplicationTests.java +++ b/cutejava-springboot3/cutejava-starter/src/test/java/cn/odboy/SystemApplicationTests.java @@ -18,8 +18,8 @@ package cn.odboy; import cn.hutool.core.collection.CollUtil; import cn.odboy.system.dal.dataobject.SystemJobTb; import cn.odboy.system.dal.dataobject.SystemRoleTb; -import cn.odboy.system.dal.model.SystemDeptVo; -import cn.odboy.system.dal.model.SystemUserVo; +import cn.odboy.system.dal.model.response.SystemDeptVo; +import cn.odboy.system.dal.model.response.SystemUserVo; import cn.odboy.system.service.SystemUserService; import java.util.Set; import org.junit.jupiter.api.Test; diff --git a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/redis/RedisConfiguration.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/redis/RedisConfiguration.java index 9cbe4099..8296702e 100644 --- a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/redis/RedisConfiguration.java +++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/redis/RedisConfiguration.java @@ -53,8 +53,13 @@ public class RedisConfiguration extends CachingConfigurerSupport { * 自动识别json对象白名单配置（仅允许解析的包名, 范围越小越安全）
未配置可能导致, 登录失败, 反复登录等问题 */ private static final String[] WHITELIST_STR = - {"org.springframework", "cn.odboy.system.dal.dataobject", "cn.odboy.system.dal.model", - "cn.odboy.task.dal.dataobject", "cn.odboy.task.dal.model",}; + { + "org.springframework", + "cn.odboy.system.dal.dataobject", + "cn.odboy.system.dal.model", + "cn.odboy.task.dal.dataobject", + "cn.odboy.task.dal.model", + }; /** * 设置 redis 数据默认过期时间，默认2小时 设置@cacheable 序列化方式 @@ -63,9 +68,7 @@ public class RedisConfiguration extends CachingConfigurerSupport { public RedisCacheConfiguration redisCacheConfiguration() { FastJsonRedisSerializer fastJsonRedisSerializer = new FastJsonRedisSerializer<>(Object.class); RedisCacheConfiguration configuration = RedisCacheConfiguration.defaultCacheConfig(); - configuration = configuration.serializeValuesWith( - RedisSerializationContext.SerializationPair.fromSerializer(fastJsonRedisSerializer)) - .entryTtl(Duration.ofHours(2)); + configuration = configuration.serializeValuesWith(RedisSerializationContext.SerializationPair.fromSerializer(fastJsonRedisSerializer)).entryTtl(Duration.ofHours(2)); return configuration; } diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemAuthController.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemAuthController.java index 859b117f..4de03174 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemAuthController.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemAuthController.java @@ -16,8 +16,8 @@ package cn.odboy.system.controller; import cn.odboy.annotation.AnonymousPostMapping; -import cn.odboy.system.dal.model.SystemAuthVo; -import cn.odboy.system.dal.model.SystemUserLoginArgs; +import cn.odboy.system.dal.model.response.SystemAuthVo; +import cn.odboy.system.dal.model.request.SystemUserLoginArgs; import cn.odboy.system.service.SystemAuthService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemCaptchaController.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemCaptchaController.java index 1d033032..ebc97e42 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemCaptchaController.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemCaptchaController.java @@ -16,7 +16,7 @@ package cn.odboy.system.controller; import cn.odboy.system.constant.SystemCaptchaBizEnum; -import cn.odboy.system.dal.model.SystemCheckEmailCaptchaArgs; +import cn.odboy.system.dal.model.request.SystemCheckEmailCaptchaArgs; import cn.odboy.system.framework.operalog.OperationLog; import cn.odboy.system.service.SystemEmailService; import io.swagger.annotations.Api; diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDeptController.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDeptController.java index b7ba0c73..8faf74a1 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDeptController.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDeptController.java @@ -18,9 +18,9 @@ package cn.odboy.system.controller; import cn.odboy.base.KitPageArgs; import cn.odboy.base.KitPageResult; import cn.odboy.system.dal.dataobject.SystemDeptTb; -import cn.odboy.system.dal.model.SystemCreateDeptArgs; -import cn.odboy.system.dal.model.SystemDeptVo; -import cn.odboy.system.dal.model.SystemQueryDeptArgs; +import cn.odboy.system.dal.model.request.SystemCreateDeptArgs; +import cn.odboy.system.dal.model.response.SystemDeptVo; +import cn.odboy.system.dal.model.request.SystemQueryDeptArgs; import cn.odboy.system.framework.operalog.OperationLog; import cn.odboy.system.service.SystemDeptService; import cn.odboy.util.KitPageUtil; diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDictController.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDictController.java index 5a6592ef..c6ffe476 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDictController.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDictController.java @@ -18,8 +18,8 @@ package cn.odboy.system.controller; import cn.odboy.base.KitPageArgs; import cn.odboy.base.KitPageResult; import cn.odboy.system.dal.dataobject.SystemDictTb; -import cn.odboy.system.dal.model.SystemCreateDictArgs; -import cn.odboy.system.dal.model.SystemQueryDictArgs; +import cn.odboy.system.dal.model.request.SystemCreateDictArgs; +import cn.odboy.system.dal.model.request.SystemQueryDictArgs; import cn.odboy.system.framework.operalog.OperationLog; import cn.odboy.system.service.SystemDictService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDictDetailController.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDictDetailController.java index b730861c..be5003c9 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDictDetailController.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDictDetailController.java @@ -18,9 +18,9 @@ package cn.odboy.system.controller; import cn.odboy.base.KitPageArgs; import cn.odboy.base.KitPageResult; import cn.odboy.system.dal.dataobject.SystemDictDetailTb; -import cn.odboy.system.dal.model.SystemCreateDictDetailArgs; -import cn.odboy.system.dal.model.SystemDictDetailVo; -import cn.odboy.system.dal.model.SystemQueryDictDetailArgs; +import cn.odboy.system.dal.model.request.SystemCreateDictDetailArgs; +import cn.odboy.system.dal.model.response.SystemDictDetailVo; +import cn.odboy.system.dal.model.request.SystemQueryDictDetailArgs; import cn.odboy.system.framework.operalog.OperationLog; import cn.odboy.system.service.SystemDictDetailService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemEmailController.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemEmailController.java index bdcca4ab..58a450aa 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemEmailController.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemEmailController.java @@ -16,7 +16,7 @@ package cn.odboy.system.controller; import cn.odboy.system.dal.dataobject.SystemEmailConfigTb; -import cn.odboy.system.dal.model.SystemSendEmailArgs; +import cn.odboy.system.dal.model.request.SystemSendEmailArgs; import cn.odboy.system.framework.operalog.OperationLog; import cn.odboy.system.service.SystemEmailService; import io.swagger.annotations.Api; diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemJobController.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemJobController.java index 514f156a..b62e917a 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemJobController.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemJobController.java @@ -18,8 +18,8 @@ package cn.odboy.system.controller; import cn.odboy.base.KitPageArgs; import cn.odboy.base.KitPageResult; import cn.odboy.system.dal.dataobject.SystemJobTb; -import cn.odboy.system.dal.model.SystemCreateJobArgs; -import cn.odboy.system.dal.model.SystemQueryJobArgs; +import cn.odboy.system.dal.model.request.SystemCreateJobArgs; +import cn.odboy.system.dal.model.request.SystemQueryJobArgs; import cn.odboy.system.framework.operalog.OperationLog; import cn.odboy.system.service.SystemJobService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemLocalStorageController.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemLocalStorageController.java index 0740bf2f..82aa1935 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemLocalStorageController.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemLocalStorageController.java @@ -18,7 +18,7 @@ package cn.odboy.system.controller; import cn.odboy.base.KitPageArgs; import cn.odboy.base.KitPageResult; import cn.odboy.system.dal.dataobject.SystemLocalStorageTb; -import cn.odboy.system.dal.model.SystemQueryStorageArgs; +import cn.odboy.system.dal.model.request.SystemQueryStorageArgs; import cn.odboy.system.framework.operalog.OperationLog; import cn.odboy.system.service.SystemLocalStorageService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemMenuController.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemMenuController.java index 2f3e9058..59531007 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemMenuController.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemMenuController.java @@ -19,9 +19,9 @@ import cn.odboy.base.KitPageArgs; import cn.odboy.base.KitPageResult; import cn.odboy.framework.exception.BadRequestException; import cn.odboy.system.dal.dataobject.SystemMenuTb; -import cn.odboy.system.dal.model.SystemMenuRouterVo; -import cn.odboy.system.dal.model.SystemMenuVo; -import cn.odboy.system.dal.model.SystemQueryMenuArgs; +import cn.odboy.system.dal.model.response.SystemMenuRouterVo; +import cn.odboy.system.dal.model.response.SystemMenuVo; +import cn.odboy.system.dal.model.request.SystemQueryMenuArgs; import cn.odboy.system.framework.operalog.OperationLog; import cn.odboy.system.service.SystemMenuService; import cn.odboy.util.KitPageUtil; diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemOnlineController.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemOnlineController.java index 658a1bbc..bdd29963 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemOnlineController.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemOnlineController.java @@ -17,7 +17,7 @@ package cn.odboy.system.controller; import cn.odboy.base.KitPageArgs; import cn.odboy.base.KitPageResult; -import cn.odboy.system.dal.model.SystemUserOnlineVo; +import cn.odboy.system.dal.model.response.SystemUserOnlineVo; import cn.odboy.system.dal.redis.SystemUserOnlineInfoDAO; import cn.odboy.system.framework.operalog.OperationLog; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemOperationLogController.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemOperationLogController.java index 2499cbcb..ac087351 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemOperationLogController.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemOperationLogController.java @@ -3,7 +3,7 @@ package cn.odboy.system.controller; import cn.odboy.base.KitPageArgs; import cn.odboy.base.KitPageResult; import cn.odboy.system.dal.dataobject.SystemOperationLogTb; -import cn.odboy.system.dal.model.SystemQueryOperationLogArgs; +import cn.odboy.system.dal.model.request.SystemQueryOperationLogArgs; import cn.odboy.system.service.SystemOperationLogService; import cn.odboy.util.KitPageUtil; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemOssStorageController.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemOssStorageController.java index 6519135d..67b8b98f 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemOssStorageController.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemOssStorageController.java @@ -18,8 +18,8 @@ package cn.odboy.system.controller; import cn.odboy.base.KitPageArgs; import cn.odboy.base.KitPageResult; import cn.odboy.system.dal.dataobject.SystemOssStorageTb; -import cn.odboy.system.dal.model.SystemOssStorageVo; -import cn.odboy.system.dal.model.SystemQueryStorageArgs; +import cn.odboy.system.dal.model.response.SystemOssStorageVo; +import cn.odboy.system.dal.model.request.SystemQueryStorageArgs; import cn.odboy.system.framework.operalog.OperationLog; import cn.odboy.system.service.SystemOssStorageService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemQuartzJobController.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemQuartzJobController.java index ffbf70f6..e9ba10dc 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemQuartzJobController.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemQuartzJobController.java @@ -19,9 +19,9 @@ import cn.odboy.base.KitPageArgs; import cn.odboy.base.KitPageResult; import cn.odboy.system.dal.dataobject.SystemQuartzJobTb; import cn.odboy.system.dal.dataobject.SystemQuartzLogTb; -import cn.odboy.system.dal.model.SystemQuartzJobVo; -import cn.odboy.system.dal.model.SystemQueryQuartzJobArgs; -import cn.odboy.system.dal.model.SystemUpdateQuartzJobArgs; +import cn.odboy.system.dal.model.response.SystemQuartzJobVo; +import cn.odboy.system.dal.model.request.SystemQueryQuartzJobArgs; +import cn.odboy.system.dal.model.request.SystemUpdateQuartzJobArgs; import cn.odboy.system.framework.operalog.OperationLog; import cn.odboy.system.service.SystemQuartzJobService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemRoleController.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemRoleController.java index 4e0eed44..54d63653 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemRoleController.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemRoleController.java @@ -19,9 +19,9 @@ import cn.hutool.core.lang.Dict; import cn.odboy.base.KitPageArgs; import cn.odboy.base.KitPageResult; import cn.odboy.system.dal.dataobject.SystemRoleTb; -import cn.odboy.system.dal.model.SystemCreateRoleArgs; -import cn.odboy.system.dal.model.SystemQueryRoleArgs; -import cn.odboy.system.dal.model.SystemRoleVo; +import cn.odboy.system.dal.model.request.SystemCreateRoleArgs; +import cn.odboy.system.dal.model.request.SystemQueryRoleArgs; +import cn.odboy.system.dal.model.response.SystemRoleVo; import cn.odboy.system.framework.operalog.OperationLog; import cn.odboy.system.service.SystemRoleService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemUserController.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemUserController.java index d7832085..7b7e1041 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemUserController.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemUserController.java @@ -19,10 +19,10 @@ import cn.odboy.base.KitPageArgs; import cn.odboy.base.KitPageResult; import cn.odboy.base.KitSelectOptionVo; import cn.odboy.system.dal.dataobject.SystemUserTb; -import cn.odboy.system.dal.model.SystemQueryUserArgs; -import cn.odboy.system.dal.model.SystemUpdateUserPasswordArgs; -import cn.odboy.system.dal.model.SystemUserJwtVo; -import cn.odboy.system.dal.model.SystemUserVo; +import cn.odboy.system.dal.model.request.SystemQueryUserArgs; +import cn.odboy.system.dal.model.request.SystemUpdateUserPasswordArgs; +import cn.odboy.system.dal.model.response.SystemUserJwtVo; +import cn.odboy.system.dal.model.response.SystemUserVo; import cn.odboy.system.framework.operalog.OperationLog; import cn.odboy.system.framework.permission.core.KitSecurityHelper; import cn.odboy.system.service.SystemAuthService; diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemDeptExportRowVo.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemDeptExportRowVo.java similarity index 90% rename from cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemDeptExportRowVo.java rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemDeptExportRowVo.java index c61b6a5e..02a9da71 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemDeptExportRowVo.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemDeptExportRowVo.java @@ -1,4 +1,4 @@ -package cn.odboy.system.dal.model; +package cn.odboy.system.dal.model.export; import cn.idev.excel.annotation.ExcelProperty; import cn.odboy.base.KitObject; diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemDictExportRowVo.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemDictExportRowVo.java similarity index 92% rename from cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemDictExportRowVo.java rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemDictExportRowVo.java index c91c290c..0cd7ff7d 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemDictExportRowVo.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemDictExportRowVo.java @@ -1,4 +1,4 @@ -package cn.odboy.system.dal.model; +package cn.odboy.system.dal.model.export; import cn.idev.excel.annotation.ExcelProperty; import cn.odboy.base.KitObject; diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemJobExportRowVo.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemJobExportRowVo.java similarity index 90% rename from cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemJobExportRowVo.java rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemJobExportRowVo.java index 64bce6e2..d4e6f2cd 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemJobExportRowVo.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemJobExportRowVo.java @@ -1,4 +1,4 @@ -package cn.odboy.system.dal.model; +package cn.odboy.system.dal.model.export; import cn.idev.excel.annotation.ExcelProperty; import cn.odboy.base.KitObject; diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemLocalStorageExportRowVo.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemLocalStorageExportRowVo.java similarity index 93% rename from cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemLocalStorageExportRowVo.java rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemLocalStorageExportRowVo.java index 9554c3b9..5148a50e 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemLocalStorageExportRowVo.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemLocalStorageExportRowVo.java @@ -1,4 +1,4 @@ -package cn.odboy.system.dal.model; +package cn.odboy.system.dal.model.export; import cn.idev.excel.annotation.ExcelProperty; import cn.odboy.base.KitObject; diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemMenuExportRowVo.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemMenuExportRowVo.java similarity index 93% rename from cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemMenuExportRowVo.java rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemMenuExportRowVo.java index e23f61de..21c2f4e2 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemMenuExportRowVo.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemMenuExportRowVo.java @@ -1,4 +1,4 @@ -package cn.odboy.system.dal.model; +package cn.odboy.system.dal.model.export; import cn.idev.excel.annotation.ExcelProperty; import cn.odboy.base.KitObject; diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemOssStorageExportRowVo.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemOssStorageExportRowVo.java similarity index 94% rename from cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemOssStorageExportRowVo.java rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemOssStorageExportRowVo.java index a196dc95..da9d765d 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemOssStorageExportRowVo.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemOssStorageExportRowVo.java @@ -1,4 +1,4 @@ -package cn.odboy.system.dal.model; +package cn.odboy.system.dal.model.export; import cn.idev.excel.annotation.ExcelProperty; import cn.odboy.base.KitObject; diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQuartzJobExportRowVo.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemQuartzJobExportRowVo.java similarity index 94% rename from cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQuartzJobExportRowVo.java rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemQuartzJobExportRowVo.java index e7d622f1..1f35df7e 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQuartzJobExportRowVo.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemQuartzJobExportRowVo.java @@ -1,4 +1,4 @@ -package cn.odboy.system.dal.model; +package cn.odboy.system.dal.model.export; import cn.idev.excel.annotation.ExcelProperty; import cn.odboy.base.KitObject; diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQuartzLogExportRowVo.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemQuartzLogExportRowVo.java similarity index 94% rename from cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQuartzLogExportRowVo.java rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemQuartzLogExportRowVo.java index d78de3c1..de272d53 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQuartzLogExportRowVo.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemQuartzLogExportRowVo.java @@ -1,4 +1,4 @@ -package cn.odboy.system.dal.model; +package cn.odboy.system.dal.model.export; import cn.idev.excel.annotation.ExcelProperty; import cn.odboy.base.KitObject; diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemRoleExportRowVo.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemRoleExportRowVo.java similarity index 91% rename from cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemRoleExportRowVo.java rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemRoleExportRowVo.java index b8c95352..549ff2e8 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemRoleExportRowVo.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemRoleExportRowVo.java @@ -1,4 +1,4 @@ -package cn.odboy.system.dal.model; +package cn.odboy.system.dal.model.export; import cn.idev.excel.annotation.ExcelProperty; import cn.odboy.base.KitObject; diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemUserExportRowVo.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemUserExportRowVo.java similarity index 94% rename from cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemUserExportRowVo.java rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemUserExportRowVo.java index 9bbd2def..cb91d952 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemUserExportRowVo.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemUserExportRowVo.java @@ -1,4 +1,4 @@ -package cn.odboy.system.dal.model; +package cn.odboy.system.dal.model.export; import cn.idev.excel.annotation.ExcelProperty; import cn.odboy.base.KitObject; diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemUserOnlineExportRowVo.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemUserOnlineExportRowVo.java similarity index 92% rename from cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemUserOnlineExportRowVo.java rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemUserOnlineExportRowVo.java index e85c86c4..15c386c0 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemUserOnlineExportRowVo.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemUserOnlineExportRowVo.java @@ -1,4 +1,4 @@ -package cn.odboy.system.dal.model; +package cn.odboy.system.dal.model.export; import cn.idev.excel.annotation.ExcelProperty; import cn.odboy.base.KitObject; diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemCheckEmailCaptchaArgs.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemCheckEmailCaptchaArgs.java similarity index 93% rename from cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemCheckEmailCaptchaArgs.java rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemCheckEmailCaptchaArgs.java index 808d178c..f8673027 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemCheckEmailCaptchaArgs.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemCheckEmailCaptchaArgs.java @@ -1,33 +1,33 @@ -/* - * Copyright 2021-2025 Odboy - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package cn.odboy.system.dal.model; - -import cn.odboy.base.KitObject; -import javax.validation.constraints.NotBlank; -import lombok.Getter; -import lombok.Setter; - -@Getter -@Setter -public class SystemCheckEmailCaptchaArgs extends KitObject { - - @NotBlank(message = "邮箱不能为空") - private String email; - @NotBlank(message = "验证码不能为空") - private String code; - @NotBlank(message = "验证码业务标识不能为空") - private String bizCode; -} +/* + * Copyright 2021-2025 Odboy + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package cn.odboy.system.dal.model.request; + +import cn.odboy.base.KitObject; +import javax.validation.constraints.NotBlank; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +public class SystemCheckEmailCaptchaArgs extends KitObject { + + @NotBlank(message = "邮箱不能为空") + private String email; + @NotBlank(message = "验证码不能为空") + private String code; + @NotBlank(message = "验证码业务标识不能为空") + private String bizCode; +} diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemCreateDeptArgs.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemCreateDeptArgs.java similarity index 93% rename from cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemCreateDeptArgs.java rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemCreateDeptArgs.java index a9b74309..bc1563d3 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemCreateDeptArgs.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemCreateDeptArgs.java @@ -1,36 +1,36 @@ -/* - * Copyright 2021-2025 Odboy - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package cn.odboy.system.dal.model; - -import cn.odboy.base.KitObject; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import lombok.Data; -import lombok.EqualsAndHashCode; - -@Data -@EqualsAndHashCode(callSuper = false) -public class SystemCreateDeptArgs extends KitObject { - - @NotBlank(message = "部门名称必填") - private String name; - @NotNull(message = "部门排序必填") - private Integer deptSort; - private Boolean enabled; - private String isTop; - private Long pid; - private Integer subCount = 0; -} +/* + * Copyright 2021-2025 Odboy + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package cn.odboy.system.dal.model.request; + +import cn.odboy.base.KitObject; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import lombok.Data; +import lombok.EqualsAndHashCode; + +@Data +@EqualsAndHashCode(callSuper = false) +public class SystemCreateDeptArgs extends KitObject { + + @NotBlank(message = "部门名称必填") + private String name; + @NotNull(message = "部门排序必填") + private Integer deptSort; + private Boolean enabled; + private String isTop; + private Long pid; + private Integer subCount = 0; +} diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemCreateDictArgs.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemCreateDictArgs.java similarity index 93% rename from cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemCreateDictArgs.java rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemCreateDictArgs.java index a8fec72a..71df4f79 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemCreateDictArgs.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemCreateDictArgs.java @@ -1,30 +1,30 @@ -/* - * Copyright 2021-2025 Odboy - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package cn.odboy.system.dal.model; - -import cn.odboy.base.KitObject; -import javax.validation.constraints.NotBlank; -import lombok.Data; -import lombok.EqualsAndHashCode; - -@Data -@EqualsAndHashCode(callSuper = false) -public class SystemCreateDictArgs extends KitObject { - - @NotBlank(message = "字典名称必填") - private String name; - private String description; -} +/* + * Copyright 2021-2025 Odboy + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package cn.odboy.system.dal.model.request; + +import cn.odboy.base.KitObject; +import javax.validation.constraints.NotBlank; +import lombok.Data; +import lombok.EqualsAndHashCode; + +@Data +@EqualsAndHashCode(callSuper = false) +public class SystemCreateDictArgs extends KitObject { + + @NotBlank(message = "字典名称必填") + private String name; + private String description; +} diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemCreateDictDetailArgs.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemCreateDictDetailArgs.java similarity index 94% rename from cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemCreateDictDetailArgs.java rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemCreateDictDetailArgs.java index 02acd140..70da6316 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemCreateDictDetailArgs.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemCreateDictDetailArgs.java @@ -1,37 +1,37 @@ -/* - * Copyright 2021-2025 Odboy - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package cn.odboy.system.dal.model; - -import cn.odboy.base.KitObject; -import cn.odboy.system.dal.dataobject.SystemDictTb; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import lombok.Data; -import lombok.EqualsAndHashCode; - -@Data -@EqualsAndHashCode(callSuper = false) -public class SystemCreateDictDetailArgs extends KitObject { - - @NotNull(message = "参数dict必填") - private SystemDictTb dict; - @NotBlank(message = "字典标签必填") - private String label; - @NotBlank(message = "字典值必填") - private String value; - @NotNull(message = "字典排序必填") - private Integer dictSort; -} +/* + * Copyright 2021-2025 Odboy + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package cn.odboy.system.dal.model.request; + +import cn.odboy.base.KitObject; +import cn.odboy.system.dal.dataobject.SystemDictTb; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import lombok.Data; +import lombok.EqualsAndHashCode; + +@Data +@EqualsAndHashCode(callSuper = false) +public class SystemCreateDictDetailArgs extends KitObject { + + @NotNull(message = "参数dict必填") + private SystemDictTb dict; + @NotBlank(message = "字典标签必填") + private String label; + @NotBlank(message = "字典值必填") + private String value; + @NotNull(message = "字典排序必填") + private Integer dictSort; +} diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemCreateJobArgs.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemCreateJobArgs.java similarity index 93% rename from cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemCreateJobArgs.java rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemCreateJobArgs.java index 43fb7a13..5bc0c6a2 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemCreateJobArgs.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemCreateJobArgs.java @@ -1,33 +1,33 @@ -/* - * Copyright 2021-2025 Odboy - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package cn.odboy.system.dal.model; - -import cn.odboy.base.KitObject; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import lombok.Data; -import lombok.EqualsAndHashCode; - -@Data -@EqualsAndHashCode(callSuper = false) -public class SystemCreateJobArgs extends KitObject { - - @NotBlank(message = "职位名称必填") - private String name; - @NotNull(message = "职位排序必填") - private Integer jobSort; - private Boolean enabled; -} +/* + * Copyright 2021-2025 Odboy + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package cn.odboy.system.dal.model.request; + +import cn.odboy.base.KitObject; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import lombok.Data; +import lombok.EqualsAndHashCode; + +@Data +@EqualsAndHashCode(callSuper = false) +public class SystemCreateJobArgs extends KitObject { + + @NotBlank(message = "职位名称必填") + private String name; + @NotNull(message = "职位排序必填") + private Integer jobSort; + private Boolean enabled; +} diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemCreateRoleArgs.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemCreateRoleArgs.java similarity index 94% rename from cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemCreateRoleArgs.java rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemCreateRoleArgs.java index d99fadaf..70faad66 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemCreateRoleArgs.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemCreateRoleArgs.java @@ -1,42 +1,42 @@ -/* - * Copyright 2021-2025 Odboy - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package cn.odboy.system.dal.model; - -import cn.odboy.base.KitObject; -import cn.odboy.system.dal.dataobject.SystemDeptTb; -import java.util.Set; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import lombok.Data; -import lombok.EqualsAndHashCode; - -@Data -@EqualsAndHashCode(callSuper = false) -public class SystemCreateRoleArgs extends KitObject { - - @NotBlank(message = "角色名称必填") - private String name; - @NotNull(message = "角色级别必填") - private Integer level; - @NotBlank(message = "数据范围必填") - private String dataScope; - private String description; - /** - * 关联的部门 - */ - private Long id; - private Set depts; -} +/* + * Copyright 2021-2025 Odboy + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package cn.odboy.system.dal.model.request; + +import cn.odboy.base.KitObject; +import cn.odboy.system.dal.dataobject.SystemDeptTb; +import java.util.Set; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import lombok.Data; +import lombok.EqualsAndHashCode; + +@Data +@EqualsAndHashCode(callSuper = false) +public class SystemCreateRoleArgs extends KitObject { + + @NotBlank(message = "角色名称必填") + private String name; + @NotNull(message = "角色级别必填") + private Integer level; + @NotBlank(message = "数据范围必填") + private String dataScope; + private String description; + /** + * 关联的部门 + */ + private Long id; + private Set depts; +} diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryDeptArgs.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemQueryDeptArgs.java similarity index 94% rename from cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryDeptArgs.java rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemQueryDeptArgs.java index cc8f7ef2..008cc29a 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryDeptArgs.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemQueryDeptArgs.java @@ -1,38 +1,38 @@ -/* - * Copyright 2021-2025 Odboy - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package cn.odboy.system.dal.model; - -import io.swagger.annotations.ApiModelProperty; -import java.util.Date; -import java.util.List; -import lombok.Data; - -@Data -public class SystemQueryDeptArgs { - - @ApiModelProperty(value = "部门id集合") - private List ids; - @ApiModelProperty(value = "部门名称") - private String name; - @ApiModelProperty(value = "是否启用") - private Boolean enabled; - @ApiModelProperty(value = "上级部门") - private Long pid; - @ApiModelProperty(value = "PID为空查询") - private Boolean pidIsNull; - @ApiModelProperty(value = "创建时间") - private List createTime; -} +/* + * Copyright 2021-2025 Odboy + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package cn.odboy.system.dal.model.request; + +import io.swagger.annotations.ApiModelProperty; +import java.util.Date; +import java.util.List; +import lombok.Data; + +@Data +public class SystemQueryDeptArgs { + + @ApiModelProperty(value = "部门id集合") + private List ids; + @ApiModelProperty(value = "部门名称") + private String name; + @ApiModelProperty(value = "是否启用") + private Boolean enabled; + @ApiModelProperty(value = "上级部门") + private Long pid; + @ApiModelProperty(value = "PID为空查询") + private Boolean pidIsNull; + @ApiModelProperty(value = "创建时间") + private List createTime; +} diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryDictArgs.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemQueryDictArgs.java similarity index 93% rename from cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryDictArgs.java rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemQueryDictArgs.java index a1c6fb2a..e47babbc 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryDictArgs.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemQueryDictArgs.java @@ -1,30 +1,30 @@ -/* - * Copyright 2021-2025 Odboy - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package cn.odboy.system.dal.model; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -@Data -public class SystemQueryDictArgs { - - @ApiModelProperty(value = "模糊查询") - private String blurry; - @ApiModelProperty(value = "页码", example = "1") - private Integer page = 1; - @ApiModelProperty(value = "每页数据量", example = "10") - private Integer size = 10; -} +/* + * Copyright 2021-2025 Odboy + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package cn.odboy.system.dal.model.request; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class SystemQueryDictArgs { + + @ApiModelProperty(value = "模糊查询") + private String blurry; + @ApiModelProperty(value = "页码", example = "1") + private Integer page = 1; + @ApiModelProperty(value = "每页数据量", example = "10") + private Integer size = 10; +} diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryDictDetailArgs.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemQueryDictDetailArgs.java similarity index 93% rename from cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryDictDetailArgs.java rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemQueryDictDetailArgs.java index f2564f3e..d05f55de 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryDictDetailArgs.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemQueryDictDetailArgs.java @@ -1,31 +1,31 @@ -/* - * Copyright 2021-2025 Odboy - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package cn.odboy.system.dal.model; - -import cn.odboy.base.KitObject; -import io.swagger.annotations.ApiModelProperty; -import lombok.Getter; -import lombok.Setter; - -@Getter -@Setter -public class SystemQueryDictDetailArgs extends KitObject { - - @ApiModelProperty(value = "标签") - private String label; - @ApiModelProperty(value = "字典名称") - private String dictName; +/* + * Copyright 2021-2025 Odboy + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package cn.odboy.system.dal.model.request; + +import cn.odboy.base.KitObject; +import io.swagger.annotations.ApiModelProperty; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +public class SystemQueryDictDetailArgs extends KitObject { + + @ApiModelProperty(value = "标签") + private String label; + @ApiModelProperty(value = "字典名称") + private String dictName; } \ No newline at end of file diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryJobArgs.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemQueryJobArgs.java similarity index 94% rename from cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryJobArgs.java rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemQueryJobArgs.java index 52196992..53e393bc 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryJobArgs.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemQueryJobArgs.java @@ -1,38 +1,38 @@ -/* - * Copyright 2021-2025 Odboy - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package cn.odboy.system.dal.model; - -import io.swagger.annotations.ApiModelProperty; -import java.util.Date; -import java.util.List; -import lombok.Data; -import lombok.NoArgsConstructor; - -@Data -@NoArgsConstructor -public class SystemQueryJobArgs { - - @ApiModelProperty(value = "岗位名称") - private String name; - @ApiModelProperty(value = "是否启用") - private Boolean enabled; - @ApiModelProperty(value = "创建时间") - private List createTime; - @ApiModelProperty(value = "页码", example = "1") - private Integer page = 1; - @ApiModelProperty(value = "每页数据量", example = "10") - private Integer size = 10; -} +/* + * Copyright 2021-2025 Odboy + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package cn.odboy.system.dal.model.request; + +import io.swagger.annotations.ApiModelProperty; +import java.util.Date; +import java.util.List; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@NoArgsConstructor +public class SystemQueryJobArgs { + + @ApiModelProperty(value = "岗位名称") + private String name; + @ApiModelProperty(value = "是否启用") + private Boolean enabled; + @ApiModelProperty(value = "创建时间") + private List createTime; + @ApiModelProperty(value = "页码", example = "1") + private Integer page = 1; + @ApiModelProperty(value = "每页数据量", example = "10") + private Integer size = 10; +} diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryMenuArgs.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemQueryMenuArgs.java similarity index 93% rename from cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryMenuArgs.java rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemQueryMenuArgs.java index bb66c1c8..f7a45ff9 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryMenuArgs.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemQueryMenuArgs.java @@ -1,34 +1,34 @@ -/* - * Copyright 2021-2025 Odboy - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package cn.odboy.system.dal.model; - -import io.swagger.annotations.ApiModelProperty; -import java.util.Date; -import java.util.List; -import lombok.Data; - -@Data -public class SystemQueryMenuArgs { - - @ApiModelProperty(value = "模糊查询") - private String blurry; - @ApiModelProperty(value = "创建时间") - private List createTime; - @ApiModelProperty(value = "PID为空查询") - private Boolean pidIsNull; - @ApiModelProperty(value = "PID") - private Long pid; -} +/* + * Copyright 2021-2025 Odboy + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package cn.odboy.system.dal.model.request; + +import io.swagger.annotations.ApiModelProperty; +import java.util.Date; +import java.util.List; +import lombok.Data; + +@Data +public class SystemQueryMenuArgs { + + @ApiModelProperty(value = "模糊查询") + private String blurry; + @ApiModelProperty(value = "创建时间") + private List createTime; + @ApiModelProperty(value = "PID为空查询") + private Boolean pidIsNull; + @ApiModelProperty(value = "PID") + private Long pid; +} diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryOperationLogArgs.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemQueryOperationLogArgs.java similarity index 78% rename from cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryOperationLogArgs.java rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemQueryOperationLogArgs.java index a37ed9bc..2d26cc23 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryOperationLogArgs.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemQueryOperationLogArgs.java @@ -1,4 +1,4 @@ -package cn.odboy.system.dal.model; +package cn.odboy.system.dal.model.request; import cn.odboy.base.KitObject; import lombok.Getter; diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryQuartzJobArgs.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemQueryQuartzJobArgs.java similarity index 94% rename from cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryQuartzJobArgs.java rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemQueryQuartzJobArgs.java index 7114be74..88ee8d81 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryQuartzJobArgs.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemQueryQuartzJobArgs.java @@ -1,36 +1,36 @@ -/* - * Copyright 2021-2025 Odboy - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package cn.odboy.system.dal.model; - -import io.swagger.annotations.ApiModelProperty; -import java.util.Date; -import java.util.List; -import lombok.Data; - -@Data -public class SystemQueryQuartzJobArgs { - - @ApiModelProperty(value = "定时任务名称") - private String jobName; - @ApiModelProperty(value = "是否成功") - private Boolean isSuccess; - @ApiModelProperty(value = "创建时间") - private List createTime; - @ApiModelProperty(value = "页码", example = "1") - private Integer page = 1; - @ApiModelProperty(value = "每页数据量", example = "10") - private Integer size = 10; -} +/* + * Copyright 2021-2025 Odboy + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package cn.odboy.system.dal.model.request; + +import io.swagger.annotations.ApiModelProperty; +import java.util.Date; +import java.util.List; +import lombok.Data; + +@Data +public class SystemQueryQuartzJobArgs { + + @ApiModelProperty(value = "定时任务名称") + private String jobName; + @ApiModelProperty(value = "是否成功") + private Boolean isSuccess; + @ApiModelProperty(value = "创建时间") + private List createTime; + @ApiModelProperty(value = "页码", example = "1") + private Integer page = 1; + @ApiModelProperty(value = "每页数据量", example = "10") + private Integer size = 10; +} diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryRoleArgs.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemQueryRoleArgs.java similarity index 94% rename from cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryRoleArgs.java rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemQueryRoleArgs.java index 6ce2f0df..a08f9acd 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryRoleArgs.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemQueryRoleArgs.java @@ -1,36 +1,36 @@ -/* - * Copyright 2021-2025 Odboy - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package cn.odboy.system.dal.model; - -import io.swagger.annotations.ApiModelProperty; -import java.util.Date; -import java.util.List; -import lombok.Data; - -@Data -public class SystemQueryRoleArgs { - - @ApiModelProperty(value = "模糊查询") - private String blurry; - @ApiModelProperty(value = "创建时间") - private List createTime; - @ApiModelProperty(value = "页码", example = "1") - private Integer page = 1; - @ApiModelProperty(value = "每页数据量", example = "10") - private Integer size = 10; - @ApiModelProperty(value = "偏移量", hidden = true) - private long offset; -} +/* + * Copyright 2021-2025 Odboy + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package cn.odboy.system.dal.model.request; + +import io.swagger.annotations.ApiModelProperty; +import java.util.Date; +import java.util.List; +import lombok.Data; + +@Data +public class SystemQueryRoleArgs { + + @ApiModelProperty(value = "模糊查询") + private String blurry; + @ApiModelProperty(value = "创建时间") + private List createTime; + @ApiModelProperty(value = "页码", example = "1") + private Integer page = 1; + @ApiModelProperty(value = "每页数据量", example = "10") + private Integer size = 10; + @ApiModelProperty(value = "偏移量", hidden = true) + private long offset; +} diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryStorageArgs.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemQueryStorageArgs.java similarity index 93% rename from cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryStorageArgs.java rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemQueryStorageArgs.java index b13fcf91..4e524e5d 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryStorageArgs.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemQueryStorageArgs.java @@ -1,34 +1,34 @@ -/* - * Copyright 2021-2025 Odboy - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package cn.odboy.system.dal.model; - -import io.swagger.annotations.ApiModelProperty; -import java.util.Date; -import java.util.List; -import lombok.Data; - -@Data -public class SystemQueryStorageArgs { - - @ApiModelProperty(value = "模糊查询") - private String blurry; - @ApiModelProperty(value = "创建时间") - private List createTime; - @ApiModelProperty(value = "页码", example = "1") - private Integer page = 1; - @ApiModelProperty(value = "每页数据量", example = "10") - private Integer size = 10; -} +/* + * Copyright 2021-2025 Odboy + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package cn.odboy.system.dal.model.request; + +import io.swagger.annotations.ApiModelProperty; +import java.util.Date; +import java.util.List; +import lombok.Data; + +@Data +public class SystemQueryStorageArgs { + + @ApiModelProperty(value = "模糊查询") + private String blurry; + @ApiModelProperty(value = "创建时间") + private List createTime; + @ApiModelProperty(value = "页码", example = "1") + private Integer page = 1; + @ApiModelProperty(value = "每页数据量", example = "10") + private Integer size = 10; +} diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryUserArgs.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemQueryUserArgs.java similarity index 94% rename from cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryUserArgs.java rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemQueryUserArgs.java index a05513dd..f74843f3 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryUserArgs.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemQueryUserArgs.java @@ -1,47 +1,47 @@ -/* - * Copyright 2021-2025 Odboy - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package cn.odboy.system.dal.model; - -import cn.odboy.base.KitObject; -import io.swagger.annotations.ApiModelProperty; -import java.util.Date; -import java.util.HashSet; -import java.util.List; -import java.util.Set; -import lombok.Data; -import lombok.EqualsAndHashCode; - -@Data -@EqualsAndHashCode(callSuper = false) -public class SystemQueryUserArgs extends KitObject { - - @ApiModelProperty(value = "ID") - private Long id; - @ApiModelProperty(value = "多个ID") - private Set deptIds = new HashSet<>(); - @ApiModelProperty(value = "模糊查询") - private String blurry; - @ApiModelProperty(value = "是否启用") - private Boolean enabled; - @ApiModelProperty(value = "部门ID") - private Long deptId; - @ApiModelProperty(value = "创建时间") - private List createTime; - @ApiModelProperty(value = "页码", example = "1") - private Integer page = 1; - @ApiModelProperty(value = "每页数据量", example = "10") - private Integer size = 10; -} +/* + * Copyright 2021-2025 Odboy + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package cn.odboy.system.dal.model.request; + +import cn.odboy.base.KitObject; +import io.swagger.annotations.ApiModelProperty; +import java.util.Date; +import java.util.HashSet; +import java.util.List; +import java.util.Set; +import lombok.Data; +import lombok.EqualsAndHashCode; + +@Data +@EqualsAndHashCode(callSuper = false) +public class SystemQueryUserArgs extends KitObject { + + @ApiModelProperty(value = "ID") + private Long id; + @ApiModelProperty(value = "多个ID") + private Set deptIds = new HashSet<>(); + @ApiModelProperty(value = "模糊查询") + private String blurry; + @ApiModelProperty(value = "是否启用") + private Boolean enabled; + @ApiModelProperty(value = "部门ID") + private Long deptId; + @ApiModelProperty(value = "创建时间") + private List createTime; + @ApiModelProperty(value = "页码", example = "1") + private Integer page = 1; + @ApiModelProperty(value = "每页数据量", example = "10") + private Integer size = 10; +} diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemSendEmailArgs.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemSendEmailArgs.java similarity index 93% rename from cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemSendEmailArgs.java rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemSendEmailArgs.java index 4c85cf8b..fa7f28ab 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemSendEmailArgs.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemSendEmailArgs.java @@ -1,43 +1,43 @@ -/* - * Copyright 2021-2025 Odboy - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package cn.odboy.system.dal.model; - -import io.swagger.annotations.ApiModelProperty; -import java.util.List; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -/** - * 发送邮件时，接收参数的类 - */ -@Data -@AllArgsConstructor -@NoArgsConstructor -public class SystemSendEmailArgs { - - @NotEmpty - @ApiModelProperty(value = "收件人") - private List tos; - @NotBlank - @ApiModelProperty(value = "主题") - private String subject; - @NotBlank - @ApiModelProperty(value = "内容") - private String content; -} +/* + * Copyright 2021-2025 Odboy + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package cn.odboy.system.dal.model.request; + +import io.swagger.annotations.ApiModelProperty; +import java.util.List; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * 发送邮件时，接收参数的类 + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +public class SystemSendEmailArgs { + + @NotEmpty + @ApiModelProperty(value = "收件人") + private List tos; + @NotBlank + @ApiModelProperty(value = "主题") + private String subject; + @NotBlank + @ApiModelProperty(value = "内容") + private String content; +} diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemUpdateQuartzJobArgs.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemUpdateQuartzJobArgs.java similarity index 94% rename from cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemUpdateQuartzJobArgs.java rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemUpdateQuartzJobArgs.java index 48813084..7a368607 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemUpdateQuartzJobArgs.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemUpdateQuartzJobArgs.java @@ -1,46 +1,46 @@ -/* - * Copyright 2021-2025 Odboy - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package cn.odboy.system.dal.model; - -import cn.odboy.base.KitObject; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import lombok.Data; -import lombok.EqualsAndHashCode; - -@Data -@EqualsAndHashCode(callSuper = false) -public class SystemUpdateQuartzJobArgs extends KitObject { - - @NotNull - private Long id; - private String uuid; - private String jobName; - @NotBlank - private String beanName; - @NotBlank - private String methodName; - private String params; - @NotBlank - private String cronExpression; - private Boolean isPause = false; - private String personInCharge; - private String email; - private String subTask; - private Boolean pauseAfterFailure; - @NotBlank - private String description; -} +/* + * Copyright 2021-2025 Odboy + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package cn.odboy.system.dal.model.request; + +import cn.odboy.base.KitObject; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import lombok.Data; +import lombok.EqualsAndHashCode; + +@Data +@EqualsAndHashCode(callSuper = false) +public class SystemUpdateQuartzJobArgs extends KitObject { + + @NotNull + private Long id; + private String uuid; + private String jobName; + @NotBlank + private String beanName; + @NotBlank + private String methodName; + private String params; + @NotBlank + private String cronExpression; + private Boolean isPause = false; + private String personInCharge; + private String email; + private String subTask; + private Boolean pauseAfterFailure; + @NotBlank + private String description; +} diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemUpdateUserPasswordArgs.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemUpdateUserPasswordArgs.java similarity index 92% rename from cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemUpdateUserPasswordArgs.java rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemUpdateUserPasswordArgs.java index 9070e53c..d8284b75 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemUpdateUserPasswordArgs.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemUpdateUserPasswordArgs.java @@ -1,31 +1,31 @@ -/* - * Copyright 2021-2025 Odboy - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package cn.odboy.system.dal.model; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * 修改密码 - */ -@Data -public class SystemUpdateUserPasswordArgs { - - @ApiModelProperty(value = "旧密码") - private String oldPass; - @ApiModelProperty(value = "新密码") - private String newPass; -} +/* + * Copyright 2021-2025 Odboy + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package cn.odboy.system.dal.model.request; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * 修改密码 + */ +@Data +public class SystemUpdateUserPasswordArgs { + + @ApiModelProperty(value = "旧密码") + private String oldPass; + @ApiModelProperty(value = "新密码") + private String newPass; +} diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemUserLoginArgs.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemUserLoginArgs.java similarity index 93% rename from cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemUserLoginArgs.java rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemUserLoginArgs.java index e93ea5c5..88e42fa6 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemUserLoginArgs.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemUserLoginArgs.java @@ -1,37 +1,37 @@ -/* - * Copyright 2021-2025 Odboy - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package cn.odboy.system.dal.model; - -import io.swagger.annotations.ApiModelProperty; -import javax.validation.constraints.NotBlank; -import lombok.Getter; -import lombok.Setter; - -@Getter -@Setter -public class SystemUserLoginArgs { - - @NotBlank - @ApiModelProperty(value = "用户名") - private String username; - @NotBlank - @ApiModelProperty(value = "密码") - private String password; - @ApiModelProperty(value = "验证码") - private String code; - @ApiModelProperty(value = "验证码的key") - private String uuid = ""; -} +/* + * Copyright 2021-2025 Odboy + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package cn.odboy.system.dal.model.request; + +import io.swagger.annotations.ApiModelProperty; +import javax.validation.constraints.NotBlank; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +public class SystemUserLoginArgs { + + @NotBlank + @ApiModelProperty(value = "用户名") + private String username; + @NotBlank + @ApiModelProperty(value = "密码") + private String password; + @ApiModelProperty(value = "验证码") + private String code; + @ApiModelProperty(value = "验证码的key") + private String uuid = ""; +} diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemAuthVo.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemAuthVo.java similarity index 85% rename from cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemAuthVo.java rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemAuthVo.java index 8baf9b76..9024d26e 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemAuthVo.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemAuthVo.java @@ -1,4 +1,4 @@ -package cn.odboy.system.dal.model; +package cn.odboy.system.dal.model.response; import cn.odboy.base.KitObject; import lombok.Getter; diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemCaptchaVo.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemCaptchaVo.java similarity index 86% rename from cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemCaptchaVo.java rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemCaptchaVo.java index bcf6c401..6f6dc84a 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemCaptchaVo.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemCaptchaVo.java @@ -1,4 +1,4 @@ -package cn.odboy.system.dal.model; +package cn.odboy.system.dal.model.response; import cn.odboy.base.KitObject; import lombok.Getter; diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemDeptVo.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemDeptVo.java similarity index 97% rename from cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemDeptVo.java rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemDeptVo.java index 3ba9e2f7..45812df8 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemDeptVo.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemDeptVo.java @@ -1,4 +1,4 @@ -package cn.odboy.system.dal.model; +package cn.odboy.system.dal.model.response; import cn.odboy.base.KitBaseUserTimeTb; import cn.odboy.system.dal.dataobject.SystemRoleTb; diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemDictDetailVo.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemDictDetailVo.java similarity index 96% rename from cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemDictDetailVo.java rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemDictDetailVo.java index 3118f9aa..fb44f569 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemDictDetailVo.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemDictDetailVo.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.odboy.system.dal.model; +package cn.odboy.system.dal.model.response; import cn.odboy.base.KitBaseUserTimeTb; import cn.odboy.system.dal.dataobject.SystemDictTb; diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemMenuMetaVo.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemMenuMetaVo.java similarity index 93% rename from cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemMenuMetaVo.java rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemMenuMetaVo.java index 3ae49d0b..a49bd485 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemMenuMetaVo.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemMenuMetaVo.java @@ -1,35 +1,35 @@ -/* - * Copyright 2021-2025 Odboy - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package cn.odboy.system.dal.model; - -import cn.odboy.base.KitObject; -import io.swagger.annotations.ApiModelProperty; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.EqualsAndHashCode; - -@Data -@AllArgsConstructor -@EqualsAndHashCode(callSuper = false) -public class SystemMenuMetaVo extends KitObject { - - @ApiModelProperty(value = "菜单标题") - private String title; - @ApiModelProperty(value = "菜单图标") - private String icon; - @ApiModelProperty(value = "缓存") - private Boolean noCache; -} +/* + * Copyright 2021-2025 Odboy + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package cn.odboy.system.dal.model.response; + +import cn.odboy.base.KitObject; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; + +@Data +@AllArgsConstructor +@EqualsAndHashCode(callSuper = false) +public class SystemMenuMetaVo extends KitObject { + + @ApiModelProperty(value = "菜单标题") + private String title; + @ApiModelProperty(value = "菜单图标") + private String icon; + @ApiModelProperty(value = "缓存") + private Boolean noCache; +} diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemMenuRouterVo.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemMenuRouterVo.java similarity index 97% rename from cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemMenuRouterVo.java rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemMenuRouterVo.java index e8c5ff8d..d98c65ff 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemMenuRouterVo.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemMenuRouterVo.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.odboy.system.dal.model; +package cn.odboy.system.dal.model.response; import cn.odboy.base.KitObject; import io.swagger.annotations.ApiModelProperty; diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemMenuVo.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemMenuVo.java similarity index 98% rename from cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemMenuVo.java rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemMenuVo.java index eac02041..f3f198bf 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemMenuVo.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemMenuVo.java @@ -1,4 +1,4 @@ -package cn.odboy.system.dal.model; +package cn.odboy.system.dal.model.response; import cn.odboy.base.KitBaseUserTimeTb; import cn.odboy.system.dal.dataobject.SystemRoleTb; diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemOssStorageVo.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemOssStorageVo.java similarity index 94% rename from cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemOssStorageVo.java rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemOssStorageVo.java index 9dcb04b8..503cfddf 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemOssStorageVo.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemOssStorageVo.java @@ -1,57 +1,57 @@ -/* - * Copyright 2021-2025 Odboy - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package cn.odboy.system.dal.model; - -import cn.odboy.base.KitBaseUserTimeTb; -import io.swagger.annotations.ApiModelProperty; -import lombok.Getter; -import lombok.Setter; - -@Getter -@Setter -public class SystemOssStorageVo extends KitBaseUserTimeTb { - - @ApiModelProperty("ID") - private Long id; - @ApiModelProperty("类型，比如minio") - private String serviceType; - @ApiModelProperty("服务地址") - private String endpoint; - @ApiModelProperty("存储桶名称") - private String bucketName; - @ApiModelProperty("完整文件名称") - private String fileName; - @ApiModelProperty("文件大小, 单位：字节") - private Long fileSize; - @ApiModelProperty("文件类型") - private String fileMime; - @ApiModelProperty("短文件名") - private String filePrefix; - @ApiModelProperty("文件后缀") - private String fileSuffix; - @ApiModelProperty("文件md5") - private String fileMd5; - @ApiModelProperty("文件链接") - private String fileUrl; - @ApiModelProperty("文件编码") - private String fileCode; - @ApiModelProperty("对象路径") - private String objectName; - /** - * 扩展字段 - */ - private String fileSizeDesc; -} +/* + * Copyright 2021-2025 Odboy + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package cn.odboy.system.dal.model.response; + +import cn.odboy.base.KitBaseUserTimeTb; +import io.swagger.annotations.ApiModelProperty; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +public class SystemOssStorageVo extends KitBaseUserTimeTb { + + @ApiModelProperty("ID") + private Long id; + @ApiModelProperty("类型，比如minio") + private String serviceType; + @ApiModelProperty("服务地址") + private String endpoint; + @ApiModelProperty("存储桶名称") + private String bucketName; + @ApiModelProperty("完整文件名称") + private String fileName; + @ApiModelProperty("文件大小, 单位：字节") + private Long fileSize; + @ApiModelProperty("文件类型") + private String fileMime; + @ApiModelProperty("短文件名") + private String filePrefix; + @ApiModelProperty("文件后缀") + private String fileSuffix; + @ApiModelProperty("文件md5") + private String fileMd5; + @ApiModelProperty("文件链接") + private String fileUrl; + @ApiModelProperty("文件编码") + private String fileCode; + @ApiModelProperty("对象路径") + private String objectName; + /** + * 扩展字段 + */ + private String fileSizeDesc; +} diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemProductLineTreeVo.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemProductLineTreeVo.java similarity index 93% rename from cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemProductLineTreeVo.java rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemProductLineTreeVo.java index 0f85dd05..91527bee 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemProductLineTreeVo.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemProductLineTreeVo.java @@ -1,30 +1,30 @@ -/* - * Copyright 2021-2025 Odboy - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package cn.odboy.system.dal.model; - -import cn.odboy.base.KitObject; -import java.util.List; -import lombok.Getter; -import lombok.Setter; - -@Getter -@Setter -public class SystemProductLineTreeVo extends KitObject { - - private String value; - private String label; - private List children; -} +/* + * Copyright 2021-2025 Odboy + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package cn.odboy.system.dal.model.response; + +import cn.odboy.base.KitObject; +import java.util.List; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +public class SystemProductLineTreeVo extends KitObject { + + private String value; + private String label; + private List children; +} diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemProductLineVo.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemProductLineVo.java similarity index 92% rename from cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemProductLineVo.java rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemProductLineVo.java index a629f57e..e358907b 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemProductLineVo.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemProductLineVo.java @@ -1,38 +1,38 @@ -/* - * Copyright 2021-2025 Odboy - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package cn.odboy.system.dal.model; - -import cn.odboy.base.KitObject; -import lombok.Getter; -import lombok.Setter; - -@Getter -@Setter -public class SystemProductLineVo extends KitObject { - - /** - * 部门ID（select的value） - */ - private Long value; - /** - * 产品线，如"研发部/华南分部/devops组" - */ - private String label; - /** - * ID路径，如"1-2-3" - */ - private String idPath; -} +/* + * Copyright 2021-2025 Odboy + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package cn.odboy.system.dal.model.response; + +import cn.odboy.base.KitObject; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +public class SystemProductLineVo extends KitObject { + + /** + * 部门ID（select的value） + */ + private Long value; + /** + * 产品线，如"研发部/华南分部/devops组" + */ + private String label; + /** + * ID路径，如"1-2-3" + */ + private String idPath; +} diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQuartzJobVo.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemQuartzJobVo.java similarity index 96% rename from cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQuartzJobVo.java rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemQuartzJobVo.java index fed3436d..e7943c48 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQuartzJobVo.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemQuartzJobVo.java @@ -1,4 +1,4 @@ -package cn.odboy.system.dal.model; +package cn.odboy.system.dal.model.response; import cn.odboy.base.KitBaseUserTimeTb; import io.swagger.annotations.ApiModelProperty; diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemRoleCodeVo.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemRoleCodeVo.java similarity index 93% rename from cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemRoleCodeVo.java rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemRoleCodeVo.java index 62552fc1..2fb55924 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemRoleCodeVo.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemRoleCodeVo.java @@ -1,34 +1,34 @@ -/* - * Copyright 2021-2025 Odboy - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package cn.odboy.system.dal.model; - -import io.swagger.annotations.ApiModelProperty; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; -import org.springframework.security.core.GrantedAuthority; - -/** - * 避免序列化问题 - */ -@Data -@NoArgsConstructor -@AllArgsConstructor -public class SystemRoleCodeVo implements GrantedAuthority { - - @ApiModelProperty(value = "角色名") - private String authority; -} +/* + * Copyright 2021-2025 Odboy + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package cn.odboy.system.dal.model.response; + +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import org.springframework.security.core.GrantedAuthority; + +/** + * 避免序列化问题 + */ +@Data +@NoArgsConstructor +@AllArgsConstructor +public class SystemRoleCodeVo implements GrantedAuthority { + + @ApiModelProperty(value = "角色名") + private String authority; +} diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemRoleVo.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemRoleVo.java similarity index 97% rename from cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemRoleVo.java rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemRoleVo.java index 22323928..0c5f25c7 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemRoleVo.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemRoleVo.java @@ -1,4 +1,4 @@ -package cn.odboy.system.dal.model; +package cn.odboy.system.dal.model.response; import cn.odboy.base.KitBaseUserTimeTb; import cn.odboy.system.constant.SystemDataScopeEnum; diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemSimpleUserVo.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemSimpleUserVo.java similarity index 95% rename from cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemSimpleUserVo.java rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemSimpleUserVo.java index ca9ed811..fd60f0c1 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemSimpleUserVo.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemSimpleUserVo.java @@ -1,55 +1,55 @@ -/* - * Copyright 2021-2025 Odboy - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package cn.odboy.system.dal.model; - -import cn.odboy.base.KitObject; -import cn.odboy.system.dal.dataobject.SystemDeptTb; -import cn.odboy.system.dal.dataobject.SystemJobTb; -import cn.odboy.system.dal.dataobject.SystemRoleTb; -import io.swagger.annotations.ApiModelProperty; -import java.util.Set; -import lombok.Data; -import lombok.EqualsAndHashCode; - -@Data -@EqualsAndHashCode(callSuper = false) -public class SystemSimpleUserVo extends KitObject { - - @ApiModelProperty(value = "ID", hidden = true) - private Long id; - @ApiModelProperty(value = "用户角色") - private Set roles; - @ApiModelProperty(value = "用户岗位") - private Set jobs; - private Long deptId; - private SystemDeptTb dept; - @ApiModelProperty(value = "用户名称") - private String username; - @ApiModelProperty(value = "用户昵称") - private String nickName; - @ApiModelProperty(value = "邮箱") - private String email; - @ApiModelProperty(value = "电话号码") - private String phone; - @ApiModelProperty(value = "用户性别") - private String gender; - @ApiModelProperty(value = "头像真实名称", hidden = true) - private String avatarName; - @ApiModelProperty(value = "是否启用") - private Boolean enabled; - @ApiModelProperty(value = "是否为admin账号", hidden = true) - private Boolean isAdmin = false; +/* + * Copyright 2021-2025 Odboy + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package cn.odboy.system.dal.model.response; + +import cn.odboy.base.KitObject; +import cn.odboy.system.dal.dataobject.SystemDeptTb; +import cn.odboy.system.dal.dataobject.SystemJobTb; +import cn.odboy.system.dal.dataobject.SystemRoleTb; +import io.swagger.annotations.ApiModelProperty; +import java.util.Set; +import lombok.Data; +import lombok.EqualsAndHashCode; + +@Data +@EqualsAndHashCode(callSuper = false) +public class SystemSimpleUserVo extends KitObject { + + @ApiModelProperty(value = "ID", hidden = true) + private Long id; + @ApiModelProperty(value = "用户角色") + private Set roles; + @ApiModelProperty(value = "用户岗位") + private Set jobs; + private Long deptId; + private SystemDeptTb dept; + @ApiModelProperty(value = "用户名称") + private String username; + @ApiModelProperty(value = "用户昵称") + private String nickName; + @ApiModelProperty(value = "邮箱") + private String email; + @ApiModelProperty(value = "电话号码") + private String phone; + @ApiModelProperty(value = "用户性别") + private String gender; + @ApiModelProperty(value = "头像真实名称", hidden = true) + private String avatarName; + @ApiModelProperty(value = "是否启用") + private Boolean enabled; + @ApiModelProperty(value = "是否为admin账号", hidden = true) + private Boolean isAdmin = false; } \ No newline at end of file diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemUserInfoVo.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemUserInfoVo.java similarity index 93% rename from cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemUserInfoVo.java rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemUserInfoVo.java index 41614581..1d435bc4 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemUserInfoVo.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemUserInfoVo.java @@ -1,36 +1,36 @@ -/* - * Copyright 2021-2025 Odboy - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package cn.odboy.system.dal.model; - -import cn.odboy.base.KitObject; -import java.util.List; -import java.util.Set; -import java.util.stream.Collectors; -import lombok.Data; -import lombok.EqualsAndHashCode; - -@Data -@EqualsAndHashCode(callSuper = false) -public class SystemUserInfoVo extends KitObject { - - private SystemSimpleUserVo user; - private List dataScopes; - private List authorities; - - public Set getRoles() { - return authorities.stream().map(SystemRoleCodeVo::getAuthority).collect(Collectors.toSet()); - } -} +/* + * Copyright 2021-2025 Odboy + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package cn.odboy.system.dal.model.response; + +import cn.odboy.base.KitObject; +import java.util.List; +import java.util.Set; +import java.util.stream.Collectors; +import lombok.Data; +import lombok.EqualsAndHashCode; + +@Data +@EqualsAndHashCode(callSuper = false) +public class SystemUserInfoVo extends KitObject { + + private SystemSimpleUserVo user; + private List dataScopes; + private List authorities; + + public Set getRoles() { + return authorities.stream().map(SystemRoleCodeVo::getAuthority).collect(Collectors.toSet()); + } +} diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemUserJwtVo.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemUserJwtVo.java similarity index 94% rename from cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemUserJwtVo.java rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemUserJwtVo.java index dbbd3545..9d47f2ef 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemUserJwtVo.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemUserJwtVo.java @@ -1,77 +1,77 @@ -/* - * Copyright 2021-2025 Odboy - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package cn.odboy.system.dal.model; - -import com.alibaba.fastjson2.annotation.JSONField; -import io.swagger.annotations.ApiModelProperty; -import java.util.List; -import java.util.Set; -import java.util.stream.Collectors; -import lombok.AllArgsConstructor; -import lombok.Getter; -import org.springframework.security.core.userdetails.UserDetails; - -@Getter -@AllArgsConstructor -public class SystemUserJwtVo implements UserDetails { - - @ApiModelProperty(value = "用户") - private final SystemUserVo user; - @ApiModelProperty(value = "数据权限") - private final List dataScopes; - @ApiModelProperty(value = "角色") - private final List authorities; - - public Set getRoles() { - return authorities.stream().map(SystemRoleCodeVo::getAuthority).collect(Collectors.toSet()); - } - - @Override - @JSONField(serialize = false) - public String getPassword() { - return user.getPassword(); - } - - @Override - @JSONField(serialize = false) - public String getUsername() { - return user.getUsername(); - } - - @Override - @JSONField(serialize = false) - public boolean isAccountNonExpired() { - return true; - } - - @Override - @JSONField(serialize = false) - public boolean isAccountNonLocked() { - return true; - } - - @Override - @JSONField(serialize = false) - public boolean isCredentialsNonExpired() { - return true; - } - - @Override - @JSONField(serialize = false) - public boolean isEnabled() { - return user.getEnabled(); - } -} +/* + * Copyright 2021-2025 Odboy + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package cn.odboy.system.dal.model.response; + +import com.alibaba.fastjson2.annotation.JSONField; +import io.swagger.annotations.ApiModelProperty; +import java.util.List; +import java.util.Set; +import java.util.stream.Collectors; +import lombok.AllArgsConstructor; +import lombok.Getter; +import org.springframework.security.core.userdetails.UserDetails; + +@Getter +@AllArgsConstructor +public class SystemUserJwtVo implements UserDetails { + + @ApiModelProperty(value = "用户") + private final SystemUserVo user; + @ApiModelProperty(value = "数据权限") + private final List dataScopes; + @ApiModelProperty(value = "角色") + private final List authorities; + + public Set getRoles() { + return authorities.stream().map(SystemRoleCodeVo::getAuthority).collect(Collectors.toSet()); + } + + @Override + @JSONField(serialize = false) + public String getPassword() { + return user.getPassword(); + } + + @Override + @JSONField(serialize = false) + public String getUsername() { + return user.getUsername(); + } + + @Override + @JSONField(serialize = false) + public boolean isAccountNonExpired() { + return true; + } + + @Override + @JSONField(serialize = false) + public boolean isAccountNonLocked() { + return true; + } + + @Override + @JSONField(serialize = false) + public boolean isCredentialsNonExpired() { + return true; + } + + @Override + @JSONField(serialize = false) + public boolean isEnabled() { + return user.getEnabled(); + } +} diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemUserOnlineVo.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemUserOnlineVo.java similarity index 94% rename from cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemUserOnlineVo.java rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemUserOnlineVo.java index b8a56f20..90d0ad67 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemUserOnlineVo.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemUserOnlineVo.java @@ -1,46 +1,46 @@ -/* - * Copyright 2021-2025 Odboy - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package cn.odboy.system.dal.model; - -import io.swagger.annotations.ApiModelProperty; -import java.util.Date; -import lombok.Data; - -/** - * 在线用户 - */ -@Data -public class SystemUserOnlineVo { - - @ApiModelProperty(value = "Token编号") - private String uid; - @ApiModelProperty(value = "用户名") - private String userName; - @ApiModelProperty(value = "昵称") - private String nickName; - @ApiModelProperty(value = "岗位") - private String dept; - @ApiModelProperty(value = "浏览器") - private String browser; - @ApiModelProperty(value = "IP") - private String ip; - @ApiModelProperty(value = "地址") - private String address; - @ApiModelProperty(value = "token") - private String key; - @ApiModelProperty(value = "登录时间") - private Date loginTime; -} +/* + * Copyright 2021-2025 Odboy + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package cn.odboy.system.dal.model.response; + +import io.swagger.annotations.ApiModelProperty; +import java.util.Date; +import lombok.Data; + +/** + * 在线用户 + */ +@Data +public class SystemUserOnlineVo { + + @ApiModelProperty(value = "Token编号") + private String uid; + @ApiModelProperty(value = "用户名") + private String userName; + @ApiModelProperty(value = "昵称") + private String nickName; + @ApiModelProperty(value = "岗位") + private String dept; + @ApiModelProperty(value = "浏览器") + private String browser; + @ApiModelProperty(value = "IP") + private String ip; + @ApiModelProperty(value = "地址") + private String address; + @ApiModelProperty(value = "token") + private String key; + @ApiModelProperty(value = "登录时间") + private Date loginTime; +} diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemUserVo.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemUserVo.java similarity index 98% rename from cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemUserVo.java rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemUserVo.java index a8ec8077..b83f4dd2 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemUserVo.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemUserVo.java @@ -1,4 +1,4 @@ -package cn.odboy.system.dal.model; +package cn.odboy.system.dal.model.response; import cn.odboy.system.dal.dataobject.SystemJobTb; import cn.odboy.system.dal.dataobject.SystemRoleTb; diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/mysql/SystemDictDetailMapper.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/mysql/SystemDictDetailMapper.java index 30b2c4e4..ca437b0f 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/mysql/SystemDictDetailMapper.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/mysql/SystemDictDetailMapper.java @@ -16,7 +16,7 @@ package cn.odboy.system.dal.mysql; import cn.odboy.system.dal.dataobject.SystemDictDetailTb; -import cn.odboy.system.dal.model.SystemQueryDictDetailArgs; +import cn.odboy.system.dal.model.request.SystemQueryDictDetailArgs; 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-module-system/src/main/java/cn/odboy/system/dal/mysql/SystemQuartzJobMapper.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/mysql/SystemQuartzJobMapper.java index 321f38af..0b1cfb82 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/mysql/SystemQuartzJobMapper.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/mysql/SystemQuartzJobMapper.java @@ -16,7 +16,7 @@ package cn.odboy.system.dal.mysql; import cn.odboy.system.dal.dataobject.SystemQuartzJobTb; -import cn.odboy.system.dal.model.SystemQuartzJobVo; +import cn.odboy.system.dal.model.response.SystemQuartzJobVo; import cn.odboy.util.KitBeanUtil; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/redis/SystemUserInfoDAO.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/redis/SystemUserInfoDAO.java index aea97b10..ccb32148 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/redis/SystemUserInfoDAO.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/redis/SystemUserInfoDAO.java @@ -3,7 +3,7 @@ package cn.odboy.system.dal.redis; import cn.hutool.core.util.RandomUtil; import cn.hutool.core.util.StrUtil; import cn.odboy.framework.redis.KitRedisHelper; -import cn.odboy.system.dal.model.SystemUserJwtVo; +import cn.odboy.system.dal.model.response.SystemUserJwtVo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Component; diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/redis/SystemUserOnlineInfoDAO.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/redis/SystemUserOnlineInfoDAO.java index 99816d88..5d7cf99c 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/redis/SystemUserOnlineInfoDAO.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/redis/SystemUserOnlineInfoDAO.java @@ -4,9 +4,9 @@ import cn.hutool.core.util.StrUtil; import cn.odboy.base.KitPageResult; import cn.odboy.framework.properties.AppProperties; import cn.odboy.framework.redis.KitRedisHelper; -import cn.odboy.system.dal.model.SystemUserJwtVo; -import cn.odboy.system.dal.model.SystemUserOnlineExportRowVo; -import cn.odboy.system.dal.model.SystemUserOnlineVo; +import cn.odboy.system.dal.model.response.SystemUserJwtVo; +import cn.odboy.system.dal.model.export.SystemUserOnlineExportRowVo; +import cn.odboy.system.dal.model.response.SystemUserOnlineVo; import cn.odboy.system.framework.permission.core.handler.TokenProvider; import cn.odboy.util.KitBeanUtil; import cn.odboy.util.KitBrowserUtil; diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/permission/core/handler/TokenFilter.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/permission/core/handler/TokenFilter.java index c23efa9d..66302e69 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/permission/core/handler/TokenFilter.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/permission/core/handler/TokenFilter.java @@ -17,7 +17,7 @@ package cn.odboy.system.framework.permission.core.handler; import cn.hutool.core.util.StrUtil; import cn.odboy.constant.SystemConst; -import cn.odboy.system.dal.model.SystemUserOnlineVo; +import cn.odboy.system.dal.model.response.SystemUserOnlineVo; import cn.odboy.system.dal.redis.SystemUserOnlineInfoDAO; import java.io.IOException; import javax.servlet.FilterChain; diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/permission/core/handler/TokenProvider.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/permission/core/handler/TokenProvider.java index 28659cb6..1e06d39a 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/permission/core/handler/TokenProvider.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/permission/core/handler/TokenProvider.java @@ -21,7 +21,7 @@ import cn.hutool.core.util.IdUtil; import cn.odboy.constant.SystemConst; import cn.odboy.framework.properties.AppProperties; import cn.odboy.framework.redis.KitRedisHelper; -import cn.odboy.system.dal.model.SystemUserJwtVo; +import cn.odboy.system.dal.model.response.SystemUserJwtVo; import cn.odboy.system.dal.redis.SystemCacheKey; import io.jsonwebtoken.Claims; import io.jsonwebtoken.JwtParser; diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/permission/core/handler/UserDetailsHandler.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/permission/core/handler/UserDetailsHandler.java index 1c0c0e27..e1225312 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/permission/core/handler/UserDetailsHandler.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/permission/core/handler/UserDetailsHandler.java @@ -16,9 +16,9 @@ package cn.odboy.system.framework.permission.core.handler; import cn.odboy.framework.exception.BadRequestException; -import cn.odboy.system.dal.model.SystemRoleCodeVo; -import cn.odboy.system.dal.model.SystemUserJwtVo; -import cn.odboy.system.dal.model.SystemUserVo; +import cn.odboy.system.dal.model.response.SystemRoleCodeVo; +import cn.odboy.system.dal.model.response.SystemUserJwtVo; +import cn.odboy.system.dal.model.response.SystemUserVo; import cn.odboy.system.dal.redis.SystemUserInfoDAO; import cn.odboy.system.service.SystemDataService; import cn.odboy.system.service.SystemRoleService; diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/quartz/ActiveJobRegister.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/quartz/ActiveJobRegister.java index cf239c90..3f5427c0 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/quartz/ActiveJobRegister.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/quartz/ActiveJobRegister.java @@ -15,7 +15,7 @@ */ package cn.odboy.system.framework.quartz; -import cn.odboy.system.dal.model.SystemQuartzJobVo; +import cn.odboy.system.dal.model.response.SystemQuartzJobVo; import cn.odboy.system.service.SystemQuartzJobService; import java.util.List; import lombok.extern.slf4j.Slf4j; diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/quartz/ExecutionJobBean.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/quartz/ExecutionJobBean.java index eaeb6265..6a109d0b 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/quartz/ExecutionJobBean.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/quartz/ExecutionJobBean.java @@ -26,8 +26,8 @@ import cn.odboy.framework.quartz.core.QuartzRunnable; import cn.odboy.framework.redis.KitRedisHelper; import cn.odboy.system.dal.dataobject.SystemQuartzJobTb; import cn.odboy.system.dal.dataobject.SystemQuartzLogTb; -import cn.odboy.system.dal.model.SystemQuartzJobVo; -import cn.odboy.system.dal.model.SystemSendEmailArgs; +import cn.odboy.system.dal.model.response.SystemQuartzJobVo; +import cn.odboy.system.dal.model.request.SystemSendEmailArgs; import cn.odboy.system.dal.mysql.SystemQuartzLogMapper; import cn.odboy.system.service.SystemEmailService; import cn.odboy.system.service.SystemQuartzJobService; diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/quartz/QuartzManage.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/quartz/QuartzManage.java index 97f1bddf..fa6d0006 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/quartz/QuartzManage.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/quartz/QuartzManage.java @@ -17,7 +17,7 @@ package cn.odboy.system.framework.quartz; import cn.odboy.framework.exception.BadRequestException; import cn.odboy.system.dal.dataobject.SystemQuartzJobTb; -import cn.odboy.system.dal.model.SystemQuartzJobVo; +import cn.odboy.system.dal.model.response.SystemQuartzJobVo; import java.util.Date; import javax.annotation.Resource; import lombok.extern.slf4j.Slf4j; diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/openapi/SystemCaptchaOpenController.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/openapi/SystemCaptchaOpenController.java index 9c3ac5e9..973d6d2a 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/openapi/SystemCaptchaOpenController.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/openapi/SystemCaptchaOpenController.java @@ -16,7 +16,7 @@ package cn.odboy.system.openapi; import cn.odboy.annotation.AnonymousPostMapping; -import cn.odboy.system.dal.model.SystemCaptchaVo; +import cn.odboy.system.dal.model.response.SystemCaptchaVo; import cn.odboy.system.service.SystemCaptchaService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemAuthService.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemAuthService.java index 6e8f4988..3e2aacaf 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemAuthService.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemAuthService.java @@ -4,10 +4,10 @@ import cn.odboy.constant.SystemConst; import cn.odboy.framework.exception.BadRequestException; import cn.odboy.framework.properties.AppProperties; import cn.odboy.framework.redis.KitRedisHelper; -import cn.odboy.system.dal.model.SystemAuthVo; -import cn.odboy.system.dal.model.SystemUserInfoVo; -import cn.odboy.system.dal.model.SystemUserJwtVo; -import cn.odboy.system.dal.model.SystemUserLoginArgs; +import cn.odboy.system.dal.model.response.SystemAuthVo; +import cn.odboy.system.dal.model.response.SystemUserInfoVo; +import cn.odboy.system.dal.model.response.SystemUserJwtVo; +import cn.odboy.system.dal.model.request.SystemUserLoginArgs; import cn.odboy.system.dal.redis.SystemUserOnlineInfoDAO; import cn.odboy.system.framework.permission.core.KitSecurityHelper; import cn.odboy.system.framework.permission.core.handler.TokenProvider; diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemCaptchaService.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemCaptchaService.java index 29517b16..1de7cbcd 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemCaptchaService.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemCaptchaService.java @@ -7,7 +7,7 @@ import cn.odboy.constant.SystemConst; import cn.odboy.framework.exception.BadRequestException; import cn.odboy.framework.properties.AppProperties; import cn.odboy.framework.redis.KitRedisHelper; -import cn.odboy.system.dal.model.SystemCaptchaVo; +import cn.odboy.system.dal.model.response.SystemCaptchaVo; import cn.odboy.system.dal.redis.SystemCacheKey; import com.wf.captcha.base.Captcha; import java.util.concurrent.TimeUnit; diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDataService.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDataService.java index 4440db33..128f8fb3 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDataService.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDataService.java @@ -18,9 +18,9 @@ package cn.odboy.system.service; import cn.hutool.core.collection.CollUtil; import cn.odboy.system.constant.SystemDataScopeEnum; import cn.odboy.system.dal.dataobject.SystemDeptTb; -import cn.odboy.system.dal.model.SystemDeptVo; -import cn.odboy.system.dal.model.SystemRoleVo; -import cn.odboy.system.dal.model.SystemUserVo; +import cn.odboy.system.dal.model.response.SystemDeptVo; +import cn.odboy.system.dal.model.response.SystemRoleVo; +import cn.odboy.system.dal.model.response.SystemUserVo; import java.util.ArrayList; import java.util.List; import java.util.Objects; diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDeptService.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDeptService.java index 450f950e..c32404ae 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDeptService.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDeptService.java @@ -24,12 +24,12 @@ import cn.odboy.framework.exception.BadRequestException; import cn.odboy.system.constant.SystemDataScopeEnum; import cn.odboy.system.constant.SystemZhConst; import cn.odboy.system.dal.dataobject.SystemDeptTb; -import cn.odboy.system.dal.model.SystemCreateDeptArgs; -import cn.odboy.system.dal.model.SystemDeptExportRowVo; -import cn.odboy.system.dal.model.SystemDeptVo; -import cn.odboy.system.dal.model.SystemProductLineTreeVo; -import cn.odboy.system.dal.model.SystemProductLineVo; -import cn.odboy.system.dal.model.SystemQueryDeptArgs; +import cn.odboy.system.dal.model.request.SystemCreateDeptArgs; +import cn.odboy.system.dal.model.export.SystemDeptExportRowVo; +import cn.odboy.system.dal.model.response.SystemDeptVo; +import cn.odboy.system.dal.model.response.SystemProductLineTreeVo; +import cn.odboy.system.dal.model.response.SystemProductLineVo; +import cn.odboy.system.dal.model.request.SystemQueryDeptArgs; import cn.odboy.system.dal.mysql.SystemDeptMapper; import cn.odboy.system.framework.permission.core.KitSecurityHelper; import cn.odboy.util.KitBeanUtil; diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDictDetailService.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDictDetailService.java index f1c58b43..c04d775c 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDictDetailService.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDictDetailService.java @@ -20,9 +20,9 @@ import cn.hutool.core.util.StrUtil; import cn.odboy.base.KitPageResult; import cn.odboy.system.dal.dataobject.SystemDictDetailTb; import cn.odboy.system.dal.dataobject.SystemDictTb; -import cn.odboy.system.dal.model.SystemCreateDictDetailArgs; -import cn.odboy.system.dal.model.SystemDictDetailVo; -import cn.odboy.system.dal.model.SystemQueryDictDetailArgs; +import cn.odboy.system.dal.model.request.SystemCreateDictDetailArgs; +import cn.odboy.system.dal.model.response.SystemDictDetailVo; +import cn.odboy.system.dal.model.request.SystemQueryDictDetailArgs; import cn.odboy.system.dal.mysql.SystemDictDetailMapper; import cn.odboy.system.dal.mysql.SystemDictMapper; import cn.odboy.util.KitBeanUtil; diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDictService.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDictService.java index 26593dd9..27678d77 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDictService.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDictService.java @@ -19,10 +19,10 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import cn.odboy.base.KitPageResult; import cn.odboy.system.dal.dataobject.SystemDictTb; -import cn.odboy.system.dal.model.SystemCreateDictArgs; -import cn.odboy.system.dal.model.SystemDictDetailVo; -import cn.odboy.system.dal.model.SystemDictExportRowVo; -import cn.odboy.system.dal.model.SystemQueryDictArgs; +import cn.odboy.system.dal.model.request.SystemCreateDictArgs; +import cn.odboy.system.dal.model.response.SystemDictDetailVo; +import cn.odboy.system.dal.model.export.SystemDictExportRowVo; +import cn.odboy.system.dal.model.request.SystemQueryDictArgs; import cn.odboy.system.dal.mysql.SystemDictMapper; import cn.odboy.util.KitBeanUtil; import cn.odboy.util.KitPageUtil; diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemEmailService.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemEmailService.java index 1971ceb9..a795bc10 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemEmailService.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemEmailService.java @@ -24,8 +24,8 @@ import cn.odboy.framework.properties.AppProperties; import cn.odboy.framework.redis.KitRedisHelper; import cn.odboy.system.constant.SystemCaptchaBizEnum; import cn.odboy.system.dal.dataobject.SystemEmailConfigTb; -import cn.odboy.system.dal.model.SystemCheckEmailCaptchaArgs; -import cn.odboy.system.dal.model.SystemSendEmailArgs; +import cn.odboy.system.dal.model.request.SystemCheckEmailCaptchaArgs; +import cn.odboy.system.dal.model.request.SystemSendEmailArgs; import cn.odboy.system.dal.mysql.SystemEmailConfigMapper; import cn.odboy.util.KitDesEncryptUtil; import cn.odboy.util.KitResourceTemplateUtil; diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemJobService.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemJobService.java index 185b4bd6..0ae43097 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemJobService.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemJobService.java @@ -20,9 +20,9 @@ import cn.hutool.core.util.StrUtil; import cn.odboy.base.KitPageResult; import cn.odboy.framework.exception.BadRequestException; import cn.odboy.system.dal.dataobject.SystemJobTb; -import cn.odboy.system.dal.model.SystemCreateJobArgs; -import cn.odboy.system.dal.model.SystemJobExportRowVo; -import cn.odboy.system.dal.model.SystemQueryJobArgs; +import cn.odboy.system.dal.model.request.SystemCreateJobArgs; +import cn.odboy.system.dal.model.export.SystemJobExportRowVo; +import cn.odboy.system.dal.model.request.SystemQueryJobArgs; import cn.odboy.system.dal.mysql.SystemJobMapper; import cn.odboy.util.KitBeanUtil; import cn.odboy.util.KitPageUtil; diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemLocalStorageService.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemLocalStorageService.java index 64b9b2e4..6fe99a64 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemLocalStorageService.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemLocalStorageService.java @@ -27,8 +27,8 @@ import cn.odboy.framework.exception.BadRequestException; import cn.odboy.framework.properties.AppProperties; import cn.odboy.framework.server.core.KitFileLocalUploadHelper; import cn.odboy.system.dal.dataobject.SystemLocalStorageTb; -import cn.odboy.system.dal.model.SystemLocalStorageExportRowVo; -import cn.odboy.system.dal.model.SystemQueryStorageArgs; +import cn.odboy.system.dal.model.export.SystemLocalStorageExportRowVo; +import cn.odboy.system.dal.model.request.SystemQueryStorageArgs; import cn.odboy.system.dal.mysql.SystemLocalStorageMapper; import cn.odboy.util.KitBeanUtil; import cn.odboy.util.KitFileUtil; diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemMenuService.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemMenuService.java index 886896b5..4592af64 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemMenuService.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemMenuService.java @@ -23,12 +23,12 @@ import cn.odboy.framework.exception.BadRequestException; import cn.odboy.system.constant.SystemYesOrNoChConst; import cn.odboy.system.constant.TransferProtocolConst; import cn.odboy.system.dal.dataobject.SystemMenuTb; -import cn.odboy.system.dal.model.SystemMenuExportRowVo; -import cn.odboy.system.dal.model.SystemMenuMetaVo; -import cn.odboy.system.dal.model.SystemMenuRouterVo; -import cn.odboy.system.dal.model.SystemMenuVo; -import cn.odboy.system.dal.model.SystemQueryMenuArgs; -import cn.odboy.system.dal.model.SystemRoleVo; +import cn.odboy.system.dal.model.export.SystemMenuExportRowVo; +import cn.odboy.system.dal.model.response.SystemMenuMetaVo; +import cn.odboy.system.dal.model.response.SystemMenuRouterVo; +import cn.odboy.system.dal.model.response.SystemMenuVo; +import cn.odboy.system.dal.model.request.SystemQueryMenuArgs; +import cn.odboy.system.dal.model.response.SystemRoleVo; import cn.odboy.system.dal.mysql.SystemMenuMapper; import cn.odboy.system.framework.permission.core.KitSecurityHelper; import cn.odboy.util.KitBeanUtil; diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemOperationLogService.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemOperationLogService.java index e1799f47..917696ca 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemOperationLogService.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemOperationLogService.java @@ -2,7 +2,7 @@ package cn.odboy.system.service; import cn.odboy.base.KitPageArgs; import cn.odboy.system.dal.dataobject.SystemOperationLogTb; -import cn.odboy.system.dal.model.SystemQueryOperationLogArgs; +import cn.odboy.system.dal.model.request.SystemQueryOperationLogArgs; import cn.odboy.system.dal.mysql.SystemOperationLogMapper; import cn.odboy.system.framework.permission.core.KitSecurityHelper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemOssStorageService.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemOssStorageService.java index fc8b25c8..a6dc500f 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemOssStorageService.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemOssStorageService.java @@ -17,8 +17,8 @@ package cn.odboy.system.service; import cn.odboy.base.KitPageResult; import cn.odboy.system.dal.dataobject.SystemOssStorageTb; -import cn.odboy.system.dal.model.SystemOssStorageVo; -import cn.odboy.system.dal.model.SystemQueryStorageArgs; +import cn.odboy.system.dal.model.response.SystemOssStorageVo; +import cn.odboy.system.dal.model.request.SystemQueryStorageArgs; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemQuartzJobService.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemQuartzJobService.java index a1930149..6943b584 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemQuartzJobService.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemQuartzJobService.java @@ -24,11 +24,11 @@ import cn.odboy.framework.exception.BadRequestException; import cn.odboy.framework.redis.KitRedisHelper; import cn.odboy.system.dal.dataobject.SystemQuartzJobTb; import cn.odboy.system.dal.dataobject.SystemQuartzLogTb; -import cn.odboy.system.dal.model.SystemQuartzJobExportRowVo; -import cn.odboy.system.dal.model.SystemQuartzJobVo; -import cn.odboy.system.dal.model.SystemQuartzLogExportRowVo; -import cn.odboy.system.dal.model.SystemQueryQuartzJobArgs; -import cn.odboy.system.dal.model.SystemUpdateQuartzJobArgs; +import cn.odboy.system.dal.model.export.SystemQuartzJobExportRowVo; +import cn.odboy.system.dal.model.response.SystemQuartzJobVo; +import cn.odboy.system.dal.model.export.SystemQuartzLogExportRowVo; +import cn.odboy.system.dal.model.request.SystemQueryQuartzJobArgs; +import cn.odboy.system.dal.model.request.SystemUpdateQuartzJobArgs; import cn.odboy.system.dal.mysql.SystemQuartzJobMapper; import cn.odboy.system.dal.mysql.SystemQuartzLogMapper; import cn.odboy.system.framework.quartz.QuartzManage; diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemRoleMenuService.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemRoleMenuService.java index f1a49e8f..2dde9009 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemRoleMenuService.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemRoleMenuService.java @@ -18,7 +18,7 @@ package cn.odboy.system.service; import cn.hutool.core.collection.CollUtil; import cn.odboy.system.dal.dataobject.SystemMenuTb; import cn.odboy.system.dal.dataobject.SystemRoleMenuTb; -import cn.odboy.system.dal.model.SystemMenuVo; +import cn.odboy.system.dal.model.response.SystemMenuVo; import cn.odboy.system.dal.mysql.SystemMenuMapper; import cn.odboy.system.dal.mysql.SystemRoleMenuMapper; import cn.odboy.util.KitBeanUtil; diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemRoleService.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemRoleService.java index a190e68c..4cdf42a8 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemRoleService.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemRoleService.java @@ -23,12 +23,12 @@ import cn.odboy.base.KitPageResult; import cn.odboy.framework.exception.BadRequestException; import cn.odboy.system.dal.dataobject.SystemRoleTb; import cn.odboy.system.dal.dataobject.SystemUserTb; -import cn.odboy.system.dal.model.SystemCreateRoleArgs; -import cn.odboy.system.dal.model.SystemMenuVo; -import cn.odboy.system.dal.model.SystemQueryRoleArgs; -import cn.odboy.system.dal.model.SystemRoleCodeVo; -import cn.odboy.system.dal.model.SystemRoleExportRowVo; -import cn.odboy.system.dal.model.SystemRoleVo; +import cn.odboy.system.dal.model.request.SystemCreateRoleArgs; +import cn.odboy.system.dal.model.response.SystemMenuVo; +import cn.odboy.system.dal.model.request.SystemQueryRoleArgs; +import cn.odboy.system.dal.model.response.SystemRoleCodeVo; +import cn.odboy.system.dal.model.export.SystemRoleExportRowVo; +import cn.odboy.system.dal.model.response.SystemRoleVo; import cn.odboy.system.dal.mysql.SystemRoleMapper; import cn.odboy.system.framework.permission.core.KitSecurityHelper; import cn.odboy.util.KitBeanUtil; diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemUserRoleService.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemUserRoleService.java index b5f37ffe..e389bda9 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemUserRoleService.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemUserRoleService.java @@ -20,9 +20,9 @@ import cn.odboy.framework.exception.BadRequestException; import cn.odboy.system.dal.dataobject.SystemDeptTb; import cn.odboy.system.dal.dataobject.SystemRoleTb; import cn.odboy.system.dal.dataobject.SystemUserRoleTb; -import cn.odboy.system.dal.model.SystemMenuVo; -import cn.odboy.system.dal.model.SystemRoleVo; -import cn.odboy.system.dal.model.SystemUserVo; +import cn.odboy.system.dal.model.response.SystemMenuVo; +import cn.odboy.system.dal.model.response.SystemRoleVo; +import cn.odboy.system.dal.model.response.SystemUserVo; import cn.odboy.system.dal.mysql.SystemRoleMapper; import cn.odboy.system.dal.mysql.SystemUserRoleMapper; import cn.odboy.system.framework.permission.core.KitSecurityHelper; diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemUserService.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemUserService.java index b796b10d..5e92a992 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemUserService.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemUserService.java @@ -31,12 +31,12 @@ import cn.odboy.system.dal.dataobject.SystemRoleTb; import cn.odboy.system.dal.dataobject.SystemUserJobTb; import cn.odboy.system.dal.dataobject.SystemUserRoleTb; import cn.odboy.system.dal.dataobject.SystemUserTb; -import cn.odboy.system.dal.model.SystemDeptVo; -import cn.odboy.system.dal.model.SystemQueryUserArgs; -import cn.odboy.system.dal.model.SystemRoleVo; -import cn.odboy.system.dal.model.SystemUpdateUserPasswordArgs; -import cn.odboy.system.dal.model.SystemUserExportRowVo; -import cn.odboy.system.dal.model.SystemUserVo; +import cn.odboy.system.dal.model.response.SystemDeptVo; +import cn.odboy.system.dal.model.request.SystemQueryUserArgs; +import cn.odboy.system.dal.model.response.SystemRoleVo; +import cn.odboy.system.dal.model.request.SystemUpdateUserPasswordArgs; +import cn.odboy.system.dal.model.export.SystemUserExportRowVo; +import cn.odboy.system.dal.model.response.SystemUserVo; import cn.odboy.system.dal.mysql.SystemUserMapper; import cn.odboy.system.dal.redis.SystemUserInfoDAO; import cn.odboy.system.dal.redis.SystemUserOnlineInfoDAO; diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/impl/SystemMinioStorageServiceImpl.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/impl/SystemMinioStorageServiceImpl.java index 4af7271f..d230f16a 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/impl/SystemMinioStorageServiceImpl.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/impl/SystemMinioStorageServiceImpl.java @@ -23,9 +23,9 @@ import cn.odboy.framework.properties.AppProperties; import cn.odboy.framework.properties.model.StorageOSSModel; import cn.odboy.framework.server.core.KitFileLocalUploadHelper; import cn.odboy.system.dal.dataobject.SystemOssStorageTb; -import cn.odboy.system.dal.model.SystemOssStorageExportRowVo; -import cn.odboy.system.dal.model.SystemOssStorageVo; -import cn.odboy.system.dal.model.SystemQueryStorageArgs; +import cn.odboy.system.dal.model.export.SystemOssStorageExportRowVo; +import cn.odboy.system.dal.model.response.SystemOssStorageVo; +import cn.odboy.system.dal.model.request.SystemQueryStorageArgs; import cn.odboy.system.dal.mysql.SystemOssStorageMapper; import cn.odboy.system.framework.storage.minio.MinioRepository; import cn.odboy.system.service.SystemOssStorageService; diff --git a/cutejava/cutejava-starter/src/test/java/cn/odboy/SystemApplicationTests.java b/cutejava/cutejava-starter/src/test/java/cn/odboy/SystemApplicationTests.java index 6bcc021c..fb91edb9 100644 --- a/cutejava/cutejava-starter/src/test/java/cn/odboy/SystemApplicationTests.java +++ b/cutejava/cutejava-starter/src/test/java/cn/odboy/SystemApplicationTests.java @@ -18,8 +18,8 @@ package cn.odboy; import cn.hutool.core.collection.CollUtil; import cn.odboy.system.dal.dataobject.SystemJobTb; import cn.odboy.system.dal.dataobject.SystemRoleTb; -import cn.odboy.system.dal.model.SystemDeptVo; -import cn.odboy.system.dal.model.SystemUserVo; +import cn.odboy.system.dal.model.response.SystemDeptVo; +import cn.odboy.system.dal.model.response.SystemUserVo; import cn.odboy.system.service.SystemUserService; import java.util.Set; import org.junit.jupiter.api.Test;