From c31dde912a9f98e3de70e41cb7395fde42a6b6b3 Mon Sep 17 00:00:00 2001 From: Odboy Date: Thu, 15 May 2025 21:10:19 +0800 Subject: [PATCH] upd --- .../src/main/java/cn/odboy/base/MyEntity.java | 2 -- .../src/main/java/cn/odboy/base/MyLogicEntity.java | 2 -- .../src/main/resources/application-dev.yml | 2 -- .../java/cn/odboy/core/api/system/SystemDeptApi.java | 2 ++ .../java/cn/odboy/core/api/system/SystemMenuApi.java | 2 ++ .../java/cn/odboy/core/api/system/SystemRoleApi.java | 1 + .../core/api/system/impl/SystemDeptApiImpl.java | 1 + .../core/api/system/impl/SystemDictApiImpl.java | 1 + .../api/system/impl/SystemDictDetailApiImpl.java | 2 ++ .../odboy/core/api/system/impl/SystemJobApiImpl.java | 1 + .../core/api/system/impl/SystemMenuApiImpl.java | 3 ++- .../cn/odboy/core/api/tools/impl/EmailApiImpl.java | 3 ++- .../core/api/tools/impl/QiniuConfigApiImpl.java | 1 + .../core/api/tools/impl/QiniuContentApiImpl.java | 1 + .../cache/service/impl/SystemUserJwtServiceImpl.java | 4 ++-- .../service/impl/SystemUserOnlineServiceImpl.java | 6 +++--- .../core/controller/job/QuartzJobController.java | 4 ++-- .../odboy/core/controller/system/AuthController.java | 12 ++++++------ .../odboy/core/controller/system/DeptController.java | 6 +++--- .../odboy/core/controller/system/DictController.java | 6 +++--- .../core/controller/system/DictDetailController.java | 6 +++--- .../odboy/core/controller/system/JobController.java | 6 +++--- .../odboy/core/controller/system/MenuController.java | 4 ++-- .../core/controller/system/OnlineController.java | 2 +- .../odboy/core/controller/system/RoleController.java | 4 ++-- .../odboy/core/controller/system/UserController.java | 2 +- .../odboy/core/controller/tools/EmailController.java | 2 +- .../controller/tools/LocalStorageController.java | 4 ++-- .../odboy/core/controller/tools/QiniuController.java | 2 +- .../cn/odboy/core/dal/dataobject/job/QuartzLog.java | 2 -- .../core/dal/dataobject/tools/QiniuContent.java | 2 -- .../cn/odboy/core/dal/mysql/job/QuartzJobMapper.java | 2 +- .../cn/odboy/core/dal/mysql/job/QuartzLogMapper.java | 2 +- .../cn/odboy/core/dal/mysql/system/DeptMapper.java | 4 ++-- .../core/dal/mysql/system/DictDetailMapper.java | 4 ++-- .../cn/odboy/core/dal/mysql/system/DictMapper.java | 4 ++-- .../cn/odboy/core/dal/mysql/system/JobMapper.java | 4 ++-- .../cn/odboy/core/dal/mysql/system/MenuMapper.java | 2 +- .../cn/odboy/core/dal/mysql/system/RoleMapper.java | 4 ++-- .../cn/odboy/core/dal/mysql/system/UserMapper.java | 2 +- .../core/dal/mysql/tools/LocalStorageMapper.java | 2 +- .../core/dal/mysql/tools/QiniuContentMapper.java | 4 ++-- .../odboy/core/framework/permission/TokenFilter.java | 2 +- .../core/framework/permission/TokenProvider.java | 2 +- .../framework/permission/UserDetailsServiceImpl.java | 2 +- .../core/framework/quartz/ExecutionJobBean.java | 2 +- .../odboy/core/service/system/SystemUserService.java | 1 + .../core/service/system/dto/QueryDeptRequest.java | 2 -- .../core/service/system/dto/QueryJobRequest.java | 2 -- .../core/service/system/dto/QueryMenuRequest.java | 2 -- .../service/system/dto/QueryQuartzJobRequest.java | 2 -- .../core/service/system/dto/QueryRoleRequest.java | 2 -- .../core/service/system/dto/QueryUserRequest.java | 2 -- .../system/impl/SystemDictDetailServiceImpl.java | 4 +--- .../service/system/impl/SystemJobServiceImpl.java | 3 +-- .../service/system/impl/SystemRoleServiceImpl.java | 2 +- .../service/system/impl/SystemUserServiceImpl.java | 4 ++-- .../cn/odboy/core/service/tools/EmailService.java | 2 +- .../service/tools/dto/QueryLocalStorageRequest.java | 2 -- .../core/service/tools/dto/QueryQiniuRequest.java | 2 -- .../core/service/tools/impl/CaptchaServiceImpl.java | 2 +- 61 files changed, 80 insertions(+), 94 deletions(-) diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/base/MyEntity.java b/cutejava/cutejava-common/src/main/java/cn/odboy/base/MyEntity.java index 72c56501..18138462 100644 --- a/cutejava/cutejava-common/src/main/java/cn/odboy/base/MyEntity.java +++ b/cutejava/cutejava-common/src/main/java/cn/odboy/base/MyEntity.java @@ -1,6 +1,5 @@ package cn.odboy.base; -import com.alibaba.fastjson2.annotation.JSONField; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; import io.swagger.annotations.ApiModelProperty; @@ -10,7 +9,6 @@ import lombok.Setter; import org.apache.commons.lang3.builder.ToStringBuilder; import org.springframework.data.annotation.CreatedBy; import org.springframework.data.annotation.LastModifiedBy; -import org.springframework.format.annotation.DateTimeFormat; import java.lang.reflect.Field; import java.util.Date; diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/base/MyLogicEntity.java b/cutejava/cutejava-common/src/main/java/cn/odboy/base/MyLogicEntity.java index 448bd73e..66479dcf 100644 --- a/cutejava/cutejava-common/src/main/java/cn/odboy/base/MyLogicEntity.java +++ b/cutejava/cutejava-common/src/main/java/cn/odboy/base/MyLogicEntity.java @@ -1,6 +1,5 @@ package cn.odboy.base; -import com.alibaba.fastjson2.annotation.JSONField; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableLogic; @@ -10,7 +9,6 @@ import lombok.Setter; import org.apache.commons.lang3.builder.ToStringBuilder; import org.springframework.data.annotation.CreatedBy; import org.springframework.data.annotation.LastModifiedBy; -import org.springframework.format.annotation.DateTimeFormat; import java.lang.reflect.Field; import java.util.Date; diff --git a/cutejava/cutejava-starter/src/main/resources/application-dev.yml b/cutejava/cutejava-starter/src/main/resources/application-dev.yml index 2dc2f080..765e7d6a 100644 --- a/cutejava/cutejava-starter/src/main/resources/application-dev.yml +++ b/cutejava/cutejava-starter/src/main/resources/application-dev.yml @@ -1,5 +1,3 @@ - - server: port: 8000 http2: diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/api/system/SystemDeptApi.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/api/system/SystemDeptApi.java index 76857b8d..73ba7677 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/api/system/SystemDeptApi.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/api/system/SystemDeptApi.java @@ -25,6 +25,7 @@ public interface SystemDeptApi { * @return / */ Dept describeDeptById(Long id); + /** * 根据PID查询 * @@ -40,6 +41,7 @@ public interface SystemDeptApi { * @return / */ Set describeDeptByRoleId(Long id); + /** * 获取部门下所有关联的部门 * diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/api/system/SystemMenuApi.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/api/system/SystemMenuApi.java index 802d82f0..2e403e29 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/api/system/SystemMenuApi.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/api/system/SystemMenuApi.java @@ -24,6 +24,7 @@ public interface SystemMenuApi { * @return / */ Menu describeMenuById(long id); + /** * 获取所有子节点，包含自身ID * @@ -48,6 +49,7 @@ public interface SystemMenuApi { * @return / */ List buildMenuResponse(List menus); + /** * 懒加载菜单数据 * diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/api/system/SystemRoleApi.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/api/system/SystemRoleApi.java index 8b46d6d2..6db40572 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/api/system/SystemRoleApi.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/api/system/SystemRoleApi.java @@ -67,6 +67,7 @@ public interface SystemRoleApi { * @return 权限信息 */ List buildUserRolePermissions(User user); + /** * 验证是否被用户关联 * diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/api/system/impl/SystemDeptApiImpl.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/api/system/impl/SystemDeptApiImpl.java index a2a2daa6..99fc013b 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/api/system/impl/SystemDeptApiImpl.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/api/system/impl/SystemDeptApiImpl.java @@ -106,6 +106,7 @@ public class SystemDeptApiImpl implements SystemDeptApi { public Set describeDeptByRoleId(Long id) { return deptMapper.queryDeptSetByRoleId(id); } + @Override public Set describeRelationDeptSet(List menuList, Set deptSet) { for (Dept dept : menuList) { diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/api/system/impl/SystemDictApiImpl.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/api/system/impl/SystemDictApiImpl.java index 46f170da..602eca70 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/api/system/impl/SystemDictApiImpl.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/api/system/impl/SystemDictApiImpl.java @@ -16,6 +16,7 @@ import java.util.List; @RequiredArgsConstructor public class SystemDictApiImpl implements SystemDictApi { private final DictMapper dictMapper; + @Override public PageResult describeDictPage(QueryDictRequest criteria, Page page) { IPage dicts = dictMapper.queryDictPageByArgs(criteria, page); diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/api/system/impl/SystemDictDetailApiImpl.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/api/system/impl/SystemDictDetailApiImpl.java index ac875416..ca841018 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/api/system/impl/SystemDictDetailApiImpl.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/api/system/impl/SystemDictDetailApiImpl.java @@ -20,10 +20,12 @@ import java.util.concurrent.TimeUnit; public class SystemDictDetailApiImpl implements SystemDictDetailApi { private final DictDetailMapper dictDetailMapper; private final RedisHelper redisHelper; + @Override public PageResult describeDictDetailPage(QueryDictDetailRequest criteria, Page page) { return PageUtil.toPage(dictDetailMapper.queryDictDetailPageByArgs(criteria, page)); } + @Override public List describeDictDetailListByName(String name) { String key = SystemRedisKey.DICT_NAME + name; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/api/system/impl/SystemJobApiImpl.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/api/system/impl/SystemJobApiImpl.java index cba8964d..a1b51f8a 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/api/system/impl/SystemJobApiImpl.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/api/system/impl/SystemJobApiImpl.java @@ -23,6 +23,7 @@ public class SystemJobApiImpl implements SystemJobApi { private final JobMapper jobMapper; private final UserMapper userMapper; private final RedisHelper redisHelper; + @Override public PageResult describeJobPage(QueryJobRequest criteria, Page page) { return PageUtil.toPage(jobMapper.queryJobPageByArgs(criteria, page)); diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/api/system/impl/SystemMenuApiImpl.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/api/system/impl/SystemMenuApiImpl.java index 4d7a0271..7788cbf1 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/api/system/impl/SystemMenuApiImpl.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/api/system/impl/SystemMenuApiImpl.java @@ -7,8 +7,8 @@ import cn.odboy.core.api.system.SystemMenuApi; import cn.odboy.core.api.system.SystemRoleApi; import cn.odboy.core.constant.SystemRedisKey; import cn.odboy.core.dal.dataobject.system.Menu; -import cn.odboy.core.dal.model.MenuResponse; import cn.odboy.core.dal.dataobject.system.Role; +import cn.odboy.core.dal.model.MenuResponse; import cn.odboy.core.dal.mysql.system.MenuMapper; import cn.odboy.core.service.system.SystemRoleService; import cn.odboy.core.service.system.dto.MenuMetaVo; @@ -86,6 +86,7 @@ public class SystemMenuApiImpl implements SystemMenuApi { } return menus; } + @Override public Set describeChildMenuSet(List menuList, Set menuSet) { for (Menu menu : menuList) { diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/api/tools/impl/EmailApiImpl.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/api/tools/impl/EmailApiImpl.java index 24f7525d..d21f7087 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/api/tools/impl/EmailApiImpl.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/api/tools/impl/EmailApiImpl.java @@ -12,7 +12,8 @@ import org.springframework.stereotype.Service; @RequiredArgsConstructor @CacheConfig(cacheNames = "email") public class EmailApiImpl implements EmailApi { -private final EmailConfigMapper emailConfigMapper; + private final EmailConfigMapper emailConfigMapper; + @Override @Cacheable(key = "'config'") public EmailConfig describeEmailConfig() { diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/api/tools/impl/QiniuConfigApiImpl.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/api/tools/impl/QiniuConfigApiImpl.java index 92fc6ca4..d97ec9ca 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/api/tools/impl/QiniuConfigApiImpl.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/api/tools/impl/QiniuConfigApiImpl.java @@ -13,6 +13,7 @@ import org.springframework.stereotype.Service; @CacheConfig(cacheNames = "qiNiu") public class QiniuConfigApiImpl implements QiniuConfigApi { private final QiniuConfigMapper qiniuConfigMapper; + @Override @Cacheable(key = "'config'") public QiniuConfig describeQiniuConfig() { diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/api/tools/impl/QiniuContentApiImpl.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/api/tools/impl/QiniuContentApiImpl.java index 9c397641..f1fa6e4d 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/api/tools/impl/QiniuContentApiImpl.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/api/tools/impl/QiniuContentApiImpl.java @@ -17,6 +17,7 @@ import java.util.List; @CacheConfig(cacheNames = "qiNiu") public class QiniuContentApiImpl implements QiniuContentApi { private final QiniuContentMapper qiniuContentMapper; + @Override public PageResult describeQiniuContentPage(QueryQiniuRequest criteria, Page page) { return PageUtil.toPage(qiniuContentMapper.queryQiniuContentPageByArgs(criteria, page)); diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/cache/service/impl/SystemUserJwtServiceImpl.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/cache/service/impl/SystemUserJwtServiceImpl.java index 60525631..be5d6c76 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/cache/service/impl/SystemUserJwtServiceImpl.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/cache/service/impl/SystemUserJwtServiceImpl.java @@ -1,9 +1,9 @@ package cn.odboy.core.cache.service.impl; import cn.hutool.core.util.RandomUtil; +import cn.odboy.core.cache.service.SystemUserJwtService; import cn.odboy.core.constant.SystemRedisKey; import cn.odboy.core.service.system.dto.UserJwtVo; -import cn.odboy.core.cache.service.SystemUserJwtService; import cn.odboy.redis.RedisHelper; import cn.odboy.util.StringUtil; import org.springframework.stereotype.Service; @@ -38,4 +38,4 @@ public class SystemUserJwtServiceImpl implements SystemUserJwtService { redisHelper.del(SystemRedisKey.USER_INFO + userName); } } -} \ No newline at end of file +} diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/cache/service/impl/SystemUserOnlineServiceImpl.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/cache/service/impl/SystemUserOnlineServiceImpl.java index 60b87aba..193d058b 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/cache/service/impl/SystemUserOnlineServiceImpl.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/cache/service/impl/SystemUserOnlineServiceImpl.java @@ -1,11 +1,11 @@ package cn.odboy.core.cache.service.impl; -import cn.odboy.core.framework.properties.AppProperties; +import cn.odboy.core.cache.service.SystemUserOnlineService; import cn.odboy.core.constant.SystemRedisKey; +import cn.odboy.core.framework.permission.TokenProvider; +import cn.odboy.core.framework.properties.AppProperties; import cn.odboy.core.service.system.dto.UserJwtVo; import cn.odboy.core.service.system.dto.UserOnlineVo; -import cn.odboy.core.framework.permission.TokenProvider; -import cn.odboy.core.cache.service.SystemUserOnlineService; import cn.odboy.redis.RedisHelper; import cn.odboy.util.BrowserUtil; import cn.odboy.util.DesEncryptUtil; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/job/QuartzJobController.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/job/QuartzJobController.java index e2a11252..71f20668 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/job/QuartzJobController.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/job/QuartzJobController.java @@ -3,11 +3,11 @@ package cn.odboy.core.controller.job; import cn.odboy.base.PageResult; import cn.odboy.context.SpringBeanHolder; import cn.odboy.core.api.system.SystemQuartzJobApi; -import cn.odboy.core.service.system.dto.QueryQuartzJobRequest; -import cn.odboy.core.service.system.dto.UpdateQuartzJobRequest; import cn.odboy.core.dal.dataobject.job.QuartzJob; import cn.odboy.core.dal.dataobject.job.QuartzLog; import cn.odboy.core.service.system.SystemQuartzJobService; +import cn.odboy.core.service.system.dto.QueryQuartzJobRequest; +import cn.odboy.core.service.system.dto.UpdateQuartzJobRequest; import cn.odboy.exception.BadRequestException; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.annotations.Api; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/AuthController.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/AuthController.java index e13f14b6..489e12e5 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/AuthController.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/AuthController.java @@ -3,17 +3,17 @@ package cn.odboy.core.controller.system; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.IdUtil; import cn.odboy.annotation.AnonymousPostMapping; -import cn.odboy.core.framework.properties.AppProperties; -import cn.odboy.core.constant.LoginCodeEnum; import cn.odboy.constant.SystemConst; +import cn.odboy.core.cache.service.impl.SystemUserOnlineServiceImpl; +import cn.odboy.core.constant.LoginCodeEnum; import cn.odboy.core.constant.SystemRedisKey; -import cn.odboy.core.framework.permission.util.SecurityHelper; -import cn.odboy.core.service.system.dto.UserJwtVo; -import cn.odboy.core.service.system.dto.UserLoginRequest; import cn.odboy.core.dal.model.UserInfoResponse; import cn.odboy.core.framework.permission.TokenProvider; import cn.odboy.core.framework.permission.UserDetailsServiceImpl; -import cn.odboy.core.cache.service.impl.SystemUserOnlineServiceImpl; +import cn.odboy.core.framework.permission.util.SecurityHelper; +import cn.odboy.core.framework.properties.AppProperties; +import cn.odboy.core.service.system.dto.UserJwtVo; +import cn.odboy.core.service.system.dto.UserLoginRequest; import cn.odboy.exception.BadRequestException; import cn.odboy.redis.RedisHelper; import cn.odboy.util.RsaEncryptUtil; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/DeptController.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/DeptController.java index 2505c86a..9f74234b 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/DeptController.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/DeptController.java @@ -2,10 +2,10 @@ package cn.odboy.core.controller.system; import cn.odboy.base.PageResult; import cn.odboy.core.api.system.SystemDeptApi; -import cn.odboy.core.service.system.dto.CreateDeptRequest; -import cn.odboy.core.service.system.dto.QueryDeptRequest; import cn.odboy.core.dal.dataobject.system.Dept; import cn.odboy.core.service.system.SystemDeptService; +import cn.odboy.core.service.system.dto.CreateDeptRequest; +import cn.odboy.core.service.system.dto.QueryDeptRequest; import cn.odboy.util.PageUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -101,4 +101,4 @@ public class DeptController { systemDeptService.removeDeptByIds(depts); return new ResponseEntity<>(HttpStatus.OK); } -} \ No newline at end of file +} diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/DictController.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/DictController.java index 02c0e4dc..37534daf 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/DictController.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/DictController.java @@ -2,10 +2,10 @@ package cn.odboy.core.controller.system; import cn.odboy.base.PageResult; import cn.odboy.core.api.system.SystemDictApi; -import cn.odboy.core.service.system.dto.CreateDictRequest; -import cn.odboy.core.service.system.dto.QueryDictRequest; import cn.odboy.core.dal.dataobject.system.Dict; import cn.odboy.core.service.system.SystemDictService; +import cn.odboy.core.service.system.dto.CreateDictRequest; +import cn.odboy.core.service.system.dto.QueryDictRequest; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -77,4 +77,4 @@ public class DictController { systemDictService.removeDictByIds(ids); return new ResponseEntity<>(HttpStatus.OK); } -} \ No newline at end of file +} diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/DictDetailController.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/DictDetailController.java index 930e6425..5cd88ca2 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/DictDetailController.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/DictDetailController.java @@ -2,10 +2,10 @@ package cn.odboy.core.controller.system; import cn.odboy.base.PageResult; import cn.odboy.core.api.system.SystemDictDetailApi; -import cn.odboy.core.service.system.dto.CreateDictDetailRequest; -import cn.odboy.core.service.system.dto.QueryDictDetailRequest; import cn.odboy.core.dal.dataobject.system.DictDetail; import cn.odboy.core.service.system.SystemDictDetailService; +import cn.odboy.core.service.system.dto.CreateDictDetailRequest; +import cn.odboy.core.service.system.dto.QueryDictDetailRequest; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -73,4 +73,4 @@ public class DictDetailController { systemDictDetailService.removeDictDetailById(args.getId()); return new ResponseEntity<>(HttpStatus.OK); } -} \ No newline at end of file +} diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/JobController.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/JobController.java index a237c0ad..0c27c341 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/JobController.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/JobController.java @@ -2,10 +2,10 @@ package cn.odboy.core.controller.system; import cn.odboy.base.PageResult; import cn.odboy.core.api.system.SystemJobApi; -import cn.odboy.core.service.system.dto.CreateJobRequest; -import cn.odboy.core.service.system.dto.QueryJobRequest; import cn.odboy.core.dal.dataobject.system.Job; import cn.odboy.core.service.system.SystemJobService; +import cn.odboy.core.service.system.dto.CreateJobRequest; +import cn.odboy.core.service.system.dto.QueryJobRequest; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -72,4 +72,4 @@ public class JobController { systemJobService.removeJobByIds(ids); return new ResponseEntity<>(HttpStatus.OK); } -} \ No newline at end of file +} diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/MenuController.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/MenuController.java index 8c2d4bb9..8c9390ea 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/MenuController.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/MenuController.java @@ -3,11 +3,11 @@ package cn.odboy.core.controller.system; import cn.hutool.core.collection.CollectionUtil; import cn.odboy.base.PageResult; import cn.odboy.core.api.system.SystemMenuApi; -import cn.odboy.core.framework.permission.util.SecurityHelper; -import cn.odboy.core.service.system.dto.QueryMenuRequest; import cn.odboy.core.dal.dataobject.system.Menu; import cn.odboy.core.dal.model.MenuResponse; +import cn.odboy.core.framework.permission.util.SecurityHelper; import cn.odboy.core.service.system.SystemMenuService; +import cn.odboy.core.service.system.dto.QueryMenuRequest; import cn.odboy.exception.BadRequestException; import cn.odboy.util.PageUtil; import io.swagger.annotations.Api; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/OnlineController.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/OnlineController.java index cdaa24c3..ea3bdb3b 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/OnlineController.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/OnlineController.java @@ -2,8 +2,8 @@ package cn.odboy.core.controller.system; import cn.odboy.base.PageResult; import cn.odboy.core.cache.api.SystemUserOnlineApi; -import cn.odboy.core.service.system.dto.UserOnlineVo; import cn.odboy.core.cache.service.SystemUserOnlineService; +import cn.odboy.core.service.system.dto.UserOnlineVo; import cn.odboy.util.DesEncryptUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/RoleController.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/RoleController.java index 095963fd..d9542ec1 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/RoleController.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/RoleController.java @@ -3,11 +3,11 @@ package cn.odboy.core.controller.system; import cn.hutool.core.lang.Dict; import cn.odboy.base.PageResult; import cn.odboy.core.api.system.SystemRoleApi; +import cn.odboy.core.dal.dataobject.system.Role; import cn.odboy.core.framework.permission.util.SecurityHelper; +import cn.odboy.core.service.system.SystemRoleService; import cn.odboy.core.service.system.dto.CreateRoleRequest; import cn.odboy.core.service.system.dto.QueryRoleRequest; -import cn.odboy.core.dal.dataobject.system.Role; -import cn.odboy.core.service.system.SystemRoleService; import cn.odboy.exception.BadRequestException; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.annotations.Api; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/UserController.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/UserController.java index 471304e6..1baba2b2 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/UserController.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/UserController.java @@ -10,8 +10,8 @@ import cn.odboy.core.api.system.SystemUserApi; import cn.odboy.core.constant.CaptchaBizEnum; import cn.odboy.core.dal.dataobject.system.Dept; import cn.odboy.core.dal.dataobject.system.Role; -import cn.odboy.core.dal.model.UpdateUserPasswordResponse; import cn.odboy.core.dal.dataobject.system.User; +import cn.odboy.core.dal.model.UpdateUserPasswordResponse; import cn.odboy.core.framework.permission.util.SecurityHelper; import cn.odboy.core.framework.properties.AppProperties; import cn.odboy.core.service.system.SystemUserService; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/tools/EmailController.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/tools/EmailController.java index b154c79d..56cb880c 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/tools/EmailController.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/tools/EmailController.java @@ -1,9 +1,9 @@ package cn.odboy.core.controller.tools; import cn.odboy.core.api.tools.EmailApi; -import cn.odboy.core.service.tools.dto.SendEmailRequest; import cn.odboy.core.dal.dataobject.tools.EmailConfig; import cn.odboy.core.service.tools.EmailService; +import cn.odboy.core.service.tools.dto.SendEmailRequest; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/tools/LocalStorageController.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/tools/LocalStorageController.java index 881c56bd..8f58f11c 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/tools/LocalStorageController.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/tools/LocalStorageController.java @@ -3,9 +3,9 @@ package cn.odboy.core.controller.tools; import cn.odboy.base.PageResult; import cn.odboy.constant.FileTypeEnum; import cn.odboy.core.api.tools.LocalStorageApi; -import cn.odboy.core.service.tools.dto.QueryLocalStorageRequest; import cn.odboy.core.dal.dataobject.tools.LocalStorage; import cn.odboy.core.service.tools.LocalStorageService; +import cn.odboy.core.service.tools.dto.QueryLocalStorageRequest; import cn.odboy.exception.BadRequestException; import cn.odboy.util.FileUtil; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -83,4 +83,4 @@ public class LocalStorageController { localStorageService.removeFileByIds(ids); return new ResponseEntity<>(HttpStatus.OK); } -} \ No newline at end of file +} diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/tools/QiniuController.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/tools/QiniuController.java index ae2fc377..d8ae1233 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/tools/QiniuController.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/tools/QiniuController.java @@ -3,11 +3,11 @@ package cn.odboy.core.controller.tools; import cn.odboy.base.PageResult; import cn.odboy.core.api.tools.QiniuConfigApi; import cn.odboy.core.api.tools.QiniuContentApi; -import cn.odboy.core.service.tools.dto.QueryQiniuRequest; import cn.odboy.core.dal.dataobject.tools.QiniuConfig; import cn.odboy.core.dal.dataobject.tools.QiniuContent; import cn.odboy.core.service.tools.QiniuConfigService; import cn.odboy.core.service.tools.QiniuContentService; +import cn.odboy.core.service.tools.dto.QueryQiniuRequest; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/job/QuartzLog.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/job/QuartzLog.java index afffb2be..a730e63e 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/job/QuartzLog.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/job/QuartzLog.java @@ -1,7 +1,6 @@ package cn.odboy.core.dal.dataobject.job; import cn.odboy.base.MyObject; -import com.alibaba.fastjson2.annotation.JSONField; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; @@ -10,7 +9,6 @@ import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; -import org.springframework.format.annotation.DateTimeFormat; import java.util.Date; @Data diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/tools/QiniuContent.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/tools/QiniuContent.java index 7ffa3826..dd0e0518 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/tools/QiniuContent.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/dataobject/tools/QiniuContent.java @@ -1,7 +1,6 @@ package cn.odboy.core.dal.dataobject.tools; import cn.odboy.base.MyObject; -import com.alibaba.fastjson2.annotation.JSONField; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; @@ -10,7 +9,6 @@ import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; -import org.springframework.format.annotation.DateTimeFormat; import java.util.Date; /** diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/job/QuartzJobMapper.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/job/QuartzJobMapper.java index e23406ea..043f4ee7 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/job/QuartzJobMapper.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/job/QuartzJobMapper.java @@ -1,7 +1,7 @@ package cn.odboy.core.dal.mysql.job; -import cn.odboy.core.service.system.dto.QueryQuartzJobRequest; import cn.odboy.core.dal.dataobject.job.QuartzJob; +import cn.odboy.core.service.system.dto.QueryQuartzJobRequest; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/job/QuartzLogMapper.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/job/QuartzLogMapper.java index 880489eb..9bf02cdf 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/job/QuartzLogMapper.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/job/QuartzLogMapper.java @@ -1,7 +1,7 @@ package cn.odboy.core.dal.mysql.job; -import cn.odboy.core.service.system.dto.QueryQuartzJobRequest; import cn.odboy.core.dal.dataobject.job.QuartzLog; +import cn.odboy.core.service.system.dto.QueryQuartzJobRequest; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/system/DeptMapper.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/system/DeptMapper.java index 09453e42..501fac02 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/system/DeptMapper.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/system/DeptMapper.java @@ -1,7 +1,7 @@ package cn.odboy.core.dal.mysql.system; -import cn.odboy.core.service.system.dto.QueryDeptRequest; import cn.odboy.core.dal.dataobject.system.Dept; +import cn.odboy.core.service.system.dto.QueryDeptRequest; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -21,4 +21,4 @@ public interface DeptMapper extends BaseMapper { Set queryDeptSetByRoleId(@Param("roleId") Long roleId); void updateSubCountById(@Param("count") Integer count, @Param("id") Long id); -} \ No newline at end of file +} diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/system/DictDetailMapper.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/system/DictDetailMapper.java index 1ea29201..ff4ef4d4 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/system/DictDetailMapper.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/system/DictDetailMapper.java @@ -1,7 +1,7 @@ package cn.odboy.core.dal.mysql.system; -import cn.odboy.core.service.system.dto.QueryDictDetailRequest; import cn.odboy.core.dal.dataobject.system.DictDetail; +import cn.odboy.core.service.system.dto.QueryDictDetailRequest; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -18,4 +18,4 @@ public interface DictDetailMapper extends BaseMapper { IPage queryDictDetailPageByArgs(@Param("criteria") QueryDictDetailRequest criteria, Page page); void deleteDictDetailByDictIds(@Param("dictIds") Set dictIds); -} \ No newline at end of file +} diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/system/DictMapper.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/system/DictMapper.java index 61116eab..61abc582 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/system/DictMapper.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/system/DictMapper.java @@ -1,7 +1,7 @@ package cn.odboy.core.dal.mysql.system; -import cn.odboy.core.service.system.dto.QueryDictRequest; import cn.odboy.core.dal.dataobject.system.Dict; +import cn.odboy.core.service.system.dto.QueryDictRequest; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -11,4 +11,4 @@ import org.apache.ibatis.annotations.Param; @Mapper public interface DictMapper extends BaseMapper { IPage queryDictPageByArgs(@Param("criteria") QueryDictRequest criteria, Page page); -} \ No newline at end of file +} diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/system/JobMapper.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/system/JobMapper.java index b689dc59..19c3a76c 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/system/JobMapper.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/system/JobMapper.java @@ -1,7 +1,7 @@ package cn.odboy.core.dal.mysql.system; -import cn.odboy.core.service.system.dto.QueryJobRequest; import cn.odboy.core.dal.dataobject.system.Job; +import cn.odboy.core.service.system.dto.QueryJobRequest; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -13,4 +13,4 @@ public interface JobMapper extends BaseMapper { Job getJobByName(@Param("name") String name); IPage queryJobPageByArgs(@Param("criteria") QueryJobRequest criteria, Page page); -} \ No newline at end of file +} diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/system/MenuMapper.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/system/MenuMapper.java index 59ce63b1..0eb2ebbb 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/system/MenuMapper.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/system/MenuMapper.java @@ -1,7 +1,7 @@ package cn.odboy.core.dal.mysql.system; -import cn.odboy.core.service.system.dto.QueryMenuRequest; import cn.odboy.core.dal.dataobject.system.Menu; +import cn.odboy.core.service.system.dto.QueryMenuRequest; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/system/RoleMapper.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/system/RoleMapper.java index 7c03955e..abdf247c 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/system/RoleMapper.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/system/RoleMapper.java @@ -1,7 +1,7 @@ package cn.odboy.core.dal.mysql.system; -import cn.odboy.core.service.system.dto.QueryRoleRequest; import cn.odboy.core.dal.dataobject.system.Role; +import cn.odboy.core.service.system.dto.QueryRoleRequest; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -25,4 +25,4 @@ public interface RoleMapper extends BaseMapper { int getRoleCountByDeptIds(@Param("deptIds") Set deptIds); List queryRoleListByMenuId(@Param("menuId") Long menuId); -} \ No newline at end of file +} diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/system/UserMapper.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/system/UserMapper.java index 93c7ccec..1cc6cd5f 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/system/UserMapper.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/system/UserMapper.java @@ -1,7 +1,7 @@ package cn.odboy.core.dal.mysql.system; -import cn.odboy.core.service.system.dto.QueryUserRequest; import cn.odboy.core.dal.dataobject.system.User; +import cn.odboy.core.service.system.dto.QueryUserRequest; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/tools/LocalStorageMapper.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/tools/LocalStorageMapper.java index befdfec7..1cdace81 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/tools/LocalStorageMapper.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/tools/LocalStorageMapper.java @@ -1,7 +1,7 @@ package cn.odboy.core.dal.mysql.tools; -import cn.odboy.core.service.tools.dto.QueryLocalStorageRequest; import cn.odboy.core.dal.dataobject.tools.LocalStorage; +import cn.odboy.core.service.tools.dto.QueryLocalStorageRequest; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/tools/QiniuContentMapper.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/tools/QiniuContentMapper.java index cd605a7d..49078da2 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/tools/QiniuContentMapper.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/mysql/tools/QiniuContentMapper.java @@ -1,7 +1,7 @@ package cn.odboy.core.dal.mysql.tools; -import cn.odboy.core.service.tools.dto.QueryQiniuRequest; import cn.odboy.core.dal.dataobject.tools.QiniuContent; +import cn.odboy.core.service.tools.dto.QueryQiniuRequest; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -14,4 +14,4 @@ public interface QiniuContentMapper extends BaseMapper { QiniuContent getQiniuContentByName(@Param("name") String name); IPage queryQiniuContentPageByArgs(@Param("criteria") QueryQiniuRequest criteria, Page page); -} \ No newline at end of file +} diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/permission/TokenFilter.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/permission/TokenFilter.java index c3b9e8e6..e95c7570 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/permission/TokenFilter.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/permission/TokenFilter.java @@ -22,7 +22,7 @@ public class TokenFilter extends GenericFilterBean { private final SystemUserOnlineApi systemUserOnlineApi; /** - * @param tokenProvider Token + * @param tokenProvider Token * @param systemUserOnlineApi 用户在线 */ public TokenFilter(TokenProvider tokenProvider, SystemUserOnlineApi systemUserOnlineApi) { diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/permission/TokenProvider.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/permission/TokenProvider.java index 6b1ae426..3c699d58 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/permission/TokenProvider.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/permission/TokenProvider.java @@ -3,9 +3,9 @@ package cn.odboy.core.framework.permission; import cn.hutool.core.date.DateField; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.IdUtil; -import cn.odboy.core.framework.properties.AppProperties; import cn.odboy.constant.SystemConst; import cn.odboy.core.constant.SystemRedisKey; +import cn.odboy.core.framework.properties.AppProperties; import cn.odboy.core.service.system.dto.UserJwtVo; import cn.odboy.redis.RedisHelper; import io.jsonwebtoken.Claims; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/permission/UserDetailsServiceImpl.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/permission/UserDetailsServiceImpl.java index 3c619b9f..55574363 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/permission/UserDetailsServiceImpl.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/permission/UserDetailsServiceImpl.java @@ -4,8 +4,8 @@ import cn.odboy.core.api.system.SystemDataApi; import cn.odboy.core.api.system.SystemRoleApi; import cn.odboy.core.api.system.SystemUserApi; import cn.odboy.core.cache.api.SystemUserJwtApi; -import cn.odboy.core.dal.dataobject.system.User; import cn.odboy.core.cache.service.SystemUserJwtService; +import cn.odboy.core.dal.dataobject.system.User; import cn.odboy.core.service.system.dto.RoleCodeVo; import cn.odboy.core.service.system.dto.UserJwtVo; import cn.odboy.exception.BadRequestException; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/quartz/ExecutionJobBean.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/quartz/ExecutionJobBean.java index 4b6d98f6..ffee5788 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/quartz/ExecutionJobBean.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/quartz/ExecutionJobBean.java @@ -6,12 +6,12 @@ import cn.hutool.extra.template.TemplateConfig; import cn.hutool.extra.template.TemplateEngine; import cn.hutool.extra.template.TemplateUtil; import cn.odboy.context.SpringBeanHolder; -import cn.odboy.core.service.tools.dto.SendEmailRequest; import cn.odboy.core.dal.dataobject.job.QuartzJob; import cn.odboy.core.dal.dataobject.job.QuartzLog; import cn.odboy.core.dal.mysql.job.QuartzLogMapper; import cn.odboy.core.service.system.SystemQuartzJobService; import cn.odboy.core.service.tools.EmailService; +import cn.odboy.core.service.tools.dto.SendEmailRequest; import cn.odboy.redis.RedisHelper; import cn.odboy.util.StringUtil; import lombok.extern.slf4j.Slf4j; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/SystemUserService.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/SystemUserService.java index ae75bb30..431bf0cd 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/SystemUserService.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/SystemUserService.java @@ -31,6 +31,7 @@ public interface SystemUserService extends IService { * @param ids / */ void removeUserByIds(Set ids); + /** * 修改密码 * diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/dto/QueryDeptRequest.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/dto/QueryDeptRequest.java index d86134fc..c3e5a2a0 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/dto/QueryDeptRequest.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/dto/QueryDeptRequest.java @@ -1,9 +1,7 @@ package cn.odboy.core.service.system.dto; -import com.alibaba.fastjson2.annotation.JSONField; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import org.springframework.format.annotation.DateTimeFormat; import java.util.Date; import java.util.List; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/dto/QueryJobRequest.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/dto/QueryJobRequest.java index c3a98ca2..0fc72226 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/dto/QueryJobRequest.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/dto/QueryJobRequest.java @@ -1,10 +1,8 @@ package cn.odboy.core.service.system.dto; -import com.alibaba.fastjson2.annotation.JSONField; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.NoArgsConstructor; -import org.springframework.format.annotation.DateTimeFormat; import java.util.Date; import java.util.List; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/dto/QueryMenuRequest.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/dto/QueryMenuRequest.java index 9037e790..757b49da 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/dto/QueryMenuRequest.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/dto/QueryMenuRequest.java @@ -1,9 +1,7 @@ package cn.odboy.core.service.system.dto; -import com.alibaba.fastjson2.annotation.JSONField; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import org.springframework.format.annotation.DateTimeFormat; import java.util.Date; import java.util.List; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/dto/QueryQuartzJobRequest.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/dto/QueryQuartzJobRequest.java index 53269305..8091987d 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/dto/QueryQuartzJobRequest.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/dto/QueryQuartzJobRequest.java @@ -1,9 +1,7 @@ package cn.odboy.core.service.system.dto; -import com.alibaba.fastjson2.annotation.JSONField; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import org.springframework.format.annotation.DateTimeFormat; import java.util.Date; import java.util.List; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/dto/QueryRoleRequest.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/dto/QueryRoleRequest.java index 000cefb8..b0633e18 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/dto/QueryRoleRequest.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/dto/QueryRoleRequest.java @@ -1,9 +1,7 @@ package cn.odboy.core.service.system.dto; -import com.alibaba.fastjson2.annotation.JSONField; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import org.springframework.format.annotation.DateTimeFormat; import java.util.Date; import java.util.List; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/dto/QueryUserRequest.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/dto/QueryUserRequest.java index 8c7f07a8..50ddb721 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/dto/QueryUserRequest.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/dto/QueryUserRequest.java @@ -1,11 +1,9 @@ package cn.odboy.core.service.system.dto; import cn.odboy.base.MyObject; -import com.alibaba.fastjson2.annotation.JSONField; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; -import org.springframework.format.annotation.DateTimeFormat; import java.util.Date; import java.util.HashSet; import java.util.List; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/impl/SystemDictDetailServiceImpl.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/impl/SystemDictDetailServiceImpl.java index 4217503a..0b2b8d9d 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/impl/SystemDictDetailServiceImpl.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/impl/SystemDictDetailServiceImpl.java @@ -21,7 +21,6 @@ public class SystemDictDetailServiceImpl extends ServiceImpl implements private final RedisHelper redisHelper; - @Override @Transactional(rollbackFor = Exception.class) public void saveJob(CreateJobRequest resources) { @@ -78,4 +77,4 @@ public class SystemJobServiceImpl extends ServiceImpl implements public void delCaches(Long id) { redisHelper.del(SystemRedisKey.JOB_ID + id); } -} \ No newline at end of file +} diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/impl/SystemRoleServiceImpl.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/impl/SystemRoleServiceImpl.java index 27224caf..c20b1f9a 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/impl/SystemRoleServiceImpl.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/impl/SystemRoleServiceImpl.java @@ -3,6 +3,7 @@ package cn.odboy.core.service.system.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollectionUtil; +import cn.odboy.core.cache.service.SystemUserJwtService; import cn.odboy.core.constant.SystemRedisKey; import cn.odboy.core.dal.dataobject.system.Role; import cn.odboy.core.dal.dataobject.system.User; @@ -11,7 +12,6 @@ import cn.odboy.core.dal.mysql.system.RoleMapper; import cn.odboy.core.dal.mysql.system.RoleMenuMapper; import cn.odboy.core.dal.mysql.system.UserMapper; import cn.odboy.core.service.system.SystemRoleService; -import cn.odboy.core.cache.service.SystemUserJwtService; import cn.odboy.core.service.system.dto.CreateRoleRequest; import cn.odboy.exception.EntityExistException; import cn.odboy.redis.RedisHelper; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/impl/SystemUserServiceImpl.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/impl/SystemUserServiceImpl.java index eaeac736..93e72681 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/impl/SystemUserServiceImpl.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/system/impl/SystemUserServiceImpl.java @@ -1,5 +1,7 @@ package cn.odboy.core.service.system.impl; +import cn.odboy.core.cache.service.SystemUserJwtService; +import cn.odboy.core.cache.service.SystemUserOnlineService; import cn.odboy.core.constant.SystemRedisKey; import cn.odboy.core.dal.dataobject.system.Job; import cn.odboy.core.dal.dataobject.system.Role; @@ -9,8 +11,6 @@ import cn.odboy.core.dal.mysql.system.UserMapper; import cn.odboy.core.dal.mysql.system.UserRoleMapper; import cn.odboy.core.framework.permission.util.SecurityHelper; import cn.odboy.core.framework.properties.AppProperties; -import cn.odboy.core.cache.service.SystemUserJwtService; -import cn.odboy.core.cache.service.SystemUserOnlineService; import cn.odboy.core.service.system.SystemUserService; import cn.odboy.exception.BadRequestException; import cn.odboy.exception.EntityExistException; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/tools/EmailService.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/tools/EmailService.java index 2202399d..fd379ecb 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/tools/EmailService.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/tools/EmailService.java @@ -1,7 +1,7 @@ package cn.odboy.core.service.tools; -import cn.odboy.core.service.tools.dto.SendEmailRequest; import cn.odboy.core.dal.dataobject.tools.EmailConfig; +import cn.odboy.core.service.tools.dto.SendEmailRequest; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/tools/dto/QueryLocalStorageRequest.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/tools/dto/QueryLocalStorageRequest.java index 990d5248..69cedf3e 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/tools/dto/QueryLocalStorageRequest.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/tools/dto/QueryLocalStorageRequest.java @@ -1,9 +1,7 @@ package cn.odboy.core.service.tools.dto; -import com.alibaba.fastjson2.annotation.JSONField; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import org.springframework.format.annotation.DateTimeFormat; import java.util.Date; import java.util.List; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/tools/dto/QueryQiniuRequest.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/tools/dto/QueryQiniuRequest.java index c184d847..8109e33b 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/tools/dto/QueryQiniuRequest.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/tools/dto/QueryQiniuRequest.java @@ -1,9 +1,7 @@ package cn.odboy.core.service.tools.dto; -import com.alibaba.fastjson2.annotation.JSONField; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import org.springframework.format.annotation.DateTimeFormat; import java.util.Date; import java.util.List; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/tools/impl/CaptchaServiceImpl.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/tools/impl/CaptchaServiceImpl.java index eadf7b4d..2ace7a37 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/tools/impl/CaptchaServiceImpl.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/service/tools/impl/CaptchaServiceImpl.java @@ -6,8 +6,8 @@ import cn.hutool.extra.template.Template; import cn.hutool.extra.template.TemplateConfig; import cn.hutool.extra.template.TemplateEngine; import cn.hutool.extra.template.TemplateUtil; -import cn.odboy.core.service.tools.dto.SendEmailRequest; import cn.odboy.core.service.tools.CaptchaService; +import cn.odboy.core.service.tools.dto.SendEmailRequest; import cn.odboy.exception.BadRequestException; import cn.odboy.redis.RedisHelper; import lombok.RequiredArgsConstructor;