upd

2025-05-15 21:10:19 +08:00
parent 626f96dd00
commit c31dde912a
61 changed files with 80 additions and 94 deletions
@@ -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;

@@ -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;

@@ -1,5 +1,3 @@
-
-
 server:
  port: 8000
  http2:
@@ -25,6 +25,7 @@ public interface SystemDeptApi {
     * @return /
     */
    Dept describeDeptById(Long id);
+
    /**
     * 根据PID查询
     *
@@ -40,6 +41,7 @@ public interface SystemDeptApi {
     * @return /
     */
    Set<Dept> describeDeptByRoleId(Long id);
+
    /**
     * 获取部门下所有关联的部门
     *
@@ -24,6 +24,7 @@ public interface SystemMenuApi {
     * @return /
     */
    Menu describeMenuById(long id);
+
    /**
     * 获取所有子节点，包含自身ID
     *
@@ -48,6 +49,7 @@ public interface SystemMenuApi {
     * @return /
     */
    List<MenuResponse> buildMenuResponse(List<Menu> menus);
+
    /**
     * 懒加载菜单数据
     *
@@ -67,6 +67,7 @@ public interface SystemRoleApi {
     * @return 权限信息
     */
    List<RoleCodeVo> buildUserRolePermissions(User user);
+
    /**
     * 验证是否被用户关联
     *
@@ -106,6 +106,7 @@ public class SystemDeptApiImpl implements SystemDeptApi {
    public Set<Dept> describeDeptByRoleId(Long id) {
        return deptMapper.queryDeptSetByRoleId(id);
    }
+
    @Override
    public Set<Dept> describeRelationDeptSet(List<Dept> menuList, Set<Dept> deptSet) {
        for (Dept dept : menuList) {
@@ -16,6 +16,7 @@ import java.util.List;
@RequiredArgsConstructor
 public class SystemDictApiImpl implements SystemDictApi {
    private final DictMapper dictMapper;
+
    @Override
    public PageResult<Dict> describeDictPage(QueryDictRequest criteria, Page<Object> page) {
        IPage<Dict> dicts = dictMapper.queryDictPageByArgs(criteria, page);
@@ -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<DictDetail> describeDictDetailPage(QueryDictDetailRequest criteria, Page<Object> page) {
        return PageUtil.toPage(dictDetailMapper.queryDictDetailPageByArgs(criteria, page));
    }
+
    @Override
    public List<DictDetail> describeDictDetailListByName(String name) {
        String key = SystemRedisKey.DICT_NAME + name;
@@ -23,6 +23,7 @@ public class SystemJobApiImpl implements SystemJobApi {
    private final JobMapper jobMapper;
    private final UserMapper userMapper;
    private final RedisHelper redisHelper;
+
    @Override
    public PageResult<Job> describeJobPage(QueryJobRequest criteria, Page<Object> page) {
        return PageUtil.toPage(jobMapper.queryJobPageByArgs(criteria, page));
@@ -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<Menu> describeChildMenuSet(List<Menu> menuList, Set<Menu> menuSet) {
        for (Menu menu : menuList) {
@@ -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() {
@@ -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() {
@@ -17,6 +17,7 @@ import java.util.List;
@CacheConfig(cacheNames = "qiNiu")
 public class QiniuContentApiImpl implements QiniuContentApi {
    private final QiniuContentMapper qiniuContentMapper;
+
    @Override
    public PageResult<QiniuContent> describeQiniuContentPage(QueryQiniuRequest criteria, Page<Object> page) {
        return PageUtil.toPage(qiniuContentMapper.queryQiniuContentPageByArgs(criteria, page));
@@ -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);
        }
    }
-}
+}
@@ -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;
@@ -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;
@@ -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;
@@ -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);
    }
-}
+}
@@ -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);
    }
-}
+}
@@ -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);
    }
-}
+}
@@ -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);
    }
-}
+}
@@ -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;
@@ -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;
@@ -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;
@@ -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;
@@ -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;
@@ -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);
    }
-}
+}
@@ -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;
@@ -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
@@ -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;

 /**
@@ -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;
@@ -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;
@@ -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<Dept> {
    Set<Dept> queryDeptSetByRoleId(@Param("roleId") Long roleId);

    void updateSubCountById(@Param("count") Integer count, @Param("id") Long id);
-}
+}
@@ -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<DictDetail> {
    IPage<DictDetail> queryDictDetailPageByArgs(@Param("criteria") QueryDictDetailRequest criteria, Page<Object> page);

    void deleteDictDetailByDictIds(@Param("dictIds") Set<Long> dictIds);
-}
+}
@@ -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<Dict> {
    IPage<Dict> queryDictPageByArgs(@Param("criteria") QueryDictRequest criteria, Page<Object> page);
-}
+}
@@ -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> {
    Job getJobByName(@Param("name") String name);

    IPage<Job> queryJobPageByArgs(@Param("criteria") QueryJobRequest criteria, Page<Object> page);
-}
+}
@@ -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;
@@ -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<Role> {
    int getRoleCountByDeptIds(@Param("deptIds") Set<Long> deptIds);

    List<Role> queryRoleListByMenuId(@Param("menuId") Long menuId);
-}
+}
@@ -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;
@@ -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;
@@ -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> {
    QiniuContent getQiniuContentByName(@Param("name") String name);

    IPage<QiniuContent> queryQiniuContentPageByArgs(@Param("criteria") QueryQiniuRequest criteria, Page<Object> page);
-}
+}
@@ -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) {
@@ -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;
@@ -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;
@@ -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;
@@ -31,6 +31,7 @@ public interface SystemUserService extends IService<User> {
     * @param ids /
     */
    void removeUserByIds(Set<Long> ids);
+
    /**
     * 修改密码
     *
@@ -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;

@@ -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;

@@ -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;

@@ -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;

@@ -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;

@@ -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;
@@ -21,7 +21,6 @@ public class SystemDictDetailServiceImpl extends ServiceImpl<DictDetailMapper, D
    private final RedisHelper redisHelper;


-
    @Override
    @Transactional(rollbackFor = Exception.class)
    public void saveDictDetail(CreateDictDetailRequest resources) {
@@ -44,7 +43,6 @@ public class SystemDictDetailServiceImpl extends ServiceImpl<DictDetailMapper, D
    }


-
    @Override
    @Transactional(rollbackFor = Exception.class)
    public void removeDictDetailById(Long id) {
@@ -58,4 +56,4 @@ public class SystemDictDetailServiceImpl extends ServiceImpl<DictDetailMapper, D
        Dict dict = dictMapper.selectById(dictDetail.getDictId());
        redisHelper.del(SystemRedisKey.DICT_NAME + dict.getName());
    }
-}
+}
@@ -28,7 +28,6 @@ public class SystemJobServiceImpl extends ServiceImpl<JobMapper, Job> implements
    private final RedisHelper redisHelper;


-
    @Override
    @Transactional(rollbackFor = Exception.class)
    public void saveJob(CreateJobRequest resources) {
@@ -78,4 +77,4 @@ public class SystemJobServiceImpl extends ServiceImpl<JobMapper, Job> implements
    public void delCaches(Long id) {
        redisHelper.del(SystemRedisKey.JOB_ID + id);
    }
-}
+}
@@ -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;
@@ -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;
@@ -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;


@@ -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;

@@ -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;

@@ -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;