upd: 编码规范

cutejava/cutejava-domain/src/main/java/cn/odboy/model/job/request/QueryQuartzJobRequest.java

@@ -7,7 +7,7 @@ import java.util.List;
 
 
 @Data
-public class QuartzJobQueryCriteria {
+public class QueryQuartzJobRequest {
 
     @ApiModelProperty(value = "定时任务名称")
     private String jobName;

cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/request/QueryDeptRequest.java

@@ -6,7 +6,7 @@ import java.sql.Timestamp;
 import java.util.List;
 
 @Data
-public class DeptQueryCriteria {
+public class QueryDeptRequest {
 
     @ApiModelProperty(value = "部门id集合")
     private List<Long> ids;

cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/request/QueryDictDetailRequest.java

@@ -4,7 +4,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 @Data
-public class DictDetailQueryCriteria {
+public class QueryDictDetailRequest {
 
     @ApiModelProperty(value = "标签")
     private String label;

cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/request/QueryDictRequest.java

@@ -4,7 +4,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 @Data
-public class DictQueryCriteria {
+public class QueryDictRequest {
 
     @ApiModelProperty(value = "模糊查询")
     private String blurry;

cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/request/QueryJobRequest.java

@@ -9,7 +9,7 @@ import java.util.List;
 
 @Data
 @NoArgsConstructor
-public class JobQueryCriteria {
+public class QueryJobRequest {
 
     @ApiModelProperty(value = "岗位名称")
     private String name;

cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/request/QueryMenuRequest.java

@@ -7,7 +7,7 @@ import java.util.List;
 
 
 @Data
-public class MenuQueryCriteria {
+public class QueryMenuRequest {
 
     @ApiModelProperty(value = "模糊查询")
     private String blurry;

cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/request/QueryRoleRequest.java

@@ -7,7 +7,7 @@ import java.util.List;
 
 
 @Data
-public class RoleQueryCriteria {
+public class QueryRoleRequest {
 
     @ApiModelProperty(value = "模糊查询")
     private String blurry;

cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/request/QueryUserRequest.java

@@ -11,7 +11,7 @@ import java.util.Set;
 
 @Data
 @EqualsAndHashCode(callSuper = false)
-public class UserQueryCriteria extends MyObject {
+public class QueryUserRequest extends MyObject {
 
     @ApiModelProperty(value = "ID")
     private Long id;

cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/response/MenuMetaResponse.java

@@ -9,7 +9,7 @@ import lombok.EqualsAndHashCode;
 @Data
 @AllArgsConstructor
 @EqualsAndHashCode(callSuper = false)
-public class MenuMetaVo extends MyObject {
+public class MenuMetaResponse extends MyObject {
 
     @ApiModelProperty(value = "菜单标题")
     private String title;

cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/response/MenuResponse.java

@@ -11,7 +11,7 @@ import java.util.List;
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
-public class MenuVo extends MyObject {
+public class MenuResponse extends MyObject {
 
     @ApiModelProperty(value = "菜单名称")
     private String name;
@@ -32,8 +32,8 @@ public class MenuVo extends MyObject {
     private Boolean alwaysShow;
 
     @ApiModelProperty(value = "元数据")
-    private MenuMetaVo meta;
+    private MenuMetaResponse meta;
 
     @ApiModelProperty(value = "子路由")
-    private List<MenuVo> children;
+    private List<MenuResponse> children;
 }

cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/response/SimpleUserResponse.java

@@ -12,7 +12,7 @@ import java.util.Set;
 
 @Data
 @EqualsAndHashCode(callSuper = false)
-public class SimpleUserVo extends MyObject {
+public class SimpleUserResponse extends MyObject {
     @ApiModelProperty(value = "ID", hidden = true)
     private Long id;
     @ApiModelProperty(value = "用户角色")

cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/response/UserInfoResponse.java

@@ -10,8 +10,8 @@ import java.util.stream.Collectors;
 
 @Data
 @EqualsAndHashCode(callSuper = false)
-public class UserInfoVo extends MyObject {
+public class UserInfoResponse extends MyObject {
-    private SimpleUserVo user;
+    private SimpleUserResponse user;
     private List<Long> dataScopes;
     private List<RoleCodeDto> authorities;
 

cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/response/UserPassResponse.java

@@ -7,7 +7,7 @@ import lombok.Data;
  * 修改密码
  */
 @Data
-public class UserPassVo {
+public class UserPassResponse {
 
     @ApiModelProperty(value = "旧密码")
     private String oldPass;

cutejava/cutejava-domain/src/main/java/cn/odboy/model/tools/request/QueryLocalStorageRequest.java

@@ -7,7 +7,7 @@ import java.util.List;
 
 
 @Data
-public class LocalStorageQueryCriteria {
+public class QueryLocalStorageRequest {
 
     @ApiModelProperty(value = "模糊查询")
     private String blurry;

cutejava/cutejava-domain/src/main/java/cn/odboy/model/tools/request/QueryQiniuRequest.java

@@ -7,7 +7,7 @@ import java.util.List;
 
 
 @Data
-public class QiniuQueryCriteria {
+public class QueryQiniuRequest {
 
     @ApiModelProperty(value = "名称查询")
     private String key;

cutejava/cutejava-domain/src/main/java/cn/odboy/model/tools/request/SendEmailRequest.java

@@ -1,4 +1,4 @@
-package cn.odboy.model.tools.dto;
+package cn.odboy.model.tools.request;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -14,7 +14,7 @@ import java.util.List;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-public class EmailDto {
+public class SendEmailRequest {
 
     @NotEmpty
     @ApiModelProperty(value = "收件人")

cutejava/cutejava-job/src/main/java/cn/odboy/application/job/context/ExecutionJob.java

@@ -11,7 +11,7 @@ import cn.odboy.application.tools.service.EmailService;
 import cn.odboy.context.SpringBeanHolder;
 import cn.odboy.model.job.domain.QuartzJob;
 import cn.odboy.model.job.domain.QuartzLog;
-import cn.odboy.model.tools.dto.EmailDto;
+import cn.odboy.model.tools.request.SendEmailRequest;
 import cn.odboy.redis.RedisHelper;
 import cn.odboy.util.StringUtil;
 import lombok.extern.slf4j.Slf4j;
@@ -89,8 +89,8 @@ public class ExecutionJob extends QuartzJobBean {
                 EmailService emailService = SpringBeanHolder.getBean(EmailService.class);
                 // 邮箱报警
                 if (StringUtil.isNoneBlank(quartzJob.getEmail())) {
-                    EmailDto emailDto = taskAlarm(quartzJob, ExceptionUtil.stacktraceToString(e));
+                    SendEmailRequest sendEmailRequest = taskAlarm(quartzJob, ExceptionUtil.stacktraceToString(e));
-                    emailService.sendEmail(emailDto);
+                    emailService.sendEmail(sendEmailRequest);
                 }
             }
         } finally {
@@ -98,17 +98,17 @@ public class ExecutionJob extends QuartzJobBean {
         }
     }
 
-    private EmailDto taskAlarm(QuartzJob quartzJob, String msg) {
+    private SendEmailRequest taskAlarm(QuartzJob quartzJob, String msg) {
-        EmailDto emailDto = new EmailDto();
+        SendEmailRequest sendEmailRequest = new SendEmailRequest();
-        emailDto.setSubject("定时任务【" + quartzJob.getJobName() + "】执行失败，请尽快处理！");
+        sendEmailRequest.setSubject("定时任务【" + quartzJob.getJobName() + "】执行失败，请尽快处理！");
         Map<String, Object> data = new HashMap<>(16);
         data.put("task", quartzJob);
         data.put("msg", msg);
         TemplateEngine engine = TemplateUtil.createEngine(new TemplateConfig("template", TemplateConfig.ResourceMode.CLASSPATH));
         Template template = engine.getTemplate("taskAlarm.ftl");
-        emailDto.setContent(template.render(data));
+        sendEmailRequest.setContent(template.render(data));
         List<String> emails = Arrays.asList(quartzJob.getEmail().split("[,，]"));
-        emailDto.setTos(emails);
+        sendEmailRequest.setTos(emails);
-        return emailDto;
+        return sendEmailRequest;
     }
 }

cutejava/cutejava-job/src/main/java/cn/odboy/application/job/mapper/QuartzJobMapper.java

@@ -1,7 +1,7 @@
 package cn.odboy.application.job.mapper;
 
 import cn.odboy.model.job.domain.QuartzJob;
-import cn.odboy.model.job.request.QuartzJobQueryCriteria;
+import cn.odboy.model.job.request.QueryQuartzJobRequest;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -11,7 +11,7 @@ import java.util.List;
 
 @Mapper
 public interface QuartzJobMapper extends BaseMapper<QuartzJob> {
-    IPage<QuartzJob> queryQuartzJobPage(@Param("criteria") QuartzJobQueryCriteria criteria, Page<Object> page);
+    IPage<QuartzJob> queryQuartzJobPage(@Param("criteria") QueryQuartzJobRequest criteria, Page<Object> page);
 
     List<QuartzJob> selectActiveQuartzJob();
 }

cutejava/cutejava-job/src/main/java/cn/odboy/application/job/mapper/QuartzLogMapper.java

@@ -1,7 +1,7 @@
 package cn.odboy.application.job.mapper;
 
 import cn.odboy.model.job.domain.QuartzLog;
-import cn.odboy.model.job.request.QuartzJobQueryCriteria;
+import cn.odboy.model.job.request.QueryQuartzJobRequest;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -11,5 +11,5 @@ import org.apache.ibatis.annotations.Param;
 
 @Mapper
 public interface QuartzLogMapper extends BaseMapper<QuartzLog> {
-    IPage<QuartzLog> queryQuartzLogPage(@Param("criteria") QuartzJobQueryCriteria criteria, Page<Object> page);
+    IPage<QuartzLog> queryQuartzLogPage(@Param("criteria") QueryQuartzJobRequest criteria, Page<Object> page);
 }

cutejava/cutejava-job/src/main/java/cn/odboy/application/job/rest/QuartzJobController.java

@@ -7,7 +7,7 @@ import cn.odboy.exception.BadRequestException;
 import cn.odboy.model.job.domain.QuartzJob;
 import cn.odboy.model.job.domain.QuartzLog;
 import cn.odboy.model.job.request.UpdateQuartzJobRequest;
-import cn.odboy.model.job.request.QuartzJobQueryCriteria;
+import cn.odboy.model.job.request.QueryQuartzJobRequest;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -43,7 +43,7 @@ public class QuartzJobController {
     @ApiOperation("查询定时任务")
     @GetMapping
     @PreAuthorize("@el.check('timing:list')")
-    public ResponseEntity<PageResult<QuartzJob>> queryQuartzJob(QuartzJobQueryCriteria criteria) {
+    public ResponseEntity<PageResult<QuartzJob>> queryQuartzJob(QueryQuartzJobRequest criteria) {
         Page<Object> page = new Page<>(criteria.getPage(), criteria.getSize());
         return new ResponseEntity<>(quartzJobService.queryJobPage(criteria, page), HttpStatus.OK);
     }
@@ -51,21 +51,21 @@ public class QuartzJobController {
     @ApiOperation("导出任务数据")
     @GetMapping(value = "/download")
     @PreAuthorize("@el.check('timing:list')")
-    public void exportQuartzJob(HttpServletResponse response, QuartzJobQueryCriteria criteria) throws IOException {
+    public void exportQuartzJob(HttpServletResponse response, QueryQuartzJobRequest criteria) throws IOException {
         quartzJobService.downloadJobExcel(quartzJobService.selectJobByCriteria(criteria), response);
     }
 
     @ApiOperation("导出日志数据")
     @GetMapping(value = "/logs/download")
     @PreAuthorize("@el.check('timing:list')")
-    public void exportQuartzJobLog(HttpServletResponse response, QuartzJobQueryCriteria criteria) throws IOException {
+    public void exportQuartzJobLog(HttpServletResponse response, QueryQuartzJobRequest criteria) throws IOException {
         quartzJobService.downloadLogExcel(quartzJobService.selectLogByCriteria(criteria), response);
     }
 
     @ApiOperation("查询任务执行日志")
     @GetMapping(value = "/logs")
     @PreAuthorize("@el.check('timing:list')")
-    public ResponseEntity<PageResult<QuartzLog>> queryQuartzJobLog(QuartzJobQueryCriteria criteria) {
+    public ResponseEntity<PageResult<QuartzLog>> queryQuartzJobLog(QueryQuartzJobRequest criteria) {
         Page<Object> page = new Page<>(criteria.getPage(), criteria.getSize());
         return new ResponseEntity<>(quartzJobService.queryLogPage(criteria, page), HttpStatus.OK);
     }

cutejava/cutejava-job/src/main/java/cn/odboy/application/job/service/QuartzJobService.java

@@ -4,7 +4,7 @@ import cn.odboy.base.PageResult;
 import cn.odboy.model.job.domain.QuartzJob;
 import cn.odboy.model.job.domain.QuartzLog;
 import cn.odboy.model.job.request.UpdateQuartzJobRequest;
-import cn.odboy.model.job.request.QuartzJobQueryCriteria;
+import cn.odboy.model.job.request.QueryQuartzJobRequest;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import javax.servlet.http.HttpServletResponse;
@@ -22,7 +22,7 @@ public interface QuartzJobService extends IService<QuartzJob> {
      * @param page     分页参数
      * @return /
      */
-    PageResult<QuartzJob> queryJobPage(QuartzJobQueryCriteria criteria, Page<Object> page);
+    PageResult<QuartzJob> queryJobPage(QueryQuartzJobRequest criteria, Page<Object> page);
 
     /**
      * 查询全部
@@ -30,7 +30,7 @@ public interface QuartzJobService extends IService<QuartzJob> {
      * @param criteria 条件
      * @return /
      */
-    List<QuartzJob> selectJobByCriteria(QuartzJobQueryCriteria criteria);
+    List<QuartzJob> selectJobByCriteria(QueryQuartzJobRequest criteria);
 
     /**
      * 分页查询日志
@@ -39,7 +39,7 @@ public interface QuartzJobService extends IService<QuartzJob> {
      * @param page     分页参数
      * @return /
      */
-    PageResult<QuartzLog> queryLogPage(QuartzJobQueryCriteria criteria, Page<Object> page);
+    PageResult<QuartzLog> queryLogPage(QueryQuartzJobRequest criteria, Page<Object> page);
 
     /**
      * 查询全部
@@ -47,7 +47,7 @@ public interface QuartzJobService extends IService<QuartzJob> {
      * @param criteria 条件
      * @return /
      */
-    List<QuartzLog> selectLogByCriteria(QuartzJobQueryCriteria criteria);
+    List<QuartzLog> selectLogByCriteria(QueryQuartzJobRequest criteria);
 
     /**
      * 创建

cutejava/cutejava-job/src/main/java/cn/odboy/application/job/service/impl/QuartzJobServiceImpl.java

@@ -12,7 +12,7 @@ import cn.odboy.exception.BadRequestException;
 import cn.odboy.model.job.domain.QuartzJob;
 import cn.odboy.model.job.domain.QuartzLog;
 import cn.odboy.model.job.request.UpdateQuartzJobRequest;
-import cn.odboy.model.job.request.QuartzJobQueryCriteria;
+import cn.odboy.model.job.request.QueryQuartzJobRequest;
 import cn.odboy.redis.RedisHelper;
 import cn.odboy.util.FileUtil;
 import cn.odboy.util.PageUtil;
@@ -42,22 +42,22 @@ public class QuartzJobServiceImpl extends ServiceImpl<QuartzJobMapper, QuartzJob
     private final RedisHelper redisHelper;
 
     @Override
-    public PageResult<QuartzJob> queryJobPage(QuartzJobQueryCriteria criteria, Page<Object> page) {
+    public PageResult<QuartzJob> queryJobPage(QueryQuartzJobRequest criteria, Page<Object> page) {
         return PageUtil.toPage(quartzJobMapper.queryQuartzJobPage(criteria, page));
     }
 
     @Override
-    public PageResult<QuartzLog> queryLogPage(QuartzJobQueryCriteria criteria, Page<Object> page) {
+    public PageResult<QuartzLog> queryLogPage(QueryQuartzJobRequest criteria, Page<Object> page) {
         return PageUtil.toPage(quartzLogMapper.queryQuartzLogPage(criteria, page));
     }
 
     @Override
-    public List<QuartzJob> selectJobByCriteria(QuartzJobQueryCriteria criteria) {
+    public List<QuartzJob> selectJobByCriteria(QueryQuartzJobRequest criteria) {
         return quartzJobMapper.queryQuartzJobPage(criteria, PageUtil.getCount(quartzJobMapper)).getRecords();
     }
 
     @Override
-    public List<QuartzLog> selectLogByCriteria(QuartzJobQueryCriteria criteria) {
+    public List<QuartzLog> selectLogByCriteria(QueryQuartzJobRequest criteria) {
         return quartzLogMapper.queryQuartzLogPage(criteria, PageUtil.getCount(quartzLogMapper)).getRecords();
     }
 

cutejava/cutejava-system/src/main/java/cn/odboy/application/core/rest/AuthController.java

@@ -17,7 +17,7 @@ import cn.odboy.context.SecurityHelper;
 import cn.odboy.exception.BadRequestException;
 import cn.odboy.model.system.dto.UserJwtDto;
 import cn.odboy.model.system.request.UserLoginRequest;
-import cn.odboy.model.system.response.UserInfoVo;
+import cn.odboy.model.system.response.UserInfoResponse;
 import cn.odboy.properties.RsaProperties;
 import cn.odboy.redis.RedisHelper;
 import cn.odboy.util.RsaEncryptUtil;
@@ -88,7 +88,7 @@ public class AuthController {
         // 返回 token 与 用户信息
         Map<String, Object> authInfo = new HashMap<>(2) {{
             put("token", String.format("%s %s", SystemConst.TOKEN_PREFIX, token));
-            put("user", BeanUtil.copyProperties(jwtUser, UserInfoVo.class));
+            put("user", BeanUtil.copyProperties(jwtUser, UserInfoResponse.class));
         }};
         if (loginProperties.isSingleLogin()) {
             // 踢掉之前已经登录的token
@@ -102,10 +102,10 @@ public class AuthController {
 
     @ApiOperation("获取用户信息")
     @GetMapping(value = "/info")
-    public ResponseEntity<UserInfoVo> getUserInfo() {
+    public ResponseEntity<UserInfoResponse> getUserInfo() {
         UserJwtDto jwtUser = (UserJwtDto) SecurityHelper.getCurrentUser();
-        UserInfoVo userInfoVo = BeanUtil.copyProperties(jwtUser, UserInfoVo.class);
+        UserInfoResponse userInfoResponse = BeanUtil.copyProperties(jwtUser, UserInfoResponse.class);
-        return ResponseEntity.ok(userInfoVo);
+        return ResponseEntity.ok(userInfoResponse);
     }
 
     @ApiOperation("获取验证码")

cutejava/cutejava-system/src/main/java/cn/odboy/application/system/mapper/DeptMapper.java

@@ -1,7 +1,7 @@
 package cn.odboy.application.system.mapper;
 
 import cn.odboy.model.system.domain.Dept;
-import cn.odboy.model.system.request.DeptQueryCriteria;
+import cn.odboy.model.system.request.QueryDeptRequest;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -10,7 +10,7 @@ import java.util.Set;
 
 @Mapper
 public interface DeptMapper extends BaseMapper<Dept> {
-    List<Dept> selectDeptByCriteria(@Param("criteria") DeptQueryCriteria criteria);
+    List<Dept> selectDeptByCriteria(@Param("criteria") QueryDeptRequest criteria);
 
     List<Dept> selectDeptByPid(@Param("pid") Long pid);
 

cutejava/cutejava-system/src/main/java/cn/odboy/application/system/mapper/DictDetailMapper.java

@@ -1,7 +1,7 @@
 package cn.odboy.application.system.mapper;
 
 import cn.odboy.model.system.domain.DictDetail;
-import cn.odboy.model.system.request.DictDetailQueryCriteria;
+import cn.odboy.model.system.request.QueryDictDetailRequest;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -15,7 +15,7 @@ import java.util.Set;
 public interface DictDetailMapper extends BaseMapper<DictDetail> {
     List<DictDetail> selectDictDetailByDictName(@Param("name") String name);
 
-    IPage<DictDetail> queryDictDetail(@Param("criteria") DictDetailQueryCriteria criteria, Page<Object> page);
+    IPage<DictDetail> queryDictDetail(@Param("criteria") QueryDictDetailRequest criteria, Page<Object> page);
 
     void deleteDictDetailsByDictIds(@Param("dictIds") Set<Long> dictIds);
 }

cutejava/cutejava-system/src/main/java/cn/odboy/application/system/mapper/DictMapper.java

@@ -1,7 +1,7 @@
 package cn.odboy.application.system.mapper;
 
 import cn.odboy.model.system.domain.Dict;
-import cn.odboy.model.system.request.DictQueryCriteria;
+import cn.odboy.model.system.request.QueryDictRequest;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -10,5 +10,5 @@ import org.apache.ibatis.annotations.Param;
 
 @Mapper
 public interface DictMapper extends BaseMapper<Dict> {
-    IPage<Dict> queryDictPage(@Param("criteria") DictQueryCriteria criteria, Page<Object> page);
+    IPage<Dict> queryDictPage(@Param("criteria") QueryDictRequest criteria, Page<Object> page);
 }

cutejava/cutejava-system/src/main/java/cn/odboy/application/system/mapper/JobMapper.java

@@ -1,7 +1,7 @@
 package cn.odboy.application.system.mapper;
 
 import cn.odboy.model.system.domain.Job;
-import cn.odboy.model.system.request.JobQueryCriteria;
+import cn.odboy.model.system.request.QueryJobRequest;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -12,5 +12,5 @@ import org.apache.ibatis.annotations.Param;
 public interface JobMapper extends BaseMapper<Job> {
     Job getJobByName(@Param("name") String name);
 
-    IPage<Job> queryJobPage(@Param("criteria") JobQueryCriteria criteria, Page<Object> page);
+    IPage<Job> queryJobPage(@Param("criteria") QueryJobRequest criteria, Page<Object> page);
 }

cutejava/cutejava-system/src/main/java/cn/odboy/application/system/mapper/MenuMapper.java

@@ -1,7 +1,7 @@
 package cn.odboy.application.system.mapper;
 
 import cn.odboy.model.system.domain.Menu;
-import cn.odboy.model.system.request.MenuQueryCriteria;
+import cn.odboy.model.system.request.QueryMenuRequest;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -12,7 +12,7 @@ import java.util.Set;
 @Mapper
 public interface MenuMapper extends BaseMapper<Menu> {
 
-    List<Menu> selectMenuByCriteria(@Param("criteria") MenuQueryCriteria criteria);
+    List<Menu> selectMenuByCriteria(@Param("criteria") QueryMenuRequest criteria);
 
     LinkedHashSet<Menu> selectMenuByRoleIdsAndType(@Param("roleIds") Set<Long> roleIds, @Param("type") Integer type);
 

cutejava/cutejava-system/src/main/java/cn/odboy/application/system/mapper/RoleMapper.java

@@ -1,7 +1,7 @@
 package cn.odboy.application.system.mapper;
 
 import cn.odboy.model.system.domain.Role;
-import cn.odboy.model.system.request.RoleQueryCriteria;
+import cn.odboy.model.system.request.QueryRoleRequest;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -12,9 +12,9 @@ import java.util.Set;
 public interface RoleMapper extends BaseMapper<Role> {
     List<Role> selectRole();
 
-    List<Role> selectRoleByCriteria(@Param("criteria") RoleQueryCriteria criteria);
+    List<Role> selectRoleByCriteria(@Param("criteria") QueryRoleRequest criteria);
 
-    Long getRoleCountByCriteria(@Param("criteria") RoleQueryCriteria criteria);
+    Long getRoleCountByCriteria(@Param("criteria") QueryRoleRequest criteria);
 
     Role getRoleByName(@Param("name") String name);
 

cutejava/cutejava-system/src/main/java/cn/odboy/application/system/mapper/UserMapper.java

@@ -1,7 +1,7 @@
 package cn.odboy.application.system.mapper;
 
 import cn.odboy.model.system.domain.User;
-import cn.odboy.model.system.request.UserQueryCriteria;
+import cn.odboy.model.system.request.QueryUserRequest;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -14,9 +14,9 @@ import java.util.Set;
 @Mapper
 public interface UserMapper extends BaseMapper<User> {
 
-    Long getUserCountByCriteria(@Param("criteria") UserQueryCriteria criteria);
+    Long getUserCountByCriteria(@Param("criteria") QueryUserRequest criteria);
 
-    IPage<User> queryUserPage(@Param("criteria") UserQueryCriteria criteria, Page<Object> page);
+    IPage<User> queryUserPage(@Param("criteria") QueryUserRequest criteria, Page<Object> page);
 
     User getUserByUsername(@Param("username") String username);
 

cutejava/cutejava-system/src/main/java/cn/odboy/application/system/rest/DeptController.java

@@ -4,7 +4,7 @@ import cn.odboy.application.system.service.DeptService;
 import cn.odboy.base.PageResult;
 import cn.odboy.model.system.domain.Dept;
 import cn.odboy.model.system.request.CreateDeptRequest;
-import cn.odboy.model.system.request.DeptQueryCriteria;
+import cn.odboy.model.system.request.QueryDeptRequest;
 import cn.odboy.util.PageUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -39,14 +39,14 @@ public class DeptController {
     @ApiOperation("导出部门数据")
     @GetMapping(value = "/download")
     @PreAuthorize("@el.check('dept:list')")
-    public void exportDept(HttpServletResponse response, DeptQueryCriteria criteria) throws Exception {
+    public void exportDept(HttpServletResponse response, QueryDeptRequest criteria) throws Exception {
         deptService.downloadExcel(deptService.selectDeptByCriteria(criteria, false), response);
     }
 
     @ApiOperation("查询部门")
     @GetMapping
     @PreAuthorize("@el.check('user:list','dept:list')")
-    public ResponseEntity<PageResult<Dept>> queryDept(DeptQueryCriteria criteria) throws Exception {
+    public ResponseEntity<PageResult<Dept>> queryDept(QueryDeptRequest criteria) throws Exception {
         List<Dept> depts = deptService.selectDeptByCriteria(criteria, true);
         return new ResponseEntity<>(PageUtil.toPage(depts), HttpStatus.OK);
     }

cutejava/cutejava-system/src/main/java/cn/odboy/application/system/rest/DictController.java

@@ -4,7 +4,7 @@ import cn.odboy.application.system.service.DictService;
 import cn.odboy.base.PageResult;
 import cn.odboy.model.system.domain.Dict;
 import cn.odboy.model.system.request.CreateDictRequest;
-import cn.odboy.model.system.request.DictQueryCriteria;
+import cn.odboy.model.system.request.QueryDictRequest;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -35,7 +35,7 @@ public class DictController {
     @ApiOperation("导出字典数据")
     @GetMapping(value = "/download")
     @PreAuthorize("@el.check('dict:list')")
-    public void exportDict(HttpServletResponse response, DictQueryCriteria criteria) throws IOException {
+    public void exportDict(HttpServletResponse response, QueryDictRequest criteria) throws IOException {
         dictService.downloadExcel(dictService.selectDictByCriteria(criteria), response);
     }
 
@@ -43,13 +43,13 @@ public class DictController {
     @GetMapping(value = "/all")
     @PreAuthorize("@el.check('dict:list')")
     public ResponseEntity<List<Dict>> queryAllDict() {
-        return new ResponseEntity<>(dictService.selectDictByCriteria(new DictQueryCriteria()), HttpStatus.OK);
+        return new ResponseEntity<>(dictService.selectDictByCriteria(new QueryDictRequest()), HttpStatus.OK);
     }
 
     @ApiOperation("查询字典")
     @GetMapping
     @PreAuthorize("@el.check('dict:list')")
-    public ResponseEntity<PageResult<Dict>> queryDict(DictQueryCriteria criteria) {
+    public ResponseEntity<PageResult<Dict>> queryDict(QueryDictRequest criteria) {
         Page<Object> page = new Page<>(criteria.getPage(), criteria.getSize());
         return new ResponseEntity<>(dictService.queryDictPage(criteria, page), HttpStatus.OK);
     }

cutejava/cutejava-system/src/main/java/cn/odboy/application/system/rest/DictDetailController.java

@@ -4,7 +4,7 @@ import cn.odboy.application.system.service.DictDetailService;
 import cn.odboy.base.PageResult;
 import cn.odboy.model.system.domain.DictDetail;
 import cn.odboy.model.system.request.CreateDictDetailRequest;
-import cn.odboy.model.system.request.DictDetailQueryCriteria;
+import cn.odboy.model.system.request.QueryDictDetailRequest;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -35,7 +35,7 @@ public class DictDetailController {
 
     @ApiOperation("查询字典详情")
     @GetMapping
-    public ResponseEntity<PageResult<DictDetail>> queryDictDetail(DictDetailQueryCriteria criteria) {
+    public ResponseEntity<PageResult<DictDetail>> queryDictDetail(QueryDictDetailRequest criteria) {
         Page<Object> page = new Page<>(criteria.getPage(), criteria.getSize());
         return new ResponseEntity<>(dictDetailService.queryDictDetailPage(criteria, page), HttpStatus.OK);
     }

cutejava/cutejava-system/src/main/java/cn/odboy/application/system/rest/JobController.java

@@ -4,7 +4,7 @@ import cn.odboy.application.system.service.JobService;
 import cn.odboy.base.PageResult;
 import cn.odboy.model.system.domain.Job;
 import cn.odboy.model.system.request.CreateJobRequest;
-import cn.odboy.model.system.request.JobQueryCriteria;
+import cn.odboy.model.system.request.QueryJobRequest;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -35,14 +35,14 @@ public class JobController {
     @ApiOperation("导出岗位数据")
     @GetMapping(value = "/download")
     @PreAuthorize("@el.check('job:list')")
-    public void exportJob(HttpServletResponse response, JobQueryCriteria criteria) throws IOException {
+    public void exportJob(HttpServletResponse response, QueryJobRequest criteria) throws IOException {
         jobService.downloadExcel(jobService.selectJobByCriteria(criteria), response);
     }
 
     @ApiOperation("查询岗位")
     @GetMapping
     @PreAuthorize("@el.check('job:list','user:list')")
-    public ResponseEntity<PageResult<Job>> queryJob(JobQueryCriteria criteria) {
+    public ResponseEntity<PageResult<Job>> queryJob(QueryJobRequest criteria) {
         Page<Object> page = new Page<>(criteria.getPage(), criteria.getSize());
         return new ResponseEntity<>(jobService.queryJobPage(criteria, page), HttpStatus.OK);
     }

cutejava/cutejava-system/src/main/java/cn/odboy/application/system/rest/MenuController.java

@@ -6,8 +6,8 @@ import cn.odboy.base.PageResult;
 import cn.odboy.context.SecurityHelper;
 import cn.odboy.exception.BadRequestException;
 import cn.odboy.model.system.domain.Menu;
-import cn.odboy.model.system.request.MenuQueryCriteria;
+import cn.odboy.model.system.request.QueryMenuRequest;
-import cn.odboy.model.system.response.MenuVo;
+import cn.odboy.model.system.response.MenuResponse;
 import cn.odboy.util.PageUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -45,13 +45,13 @@ public class MenuController {
     @ApiOperation("导出菜单数据")
     @GetMapping(value = "/download")
     @PreAuthorize("@el.check('menu:list')")
-    public void exportMenu(HttpServletResponse response, MenuQueryCriteria criteria) throws Exception {
+    public void exportMenu(HttpServletResponse response, QueryMenuRequest criteria) throws Exception {
         menuService.downloadExcel(menuService.selectMenuByCriteria(criteria, false), response);
     }
 
     @GetMapping(value = "/build")
     @ApiOperation("获取前端所需菜单")
-    public ResponseEntity<List<MenuVo>> buildMenus() {
+    public ResponseEntity<List<MenuResponse>> buildMenus() {
         List<Menu> menuList = menuService.selectMenuByUserId(SecurityHelper.getCurrentUserId());
         List<Menu> menus = menuService.buildTree(menuList);
         return new ResponseEntity<>(menuService.buildMenus(menus), HttpStatus.OK);
@@ -79,7 +79,7 @@ public class MenuController {
     @GetMapping
     @ApiOperation("查询菜单")
     @PreAuthorize("@el.check('menu:list')")
-    public ResponseEntity<PageResult<Menu>> queryMenu(MenuQueryCriteria criteria) throws Exception {
+    public ResponseEntity<PageResult<Menu>> queryMenu(QueryMenuRequest criteria) throws Exception {
         List<Menu> menuList = menuService.selectMenuByCriteria(criteria, true);
         return new ResponseEntity<>(PageUtil.toPage(menuList), HttpStatus.OK);
     }

cutejava/cutejava-system/src/main/java/cn/odboy/application/system/rest/RoleController.java

@@ -7,7 +7,7 @@ import cn.odboy.context.SecurityHelper;
 import cn.odboy.exception.BadRequestException;
 import cn.odboy.model.system.domain.Role;
 import cn.odboy.model.system.request.CreateRoleRequest;
-import cn.odboy.model.system.request.RoleQueryCriteria;
+import cn.odboy.model.system.request.QueryRoleRequest;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -49,7 +49,7 @@ public class RoleController {
     @ApiOperation("导出角色数据")
     @GetMapping(value = "/download")
     @PreAuthorize("@el.check('role:list')")
-    public void exportRole(HttpServletResponse response, RoleQueryCriteria criteria) throws IOException {
+    public void exportRole(HttpServletResponse response, QueryRoleRequest criteria) throws IOException {
         roleService.downloadExcel(roleService.selectRoleByCriteria(criteria), response);
     }
 
@@ -63,7 +63,7 @@ public class RoleController {
     @ApiOperation("查询角色")
     @GetMapping
     @PreAuthorize("@el.check('roles:list')")
-    public ResponseEntity<PageResult<Role>> queryRole(RoleQueryCriteria criteria) {
+    public ResponseEntity<PageResult<Role>> queryRole(QueryRoleRequest criteria) {
         Page<Object> page = new Page<>(criteria.getPage(), criteria.getSize());
         return new ResponseEntity<>(roleService.queryRolePage(criteria, page), HttpStatus.OK);
     }

cutejava/cutejava-system/src/main/java/cn/odboy/application/system/rest/UserController.java

@@ -14,8 +14,8 @@ import cn.odboy.exception.BadRequestException;
 import cn.odboy.model.system.domain.Dept;
 import cn.odboy.model.system.domain.Role;
 import cn.odboy.model.system.domain.User;
-import cn.odboy.model.system.request.UserQueryCriteria;
+import cn.odboy.model.system.request.QueryUserRequest;
-import cn.odboy.model.system.response.UserPassVo;
+import cn.odboy.model.system.response.UserPassResponse;
 import cn.odboy.properties.RsaProperties;
 import cn.odboy.util.PageUtil;
 import cn.odboy.util.RsaEncryptUtil;
@@ -65,14 +65,14 @@ public class UserController {
     @ApiOperation("导出用户数据")
     @GetMapping(value = "/download")
     @PreAuthorize("@el.check('user:list')")
-    public void exportUser(HttpServletResponse response, UserQueryCriteria criteria) throws IOException {
+    public void exportUser(HttpServletResponse response, QueryUserRequest criteria) throws IOException {
         userService.downloadExcel(userService.selectUserByCriteria(criteria), response);
     }
 
     @ApiOperation("查询用户")
     @GetMapping
     @PreAuthorize("@el.check('user:list')")
-    public ResponseEntity<PageResult<User>> queryUser(UserQueryCriteria criteria) {
+    public ResponseEntity<PageResult<User>> queryUser(QueryUserRequest criteria) {
         Page<Object> page = new Page<>(criteria.getPage(), criteria.getSize());
         if (!ObjectUtils.isEmpty(criteria.getDeptId())) {
             criteria.getDeptIds().add(criteria.getDeptId());
@@ -145,7 +145,7 @@ public class UserController {
 
     @ApiOperation("修改密码")
     @PostMapping(value = "/updatePass")
-    public ResponseEntity<Object> updateUserPassword(@RequestBody UserPassVo passVo) throws Exception {
+    public ResponseEntity<Object> updateUserPassword(@RequestBody UserPassResponse passVo) throws Exception {
         String oldPass = RsaEncryptUtil.decryptByPrivateKey(RsaProperties.privateKey, passVo.getOldPass());
         String newPass = RsaEncryptUtil.decryptByPrivateKey(RsaProperties.privateKey, passVo.getNewPass());
         User user = userService.getUserByUsername(SecurityHelper.getCurrentUsername());
@@ -202,7 +202,7 @@ public class UserController {
     @ApiOperation("查询用户基础数据")
     @PostMapping(value = "/queryUserMetaPage")
     @PreAuthorize("@el.check('user:list')")
-    public ResponseEntity<List<MyMetaOption>> queryUserMetaPage(@Validated @RequestBody UserQueryCriteria criteria) {
+    public ResponseEntity<List<MyMetaOption>> queryUserMetaPage(@Validated @RequestBody QueryUserRequest criteria) {
         int maxPageSize = 50;
         return new ResponseEntity<>(userService.page(new Page<>(criteria.getPage(), maxPageSize), new LambdaQueryWrapper<User>()
                 .and(c -> {

cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/DeptService.java

@@ -3,7 +3,7 @@ package cn.odboy.application.system.service;
 import cn.odboy.base.BaseResult;
 import cn.odboy.model.system.domain.Dept;
 import cn.odboy.model.system.request.CreateDeptRequest;
-import cn.odboy.model.system.request.DeptQueryCriteria;
+import cn.odboy.model.system.request.QueryDeptRequest;
 import com.baomidou.mybatisplus.extension.service.IService;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
@@ -20,7 +20,7 @@ public interface DeptService extends IService<Dept> {
      * @return /
      * @throws Exception /
      */
-    List<Dept> selectDeptByCriteria(DeptQueryCriteria criteria, Boolean isQuery) throws Exception;
+    List<Dept> selectDeptByCriteria(QueryDeptRequest criteria, Boolean isQuery) throws Exception;
 
     /**
      * 根据ID查询

cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/DictDetailService.java

@@ -3,7 +3,7 @@ package cn.odboy.application.system.service;
 import cn.odboy.base.PageResult;
 import cn.odboy.model.system.domain.DictDetail;
 import cn.odboy.model.system.request.CreateDictDetailRequest;
-import cn.odboy.model.system.request.DictDetailQueryCriteria;
+import cn.odboy.model.system.request.QueryDictDetailRequest;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import java.util.List;
@@ -39,7 +39,7 @@ public interface DictDetailService extends IService<DictDetail> {
      * @param page     分页参数
      * @return /
      */
-    PageResult<DictDetail> queryDictDetailPage(DictDetailQueryCriteria criteria, Page<Object> page);
+    PageResult<DictDetail> queryDictDetailPage(QueryDictDetailRequest criteria, Page<Object> page);
 
     /**
      * 根据字典名称获取字典详情

cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/DictService.java

@@ -3,7 +3,7 @@ package cn.odboy.application.system.service;
 import cn.odboy.base.PageResult;
 import cn.odboy.model.system.domain.Dict;
 import cn.odboy.model.system.request.CreateDictRequest;
-import cn.odboy.model.system.request.DictQueryCriteria;
+import cn.odboy.model.system.request.QueryDictRequest;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import javax.servlet.http.HttpServletResponse;
@@ -21,7 +21,7 @@ public interface DictService extends IService<Dict> {
      * @param page     分页参数
      * @return /
      */
-    PageResult<Dict> queryDictPage(DictQueryCriteria criteria, Page<Object> page);
+    PageResult<Dict> queryDictPage(QueryDictRequest criteria, Page<Object> page);
 
     /**
      * 查询全部数据
@@ -29,7 +29,7 @@ public interface DictService extends IService<Dict> {
      * @param criteria /
      * @return /
      */
-    List<Dict> selectDictByCriteria(DictQueryCriteria criteria);
+    List<Dict> selectDictByCriteria(QueryDictRequest criteria);
 
     /**
      * 创建

cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/JobService.java

@@ -3,7 +3,7 @@ package cn.odboy.application.system.service;
 import cn.odboy.base.PageResult;
 import cn.odboy.model.system.domain.Job;
 import cn.odboy.model.system.request.CreateJobRequest;
-import cn.odboy.model.system.request.JobQueryCriteria;
+import cn.odboy.model.system.request.QueryJobRequest;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import javax.servlet.http.HttpServletResponse;
@@ -50,7 +50,7 @@ public interface JobService extends IService<Job> {
      * @param page     分页参数
      * @return /
      */
-    PageResult<Job> queryJobPage(JobQueryCriteria criteria, Page<Object> page);
+    PageResult<Job> queryJobPage(QueryJobRequest criteria, Page<Object> page);
 
     /**
      * 查询全部数据
@@ -58,7 +58,7 @@ public interface JobService extends IService<Job> {
      * @param criteria /
      * @return /
      */
-    List<Job> selectJobByCriteria(JobQueryCriteria criteria);
+    List<Job> selectJobByCriteria(QueryJobRequest criteria);
 
     /**
      * 导出数据

cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/MenuService.java

@@ -1,8 +1,8 @@
 package cn.odboy.application.system.service;
 
 import cn.odboy.model.system.domain.Menu;
-import cn.odboy.model.system.request.MenuQueryCriteria;
+import cn.odboy.model.system.request.QueryMenuRequest;
-import cn.odboy.model.system.response.MenuVo;
+import cn.odboy.model.system.response.MenuResponse;
 import com.baomidou.mybatisplus.extension.service.IService;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
@@ -19,7 +19,7 @@ public interface MenuService extends IService<Menu> {
      * @return /
      * @throws Exception /
      */
-    List<Menu> selectMenuByCriteria(MenuQueryCriteria criteria, Boolean isQuery) throws Exception;
+    List<Menu> selectMenuByCriteria(QueryMenuRequest criteria, Boolean isQuery) throws Exception;
 
     /**
      * 根据ID查询
@@ -66,7 +66,7 @@ public interface MenuService extends IService<Menu> {
      * @param menus /
      * @return /
      */
-    List<MenuVo> buildMenus(List<Menu> menus);
+    List<MenuResponse> buildMenus(List<Menu> menus);
 
     /**
      * 删除

cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/RoleService.java

@@ -5,7 +5,7 @@ import cn.odboy.model.system.domain.Role;
 import cn.odboy.model.system.domain.User;
 import cn.odboy.model.system.dto.RoleCodeDto;
 import cn.odboy.model.system.request.CreateRoleRequest;
-import cn.odboy.model.system.request.RoleQueryCriteria;
+import cn.odboy.model.system.request.QueryRoleRequest;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import javax.servlet.http.HttpServletResponse;
@@ -29,7 +29,7 @@ public interface RoleService extends IService<Role> {
      * @param criteria 条件
      * @return /
      */
-    List<Role> selectRoleByCriteria(RoleQueryCriteria criteria);
+    List<Role> selectRoleByCriteria(QueryRoleRequest criteria);
 
     /**
      * 待条件分页查询
@@ -38,7 +38,7 @@ public interface RoleService extends IService<Role> {
      * @param page     分页参数
      * @return /
      */
-    PageResult<Role> queryRolePage(RoleQueryCriteria criteria, Page<Object> page);
+    PageResult<Role> queryRolePage(QueryRoleRequest criteria, Page<Object> page);
 
     /**
      * 根据ID查询

cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/UserService.java

@@ -2,7 +2,7 @@ package cn.odboy.application.system.service;
 
 import cn.odboy.base.PageResult;
 import cn.odboy.model.system.domain.User;
-import cn.odboy.model.system.request.UserQueryCriteria;
+import cn.odboy.model.system.request.QueryUserRequest;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.springframework.web.multipart.MultipartFile;
@@ -83,7 +83,7 @@ public interface UserService extends IService<User> {
      * @param page     分页参数
      * @return /
      */
-    PageResult<User> queryUserPage(UserQueryCriteria criteria, Page<Object> page);
+    PageResult<User> queryUserPage(QueryUserRequest criteria, Page<Object> page);
 
     /**
      * 查询全部不分页
@@ -91,7 +91,7 @@ public interface UserService extends IService<User> {
      * @param criteria 条件
      * @return /
      */
-    List<User> selectUserByCriteria(UserQueryCriteria criteria);
+    List<User> selectUserByCriteria(QueryUserRequest criteria);
 
     /**
      * 导出数据

cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/impl/DeptServiceImpl.java

@@ -16,7 +16,7 @@ import cn.odboy.exception.BadRequestException;
 import cn.odboy.model.system.domain.Dept;
 import cn.odboy.model.system.domain.User;
 import cn.odboy.model.system.request.CreateDeptRequest;
-import cn.odboy.model.system.request.DeptQueryCriteria;
+import cn.odboy.model.system.request.QueryDeptRequest;
 import cn.odboy.redis.RedisHelper;
 import cn.odboy.util.ClassUtil;
 import cn.odboy.util.FileUtil;
@@ -46,7 +46,7 @@ public class DeptServiceImpl extends ServiceImpl<DeptMapper, Dept> implements De
     private final RedisHelper redisHelper;
 
     @Override
-    public List<Dept> selectDeptByCriteria(DeptQueryCriteria criteria, Boolean isQuery) throws Exception {
+    public List<Dept> selectDeptByCriteria(QueryDeptRequest criteria, Boolean isQuery) throws Exception {
         String dataScopeType = SecurityHelper.getDataScopeType();
         if (isQuery) {
             if (dataScopeType.equals(DataScopeEnum.ALL.getValue())) {

cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/impl/DictDetailServiceImpl.java

@@ -10,7 +10,7 @@ import cn.odboy.constant.SystemRedisKey;
 import cn.odboy.model.system.domain.Dict;
 import cn.odboy.model.system.domain.DictDetail;
 import cn.odboy.model.system.request.CreateDictDetailRequest;
-import cn.odboy.model.system.request.DictDetailQueryCriteria;
+import cn.odboy.model.system.request.QueryDictDetailRequest;
 import cn.odboy.redis.RedisHelper;
 import cn.odboy.util.PageUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -29,7 +29,7 @@ public class DictDetailServiceImpl extends ServiceImpl<DictDetailMapper, DictDet
     private final RedisHelper redisHelper;
 
     @Override
-    public PageResult<DictDetail> queryDictDetailPage(DictDetailQueryCriteria criteria, Page<Object> page) {
+    public PageResult<DictDetail> queryDictDetailPage(QueryDictDetailRequest criteria, Page<Object> page) {
         return PageUtil.toPage(dictDetailMapper.queryDictDetail(criteria, page));
     }
 

cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/impl/DictServiceImpl.java

@@ -10,7 +10,7 @@ import cn.odboy.constant.SystemRedisKey;
 import cn.odboy.model.system.domain.Dict;
 import cn.odboy.model.system.domain.DictDetail;
 import cn.odboy.model.system.request.CreateDictRequest;
-import cn.odboy.model.system.request.DictQueryCriteria;
+import cn.odboy.model.system.request.QueryDictRequest;
 import cn.odboy.redis.RedisHelper;
 import cn.odboy.util.FileUtil;
 import cn.odboy.util.PageUtil;
@@ -36,13 +36,13 @@ public class DictServiceImpl extends ServiceImpl<DictMapper, Dict> implements Di
     private final RedisHelper redisHelper;
 
     @Override
-    public PageResult<Dict> queryDictPage(DictQueryCriteria criteria, Page<Object> page) {
+    public PageResult<Dict> queryDictPage(QueryDictRequest criteria, Page<Object> page) {
         IPage<Dict> dicts = dictMapper.queryDictPage(criteria, page);
         return PageUtil.toPage(dicts);
     }
 
     @Override
-    public List<Dict> selectDictByCriteria(DictQueryCriteria criteria) {
+    public List<Dict> selectDictByCriteria(QueryDictRequest criteria) {
         return dictMapper.queryDictPage(criteria, PageUtil.getCount(dictMapper)).getRecords();
     }
 

cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/impl/JobServiceImpl.java

@@ -10,7 +10,7 @@ import cn.odboy.exception.BadRequestException;
 import cn.odboy.exception.EntityExistException;
 import cn.odboy.model.system.domain.Job;
 import cn.odboy.model.system.request.CreateJobRequest;
-import cn.odboy.model.system.request.JobQueryCriteria;
+import cn.odboy.model.system.request.QueryJobRequest;
 import cn.odboy.redis.RedisHelper;
 import cn.odboy.util.FileUtil;
 import cn.odboy.util.PageUtil;
@@ -36,12 +36,12 @@ public class JobServiceImpl extends ServiceImpl<JobMapper, Job> implements JobSe
     private final RedisHelper redisHelper;
 
     @Override
-    public PageResult<Job> queryJobPage(JobQueryCriteria criteria, Page<Object> page) {
+    public PageResult<Job> queryJobPage(QueryJobRequest criteria, Page<Object> page) {
         return PageUtil.toPage(jobMapper.queryJobPage(criteria, page));
     }
 
     @Override
-    public List<Job> selectJobByCriteria(JobQueryCriteria criteria) {
+    public List<Job> selectJobByCriteria(QueryJobRequest criteria) {
         return jobMapper.queryJobPage(criteria, PageUtil.getCount(jobMapper)).getRecords();
     }
 

cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/impl/MenuServiceImpl.java

@@ -15,9 +15,9 @@ import cn.odboy.exception.EntityExistException;
 import cn.odboy.model.system.domain.Menu;
 import cn.odboy.model.system.domain.Role;
 import cn.odboy.model.system.domain.User;
-import cn.odboy.model.system.request.MenuQueryCriteria;
+import cn.odboy.model.system.request.QueryMenuRequest;
-import cn.odboy.model.system.response.MenuMetaVo;
+import cn.odboy.model.system.response.MenuMetaResponse;
-import cn.odboy.model.system.response.MenuVo;
+import cn.odboy.model.system.response.MenuResponse;
 import cn.odboy.redis.RedisHelper;
 import cn.odboy.util.ClassUtil;
 import cn.odboy.util.FileUtil;
@@ -53,7 +53,7 @@ public class MenuServiceImpl extends ServiceImpl<MenuMapper, Menu> implements Me
     private static final String NO_STR = "否";
 
     @Override
-    public List<Menu> selectMenuByCriteria(MenuQueryCriteria criteria, Boolean isQuery) throws Exception {
+    public List<Menu> selectMenuByCriteria(QueryMenuRequest criteria, Boolean isQuery) throws Exception {
         if (Boolean.TRUE.equals(isQuery)) {
             criteria.setPidIsNull(true);
             List<Field> fields = ClassUtil.getAllFields(criteria.getClass(), new ArrayList<>());
@@ -252,43 +252,43 @@ public class MenuServiceImpl extends ServiceImpl<MenuMapper, Menu> implements Me
     }
 
     @Override
-    public List<MenuVo> buildMenus(List<Menu> menus) {
+    public List<MenuResponse> buildMenus(List<Menu> menus) {
-        List<MenuVo> list = new LinkedList<>();
+        List<MenuResponse> list = new LinkedList<>();
         menus.forEach(menu -> {
                     if (menu != null) {
                         List<Menu> menuList = menu.getChildren();
-                        MenuVo menuVo = new MenuVo();
+                        MenuResponse menuResponse = new MenuResponse();
-                        menuVo.setName(ObjectUtil.isNotEmpty(menu.getComponentName()) ? menu.getComponentName() : menu.getTitle());
+                        menuResponse.setName(ObjectUtil.isNotEmpty(menu.getComponentName()) ? menu.getComponentName() : menu.getTitle());
                         // 一级目录需要加斜杠，不然会报警告
-                        menuVo.setPath(menu.getPid() == null ? "/" + menu.getPath() : menu.getPath());
+                        menuResponse.setPath(menu.getPid() == null ? "/" + menu.getPath() : menu.getPath());
-                        menuVo.setHidden(menu.getHidden());
+                        menuResponse.setHidden(menu.getHidden());
                         // 如果不是外链
                         if (!menu.getIFrame()) {
                             if (menu.getPid() == null) {
-                                menuVo.setComponent(StringUtil.isEmpty(menu.getComponent()) ? "Layout" : menu.getComponent());
+                                menuResponse.setComponent(StringUtil.isEmpty(menu.getComponent()) ? "Layout" : menu.getComponent());
                                 // 如果不是一级菜单，并且菜单类型为目录，则代表是多级菜单
                             } else if (menu.getType() == 0) {
-                                menuVo.setComponent(StringUtil.isEmpty(menu.getComponent()) ? "ParentView" : menu.getComponent());
+                                menuResponse.setComponent(StringUtil.isEmpty(menu.getComponent()) ? "ParentView" : menu.getComponent());
                             } else if (StringUtil.isNoneBlank(menu.getComponent())) {
-                                menuVo.setComponent(menu.getComponent());
+                                menuResponse.setComponent(menu.getComponent());
                             }
                         }
-                        menuVo.setMeta(new MenuMetaVo(menu.getTitle(), menu.getIcon(), !menu.getCache()));
+                        menuResponse.setMeta(new MenuMetaResponse(menu.getTitle(), menu.getIcon(), !menu.getCache()));
                         if (CollectionUtil.isNotEmpty(menuList)) {
-                            menuVo.setAlwaysShow(true);
+                            menuResponse.setAlwaysShow(true);
-                            menuVo.setRedirect("noredirect");
+                            menuResponse.setRedirect("noredirect");
-                            menuVo.setChildren(buildMenus(menuList));
+                            menuResponse.setChildren(buildMenus(menuList));
                             // 处理是一级菜单并且没有子菜单的情况
                         } else if (menu.getPid() == null) {
-                            MenuVo menuVo1 = getMenuVo(menu, menuVo);
+                            MenuResponse menuResponse1 = getMenuVo(menu, menuResponse);
-                            menuVo.setName(null);
+                            menuResponse.setName(null);
-                            menuVo.setMeta(null);
+                            menuResponse.setMeta(null);
-                            menuVo.setComponent("Layout");
+                            menuResponse.setComponent("Layout");
-                            List<MenuVo> list1 = new ArrayList<>();
+                            List<MenuResponse> list1 = new ArrayList<>();
-                            list1.add(menuVo1);
+                            list1.add(menuResponse1);
-                            menuVo.setChildren(list1);
+                            menuResponse.setChildren(list1);
                         }
-                        list.add(menuVo);
+                        list.add(menuResponse);
                     }
                 }
         );
@@ -334,23 +334,23 @@ public class MenuServiceImpl extends ServiceImpl<MenuMapper, Menu> implements Me
     }
 
     /**
-     * 获取 MenuVo
+     * 获取 MenuResponse
      *
      * @param menu   /
-     * @param menuVo /
+     * @param menuResponse /
      * @return /
      */
-    private static MenuVo getMenuVo(Menu menu, MenuVo menuVo) {
+    private static MenuResponse getMenuVo(Menu menu, MenuResponse menuResponse) {
-        MenuVo menuVo1 = new MenuVo();
+        MenuResponse menuResponse1 = new MenuResponse();
-        menuVo1.setMeta(menuVo.getMeta());
+        menuResponse1.setMeta(menuResponse.getMeta());
         // 非外链
         if (!menu.getIFrame()) {
-            menuVo1.setPath("index");
+            menuResponse1.setPath("index");
-            menuVo1.setName(menuVo.getName());
+            menuResponse1.setName(menuResponse.getName());
-            menuVo1.setComponent(menuVo.getComponent());
+            menuResponse1.setComponent(menuResponse.getComponent());
         } else {
-            menuVo1.setPath(menu.getPath());
+            menuResponse1.setPath(menu.getPath());
         }
-        return menuVo1;
+        return menuResponse1;
     }
 }

cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/impl/RoleServiceImpl.java

@@ -18,7 +18,7 @@ import cn.odboy.model.system.domain.Role;
 import cn.odboy.model.system.domain.User;
 import cn.odboy.model.system.dto.RoleCodeDto;
 import cn.odboy.model.system.request.CreateRoleRequest;
-import cn.odboy.model.system.request.RoleQueryCriteria;
+import cn.odboy.model.system.request.QueryRoleRequest;
 import cn.odboy.redis.RedisHelper;
 import cn.odboy.util.FileUtil;
 import cn.odboy.util.PageUtil;
@@ -56,12 +56,12 @@ public class RoleServiceImpl extends ServiceImpl<RoleMapper, Role> implements Ro
     }
 
     @Override
-    public List<Role> selectRoleByCriteria(RoleQueryCriteria criteria) {
+    public List<Role> selectRoleByCriteria(QueryRoleRequest criteria) {
         return roleMapper.selectRoleByCriteria(criteria);
     }
 
     @Override
-    public PageResult<Role> queryRolePage(RoleQueryCriteria criteria, Page<Object> page) {
+    public PageResult<Role> queryRolePage(QueryRoleRequest criteria, Page<Object> page) {
         criteria.setOffset(page.offset());
         List<Role> roles = roleMapper.selectRoleByCriteria(criteria);
         Long total = roleMapper.getRoleCountByCriteria(criteria);

cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/impl/UserServiceImpl.java

@@ -14,7 +14,7 @@ import cn.odboy.exception.EntityExistException;
 import cn.odboy.model.system.domain.Job;
 import cn.odboy.model.system.domain.Role;
 import cn.odboy.model.system.domain.User;
-import cn.odboy.model.system.request.UserQueryCriteria;
+import cn.odboy.model.system.request.QueryUserRequest;
 import cn.odboy.properties.FileProperties;
 import cn.odboy.redis.RedisHelper;
 import cn.odboy.util.FileUtil;
@@ -53,7 +53,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
     private final UserOnlineService userOnlineService;
 
     @Override
-    public PageResult<User> queryUserPage(UserQueryCriteria criteria, Page<Object> page) {
+    public PageResult<User> queryUserPage(QueryUserRequest criteria, Page<Object> page) {
         criteria.setOffset(page.offset());
         List<User> users = userMapper.queryUserPage(criteria, PageUtil.getCount(userMapper)).getRecords();
         Long total = userMapper.getUserCountByCriteria(criteria);
@@ -61,7 +61,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
     }
 
     @Override
-    public List<User> selectUserByCriteria(UserQueryCriteria criteria) {
+    public List<User> selectUserByCriteria(QueryUserRequest criteria) {
         return userMapper.queryUserPage(criteria, PageUtil.getCount(userMapper)).getRecords();
     }
 

cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/mapper/LocalStorageMapper.java

@@ -1,7 +1,7 @@
 package cn.odboy.application.tools.mapper;
 
 import cn.odboy.model.tools.domain.LocalStorage;
-import cn.odboy.model.tools.request.LocalStorageQueryCriteria;
+import cn.odboy.model.tools.request.QueryLocalStorageRequest;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -10,5 +10,5 @@ import org.apache.ibatis.annotations.Param;
 
 @Mapper
 public interface LocalStorageMapper extends BaseMapper<LocalStorage> {
-    IPage<LocalStorage> queryLocalStoragePage(@Param("criteria") LocalStorageQueryCriteria criteria, Page<Object> page);
+    IPage<LocalStorage> queryLocalStoragePage(@Param("criteria") QueryLocalStorageRequest criteria, Page<Object> page);
 }

cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/mapper/QiniuContentMapper.java

@@ -1,7 +1,7 @@
 package cn.odboy.application.tools.mapper;
 
 import cn.odboy.model.tools.domain.QiniuContent;
-import cn.odboy.model.tools.request.QiniuQueryCriteria;
+import cn.odboy.model.tools.request.QueryQiniuRequest;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -13,5 +13,5 @@ import org.apache.ibatis.annotations.Param;
 public interface QiniuContentMapper extends BaseMapper<QiniuContent> {
     QiniuContent getQiniuContentByName(@Param("name") String name);
 
-    IPage<QiniuContent> queryQiniuContentPage(@Param("criteria") QiniuQueryCriteria criteria, Page<Object> page);
+    IPage<QiniuContent> queryQiniuContentPage(@Param("criteria") QueryQiniuRequest criteria, Page<Object> page);
 }

cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/rest/EmailController.java

@@ -2,7 +2,7 @@ package cn.odboy.application.tools.rest;
 
 import cn.odboy.application.tools.service.EmailService;
 import cn.odboy.model.tools.domain.EmailConfig;
-import cn.odboy.model.tools.dto.EmailDto;
+import cn.odboy.model.tools.request.SendEmailRequest;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
@@ -41,8 +41,8 @@ public class EmailController {
 
     @PostMapping
     @ApiOperation("发送邮件")
-    public ResponseEntity<Object> sendEmail(@Validated @RequestBody EmailDto emailDto) {
+    public ResponseEntity<Object> sendEmail(@Validated @RequestBody SendEmailRequest sendEmailRequest) {
-        emailService.sendEmail(emailDto);
+        emailService.sendEmail(sendEmailRequest);
         return new ResponseEntity<>(HttpStatus.OK);
     }
 }

cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/rest/LocalStorageController.java

@@ -5,7 +5,7 @@ import cn.odboy.base.PageResult;
 import cn.odboy.constant.FileTypeEnum;
 import cn.odboy.exception.BadRequestException;
 import cn.odboy.model.tools.domain.LocalStorage;
-import cn.odboy.model.tools.request.LocalStorageQueryCriteria;
+import cn.odboy.model.tools.request.QueryLocalStorageRequest;
 import cn.odboy.util.FileUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.annotations.Api;
@@ -37,7 +37,7 @@ public class LocalStorageController {
     @GetMapping
     @ApiOperation("查询文件")
     @PreAuthorize("@el.check('storage:list')")
-    public ResponseEntity<PageResult<LocalStorage>> queryFile(LocalStorageQueryCriteria criteria) {
+    public ResponseEntity<PageResult<LocalStorage>> queryFile(QueryLocalStorageRequest criteria) {
         Page<Object> page = new Page<>(criteria.getPage(), criteria.getSize());
         return new ResponseEntity<>(localStorageService.queryLocalStoragePage(criteria, page), HttpStatus.OK);
     }
@@ -45,7 +45,7 @@ public class LocalStorageController {
     @ApiOperation("导出数据")
     @GetMapping(value = "/download")
     @PreAuthorize("@el.check('storage:list')")
-    public void exportFile(HttpServletResponse response, LocalStorageQueryCriteria criteria) throws IOException {
+    public void exportFile(HttpServletResponse response, QueryLocalStorageRequest criteria) throws IOException {
         localStorageService.downloadExcel(localStorageService.selectLocalStorageByCriteria(criteria), response);
     }
 

cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/rest/QiniuController.java

@@ -5,7 +5,7 @@ import cn.odboy.application.tools.service.QiniuContentService;
 import cn.odboy.base.PageResult;
 import cn.odboy.model.tools.domain.QiniuConfig;
 import cn.odboy.model.tools.domain.QiniuContent;
-import cn.odboy.model.tools.request.QiniuQueryCriteria;
+import cn.odboy.model.tools.request.QueryQiniuRequest;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -56,13 +56,13 @@ public class QiniuController {
 
     @ApiOperation("导出数据")
     @GetMapping(value = "/download")
-    public void exportQiNiu(HttpServletResponse response, QiniuQueryCriteria criteria) throws IOException {
+    public void exportQiNiu(HttpServletResponse response, QueryQiniuRequest criteria) throws IOException {
         qiniuContentService.downloadExcel(qiniuContentService.selectQiniuContentByCriteria(criteria), response);
     }
 
     @ApiOperation("查询文件")
     @GetMapping
-    public ResponseEntity<PageResult<QiniuContent>> queryQiNiu(QiniuQueryCriteria criteria) {
+    public ResponseEntity<PageResult<QiniuContent>> queryQiNiu(QueryQiniuRequest criteria) {
         Page<Object> page = new Page<>(criteria.getPage(), criteria.getSize());
         return new ResponseEntity<>(qiniuContentService.queryQiniuContentPage(criteria, page), HttpStatus.OK);
     }

cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/service/CaptchaService.java

@@ -1,7 +1,7 @@
 package cn.odboy.application.tools.service;
 
 
-import cn.odboy.model.tools.dto.EmailDto;
+import cn.odboy.model.tools.request.SendEmailRequest;
 
 public interface CaptchaService {
     /**
@@ -11,7 +11,7 @@ public interface CaptchaService {
      * @param key   /
      * @return /
      */
-    EmailDto renderCode(String email, String key);
+    SendEmailRequest renderCode(String email, String key);
 
 
     /**

cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/service/EmailService.java

@@ -1,7 +1,7 @@
 package cn.odboy.application.tools.service;
 
 import cn.odboy.model.tools.domain.EmailConfig;
-import cn.odboy.model.tools.dto.EmailDto;
+import cn.odboy.model.tools.request.SendEmailRequest;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 
@@ -26,9 +26,9 @@ public interface EmailService extends IService<EmailConfig> {
     /**
      * 发送邮件
      *
-     * @param emailDto 邮件发送的内容
+     * @param sendEmailRequest 邮件发送的内容
      */
-    void sendEmail(EmailDto emailDto);
+    void sendEmail(SendEmailRequest sendEmailRequest);
 
     /**
      * 发送邮件验证码

cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/service/LocalStorageService.java

@@ -2,7 +2,7 @@ package cn.odboy.application.tools.service;
 
 import cn.odboy.base.PageResult;
 import cn.odboy.model.tools.domain.LocalStorage;
-import cn.odboy.model.tools.request.LocalStorageQueryCriteria;
+import cn.odboy.model.tools.request.QueryLocalStorageRequest;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.springframework.web.multipart.MultipartFile;
@@ -20,7 +20,7 @@ public interface LocalStorageService extends IService<LocalStorage> {
      * @param page     分页参数
      * @return /
      */
-    PageResult<LocalStorage> queryLocalStoragePage(LocalStorageQueryCriteria criteria, Page<Object> page);
+    PageResult<LocalStorage> queryLocalStoragePage(QueryLocalStorageRequest criteria, Page<Object> page);
 
     /**
      * 查询全部数据
@@ -28,7 +28,7 @@ public interface LocalStorageService extends IService<LocalStorage> {
      * @param criteria 条件
      * @return /
      */
-    List<LocalStorage> selectLocalStorageByCriteria(LocalStorageQueryCriteria criteria);
+    List<LocalStorage> selectLocalStorageByCriteria(QueryLocalStorageRequest criteria);
 
     /**
      * 上传

cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/service/QiniuContentService.java

@@ -2,7 +2,7 @@ package cn.odboy.application.tools.service;
 
 import cn.odboy.base.PageResult;
 import cn.odboy.model.tools.domain.QiniuContent;
-import cn.odboy.model.tools.request.QiniuQueryCriteria;
+import cn.odboy.model.tools.request.QueryQiniuRequest;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.springframework.web.multipart.MultipartFile;
@@ -20,7 +20,7 @@ public interface QiniuContentService extends IService<QiniuContent> {
      * @param page     分页参数
      * @return /
      */
-    PageResult<QiniuContent> queryQiniuContentPage(QiniuQueryCriteria criteria, Page<Object> page);
+    PageResult<QiniuContent> queryQiniuContentPage(QueryQiniuRequest criteria, Page<Object> page);
 
     /**
      * 查询全部
@@ -28,7 +28,7 @@ public interface QiniuContentService extends IService<QiniuContent> {
      * @param criteria 条件
      * @return /
      */
-    List<QiniuContent> selectQiniuContentByCriteria(QiniuQueryCriteria criteria);
+    List<QiniuContent> selectQiniuContentByCriteria(QueryQiniuRequest criteria);
 
     /**
      * 上传文件

cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/service/impl/CaptchaServiceImpl.java

@@ -8,7 +8,7 @@ import cn.hutool.extra.template.TemplateEngine;
 import cn.hutool.extra.template.TemplateUtil;
 import cn.odboy.application.tools.service.CaptchaService;
 import cn.odboy.exception.BadRequestException;
-import cn.odboy.model.tools.dto.EmailDto;
+import cn.odboy.model.tools.request.SendEmailRequest;
 import cn.odboy.redis.RedisHelper;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Value;
@@ -25,8 +25,8 @@ public class CaptchaServiceImpl implements CaptchaService {
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public EmailDto renderCode(String email, String key) {
+    public SendEmailRequest renderCode(String email, String key) {
-        EmailDto emailDto;
+        SendEmailRequest sendEmailRequest;
         String content;
         String redisKey = key + email;
         // 如果不存在有效的验证码，就创建一个新的
@@ -44,8 +44,8 @@ public class CaptchaServiceImpl implements CaptchaService {
         } else {
             content = template.render(Dict.create().set("code", oldCode));
         }
-        emailDto = new EmailDto(Collections.singletonList(email), "CuteJava后台管理系统", content);
+        sendEmailRequest = new SendEmailRequest(Collections.singletonList(email), "CuteJava后台管理系统", content);
-        return emailDto;
+        return sendEmailRequest;
     }
 
     @Override

cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/service/impl/EmailServiceImpl.java

@@ -8,7 +8,7 @@ import cn.odboy.application.tools.service.EmailService;
 import cn.odboy.constant.CodeEnum;
 import cn.odboy.exception.BadRequestException;
 import cn.odboy.model.tools.domain.EmailConfig;
-import cn.odboy.model.tools.dto.EmailDto;
+import cn.odboy.model.tools.request.SendEmailRequest;
 import cn.odboy.util.DesEncryptUtil;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -50,7 +50,7 @@ public class EmailServiceImpl extends ServiceImpl<EmailConfigMapper, EmailConfig
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void sendEmail(EmailDto emailDto) {
+    public void sendEmail(SendEmailRequest sendEmailRequest) {
         EmailConfig emailConfig = emailService.getEmailConfig();
         if (emailConfig.getId() == null) {
             throw new BadRequestException("请先配置，再操作");
@@ -76,13 +76,13 @@ public class EmailServiceImpl extends ServiceImpl<EmailConfigMapper, EmailConfig
         account.setStarttlsEnable(true);
         // 解决jdk8之后默认禁用部分tls协议，导致邮件发送失败的问题
         account.setSslProtocols("TLSv1 TLSv1.1 TLSv1.2");
-        String content = emailDto.getContent();
+        String content = sendEmailRequest.getContent();
         // 发送
         try {
-            int size = emailDto.getTos().size();
+            int size = sendEmailRequest.getTos().size();
             Mail.create(account)
-                    .setTos(emailDto.getTos().toArray(new String[size]))
+                    .setTos(sendEmailRequest.getTos().toArray(new String[size]))
-                    .setTitle(emailDto.getSubject())
+                    .setTitle(sendEmailRequest.getSubject())
                     .setContent(content)
                     .setHtml(true)
                     // 关闭session

cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/service/impl/LocalStorageServiceImpl.java

@@ -6,7 +6,7 @@ import cn.odboy.application.tools.service.LocalStorageService;
 import cn.odboy.base.PageResult;
 import cn.odboy.exception.BadRequestException;
 import cn.odboy.model.tools.domain.LocalStorage;
-import cn.odboy.model.tools.request.LocalStorageQueryCriteria;
+import cn.odboy.model.tools.request.QueryLocalStorageRequest;
 import cn.odboy.properties.FileProperties;
 import cn.odboy.util.FileUtil;
 import cn.odboy.util.PageUtil;
@@ -34,12 +34,12 @@ public class LocalStorageServiceImpl extends ServiceImpl<LocalStorageMapper, Loc
     private final FileProperties properties;
 
     @Override
-    public PageResult<LocalStorage> queryLocalStoragePage(LocalStorageQueryCriteria criteria, Page<Object> page) {
+    public PageResult<LocalStorage> queryLocalStoragePage(QueryLocalStorageRequest criteria, Page<Object> page) {
         return PageUtil.toPage(localStorageMapper.queryLocalStoragePage(criteria, page));
     }
 
     @Override
-    public List<LocalStorage> selectLocalStorageByCriteria(LocalStorageQueryCriteria criteria) {
+    public List<LocalStorage> selectLocalStorageByCriteria(QueryLocalStorageRequest criteria) {
         return localStorageMapper.queryLocalStoragePage(criteria, PageUtil.getCount(localStorageMapper)).getRecords();
     }
 

cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/service/impl/QiniuContentServiceImpl.java

@@ -8,7 +8,7 @@ import cn.odboy.base.PageResult;
 import cn.odboy.exception.BadRequestException;
 import cn.odboy.model.tools.domain.QiniuConfig;
 import cn.odboy.model.tools.domain.QiniuContent;
-import cn.odboy.model.tools.request.QiniuQueryCriteria;
+import cn.odboy.model.tools.request.QueryQiniuRequest;
 import cn.odboy.util.FileUtil;
 import cn.odboy.util.PageUtil;
 import com.alibaba.fastjson2.JSON;
@@ -46,12 +46,12 @@ public class QiniuContentServiceImpl extends ServiceImpl<QiniuContentMapper, Qin
     private Long maxSize;
 
     @Override
-    public PageResult<QiniuContent> queryQiniuContentPage(QiniuQueryCriteria criteria, Page<Object> page) {
+    public PageResult<QiniuContent> queryQiniuContentPage(QueryQiniuRequest criteria, Page<Object> page) {
         return PageUtil.toPage(qiniuContentMapper.queryQiniuContentPage(criteria, page));
     }
 
     @Override
-    public List<QiniuContent> selectQiniuContentByCriteria(QiniuQueryCriteria criteria) {
+    public List<QiniuContent> selectQiniuContentByCriteria(QueryQiniuRequest criteria) {
         return qiniuContentMapper.queryQiniuContentPage(criteria, PageUtil.getCount(qiniuContentMapper)).getRecords();
     }