From b9518dbec809126fb601cba841d07880292b66a9 Mon Sep 17 00:00:00 2001 From: Jie Zheng <201507802@qq.com> Date: Tue, 14 Jan 2025 11:06:23 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E4=BC=98=E5=8C=96=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E7=94=9F=E6=88=90=E6=A8=A1=E6=9D=BF=EF=BC=8C=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E9=A1=B9=E7=9B=AE=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/me/zhengjie/base/BaseEntity.java | 7 ++-- .../domain/{vo => dto}/TableInfo.java | 17 ++++----- .../me/zhengjie/mapper/ColumnInfoMapper.java | 2 +- .../me/zhengjie/rest/GeneratorController.java | 2 +- .../me/zhengjie/service/GeneratorService.java | 2 +- .../service/impl/GeneratorServiceImpl.java | 2 +- .../main/java/me/zhengjie/utils/GenUtil.java | 2 +- .../resources/mapper/ColumnInfoMapper.xml | 2 +- .../resources/template/admin/Controller.ftl | 2 +- .../main/resources/template/admin/Mapper.ftl | 2 +- .../template/admin/QueryCriteria.ftl | 2 +- .../main/resources/template/admin/Service.ftl | 2 +- .../resources/template/admin/ServiceImpl.ftl | 2 +- .../main/java/me/zhengjie/domain/SysLog.java | 25 +++++++------ .../{vo => dto}/SysLogQueryCriteria.java | 7 +++- .../java/me/zhengjie/mapper/SysLogMapper.java | 5 ++- .../me/zhengjie/rest/SysLogController.java | 2 +- .../me/zhengjie/service/SysLogService.java | 2 +- .../service/impl/SysLogServiceImpl.java | 2 +- .../zhengjie/modules/mnt/domain/Database.java | 10 +++--- .../zhengjie/modules/mnt/domain/Deploy.java | 1 + .../modules/mnt/domain/DeployHistory.java | 12 +++---- .../domain/{vo => dto}/AppQueryCriteria.java | 7 ++-- .../{vo => dto}/DatabaseQueryCriteria.java | 8 +++-- .../DeployHistoryQueryCriteria.java | 6 +++- .../{vo => dto}/DeployQueryCriteria.java | 11 +++--- .../{vo => dto}/ServerQueryCriteria.java | 7 ++-- .../modules/mnt/mapper/AppMapper.java | 2 +- .../modules/mnt/mapper/DatabaseMapper.java | 2 +- .../mnt/mapper/DeployHistoryMapper.java | 2 +- .../modules/mnt/mapper/DeployMapper.java | 11 +++--- .../modules/mnt/mapper/ServerMapper.java | 2 +- .../modules/mnt/rest/AppController.java | 2 +- .../modules/mnt/rest/DatabaseController.java | 2 +- .../modules/mnt/rest/DeployController.java | 4 +-- .../mnt/rest/DeployHistoryController.java | 2 +- .../modules/mnt/rest/ServerController.java | 2 +- .../modules/mnt/service/AppService.java | 3 +- .../modules/mnt/service/DatabaseService.java | 2 +- .../mnt/service/DeployHistoryService.java | 2 +- .../modules/mnt/service/DeployService.java | 2 +- .../modules/mnt/service/ServerService.java | 2 +- .../mnt/service/impl/AppServiceImpl.java | 2 +- .../mnt/service/impl/DatabaseServiceImpl.java | 2 +- .../impl/DeployHistoryServiceImpl.java | 2 +- .../mnt/service/impl/DeployServiceImpl.java | 9 +++-- .../mnt/service/impl/ServerServiceImpl.java | 2 +- .../{vo => dto}/QuartzJobQueryCriteria.java | 6 +++- .../quartz/mapper/QuartzJobMapper.java | 2 +- .../quartz/mapper/QuartzLogMapper.java | 2 +- .../quartz/rest/QuartzJobController.java | 2 +- .../quartz/service/QuartzJobService.java | 2 +- .../service/impl/QuartzJobServiceImpl.java | 2 +- .../modules/quartz/utils/ExecutionJob.java | 18 +++++----- .../security/service/dto/AuthUserDto.java | 5 +++ .../security/service/dto/AuthorityDto.java | 2 ++ .../security/service/dto/JwtUserDto.java | 5 +++ .../security/service/dto/OnlineUserDto.java | 35 +++++-------------- .../zhengjie/modules/system/domain/Dept.java | 1 + .../zhengjie/modules/system/domain/Dict.java | 1 + .../modules/system/domain/DictDetail.java | 1 + .../domain/{vo => dto}/DeptQueryCriteria.java | 9 ++++- .../{vo => dto}/DictDetailQueryCriteria.java | 5 ++- .../domain/{vo => dto}/DictQueryCriteria.java | 4 ++- .../domain/{vo => dto}/JobQueryCriteria.java | 6 +++- .../system/domain/{vo => dto}/MenuMetaVo.java | 6 +++- .../domain/{vo => dto}/MenuQueryCriteria.java | 7 +++- .../system/domain/{vo => dto}/MenuVo.java | 11 +++++- .../domain/{vo => dto}/RoleQueryCriteria.java | 5 ++- .../system/domain/{vo => dto}/UserPassVo.java | 5 ++- .../domain/{vo => dto}/UserQueryCriteria.java | 9 ++++- .../modules/system/mapper/DeptMapper.java | 2 +- .../system/mapper/DictDetailMapper.java | 2 +- .../modules/system/mapper/DictMapper.java | 2 +- .../modules/system/mapper/JobMapper.java | 2 +- .../modules/system/mapper/MenuMapper.java | 2 +- .../modules/system/mapper/RoleMapper.java | 2 +- .../modules/system/mapper/UserMapper.java | 2 +- .../modules/system/rest/DeptController.java | 2 +- .../modules/system/rest/DictController.java | 2 +- .../system/rest/DictDetailController.java | 2 +- .../modules/system/rest/JobController.java | 2 +- .../modules/system/rest/MenuController.java | 4 +-- .../modules/system/rest/RoleController.java | 2 +- .../modules/system/rest/UserController.java | 4 +-- .../modules/system/rest/VerifyController.java | 10 +++--- .../modules/system/service/DeptService.java | 2 +- .../system/service/DictDetailService.java | 2 +- .../modules/system/service/DictService.java | 2 +- .../modules/system/service/JobService.java | 2 +- .../modules/system/service/MenuService.java | 4 +-- .../modules/system/service/RoleService.java | 2 +- .../modules/system/service/UserService.java | 2 +- .../modules/system/service/VerifyService.java | 4 +-- .../system/service/impl/DeptServiceImpl.java | 2 +- .../service/impl/DictDetailServiceImpl.java | 2 +- .../system/service/impl/DictServiceImpl.java | 2 +- .../system/service/impl/JobServiceImpl.java | 2 +- .../system/service/impl/MenuServiceImpl.java | 6 ++-- .../system/service/impl/RoleServiceImpl.java | 2 +- .../system/service/impl/UserServiceImpl.java | 2 +- .../service/impl/VerifyServiceImpl.java | 10 +++--- .../resources/mapper/mnt/DeployMapper.xml | 33 +++++------------ .../{vo/EmailVo.java => dto/EmailDto.java} | 9 +++-- .../LocalStorageQueryCriteria.java | 5 ++- .../{vo => dto}/QiniuQueryCriteria.java | 5 ++- .../{vo/TradeVo.java => dto/TradeDto.java} | 25 ++++++------- .../enums}/AliPayStatusEnum.java | 2 +- .../zhengjie/mapper/LocalStorageMapper.java | 2 +- .../zhengjie/mapper/QiniuContentMapper.java | 2 +- .../me/zhengjie/rest/AliPayController.java | 8 ++--- .../me/zhengjie/rest/EmailController.java | 6 ++-- .../zhengjie/rest/LocalStorageController.java | 2 +- .../me/zhengjie/rest/QiniuController.java | 2 +- .../me/zhengjie/service/AliPayService.java | 6 ++-- .../me/zhengjie/service/EmailService.java | 6 ++-- .../zhengjie/service/LocalStorageService.java | 2 +- .../zhengjie/service/QiniuContentService.java | 2 +- .../service/impl/AliPayServiceImpl.java | 6 ++-- .../service/impl/EmailServiceImpl.java | 12 +++---- .../service/impl/LocalStorageServiceImpl.java | 2 +- .../service/impl/QiniuContentServiceImpl.java | 2 +- 122 files changed, 328 insertions(+), 262 deletions(-) rename eladmin/eladmin-generator/src/main/java/me/zhengjie/domain/{vo => dto}/TableInfo.java (68%) rename eladmin/eladmin-logging/src/main/java/me/zhengjie/domain/{vo => dto}/SysLogQueryCriteria.java (77%) rename eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/domain/{vo => dto}/AppQueryCriteria.java (78%) rename eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/domain/{vo => dto}/DatabaseQueryCriteria.java (75%) rename eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/domain/{vo => dto}/DeployHistoryQueryCriteria.java (79%) rename eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/domain/{vo => dto}/DeployQueryCriteria.java (78%) rename eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/domain/{vo => dto}/ServerQueryCriteria.java (78%) rename eladmin/eladmin-system/src/main/java/me/zhengjie/modules/quartz/domain/{vo => dto}/QuartzJobQueryCriteria.java (78%) rename eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/{vo => dto}/DeptQueryCriteria.java (71%) rename eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/{vo => dto}/DictDetailQueryCriteria.java (81%) rename eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/{vo => dto}/DictQueryCriteria.java (84%) rename eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/{vo => dto}/JobQueryCriteria.java (79%) rename eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/{vo => dto}/MenuMetaVo.java (79%) rename eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/{vo => dto}/MenuQueryCriteria.java (76%) rename eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/{vo => dto}/MenuVo.java (70%) rename eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/{vo => dto}/RoleQueryCriteria.java (81%) rename eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/{vo => dto}/UserPassVo.java (81%) rename eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/{vo => dto}/UserQueryCriteria.java (75%) rename eladmin/eladmin-tools/src/main/java/me/zhengjie/domain/{vo/EmailVo.java => dto/EmailDto.java} (82%) rename eladmin/eladmin-tools/src/main/java/me/zhengjie/domain/{vo => dto}/LocalStorageQueryCriteria.java (82%) rename eladmin/eladmin-tools/src/main/java/me/zhengjie/domain/{vo => dto}/QiniuQueryCriteria.java (82%) rename eladmin/eladmin-tools/src/main/java/me/zhengjie/domain/{vo/TradeVo.java => dto/TradeDto.java} (66%) rename eladmin/eladmin-tools/src/main/java/me/zhengjie/{utils => domain/enums}/AliPayStatusEnum.java (97%) diff --git a/eladmin/eladmin-common/src/main/java/me/zhengjie/base/BaseEntity.java b/eladmin/eladmin-common/src/main/java/me/zhengjie/base/BaseEntity.java index d51b4e7..c51bd6f 100644 --- a/eladmin/eladmin-common/src/main/java/me/zhengjie/base/BaseEntity.java +++ b/eladmin/eladmin-common/src/main/java/me/zhengjie/base/BaseEntity.java @@ -17,6 +17,7 @@ package me.zhengjie.base; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import lombok.Getter; import lombok.Setter; @@ -47,11 +48,13 @@ public class BaseEntity implements Serializable { private String updateBy; @TableField(fill = FieldFill.INSERT) - @ApiModelProperty(value = "创建时间", hidden = true) + @ApiModelProperty(value = "创建时间: yyyy-MM-dd HH:mm:ss", hidden = true) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss") private Timestamp createTime; @TableField(fill = FieldFill.INSERT_UPDATE) - @ApiModelProperty(value = "更新时间", hidden = true) + @ApiModelProperty(value = "更新时间: yyyy-MM-dd HH:mm:ss", hidden = true) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss") private Timestamp updateTime; /* 分组校验 */ diff --git a/eladmin/eladmin-generator/src/main/java/me/zhengjie/domain/vo/TableInfo.java b/eladmin/eladmin-generator/src/main/java/me/zhengjie/domain/dto/TableInfo.java similarity index 68% rename from eladmin/eladmin-generator/src/main/java/me/zhengjie/domain/vo/TableInfo.java rename to eladmin/eladmin-generator/src/main/java/me/zhengjie/domain/dto/TableInfo.java index 1d3967b..748e168 100644 --- a/eladmin/eladmin-generator/src/main/java/me/zhengjie/domain/vo/TableInfo.java +++ b/eladmin/eladmin-generator/src/main/java/me/zhengjie/domain/dto/TableInfo.java @@ -13,8 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.domain.vo; +package me.zhengjie.domain.dto; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; @@ -29,20 +31,19 @@ import lombok.NoArgsConstructor; @NoArgsConstructor public class TableInfo { - /** 表名称 */ + @ApiModelProperty(value = "表名称") private Object tableName; - /** 创建日期 */ + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建日期：yyyy-MM-dd HH:mm:ss") private Object createTime; - /** 数据库引擎 */ + @ApiModelProperty(value = "数据库引擎") private Object engine; - /** 编码集 */ + @ApiModelProperty(value = "编码集") private Object coding; - /** 备注 */ + @ApiModelProperty(value = "备注") private Object remark; - - } diff --git a/eladmin/eladmin-generator/src/main/java/me/zhengjie/mapper/ColumnInfoMapper.java b/eladmin/eladmin-generator/src/main/java/me/zhengjie/mapper/ColumnInfoMapper.java index 14ca0b8..b6913a3 100644 --- a/eladmin/eladmin-generator/src/main/java/me/zhengjie/mapper/ColumnInfoMapper.java +++ b/eladmin/eladmin-generator/src/main/java/me/zhengjie/mapper/ColumnInfoMapper.java @@ -19,7 +19,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import me.zhengjie.domain.ColumnInfo; -import me.zhengjie.domain.vo.TableInfo; +import me.zhengjie.domain.dto.TableInfo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/eladmin/eladmin-generator/src/main/java/me/zhengjie/rest/GeneratorController.java b/eladmin/eladmin-generator/src/main/java/me/zhengjie/rest/GeneratorController.java index 89e0c11..1067a42 100644 --- a/eladmin/eladmin-generator/src/main/java/me/zhengjie/rest/GeneratorController.java +++ b/eladmin/eladmin-generator/src/main/java/me/zhengjie/rest/GeneratorController.java @@ -20,7 +20,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import me.zhengjie.domain.ColumnInfo; -import me.zhengjie.domain.vo.TableInfo; +import me.zhengjie.domain.dto.TableInfo; import me.zhengjie.exception.BadRequestException; import me.zhengjie.service.GenConfigService; import me.zhengjie.service.GeneratorService; diff --git a/eladmin/eladmin-generator/src/main/java/me/zhengjie/service/GeneratorService.java b/eladmin/eladmin-generator/src/main/java/me/zhengjie/service/GeneratorService.java index d53fa07..f8938d8 100644 --- a/eladmin/eladmin-generator/src/main/java/me/zhengjie/service/GeneratorService.java +++ b/eladmin/eladmin-generator/src/main/java/me/zhengjie/service/GeneratorService.java @@ -19,7 +19,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import me.zhengjie.domain.GenConfig; import me.zhengjie.domain.ColumnInfo; -import me.zhengjie.domain.vo.TableInfo; +import me.zhengjie.domain.dto.TableInfo; import me.zhengjie.utils.PageResult; import org.springframework.http.ResponseEntity; import javax.servlet.http.HttpServletRequest; diff --git a/eladmin/eladmin-generator/src/main/java/me/zhengjie/service/impl/GeneratorServiceImpl.java b/eladmin/eladmin-generator/src/main/java/me/zhengjie/service/impl/GeneratorServiceImpl.java index 45bb8c0..eace528 100644 --- a/eladmin/eladmin-generator/src/main/java/me/zhengjie/service/impl/GeneratorServiceImpl.java +++ b/eladmin/eladmin-generator/src/main/java/me/zhengjie/service/impl/GeneratorServiceImpl.java @@ -23,7 +23,7 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import me.zhengjie.domain.GenConfig; import me.zhengjie.domain.ColumnInfo; -import me.zhengjie.domain.vo.TableInfo; +import me.zhengjie.domain.dto.TableInfo; import me.zhengjie.exception.BadRequestException; import me.zhengjie.mapper.ColumnInfoMapper; import me.zhengjie.service.GeneratorService; diff --git a/eladmin/eladmin-generator/src/main/java/me/zhengjie/utils/GenUtil.java b/eladmin/eladmin-generator/src/main/java/me/zhengjie/utils/GenUtil.java index ab3b417..6a8e9aa 100644 --- a/eladmin/eladmin-generator/src/main/java/me/zhengjie/utils/GenUtil.java +++ b/eladmin/eladmin-generator/src/main/java/me/zhengjie/utils/GenUtil.java @@ -370,7 +370,7 @@ public class GenUtil { } if ("QueryCriteria".equals(templateName)) { - return packagePath + "domain" + File.separator + "vo" + File.separator + className + "QueryCriteria.java"; + return packagePath + "domain" + File.separator + "dto" + File.separator + className + "QueryCriteria.java"; } if ("Mapper".equals(templateName)) { diff --git a/eladmin/eladmin-generator/src/main/resources/mapper/ColumnInfoMapper.xml b/eladmin/eladmin-generator/src/main/resources/mapper/ColumnInfoMapper.xml index 82de341..c9accd7 100644 --- a/eladmin/eladmin-generator/src/main/resources/mapper/ColumnInfoMapper.xml +++ b/eladmin/eladmin-generator/src/main/resources/mapper/ColumnInfoMapper.xml @@ -21,7 +21,7 @@ column_id, table_name, column_name, column_type, key_type, extra, remark, not_null, list_show, form_show, form_type, query_type, dict_name - select table_name, create_time, engine, table_collation as coding, table_comment as remark from information_schema.tables where table_schema = (select database()) diff --git a/eladmin/eladmin-generator/src/main/resources/template/admin/Controller.ftl b/eladmin/eladmin-generator/src/main/resources/template/admin/Controller.ftl index 6ef6d15..9e064bf 100644 --- a/eladmin/eladmin-generator/src/main/resources/template/admin/Controller.ftl +++ b/eladmin/eladmin-generator/src/main/resources/template/admin/Controller.ftl @@ -18,7 +18,7 @@ package ${package}.rest; import me.zhengjie.annotation.Log; import ${package}.domain.${className}; import ${package}.service.${className}Service; -import ${package}.domain.vo.${className}QueryCriteria; +import ${package}.domain.dto.${className}QueryCriteria; import lombok.RequiredArgsConstructor; import java.util.List; import org.springframework.http.HttpStatus; diff --git a/eladmin/eladmin-generator/src/main/resources/template/admin/Mapper.ftl b/eladmin/eladmin-generator/src/main/resources/template/admin/Mapper.ftl index e91da0a..7e220cb 100644 --- a/eladmin/eladmin-generator/src/main/resources/template/admin/Mapper.ftl +++ b/eladmin/eladmin-generator/src/main/resources/template/admin/Mapper.ftl @@ -16,7 +16,7 @@ package ${package}.mapper; import ${package}.domain.${className}; -import ${package}.domain.vo.${className}QueryCriteria; +import ${package}.domain.dto.${className}QueryCriteria; import java.util.List; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Mapper; diff --git a/eladmin/eladmin-generator/src/main/resources/template/admin/QueryCriteria.ftl b/eladmin/eladmin-generator/src/main/resources/template/admin/QueryCriteria.ftl index 0436879..b9aaab1 100644 --- a/eladmin/eladmin-generator/src/main/resources/template/admin/QueryCriteria.ftl +++ b/eladmin/eladmin-generator/src/main/resources/template/admin/QueryCriteria.ftl @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package ${package}.domain.vo; +package ${package}.domain.dto; import lombok.Data; <#if queryHasTimestamp> diff --git a/eladmin/eladmin-generator/src/main/resources/template/admin/Service.ftl b/eladmin/eladmin-generator/src/main/resources/template/admin/Service.ftl index aeab0af..b8cb69f 100644 --- a/eladmin/eladmin-generator/src/main/resources/template/admin/Service.ftl +++ b/eladmin/eladmin-generator/src/main/resources/template/admin/Service.ftl @@ -16,7 +16,7 @@ package ${package}.service; import ${package}.domain.${className}; -import ${package}.domain.vo.${className}QueryCriteria; +import ${package}.domain.dto.${className}QueryCriteria; import java.util.Map; import java.util.List; import java.io.IOException; diff --git a/eladmin/eladmin-generator/src/main/resources/template/admin/ServiceImpl.ftl b/eladmin/eladmin-generator/src/main/resources/template/admin/ServiceImpl.ftl index d62b8fe..ac691b8 100644 --- a/eladmin/eladmin-generator/src/main/resources/template/admin/ServiceImpl.ftl +++ b/eladmin/eladmin-generator/src/main/resources/template/admin/ServiceImpl.ftl @@ -30,7 +30,7 @@ import lombok.RequiredArgsConstructor; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import ${package}.service.${className}Service; -import ${package}.domain.vo.${className}QueryCriteria; +import ${package}.domain.dto.${className}QueryCriteria; import ${package}.mapper.${className}Mapper; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/eladmin/eladmin-logging/src/main/java/me/zhengjie/domain/SysLog.java b/eladmin/eladmin-logging/src/main/java/me/zhengjie/domain/SysLog.java index e23bfb5..7fc887c 100644 --- a/eladmin/eladmin-logging/src/main/java/me/zhengjie/domain/SysLog.java +++ b/eladmin/eladmin-logging/src/main/java/me/zhengjie/domain/SysLog.java @@ -17,6 +17,8 @@ package me.zhengjie.domain; import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.*; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; @@ -36,39 +38,40 @@ public class SysLog implements Serializable { @TableId(value = "log_id", type = IdType.AUTO) private Long id; - /** 操作用户 */ + @ApiModelProperty(value = "操作用户") private String username; - /** 描述 */ + @ApiModelProperty(value = "描述") private String description; - /** 方法名 */ + @ApiModelProperty(value = "方法名") private String method; - /** 参数 */ + @ApiModelProperty(value = "参数") private String params; - /** 日志类型 */ + @ApiModelProperty(value = "日志类型") private String logType; - /** 请求ip */ + @ApiModelProperty(value = "请求ip") private String requestIp; - /** 地址 */ + @ApiModelProperty(value = "地址") private String address; - /** 浏览器 */ + @ApiModelProperty(value = "浏览器") private String browser; - /** 请求耗时 */ + @ApiModelProperty(value = "请求耗时") private Long time; - /** 异常详细 */ + @ApiModelProperty(value = "异常详细") @JSONField(serialize = false) private String exceptionDetail; - /** 创建日期 */ @TableField(fill = FieldFill.INSERT) + @ApiModelProperty(value = "创建日期：yyyy-MM-dd HH:mm:ss") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss") private Timestamp createTime; public SysLog(String logType, Long time) { diff --git a/eladmin/eladmin-logging/src/main/java/me/zhengjie/domain/vo/SysLogQueryCriteria.java b/eladmin/eladmin-logging/src/main/java/me/zhengjie/domain/dto/SysLogQueryCriteria.java similarity index 77% rename from eladmin/eladmin-logging/src/main/java/me/zhengjie/domain/vo/SysLogQueryCriteria.java rename to eladmin/eladmin-logging/src/main/java/me/zhengjie/domain/dto/SysLogQueryCriteria.java index 87e7721..fed8400 100644 --- a/eladmin/eladmin-logging/src/main/java/me/zhengjie/domain/vo/SysLogQueryCriteria.java +++ b/eladmin/eladmin-logging/src/main/java/me/zhengjie/domain/dto/SysLogQueryCriteria.java @@ -13,8 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.domain.vo; +package me.zhengjie.domain.dto; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.sql.Timestamp; import java.util.List; @@ -27,11 +28,15 @@ import java.util.List; @Data public class SysLogQueryCriteria { + @ApiModelProperty(value = "模糊查询") private String blurry; + @ApiModelProperty(value = "用户名称") private String username; + @ApiModelProperty(value = "日志类型") private String logType; + @ApiModelProperty(value = "创建时间") private List createTime; } diff --git a/eladmin/eladmin-logging/src/main/java/me/zhengjie/mapper/SysLogMapper.java b/eladmin/eladmin-logging/src/main/java/me/zhengjie/mapper/SysLogMapper.java index a71fb41..42da054 100644 --- a/eladmin/eladmin-logging/src/main/java/me/zhengjie/mapper/SysLogMapper.java +++ b/eladmin/eladmin-logging/src/main/java/me/zhengjie/mapper/SysLogMapper.java @@ -19,7 +19,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import me.zhengjie.domain.SysLog; -import me.zhengjie.domain.vo.SysLogQueryCriteria; +import me.zhengjie.domain.dto.SysLogQueryCriteria; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -36,7 +36,10 @@ public interface SysLogMapper extends BaseMapper { List queryAll(@Param("criteria") SysLogQueryCriteria criteria); IPage queryAll(@Param("criteria") SysLogQueryCriteria criteria, Page page); + IPage queryAllByUser(@Param("criteria") SysLogQueryCriteria criteria, Page page); + String getExceptionDetails(@Param("id") Long id); + void deleteByLevel(@Param("logType") String logType); } diff --git a/eladmin/eladmin-logging/src/main/java/me/zhengjie/rest/SysLogController.java b/eladmin/eladmin-logging/src/main/java/me/zhengjie/rest/SysLogController.java index f23376b..8e3d556 100644 --- a/eladmin/eladmin-logging/src/main/java/me/zhengjie/rest/SysLogController.java +++ b/eladmin/eladmin-logging/src/main/java/me/zhengjie/rest/SysLogController.java @@ -22,7 +22,7 @@ import lombok.RequiredArgsConstructor; import me.zhengjie.annotation.Log; import me.zhengjie.domain.SysLog; import me.zhengjie.service.SysLogService; -import me.zhengjie.domain.vo.SysLogQueryCriteria; +import me.zhengjie.domain.dto.SysLogQueryCriteria; import me.zhengjie.utils.PageResult; import me.zhengjie.utils.SecurityUtils; import org.springframework.http.HttpStatus; diff --git a/eladmin/eladmin-logging/src/main/java/me/zhengjie/service/SysLogService.java b/eladmin/eladmin-logging/src/main/java/me/zhengjie/service/SysLogService.java index b9b87b4..e4c9190 100644 --- a/eladmin/eladmin-logging/src/main/java/me/zhengjie/service/SysLogService.java +++ b/eladmin/eladmin-logging/src/main/java/me/zhengjie/service/SysLogService.java @@ -18,7 +18,7 @@ package me.zhengjie.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import me.zhengjie.domain.SysLog; -import me.zhengjie.domain.vo.SysLogQueryCriteria; +import me.zhengjie.domain.dto.SysLogQueryCriteria; import me.zhengjie.utils.PageResult; import org.aspectj.lang.ProceedingJoinPoint; import javax.servlet.http.HttpServletResponse; diff --git a/eladmin/eladmin-logging/src/main/java/me/zhengjie/service/impl/SysLogServiceImpl.java b/eladmin/eladmin-logging/src/main/java/me/zhengjie/service/impl/SysLogServiceImpl.java index 9d88928..8fe0994 100644 --- a/eladmin/eladmin-logging/src/main/java/me/zhengjie/service/impl/SysLogServiceImpl.java +++ b/eladmin/eladmin-logging/src/main/java/me/zhengjie/service/impl/SysLogServiceImpl.java @@ -24,7 +24,7 @@ import lombok.RequiredArgsConstructor; import me.zhengjie.domain.SysLog; import me.zhengjie.mapper.SysLogMapper; import me.zhengjie.service.SysLogService; -import me.zhengjie.domain.vo.SysLogQueryCriteria; +import me.zhengjie.domain.dto.SysLogQueryCriteria; import me.zhengjie.utils.*; import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.reflect.MethodSignature; diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/domain/Database.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/domain/Database.java index 9d8d892..fd4a42b 100644 --- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/domain/Database.java +++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/domain/Database.java @@ -36,19 +36,19 @@ import java.io.Serializable; public class Database extends BaseEntity implements Serializable { @TableId(value = "db_id", type = IdType.AUTO) - @ApiModelProperty(value = "ID", hidden = true) + @ApiModelProperty(value = "ID", hidden = true) private String id; - @ApiModelProperty(value = "数据库名称") + @ApiModelProperty(value = "数据库名称") private String name; - @ApiModelProperty(value = "数据库连接地址") + @ApiModelProperty(value = "数据库连接地址") private String jdbcUrl; - @ApiModelProperty(value = "数据库密码") + @ApiModelProperty(value = "数据库密码") private String pwd; - @ApiModelProperty(value = "用户名") + @ApiModelProperty(value = "用户名") private String userName; public void copy(Database source){ diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/domain/Deploy.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/domain/Deploy.java index 065329b..db16437 100644 --- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/domain/Deploy.java +++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/domain/Deploy.java @@ -52,6 +52,7 @@ public class Deploy extends BaseEntity implements Serializable { private Set deploys; @TableField(exist = false) + @ApiModelProperty(value = "应用") private App app; public void copy(Deploy source){ diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/domain/DeployHistory.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/domain/DeployHistory.java index c892560..09c02be 100644 --- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/domain/DeployHistory.java +++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/domain/DeployHistory.java @@ -36,23 +36,23 @@ import java.sql.Timestamp; public class DeployHistory implements Serializable { @TableId(value = "history_id", type = IdType.AUTO) - @ApiModelProperty(value = "ID", hidden = true) + @ApiModelProperty(value = "ID", hidden = true) private String id; @ApiModelProperty(value = "应用名称") private String appName; - @ApiModelProperty(value = "IP") + @ApiModelProperty(value = "IP") private String ip; - @ApiModelProperty(value = "部署时间") + @ApiModelProperty(value = "部署时间") private Timestamp deployDate; - @ApiModelProperty(value = "部署者") + @ApiModelProperty(value = "部署者") private String deployUser; - @ApiModelProperty(value = "部署ID") - private Long deployId; + @ApiModelProperty(value = "部署ID") + private Long deployId; public void copy(DeployHistory source){ BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true)); diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/domain/vo/AppQueryCriteria.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/domain/dto/AppQueryCriteria.java similarity index 78% rename from eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/domain/vo/AppQueryCriteria.java rename to eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/domain/dto/AppQueryCriteria.java index c3fa170..e236b0f 100644 --- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/domain/vo/AppQueryCriteria.java +++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/domain/dto/AppQueryCriteria.java @@ -13,8 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.mnt.domain.vo; +package me.zhengjie.modules.mnt.domain.dto; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.sql.Timestamp; import java.util.List; @@ -26,7 +27,9 @@ import java.util.List; @Data public class AppQueryCriteria{ + @ApiModelProperty(value = "名称") private String name; - private List createTime; + @ApiModelProperty(value = "创建时间") + private List createTime; } diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/domain/vo/DatabaseQueryCriteria.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/domain/dto/DatabaseQueryCriteria.java similarity index 75% rename from eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/domain/vo/DatabaseQueryCriteria.java rename to eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/domain/dto/DatabaseQueryCriteria.java index a8282c5..5c0e732 100644 --- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/domain/vo/DatabaseQueryCriteria.java +++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/domain/dto/DatabaseQueryCriteria.java @@ -13,8 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.mnt.domain.vo; +package me.zhengjie.modules.mnt.domain.dto; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.sql.Timestamp; import java.util.List; @@ -26,9 +27,12 @@ import java.util.List; @Data public class DatabaseQueryCriteria{ + @ApiModelProperty(value = "名称") private String name; + @ApiModelProperty(value = "数据源") private String jdbcUrl; - private List createTime; + @ApiModelProperty(value = "创建时间") + private List createTime; } diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/domain/vo/DeployHistoryQueryCriteria.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/domain/dto/DeployHistoryQueryCriteria.java similarity index 79% rename from eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/domain/vo/DeployHistoryQueryCriteria.java rename to eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/domain/dto/DeployHistoryQueryCriteria.java index 97ee671..4e9f241 100644 --- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/domain/vo/DeployHistoryQueryCriteria.java +++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/domain/dto/DeployHistoryQueryCriteria.java @@ -13,8 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.mnt.domain.vo; +package me.zhengjie.modules.mnt.domain.dto; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.sql.Timestamp; import java.util.List; @@ -26,9 +27,12 @@ import java.util.List; @Data public class DeployHistoryQueryCriteria{ + @ApiModelProperty(value = "模糊查询") private String blurry; + @ApiModelProperty(value = "部署ID") private Long deployId; + @ApiModelProperty(value = "部署时间") private List deployDate; } diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/domain/vo/DeployQueryCriteria.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/domain/dto/DeployQueryCriteria.java similarity index 78% rename from eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/domain/vo/DeployQueryCriteria.java rename to eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/domain/dto/DeployQueryCriteria.java index 947de8e..e8b4daf 100644 --- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/domain/vo/DeployQueryCriteria.java +++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/domain/dto/DeployQueryCriteria.java @@ -13,8 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.mnt.domain.vo; +package me.zhengjie.modules.mnt.domain.dto; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.sql.Timestamp; import java.util.List; @@ -26,11 +27,9 @@ import java.util.List; @Data public class DeployQueryCriteria{ + @ApiModelProperty(value = "应用名称") private String appName; - private List createTime; - - private Long offset; - - private Long size; + @ApiModelProperty(value = "创建时间") + private List createTime; } diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/domain/vo/ServerQueryCriteria.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/domain/dto/ServerQueryCriteria.java similarity index 78% rename from eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/domain/vo/ServerQueryCriteria.java rename to eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/domain/dto/ServerQueryCriteria.java index f1a0735..4f89c33 100644 --- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/domain/vo/ServerQueryCriteria.java +++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/domain/dto/ServerQueryCriteria.java @@ -13,8 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.mnt.domain.vo; +package me.zhengjie.modules.mnt.domain.dto; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.sql.Timestamp; import java.util.List; @@ -26,7 +27,9 @@ import java.util.List; @Data public class ServerQueryCriteria { + @ApiModelProperty(value = "模糊查询") private String blurry; - private List createTime; + @ApiModelProperty(value = "创建时间") + private List createTime; } diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/mapper/AppMapper.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/mapper/AppMapper.java index aff9fcc..175156f 100644 --- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/mapper/AppMapper.java +++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/mapper/AppMapper.java @@ -19,7 +19,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import me.zhengjie.modules.mnt.domain.App; -import me.zhengjie.modules.mnt.domain.vo.AppQueryCriteria; +import me.zhengjie.modules.mnt.domain.dto.AppQueryCriteria; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/mapper/DatabaseMapper.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/mapper/DatabaseMapper.java index 3110b91..4a480e0 100644 --- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/mapper/DatabaseMapper.java +++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/mapper/DatabaseMapper.java @@ -19,7 +19,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import me.zhengjie.modules.mnt.domain.Database; -import me.zhengjie.modules.mnt.domain.vo.DatabaseQueryCriteria; +import me.zhengjie.modules.mnt.domain.dto.DatabaseQueryCriteria; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/mapper/DeployHistoryMapper.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/mapper/DeployHistoryMapper.java index 20f4d0b..d475982 100644 --- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/mapper/DeployHistoryMapper.java +++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/mapper/DeployHistoryMapper.java @@ -19,7 +19,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import me.zhengjie.modules.mnt.domain.DeployHistory; -import me.zhengjie.modules.mnt.domain.vo.DeployHistoryQueryCriteria; +import me.zhengjie.modules.mnt.domain.dto.DeployHistoryQueryCriteria; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/mapper/DeployMapper.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/mapper/DeployMapper.java index bf76d57..8baa5cb 100644 --- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/mapper/DeployMapper.java +++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/mapper/DeployMapper.java @@ -16,8 +16,10 @@ package me.zhengjie.modules.mnt.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import me.zhengjie.modules.mnt.domain.Deploy; -import me.zhengjie.modules.mnt.domain.vo.DeployQueryCriteria; +import me.zhengjie.modules.mnt.domain.dto.DeployQueryCriteria; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -31,11 +33,12 @@ import java.util.Set; @Mapper public interface DeployMapper extends BaseMapper { - Long countAll(@Param("criteria") DeployQueryCriteria criteria); - List findAll(@Param("criteria") DeployQueryCriteria criteria); - + + IPage findAll(@Param("criteria") DeployQueryCriteria criteria, Page page); + Set getIdByAppIds(@Param("appIds") Set appIds); Deploy getDeployById(@Param("deployId") Long deployId); + } diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/mapper/ServerMapper.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/mapper/ServerMapper.java index 15fd454..d878b07 100644 --- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/mapper/ServerMapper.java +++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/mapper/ServerMapper.java @@ -19,7 +19,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import me.zhengjie.modules.mnt.domain.Server; -import me.zhengjie.modules.mnt.domain.vo.ServerQueryCriteria; +import me.zhengjie.modules.mnt.domain.dto.ServerQueryCriteria; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/rest/AppController.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/rest/AppController.java index fe906c7..eda4450 100644 --- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/rest/AppController.java +++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/rest/AppController.java @@ -22,7 +22,7 @@ import lombok.RequiredArgsConstructor; import me.zhengjie.annotation.Log; import me.zhengjie.modules.mnt.domain.App; import me.zhengjie.modules.mnt.service.AppService; -import me.zhengjie.modules.mnt.domain.vo.AppQueryCriteria; +import me.zhengjie.modules.mnt.domain.dto.AppQueryCriteria; import me.zhengjie.utils.PageResult; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/rest/DatabaseController.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/rest/DatabaseController.java index f70bcfc..dfca679 100644 --- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/rest/DatabaseController.java +++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/rest/DatabaseController.java @@ -23,7 +23,7 @@ import me.zhengjie.annotation.Log; import me.zhengjie.exception.BadRequestException; import me.zhengjie.modules.mnt.domain.Database; import me.zhengjie.modules.mnt.service.DatabaseService; -import me.zhengjie.modules.mnt.domain.vo.DatabaseQueryCriteria; +import me.zhengjie.modules.mnt.domain.dto.DatabaseQueryCriteria; import me.zhengjie.modules.mnt.util.SqlUtils; import me.zhengjie.utils.FileUtil; import me.zhengjie.utils.PageResult; diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/rest/DeployController.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/rest/DeployController.java index 3a1336f..042f5f6 100644 --- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/rest/DeployController.java +++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/rest/DeployController.java @@ -23,7 +23,7 @@ import me.zhengjie.annotation.Log; import me.zhengjie.modules.mnt.domain.Deploy; import me.zhengjie.modules.mnt.domain.DeployHistory; import me.zhengjie.modules.mnt.service.DeployService; -import me.zhengjie.modules.mnt.domain.vo.DeployQueryCriteria; +import me.zhengjie.modules.mnt.domain.dto.DeployQueryCriteria; import me.zhengjie.utils.FileUtil; import me.zhengjie.utils.PageResult; import org.springframework.http.HttpStatus; @@ -65,7 +65,7 @@ public class DeployController { @GetMapping @PreAuthorize("@el.check('deploy:list')") public ResponseEntity> queryDeployData(DeployQueryCriteria criteria, Page page){ - return new ResponseEntity<>(deployService.queryAll(criteria, page),HttpStatus.OK); + return new ResponseEntity<>(deployService.queryAll(criteria, page),HttpStatus.OK); } @Log("新增部署") diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/rest/DeployHistoryController.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/rest/DeployHistoryController.java index d8a36c7..c43845e 100644 --- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/rest/DeployHistoryController.java +++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/rest/DeployHistoryController.java @@ -22,7 +22,7 @@ import lombok.RequiredArgsConstructor; import me.zhengjie.annotation.Log; import me.zhengjie.modules.mnt.domain.DeployHistory; import me.zhengjie.modules.mnt.service.DeployHistoryService; -import me.zhengjie.modules.mnt.domain.vo.DeployHistoryQueryCriteria; +import me.zhengjie.modules.mnt.domain.dto.DeployHistoryQueryCriteria; import me.zhengjie.utils.PageResult; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/rest/ServerController.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/rest/ServerController.java index 17b68dc..a9d8025 100644 --- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/rest/ServerController.java +++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/rest/ServerController.java @@ -22,7 +22,7 @@ import lombok.RequiredArgsConstructor; import me.zhengjie.annotation.Log; import me.zhengjie.modules.mnt.domain.Server; import me.zhengjie.modules.mnt.service.ServerService; -import me.zhengjie.modules.mnt.domain.vo.ServerQueryCriteria; +import me.zhengjie.modules.mnt.domain.dto.ServerQueryCriteria; import me.zhengjie.utils.PageResult; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/AppService.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/AppService.java index a6b2090..e85ec76 100644 --- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/AppService.java +++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/AppService.java @@ -18,13 +18,12 @@ package me.zhengjie.modules.mnt.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import me.zhengjie.modules.mnt.domain.App; -import me.zhengjie.modules.mnt.domain.vo.AppQueryCriteria; +import me.zhengjie.modules.mnt.domain.dto.AppQueryCriteria; import me.zhengjie.utils.PageResult; import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.List; -import java.util.Map; import java.util.Set; /** diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/DatabaseService.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/DatabaseService.java index a042605..bd9841d 100644 --- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/DatabaseService.java +++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/DatabaseService.java @@ -18,7 +18,7 @@ package me.zhengjie.modules.mnt.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import me.zhengjie.modules.mnt.domain.Database; -import me.zhengjie.modules.mnt.domain.vo.DatabaseQueryCriteria; +import me.zhengjie.modules.mnt.domain.dto.DatabaseQueryCriteria; import me.zhengjie.utils.PageResult; import javax.servlet.http.HttpServletResponse; diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/DeployHistoryService.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/DeployHistoryService.java index 28a3653..e73f10c 100644 --- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/DeployHistoryService.java +++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/DeployHistoryService.java @@ -18,7 +18,7 @@ package me.zhengjie.modules.mnt.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import me.zhengjie.modules.mnt.domain.DeployHistory; -import me.zhengjie.modules.mnt.domain.vo.DeployHistoryQueryCriteria; +import me.zhengjie.modules.mnt.domain.dto.DeployHistoryQueryCriteria; import me.zhengjie.utils.PageResult; import javax.servlet.http.HttpServletResponse; diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/DeployService.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/DeployService.java index 8d30bd5..7b3e706 100644 --- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/DeployService.java +++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/DeployService.java @@ -19,7 +19,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import me.zhengjie.modules.mnt.domain.Deploy; import me.zhengjie.modules.mnt.domain.DeployHistory; -import me.zhengjie.modules.mnt.domain.vo.DeployQueryCriteria; +import me.zhengjie.modules.mnt.domain.dto.DeployQueryCriteria; import me.zhengjie.utils.PageResult; import javax.servlet.http.HttpServletResponse; diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/ServerService.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/ServerService.java index 407a047..ef5b1f4 100644 --- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/ServerService.java +++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/ServerService.java @@ -18,7 +18,7 @@ package me.zhengjie.modules.mnt.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import me.zhengjie.modules.mnt.domain.Server; -import me.zhengjie.modules.mnt.domain.vo.ServerQueryCriteria; +import me.zhengjie.modules.mnt.domain.dto.ServerQueryCriteria; import me.zhengjie.utils.PageResult; import javax.servlet.http.HttpServletResponse; diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/impl/AppServiceImpl.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/impl/AppServiceImpl.java index a86d628..e7f97fb 100644 --- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/impl/AppServiceImpl.java +++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/impl/AppServiceImpl.java @@ -24,7 +24,7 @@ import me.zhengjie.modules.mnt.mapper.AppMapper; import me.zhengjie.modules.mnt.mapper.DeployMapper; import me.zhengjie.modules.mnt.mapper.DeployServerMapper; import me.zhengjie.modules.mnt.service.AppService; -import me.zhengjie.modules.mnt.domain.vo.AppQueryCriteria; +import me.zhengjie.modules.mnt.domain.dto.AppQueryCriteria; import me.zhengjie.utils.FileUtil; import me.zhengjie.utils.PageResult; import me.zhengjie.utils.PageUtil; diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/impl/DatabaseServiceImpl.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/impl/DatabaseServiceImpl.java index ace15a7..60edcfd 100644 --- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/impl/DatabaseServiceImpl.java +++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/impl/DatabaseServiceImpl.java @@ -23,7 +23,7 @@ import lombok.extern.slf4j.Slf4j; import me.zhengjie.modules.mnt.domain.Database; import me.zhengjie.modules.mnt.mapper.DatabaseMapper; import me.zhengjie.modules.mnt.service.DatabaseService; -import me.zhengjie.modules.mnt.domain.vo.DatabaseQueryCriteria; +import me.zhengjie.modules.mnt.domain.dto.DatabaseQueryCriteria; import me.zhengjie.modules.mnt.util.SqlUtils; import me.zhengjie.utils.FileUtil; import me.zhengjie.utils.PageResult; diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/impl/DeployHistoryServiceImpl.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/impl/DeployHistoryServiceImpl.java index 583d973..ac1b013 100644 --- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/impl/DeployHistoryServiceImpl.java +++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/impl/DeployHistoryServiceImpl.java @@ -22,7 +22,7 @@ import lombok.RequiredArgsConstructor; import me.zhengjie.modules.mnt.domain.DeployHistory; import me.zhengjie.modules.mnt.mapper.DeployHistoryMapper; import me.zhengjie.modules.mnt.service.DeployHistoryService; -import me.zhengjie.modules.mnt.domain.vo.DeployHistoryQueryCriteria; +import me.zhengjie.modules.mnt.domain.dto.DeployHistoryQueryCriteria; import me.zhengjie.utils.DateUtil; import me.zhengjie.utils.FileUtil; import me.zhengjie.utils.PageResult; diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/impl/DeployServiceImpl.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/impl/DeployServiceImpl.java index 205a0e8..65ea494 100644 --- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/impl/DeployServiceImpl.java +++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/impl/DeployServiceImpl.java @@ -17,6 +17,7 @@ package me.zhengjie.modules.mnt.service.impl; import cn.hutool.core.date.DatePattern; import cn.hutool.core.date.DateUtil; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import lombok.RequiredArgsConstructor; @@ -31,7 +32,7 @@ import me.zhengjie.modules.mnt.mapper.DeployServerMapper; import me.zhengjie.modules.mnt.service.DeployHistoryService; import me.zhengjie.modules.mnt.service.DeployService; import me.zhengjie.modules.mnt.service.ServerService; -import me.zhengjie.modules.mnt.domain.vo.DeployQueryCriteria; +import me.zhengjie.modules.mnt.domain.dto.DeployQueryCriteria; import me.zhengjie.modules.mnt.util.ExecuteShellUtil; import me.zhengjie.modules.mnt.util.ScpClientUtil; import me.zhengjie.modules.mnt.websocket.MsgType; @@ -65,10 +66,8 @@ public class DeployServiceImpl extends ServiceImpl impleme @Override public PageResult queryAll(DeployQueryCriteria criteria, Page page) { - criteria.setOffset(page.offset()); - List deploys = deployMapper.findAll(criteria); - Long total = deployMapper.countAll(criteria); - return PageUtil.toPage(deploys, total); + IPage deploys = deployMapper.findAll(criteria, page); + return PageUtil.toPage(deploys); } @Override diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/impl/ServerServiceImpl.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/impl/ServerServiceImpl.java index 73aa983..aec83db 100644 --- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/impl/ServerServiceImpl.java +++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/impl/ServerServiceImpl.java @@ -22,7 +22,7 @@ import me.zhengjie.modules.mnt.domain.Server; import me.zhengjie.modules.mnt.mapper.DeployServerMapper; import me.zhengjie.modules.mnt.mapper.ServerMapper; import me.zhengjie.modules.mnt.service.ServerService; -import me.zhengjie.modules.mnt.domain.vo.ServerQueryCriteria; +import me.zhengjie.modules.mnt.domain.dto.ServerQueryCriteria; import me.zhengjie.modules.mnt.util.ExecuteShellUtil; import me.zhengjie.utils.FileUtil; import me.zhengjie.utils.PageResult; diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/quartz/domain/vo/QuartzJobQueryCriteria.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/quartz/domain/dto/QuartzJobQueryCriteria.java similarity index 78% rename from eladmin/eladmin-system/src/main/java/me/zhengjie/modules/quartz/domain/vo/QuartzJobQueryCriteria.java rename to eladmin/eladmin-system/src/main/java/me/zhengjie/modules/quartz/domain/dto/QuartzJobQueryCriteria.java index 140a06b..a198a2d 100644 --- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/quartz/domain/vo/QuartzJobQueryCriteria.java +++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/quartz/domain/dto/QuartzJobQueryCriteria.java @@ -13,8 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.quartz.domain.vo; +package me.zhengjie.modules.quartz.domain.dto; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.sql.Timestamp; import java.util.List; @@ -26,9 +27,12 @@ import java.util.List; @Data public class QuartzJobQueryCriteria { + @ApiModelProperty(value = "定时任务名称") private String jobName; + @ApiModelProperty(value = "是否成功") private Boolean isSuccess; + @ApiModelProperty(value = "创建时间") private List createTime; } diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/quartz/mapper/QuartzJobMapper.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/quartz/mapper/QuartzJobMapper.java index a83ffcc..c717667 100644 --- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/quartz/mapper/QuartzJobMapper.java +++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/quartz/mapper/QuartzJobMapper.java @@ -19,7 +19,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import me.zhengjie.modules.quartz.domain.QuartzJob; -import me.zhengjie.modules.quartz.domain.vo.QuartzJobQueryCriteria; +import me.zhengjie.modules.quartz.domain.dto.QuartzJobQueryCriteria; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/quartz/mapper/QuartzLogMapper.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/quartz/mapper/QuartzLogMapper.java index 7665822..d27469d 100644 --- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/quartz/mapper/QuartzLogMapper.java +++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/quartz/mapper/QuartzLogMapper.java @@ -19,7 +19,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import me.zhengjie.modules.quartz.domain.QuartzLog; -import me.zhengjie.modules.quartz.domain.vo.QuartzJobQueryCriteria; +import me.zhengjie.modules.quartz.domain.dto.QuartzJobQueryCriteria; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/quartz/rest/QuartzJobController.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/quartz/rest/QuartzJobController.java index 825d264..50b3876 100644 --- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/quartz/rest/QuartzJobController.java +++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/quartz/rest/QuartzJobController.java @@ -25,7 +25,7 @@ import me.zhengjie.exception.BadRequestException; import me.zhengjie.modules.quartz.domain.QuartzJob; import me.zhengjie.modules.quartz.domain.QuartzLog; import me.zhengjie.modules.quartz.service.QuartzJobService; -import me.zhengjie.modules.quartz.domain.vo.QuartzJobQueryCriteria; +import me.zhengjie.modules.quartz.domain.dto.QuartzJobQueryCriteria; import me.zhengjie.utils.PageResult; import me.zhengjie.utils.SpringBeanHolder; import org.springframework.http.HttpStatus; diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/quartz/service/QuartzJobService.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/quartz/service/QuartzJobService.java index f3516d2..dc7a8b2 100644 --- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/quartz/service/QuartzJobService.java +++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/quartz/service/QuartzJobService.java @@ -19,7 +19,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import me.zhengjie.modules.quartz.domain.QuartzJob; import me.zhengjie.modules.quartz.domain.QuartzLog; -import me.zhengjie.modules.quartz.domain.vo.QuartzJobQueryCriteria; +import me.zhengjie.modules.quartz.domain.dto.QuartzJobQueryCriteria; import me.zhengjie.utils.PageResult; import javax.servlet.http.HttpServletResponse; diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/quartz/service/impl/QuartzJobServiceImpl.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/quartz/service/impl/QuartzJobServiceImpl.java index 0eb278e..b27f4fb 100644 --- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/quartz/service/impl/QuartzJobServiceImpl.java +++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/quartz/service/impl/QuartzJobServiceImpl.java @@ -26,7 +26,7 @@ import me.zhengjie.modules.quartz.domain.QuartzLog; import me.zhengjie.modules.quartz.mapper.QuartzJobMapper; import me.zhengjie.modules.quartz.mapper.QuartzLogMapper; import me.zhengjie.modules.quartz.service.QuartzJobService; -import me.zhengjie.modules.quartz.domain.vo.QuartzJobQueryCriteria; +import me.zhengjie.modules.quartz.domain.dto.QuartzJobQueryCriteria; import me.zhengjie.modules.quartz.utils.QuartzManage; import me.zhengjie.utils.*; import org.quartz.CronExpression; diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/quartz/utils/ExecutionJob.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/quartz/utils/ExecutionJob.java index 63222d0..253ff6b 100644 --- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/quartz/utils/ExecutionJob.java +++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/quartz/utils/ExecutionJob.java @@ -19,7 +19,7 @@ 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 me.zhengjie.domain.vo.EmailVo; +import me.zhengjie.domain.dto.EmailDto; import me.zhengjie.modules.quartz.domain.QuartzJob; import me.zhengjie.modules.quartz.domain.QuartzLog; import me.zhengjie.modules.quartz.mapper.QuartzLogMapper; @@ -106,8 +106,8 @@ public class ExecutionJob extends QuartzJobBean { EmailService emailService = SpringBeanHolder.getBean(EmailService.class); // 邮箱报警 if(StringUtils.isNoneBlank(quartzJob.getEmail())){ - EmailVo emailVo = taskAlarm(quartzJob, ThrowableUtil.getStackTrace(e)); - emailService.send(emailVo, emailService.find()); + EmailDto emailDto = taskAlarm(quartzJob, ThrowableUtil.getStackTrace(e)); + emailService.send(emailDto, emailService.find()); } } } finally { @@ -115,17 +115,17 @@ public class ExecutionJob extends QuartzJobBean { } } - private EmailVo taskAlarm(QuartzJob quartzJob, String msg) { - EmailVo emailVo = new EmailVo(); - emailVo.setSubject("定时任务【"+ quartzJob.getJobName() +"】执行失败，请尽快处理！"); + private EmailDto taskAlarm(QuartzJob quartzJob, String msg) { + EmailDto emailDto = new EmailDto(); + emailDto.setSubject("定时任务【"+ quartzJob.getJobName() +"】执行失败，请尽快处理！"); Map 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"); - emailVo.setContent(template.render(data)); + emailDto.setContent(template.render(data)); List emails = Arrays.asList(quartzJob.getEmail().split("[,，]")); - emailVo.setTos(emails); - return emailVo; + emailDto.setTos(emails); + return emailDto; } } diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/security/service/dto/AuthUserDto.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/security/service/dto/AuthUserDto.java index 5219fc5..2a4a2ce 100644 --- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/security/service/dto/AuthUserDto.java +++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/security/service/dto/AuthUserDto.java @@ -15,6 +15,7 @@ */ package me.zhengjie.modules.security.service.dto; +import io.swagger.annotations.ApiModelProperty; import lombok.Getter; import lombok.Setter; import javax.validation.constraints.NotBlank; @@ -28,12 +29,16 @@ import javax.validation.constraints.NotBlank; public class AuthUserDto { @NotBlank + @ApiModelProperty(value = "用户名") private String username; @NotBlank + @ApiModelProperty(value = "密码") private String password; + @ApiModelProperty(value = "验证码") private String code; + @ApiModelProperty(value = "验证码的key") private String uuid = ""; } diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/security/service/dto/AuthorityDto.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/security/service/dto/AuthorityDto.java index 888cceb..d12b865 100644 --- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/security/service/dto/AuthorityDto.java +++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/security/service/dto/AuthorityDto.java @@ -15,6 +15,7 @@ */ package me.zhengjie.modules.security.service.dto; +import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; @@ -30,5 +31,6 @@ import org.springframework.security.core.GrantedAuthority; @AllArgsConstructor public class AuthorityDto implements GrantedAuthority { + @ApiModelProperty(value = "角色名") private String authority; } diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/security/service/dto/JwtUserDto.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/security/service/dto/JwtUserDto.java index 9582061..3a45ec2 100644 --- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/security/service/dto/JwtUserDto.java +++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/security/service/dto/JwtUserDto.java @@ -16,6 +16,7 @@ package me.zhengjie.modules.security.service.dto; import com.alibaba.fastjson.annotation.JSONField; +import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.Setter; @@ -33,13 +34,17 @@ import java.util.stream.Collectors; @AllArgsConstructor public class JwtUserDto implements UserDetails { + @ApiModelProperty(value = "用户") private final User user; + @ApiModelProperty(value = "数据权限") private final List dataScopes; + @ApiModelProperty(value = "角色") private final List authorities; @Setter + @ApiModelProperty(value = "密码") private String password; public Set getRoles() { diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/security/service/dto/OnlineUserDto.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/security/service/dto/OnlineUserDto.java index 290ab6d..32bfc3c 100644 --- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/security/service/dto/OnlineUserDto.java +++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/security/service/dto/OnlineUserDto.java @@ -15,6 +15,7 @@ */ package me.zhengjie.modules.security.service.dto; +import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; @@ -29,45 +30,27 @@ import java.util.Date; @NoArgsConstructor public class OnlineUserDto { - /** - * 用户名 - */ + @ApiModelProperty(value = "用户名") private String userName; - /** - * 昵称 - */ + @ApiModelProperty(value = "昵称") private String nickName; - /** - * 岗位 - */ + @ApiModelProperty(value = "岗位") private String dept; - /** - * 浏览器 - */ + @ApiModelProperty(value = "浏览器") private String browser; - /** - * IP - */ + @ApiModelProperty(value = "IP") private String ip; - /** - * 地址 - */ + @ApiModelProperty(value = "地址") private String address; - /** - * token - */ + @ApiModelProperty(value = "token") private String key; - /** - * 登录时间 - */ + @ApiModelProperty(value = "登录时间") private Date loginTime; - - } diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/Dept.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/Dept.java index 26af317..063b9c2 100644 --- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/Dept.java +++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/Dept.java @@ -51,6 +51,7 @@ public class Dept extends BaseEntity implements Serializable { private Set roles; @TableField(exist = false) + @ApiModelProperty(value = "子部门") private List children; @ApiModelProperty(value = "排序") diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/Dict.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/Dict.java index d354fde..3b7068c 100644 --- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/Dict.java +++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/Dict.java @@ -43,6 +43,7 @@ public class Dict extends BaseEntity implements Serializable { private Long id; @TableField(exist = false) + @ApiModelProperty(value = "字典详情") private List dictDetails; @NotBlank diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/DictDetail.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/DictDetail.java index 6f38c59..394ec27 100644 --- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/DictDetail.java +++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/DictDetail.java @@ -45,6 +45,7 @@ public class DictDetail extends BaseEntity implements Serializable { private Long dictId; @TableField(exist = false) + @ApiModelProperty(value = "字典") private Dict dict; @ApiModelProperty(value = "字典标签") diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/vo/DeptQueryCriteria.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/dto/DeptQueryCriteria.java similarity index 71% rename from eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/vo/DeptQueryCriteria.java rename to eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/dto/DeptQueryCriteria.java index d8b99a2..dd2ed40 100644 --- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/vo/DeptQueryCriteria.java +++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/dto/DeptQueryCriteria.java @@ -13,8 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.system.domain.vo; +package me.zhengjie.modules.system.domain.dto; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.sql.Timestamp; import java.util.List; @@ -26,15 +27,21 @@ import java.util.List; @Data public class DeptQueryCriteria{ + @ApiModelProperty(value = "部门id集合") private List ids; + @ApiModelProperty(value = "部门名称") private String name; + @ApiModelProperty(value = "是否启用") private Boolean enabled; + @ApiModelProperty(value = "上级部门") private Long pid; + @ApiModelProperty(value = "PID为空查询") private Boolean pidIsNull; + @ApiModelProperty(value = "创建时间") private List createTime; } \ No newline at end of file diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/vo/DictDetailQueryCriteria.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/dto/DictDetailQueryCriteria.java similarity index 81% rename from eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/vo/DictDetailQueryCriteria.java rename to eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/dto/DictDetailQueryCriteria.java index c548ec9..b35d1ea 100644 --- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/vo/DictDetailQueryCriteria.java +++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/dto/DictDetailQueryCriteria.java @@ -13,8 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.system.domain.vo; +package me.zhengjie.modules.system.domain.dto; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** @@ -24,7 +25,9 @@ import lombok.Data; @Data public class DictDetailQueryCriteria { + @ApiModelProperty(value = "标签") private String label; + @ApiModelProperty(value = "字典名称") private String dictName; } \ No newline at end of file diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/vo/DictQueryCriteria.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/dto/DictQueryCriteria.java similarity index 84% rename from eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/vo/DictQueryCriteria.java rename to eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/dto/DictQueryCriteria.java index 343351d..329691d 100644 --- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/vo/DictQueryCriteria.java +++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/dto/DictQueryCriteria.java @@ -13,8 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.system.domain.vo; +package me.zhengjie.modules.system.domain.dto; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** @@ -24,5 +25,6 @@ import lombok.Data; @Data public class DictQueryCriteria { + @ApiModelProperty(value = "模糊查询") private String blurry; } diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/vo/JobQueryCriteria.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/dto/JobQueryCriteria.java similarity index 79% rename from eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/vo/JobQueryCriteria.java rename to eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/dto/JobQueryCriteria.java index 52383c8..62f8578 100644 --- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/vo/JobQueryCriteria.java +++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/dto/JobQueryCriteria.java @@ -13,8 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.system.domain.vo; +package me.zhengjie.modules.system.domain.dto; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.NoArgsConstructor; import java.sql.Timestamp; @@ -28,9 +29,12 @@ import java.util.List; @NoArgsConstructor public class JobQueryCriteria { + @ApiModelProperty(value = "岗位名称") private String name; + @ApiModelProperty(value = "是否启用") private Boolean enabled; + @ApiModelProperty(value = "创建时间") private List createTime; } \ No newline at end of file diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/vo/MenuMetaVo.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/dto/MenuMetaVo.java similarity index 79% rename from eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/vo/MenuMetaVo.java rename to eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/dto/MenuMetaVo.java index 647baa8..dbf87a7 100644 --- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/vo/MenuMetaVo.java +++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/dto/MenuMetaVo.java @@ -13,8 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.system.domain.vo; +package me.zhengjie.modules.system.domain.dto; +import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; import lombok.Data; import java.io.Serializable; @@ -27,9 +28,12 @@ import java.io.Serializable; @AllArgsConstructor public class MenuMetaVo implements Serializable { + @ApiModelProperty(value = "菜单标题") private String title; + @ApiModelProperty(value = "菜单图标") private String icon; + @ApiModelProperty(value = "缓存") private Boolean noCache; } diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/vo/MenuQueryCriteria.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/dto/MenuQueryCriteria.java similarity index 76% rename from eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/vo/MenuQueryCriteria.java rename to eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/dto/MenuQueryCriteria.java index cbb2f04..bfd93ba 100644 --- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/vo/MenuQueryCriteria.java +++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/dto/MenuQueryCriteria.java @@ -13,8 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.system.domain.vo; +package me.zhengjie.modules.system.domain.dto; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.sql.Timestamp; import java.util.List; @@ -26,11 +27,15 @@ import java.util.List; @Data public class MenuQueryCriteria { + @ApiModelProperty(value = "模糊查询") private String blurry; + @ApiModelProperty(value = "创建时间") private List createTime; + @ApiModelProperty(value = "PID为空查询") private Boolean pidIsNull; + @ApiModelProperty(value = "PID") private Long pid; } diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/vo/MenuVo.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/dto/MenuVo.java similarity index 70% rename from eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/vo/MenuVo.java rename to eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/dto/MenuVo.java index e1efa5a..7b45088 100644 --- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/vo/MenuVo.java +++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/dto/MenuVo.java @@ -13,8 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.system.domain.vo; +package me.zhengjie.modules.system.domain.dto; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; import java.util.List; @@ -27,19 +28,27 @@ import java.util.List; @Data public class MenuVo implements Serializable { + @ApiModelProperty(value = "菜单名称") private String name; + @ApiModelProperty(value = "路径") private String path; + @ApiModelProperty(value = "隐藏状态") private Boolean hidden; + @ApiModelProperty(value = "重定向") private String redirect; + @ApiModelProperty(value = "组件") private String component; + @ApiModelProperty(value = "总是显示") private Boolean alwaysShow; + @ApiModelProperty(value = "元数据") private MenuMetaVo meta; + @ApiModelProperty(value = "子路由") private List children; } diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/vo/RoleQueryCriteria.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/dto/RoleQueryCriteria.java similarity index 81% rename from eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/vo/RoleQueryCriteria.java rename to eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/dto/RoleQueryCriteria.java index c105232..325955d 100644 --- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/vo/RoleQueryCriteria.java +++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/dto/RoleQueryCriteria.java @@ -13,8 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.system.domain.vo; +package me.zhengjie.modules.system.domain.dto; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.sql.Timestamp; import java.util.List; @@ -26,7 +27,9 @@ import java.util.List; @Data public class RoleQueryCriteria { + @ApiModelProperty(value = "模糊查询") private String blurry; + @ApiModelProperty(value = "创建时间") private List createTime; } diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/vo/UserPassVo.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/dto/UserPassVo.java similarity index 81% rename from eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/vo/UserPassVo.java rename to eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/dto/UserPassVo.java index fccb100..3d2306f 100644 --- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/vo/UserPassVo.java +++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/dto/UserPassVo.java @@ -13,8 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.system.domain.vo; +package me.zhengjie.modules.system.domain.dto; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** @@ -25,7 +26,9 @@ import lombok.Data; @Data public class UserPassVo { + @ApiModelProperty(value = "旧密码") private String oldPass; + @ApiModelProperty(value = "新密码") private String newPass; } diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/vo/UserQueryCriteria.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/dto/UserQueryCriteria.java similarity index 75% rename from eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/vo/UserQueryCriteria.java rename to eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/dto/UserQueryCriteria.java index 115b407..464f989 100644 --- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/vo/UserQueryCriteria.java +++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/dto/UserQueryCriteria.java @@ -13,8 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.system.domain.vo; +package me.zhengjie.modules.system.domain.dto; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; import java.sql.Timestamp; @@ -29,15 +30,21 @@ import java.util.Set; @Data public class UserQueryCriteria implements Serializable { + @ApiModelProperty(value = "ID") private Long id; + @ApiModelProperty(value = "多个ID") private Set deptIds = new HashSet<>(); + @ApiModelProperty(value = "模糊查询") private String blurry; + @ApiModelProperty(value = "是否启用") private Boolean enabled; + @ApiModelProperty(value = "部门ID") private Long deptId; + @ApiModelProperty(value = "创建时间") private List createTime; } diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/mapper/DeptMapper.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/mapper/DeptMapper.java index 7e456a0..c9641d6 100644 --- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/mapper/DeptMapper.java +++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/mapper/DeptMapper.java @@ -17,7 +17,7 @@ package me.zhengjie.modules.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import me.zhengjie.modules.system.domain.Dept; -import me.zhengjie.modules.system.domain.vo.DeptQueryCriteria; +import me.zhengjie.modules.system.domain.dto.DeptQueryCriteria; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/mapper/DictDetailMapper.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/mapper/DictDetailMapper.java index 5999528..5d03649 100644 --- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/mapper/DictDetailMapper.java +++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/mapper/DictDetailMapper.java @@ -19,7 +19,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import me.zhengjie.modules.system.domain.DictDetail; -import me.zhengjie.modules.system.domain.vo.DictDetailQueryCriteria; +import me.zhengjie.modules.system.domain.dto.DictDetailQueryCriteria; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/mapper/DictMapper.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/mapper/DictMapper.java index 101122a..2b381a8 100644 --- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/mapper/DictMapper.java +++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/mapper/DictMapper.java @@ -19,7 +19,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import me.zhengjie.modules.system.domain.Dict; -import me.zhengjie.modules.system.domain.vo.DictQueryCriteria; +import me.zhengjie.modules.system.domain.dto.DictQueryCriteria; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/mapper/JobMapper.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/mapper/JobMapper.java index 40084d4..bc767c4 100644 --- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/mapper/JobMapper.java +++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/mapper/JobMapper.java @@ -19,7 +19,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import me.zhengjie.modules.system.domain.Job; -import me.zhengjie.modules.system.domain.vo.JobQueryCriteria; +import me.zhengjie.modules.system.domain.dto.JobQueryCriteria; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/mapper/MenuMapper.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/mapper/MenuMapper.java index f34969a..d687b27 100644 --- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/mapper/MenuMapper.java +++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/mapper/MenuMapper.java @@ -17,7 +17,7 @@ package me.zhengjie.modules.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import me.zhengjie.modules.system.domain.Menu; -import me.zhengjie.modules.system.domain.vo.MenuQueryCriteria; +import me.zhengjie.modules.system.domain.dto.MenuQueryCriteria; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/mapper/RoleMapper.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/mapper/RoleMapper.java index 3214e41..6aeab80 100644 --- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/mapper/RoleMapper.java +++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/mapper/RoleMapper.java @@ -19,7 +19,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import me.zhengjie.modules.system.domain.Role; -import me.zhengjie.modules.system.domain.vo.RoleQueryCriteria; +import me.zhengjie.modules.system.domain.dto.RoleQueryCriteria; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/mapper/UserMapper.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/mapper/UserMapper.java index db66e02..5eb5a7e 100644 --- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/mapper/UserMapper.java +++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/mapper/UserMapper.java @@ -19,7 +19,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import me.zhengjie.modules.system.domain.User; -import me.zhengjie.modules.system.domain.vo.UserQueryCriteria; +import me.zhengjie.modules.system.domain.dto.UserQueryCriteria; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/DeptController.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/DeptController.java index ef264ef..a9baf51 100644 --- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/DeptController.java +++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/DeptController.java @@ -23,7 +23,7 @@ import me.zhengjie.annotation.Log; import me.zhengjie.exception.BadRequestException; import me.zhengjie.modules.system.domain.Dept; import me.zhengjie.modules.system.service.DeptService; -import me.zhengjie.modules.system.domain.vo.DeptQueryCriteria; +import me.zhengjie.modules.system.domain.dto.DeptQueryCriteria; import me.zhengjie.utils.PageResult; import me.zhengjie.utils.PageUtil; import org.springframework.http.HttpStatus; diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/DictController.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/DictController.java index 2c50d0d..d66ba52 100644 --- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/DictController.java +++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/DictController.java @@ -23,7 +23,7 @@ import me.zhengjie.annotation.Log; import me.zhengjie.exception.BadRequestException; import me.zhengjie.modules.system.domain.Dict; import me.zhengjie.modules.system.service.DictService; -import me.zhengjie.modules.system.domain.vo.DictQueryCriteria; +import me.zhengjie.modules.system.domain.dto.DictQueryCriteria; import me.zhengjie.utils.PageResult; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/DictDetailController.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/DictDetailController.java index ddbf3fc..9439cb6 100644 --- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/DictDetailController.java +++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/DictDetailController.java @@ -23,7 +23,7 @@ import me.zhengjie.annotation.Log; import me.zhengjie.exception.BadRequestException; import me.zhengjie.modules.system.domain.DictDetail; import me.zhengjie.modules.system.service.DictDetailService; -import me.zhengjie.modules.system.domain.vo.DictDetailQueryCriteria; +import me.zhengjie.modules.system.domain.dto.DictDetailQueryCriteria; import me.zhengjie.utils.PageResult; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/JobController.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/JobController.java index b68dfef..81cca59 100644 --- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/JobController.java +++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/JobController.java @@ -23,7 +23,7 @@ import me.zhengjie.annotation.Log; import me.zhengjie.exception.BadRequestException; import me.zhengjie.modules.system.domain.Job; import me.zhengjie.modules.system.service.JobService; -import me.zhengjie.modules.system.domain.vo.JobQueryCriteria; +import me.zhengjie.modules.system.domain.dto.JobQueryCriteria; import me.zhengjie.utils.PageResult; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/MenuController.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/MenuController.java index 75bf7c3..aceae97 100644 --- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/MenuController.java +++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/MenuController.java @@ -22,9 +22,9 @@ import lombok.RequiredArgsConstructor; import me.zhengjie.annotation.Log; import me.zhengjie.modules.system.domain.Menu; import me.zhengjie.exception.BadRequestException; -import me.zhengjie.modules.system.domain.vo.MenuVo; +import me.zhengjie.modules.system.domain.dto.MenuVo; import me.zhengjie.modules.system.service.MenuService; -import me.zhengjie.modules.system.domain.vo.MenuQueryCriteria; +import me.zhengjie.modules.system.domain.dto.MenuQueryCriteria; import me.zhengjie.utils.PageResult; import me.zhengjie.utils.PageUtil; import me.zhengjie.utils.SecurityUtils; diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/RoleController.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/RoleController.java index 458440f..469a492 100644 --- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/RoleController.java +++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/RoleController.java @@ -24,7 +24,7 @@ import me.zhengjie.annotation.Log; import me.zhengjie.modules.system.domain.Role; import me.zhengjie.exception.BadRequestException; import me.zhengjie.modules.system.service.RoleService; -import me.zhengjie.modules.system.domain.vo.RoleQueryCriteria; +import me.zhengjie.modules.system.domain.dto.RoleQueryCriteria; import me.zhengjie.utils.PageResult; import me.zhengjie.utils.SecurityUtils; import org.springframework.http.HttpStatus; diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/UserController.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/UserController.java index b5a4645..67c35ae 100644 --- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/UserController.java +++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/UserController.java @@ -27,10 +27,10 @@ import me.zhengjie.modules.system.domain.Role; import me.zhengjie.modules.system.service.DataService; import me.zhengjie.modules.system.domain.User; import me.zhengjie.exception.BadRequestException; -import me.zhengjie.modules.system.domain.vo.UserPassVo; +import me.zhengjie.modules.system.domain.dto.UserPassVo; import me.zhengjie.modules.system.service.DeptService; import me.zhengjie.modules.system.service.RoleService; -import me.zhengjie.modules.system.domain.vo.UserQueryCriteria; +import me.zhengjie.modules.system.domain.dto.UserQueryCriteria; import me.zhengjie.modules.system.service.VerifyService; import me.zhengjie.utils.*; import me.zhengjie.modules.system.service.UserService; diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/VerifyController.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/VerifyController.java index 09ba44b..4ff91d8 100755 --- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/VerifyController.java +++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/VerifyController.java @@ -18,7 +18,7 @@ package me.zhengjie.modules.system.rest; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; -import me.zhengjie.domain.vo.EmailVo; +import me.zhengjie.domain.dto.EmailDto; import me.zhengjie.service.EmailService; import me.zhengjie.modules.system.service.VerifyService; import me.zhengjie.utils.enums.CodeBiEnum; @@ -44,16 +44,16 @@ public class VerifyController { @PostMapping(value = "/resetEmail") @ApiOperation("重置邮箱，发送验证码") public ResponseEntity resetEmail(@RequestParam String email){ - EmailVo emailVo = verificationCodeService.sendEmail(email, CodeEnum.EMAIL_RESET_EMAIL_CODE.getKey()); - emailService.send(emailVo,emailService.find()); + EmailDto emailDto = verificationCodeService.sendEmail(email, CodeEnum.EMAIL_RESET_EMAIL_CODE.getKey()); + emailService.send(emailDto,emailService.find()); return new ResponseEntity<>(HttpStatus.OK); } @PostMapping(value = "/email/resetPass") @ApiOperation("重置密码，发送验证码") public ResponseEntity resetPass(@RequestParam String email){ - EmailVo emailVo = verificationCodeService.sendEmail(email, CodeEnum.EMAIL_RESET_PWD_CODE.getKey()); - emailService.send(emailVo,emailService.find()); + EmailDto emailDto = verificationCodeService.sendEmail(email, CodeEnum.EMAIL_RESET_PWD_CODE.getKey()); + emailService.send(emailDto,emailService.find()); return new ResponseEntity<>(HttpStatus.OK); } diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/DeptService.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/DeptService.java index 670270e..622dd2e 100644 --- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/DeptService.java +++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/DeptService.java @@ -17,7 +17,7 @@ package me.zhengjie.modules.system.service; import com.baomidou.mybatisplus.extension.service.IService; import me.zhengjie.modules.system.domain.Dept; -import me.zhengjie.modules.system.domain.vo.DeptQueryCriteria; +import me.zhengjie.modules.system.domain.dto.DeptQueryCriteria; import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.List; diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/DictDetailService.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/DictDetailService.java index 0432dca..9cffa06 100644 --- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/DictDetailService.java +++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/DictDetailService.java @@ -18,7 +18,7 @@ package me.zhengjie.modules.system.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import me.zhengjie.modules.system.domain.DictDetail; -import me.zhengjie.modules.system.domain.vo.DictDetailQueryCriteria; +import me.zhengjie.modules.system.domain.dto.DictDetailQueryCriteria; import me.zhengjie.utils.PageResult; import java.util.List; diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/DictService.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/DictService.java index ae737c1..9fecb43 100644 --- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/DictService.java +++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/DictService.java @@ -18,7 +18,7 @@ package me.zhengjie.modules.system.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import me.zhengjie.modules.system.domain.Dict; -import me.zhengjie.modules.system.domain.vo.DictQueryCriteria; +import me.zhengjie.modules.system.domain.dto.DictQueryCriteria; import me.zhengjie.utils.PageResult; import javax.servlet.http.HttpServletResponse; diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/JobService.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/JobService.java index c65c609..b743130 100644 --- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/JobService.java +++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/JobService.java @@ -18,7 +18,7 @@ package me.zhengjie.modules.system.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import me.zhengjie.modules.system.domain.Job; -import me.zhengjie.modules.system.domain.vo.JobQueryCriteria; +import me.zhengjie.modules.system.domain.dto.JobQueryCriteria; import me.zhengjie.utils.PageResult; import javax.servlet.http.HttpServletResponse; diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/MenuService.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/MenuService.java index 4c25192..aba8de4 100644 --- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/MenuService.java +++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/MenuService.java @@ -17,8 +17,8 @@ package me.zhengjie.modules.system.service; import com.baomidou.mybatisplus.extension.service.IService; import me.zhengjie.modules.system.domain.Menu; -import me.zhengjie.modules.system.domain.vo.MenuQueryCriteria; -import me.zhengjie.modules.system.domain.vo.MenuVo; +import me.zhengjie.modules.system.domain.dto.MenuQueryCriteria; +import me.zhengjie.modules.system.domain.dto.MenuVo; import javax.servlet.http.HttpServletResponse; import java.io.IOException; diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/RoleService.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/RoleService.java index ac240e4..4c140e4 100644 --- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/RoleService.java +++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/RoleService.java @@ -20,7 +20,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import me.zhengjie.modules.security.service.dto.AuthorityDto; import me.zhengjie.modules.system.domain.Role; import me.zhengjie.modules.system.domain.User; -import me.zhengjie.modules.system.domain.vo.RoleQueryCriteria; +import me.zhengjie.modules.system.domain.dto.RoleQueryCriteria; import me.zhengjie.utils.PageResult; import javax.servlet.http.HttpServletResponse; diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/UserService.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/UserService.java index 4758dfa..b624a5d 100644 --- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/UserService.java +++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/UserService.java @@ -18,7 +18,7 @@ package me.zhengjie.modules.system.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import me.zhengjie.modules.system.domain.User; -import me.zhengjie.modules.system.domain.vo.UserQueryCriteria; +import me.zhengjie.modules.system.domain.dto.UserQueryCriteria; import me.zhengjie.utils.PageResult; import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletResponse; diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/VerifyService.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/VerifyService.java index 4ca39b9..f619861 100644 --- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/VerifyService.java +++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/VerifyService.java @@ -15,7 +15,7 @@ */ package me.zhengjie.modules.system.service; -import me.zhengjie.domain.vo.EmailVo; +import me.zhengjie.domain.dto.EmailDto; /** * @author Zheng Jie @@ -29,7 +29,7 @@ public interface VerifyService { * @param key / * @return / */ - EmailVo sendEmail(String email, String key); + EmailDto sendEmail(String email, String key); /** diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/DeptServiceImpl.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/DeptServiceImpl.java index ddcddde..5f524f9 100644 --- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/DeptServiceImpl.java +++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/DeptServiceImpl.java @@ -24,7 +24,7 @@ import me.zhengjie.modules.system.domain.Dept; import me.zhengjie.modules.system.domain.User; import me.zhengjie.modules.system.mapper.RoleMapper; import me.zhengjie.modules.system.mapper.UserMapper; -import me.zhengjie.modules.system.domain.vo.DeptQueryCriteria; +import me.zhengjie.modules.system.domain.dto.DeptQueryCriteria; import me.zhengjie.utils.*; import me.zhengjie.modules.system.mapper.DeptMapper; import me.zhengjie.modules.system.service.DeptService; diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/DictDetailServiceImpl.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/DictDetailServiceImpl.java index 2b94d9d..d41b715 100644 --- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/DictDetailServiceImpl.java +++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/DictDetailServiceImpl.java @@ -21,7 +21,7 @@ import lombok.RequiredArgsConstructor; import me.zhengjie.modules.system.domain.Dict; import me.zhengjie.modules.system.domain.DictDetail; import me.zhengjie.modules.system.mapper.DictMapper; -import me.zhengjie.modules.system.domain.vo.DictDetailQueryCriteria; +import me.zhengjie.modules.system.domain.dto.DictDetailQueryCriteria; import me.zhengjie.utils.*; import me.zhengjie.modules.system.mapper.DictDetailMapper; import me.zhengjie.modules.system.service.DictDetailService; diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/DictServiceImpl.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/DictServiceImpl.java index 4587a1d..94f32e0 100644 --- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/DictServiceImpl.java +++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/DictServiceImpl.java @@ -23,7 +23,7 @@ import lombok.RequiredArgsConstructor; import me.zhengjie.modules.system.domain.Dict; import me.zhengjie.modules.system.domain.DictDetail; import me.zhengjie.modules.system.mapper.DictDetailMapper; -import me.zhengjie.modules.system.domain.vo.DictQueryCriteria; +import me.zhengjie.modules.system.domain.dto.DictQueryCriteria; import me.zhengjie.utils.*; import me.zhengjie.modules.system.mapper.DictMapper; import me.zhengjie.modules.system.service.DictService; diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/JobServiceImpl.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/JobServiceImpl.java index d7d331f..c7b8069 100644 --- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/JobServiceImpl.java +++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/JobServiceImpl.java @@ -22,7 +22,7 @@ import me.zhengjie.exception.BadRequestException; import me.zhengjie.exception.EntityExistException; import me.zhengjie.modules.system.domain.Job; import me.zhengjie.modules.system.mapper.UserMapper; -import me.zhengjie.modules.system.domain.vo.JobQueryCriteria; +import me.zhengjie.modules.system.domain.dto.JobQueryCriteria; import me.zhengjie.utils.*; import me.zhengjie.modules.system.mapper.JobMapper; import me.zhengjie.modules.system.service.JobService; diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/MenuServiceImpl.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/MenuServiceImpl.java index 857590d..b69c96c 100644 --- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/MenuServiceImpl.java +++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/MenuServiceImpl.java @@ -22,8 +22,8 @@ import lombok.RequiredArgsConstructor; import me.zhengjie.modules.system.domain.Menu; import me.zhengjie.modules.system.domain.Role; import me.zhengjie.modules.system.domain.User; -import me.zhengjie.modules.system.domain.vo.MenuMetaVo; -import me.zhengjie.modules.system.domain.vo.MenuVo; +import me.zhengjie.modules.system.domain.dto.MenuMetaVo; +import me.zhengjie.modules.system.domain.dto.MenuVo; import me.zhengjie.exception.BadRequestException; import me.zhengjie.exception.EntityExistException; import me.zhengjie.modules.system.mapper.MenuMapper; @@ -31,7 +31,7 @@ import me.zhengjie.modules.system.mapper.RoleMenuMapper; import me.zhengjie.modules.system.mapper.UserMapper; import me.zhengjie.modules.system.service.MenuService; import me.zhengjie.modules.system.service.RoleService; -import me.zhengjie.modules.system.domain.vo.MenuQueryCriteria; +import me.zhengjie.modules.system.domain.dto.MenuQueryCriteria; import me.zhengjie.utils.*; import org.springframework.cache.annotation.CacheConfig; import org.springframework.cache.annotation.Cacheable; diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/RoleServiceImpl.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/RoleServiceImpl.java index a012dee..22c4dde 100644 --- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/RoleServiceImpl.java +++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/RoleServiceImpl.java @@ -33,7 +33,7 @@ import me.zhengjie.modules.system.mapper.RoleMapper; import me.zhengjie.modules.system.mapper.RoleMenuMapper; import me.zhengjie.modules.system.mapper.UserMapper; import me.zhengjie.modules.system.service.RoleService; -import me.zhengjie.modules.system.domain.vo.RoleQueryCriteria; +import me.zhengjie.modules.system.domain.dto.RoleQueryCriteria; import me.zhengjie.utils.*; import org.springframework.cache.annotation.CacheConfig; import org.springframework.cache.annotation.Cacheable; diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/UserServiceImpl.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/UserServiceImpl.java index 5756a6e..e14a279 100644 --- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/UserServiceImpl.java +++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/UserServiceImpl.java @@ -27,7 +27,7 @@ import me.zhengjie.modules.system.domain.Job; import me.zhengjie.modules.system.domain.Role; import me.zhengjie.modules.system.domain.User; import me.zhengjie.exception.EntityExistException; -import me.zhengjie.modules.system.domain.vo.UserQueryCriteria; +import me.zhengjie.modules.system.domain.dto.UserQueryCriteria; import me.zhengjie.modules.system.mapper.UserJobMapper; import me.zhengjie.modules.system.mapper.UserMapper; import me.zhengjie.modules.system.mapper.UserRoleMapper; diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/VerifyServiceImpl.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/VerifyServiceImpl.java index a083a45..0c496fc 100644 --- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/VerifyServiceImpl.java +++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/VerifyServiceImpl.java @@ -22,7 +22,7 @@ import cn.hutool.extra.template.TemplateConfig; import cn.hutool.extra.template.TemplateEngine; import cn.hutool.extra.template.TemplateUtil; import lombok.RequiredArgsConstructor; -import me.zhengjie.domain.vo.EmailVo; +import me.zhengjie.domain.dto.EmailDto; import me.zhengjie.exception.BadRequestException; import me.zhengjie.modules.system.service.VerifyService; import me.zhengjie.utils.RedisUtils; @@ -45,8 +45,8 @@ public class VerifyServiceImpl implements VerifyService { @Override @Transactional(rollbackFor = Exception.class) - public EmailVo sendEmail(String email, String key) { - EmailVo emailVo; + public EmailDto sendEmail(String email, String key) { + EmailDto emailDto; String content; String redisKey = key + email; // 如果不存在有效的验证码，就创建一个新的 @@ -64,8 +64,8 @@ public class VerifyServiceImpl implements VerifyService { } else { content = template.render(Dict.create().set("code",oldCode)); } - emailVo = new EmailVo(Collections.singletonList(email),"ELADMIN后台管理系统",content); - return emailVo; + emailDto = new EmailDto(Collections.singletonList(email),"ELADMIN后台管理系统",content); + return emailDto; } @Override diff --git a/eladmin/eladmin-system/src/main/resources/mapper/mnt/DeployMapper.xml b/eladmin/eladmin-system/src/main/resources/mapper/mnt/DeployMapper.xml index 001b369..8f63890 100644 --- a/eladmin/eladmin-system/src/main/resources/mapper/mnt/DeployMapper.xml +++ b/eladmin/eladmin-system/src/main/resources/mapper/mnt/DeployMapper.xml @@ -37,7 +37,13 @@ server.server_id as s_server_id,server.name as s_name,server.ip as s_ip,server.port as s_port,server.account as s_account,server.password as s_password - + - select t.*, - - from ( - select - from mnt_deploy deploy - left join mnt_app app on deploy.app_id = app.app_id - - - limit #{criteria.offset}, #{criteria.size} - - ) t - left join mnt_deploy_server mds on t.d_deploy_id = mds.deploy_id - left join mnt_server server on server.server_id = mds.server_id - order by t.d_deploy_id desc - - -