From 83dc7f8a187048a1a19be36fecf5762ee0a10bf8 Mon Sep 17 00:00:00 2001 From: zhengjie <201507802@qq.com> Date: Mon, 10 Jun 2019 16:49:51 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96user=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E4=B8=AD=E7=9A=84=E5=B2=97=E4=BD=8DDTO=EF=BC=8C=E4=BF=AE?= =?UTF-8?q?=E6=94=B9@author=E4=BF=A1=E6=81=AF=EF=BC=8C=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E9=AA=8C=E8=AF=81=E7=A0=81=E7=99=BB=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 6 +- .../java/me/zhengjie/annotation/Query.java | 4 +- .../java/me/zhengjie/aspect/LimitAspect.java | 1 - .../exception/BadRequestException.java | 2 +- .../exception/EntityExistException.java | 2 +- .../exception/EntityNotFoundException.java | 2 +- .../zhengjie/exception/handler/ApiError.java | 2 +- .../handler/GlobalExceptionHandler.java | 2 +- .../java/me/zhengjie/mapper/EntityMapper.java | 2 +- .../java/me/zhengjie/redis/RedisConfig.java | 2 +- .../me/zhengjie/swagger2/SwaggerConfig.java | 2 +- .../me/zhengjie/utils/ElAdminConstant.java | 2 +- .../java/me/zhengjie/utils/EncryptUtils.java | 2 +- .../main/java/me/zhengjie/utils/FileUtil.java | 2 +- .../main/java/me/zhengjie/utils/PageUtil.java | 2 +- .../java/me/zhengjie/utils/QueryHelp.java | 5 +- .../java/me/zhengjie/utils/RequestHolder.java | 2 +- .../java/me/zhengjie/utils/SecurityUtils.java | 2 +- .../java/me/zhengjie/utils/ThrowableUtil.java | 2 +- .../me/zhengjie/utils/ValidationUtil.java | 2 +- .../java/me/zhengjie/domain/GenConfig.java | 2 +- .../me/zhengjie/domain/vo/ColumnInfo.java | 2 +- .../java/me/zhengjie/domain/vo/TableInfo.java | 2 +- .../repository/GenConfigRepository.java | 2 +- .../me/zhengjie/rest/GenConfigController.java | 2 +- .../me/zhengjie/rest/GeneratorController.java | 2 +- .../me/zhengjie/service/GenConfigService.java | 2 +- .../me/zhengjie/service/GeneratorService.java | 2 +- .../service/impl/GenConfigServiceImpl.java | 2 +- .../service/impl/GeneratorServiceImpl.java | 2 +- .../main/java/me/zhengjie/utils/ColUtil.java | 2 +- .../main/java/me/zhengjie/utils/GenUtil.java | 2 +- .../main/java/me/zhengjie/aop/log/Log.java | 2 +- .../java/me/zhengjie/aspect/LogAspect.java | 4 +- .../src/main/java/me/zhengjie/domain/Log.java | 4 +- .../me/zhengjie/repository/LogRepository.java | 2 +- .../java/me/zhengjie/rest/LogController.java | 2 +- .../java/me/zhengjie/service/LogService.java | 2 +- .../me/zhengjie/service/dto/LogErrorDTO.java | 2 +- .../service/dto/LogQueryCriteria.java | 2 +- .../me/zhengjie/service/dto/LogSmallDTO.java | 2 +- .../zhengjie/service/impl/LogServiceImpl.java | 2 +- .../service/mapper/LogErrorMapper.java | 2 +- .../service/mapper/LogSmallMapper.java | 2 +- eladmin-system/pom.xml | 14 +++++ .../src/main/java/me/zhengjie/AppRun.java | 2 +- .../me/zhengjie/config/ConfigurerAdapter.java | 2 +- .../java/me/zhengjie/config/DataScope.java | 2 +- .../monitor/config/VisitsInitialization.java | 2 +- .../modules/monitor/domain/Visits.java | 2 +- .../modules/monitor/domain/vo/RedisVo.java | 2 +- .../monitor/repository/VisitsRepository.java | 2 +- .../modules/monitor/rest/RedisController.java | 2 +- .../monitor/rest/VisitsController.java | 2 +- .../modules/monitor/service/RedisService.java | 22 ++++++-- .../monitor/service/VisitsService.java | 2 +- .../service/impl/RedisServiceImpl.java | 20 ++++++- .../service/impl/VisitsServiceImpl.java | 2 +- .../modules/quartz/config/JobRunner.java | 2 +- .../modules/quartz/domain/QuartzJob.java | 2 +- .../modules/quartz/domain/QuartzLog.java | 2 +- .../repository/QuartzJobRepository.java | 16 +----- .../repository/QuartzLogRepository.java | 2 +- .../quartz/rest/QuartzJobController.java | 2 +- .../quartz/service/QuartzJobService.java | 2 +- .../quartz/service/dto/JobQueryCriteria.java | 2 +- .../service/impl/QuartzJobServiceImpl.java | 2 +- .../modules/quartz/task/TestTask.java | 2 +- .../modules/quartz/task/VisitsTask.java | 2 +- .../modules/quartz/utils/QuartzManage.java | 2 +- .../security/config/SecurityConfig.java | 5 +- .../rest/AuthenticationController.java | 55 ++++++++++++++++++- .../security/security/AuthenticationInfo.java | 2 +- .../security/security/AuthorizationUser.java | 6 +- .../modules/security/security/ImgResult.java | 17 ++++++ .../modules/security/security/JwtUser.java | 2 +- .../service/JwtUserDetailsService.java | 11 ++-- .../zhengjie/modules/system/domain/Dept.java | 2 +- .../zhengjie/modules/system/domain/Dict.java | 2 +- .../modules/system/domain/DictDetail.java | 2 +- .../zhengjie/modules/system/domain/Job.java | 2 +- .../zhengjie/modules/system/domain/Menu.java | 2 +- .../modules/system/domain/Permission.java | 2 +- .../zhengjie/modules/system/domain/Role.java | 2 +- .../zhengjie/modules/system/domain/User.java | 2 +- .../modules/system/domain/vo/MenuMetaVo.java | 2 +- .../modules/system/domain/vo/MenuVo.java | 2 +- .../system/repository/DeptRepository.java | 2 +- .../repository/DictDetailRepository.java | 2 +- .../system/repository/DictRepository.java | 2 +- .../system/repository/JobRepository.java | 2 +- .../system/repository/MenuRepository.java | 2 +- .../repository/PermissionRepository.java | 2 +- .../system/repository/RoleRepository.java | 2 +- .../system/repository/UserRepository.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 | 2 +- .../system/rest/PermissionController.java | 2 +- .../modules/system/rest/RoleController.java | 2 +- .../modules/system/rest/UserController.java | 2 +- .../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 | 2 +- .../system/service/PermissionService.java | 2 +- .../modules/system/service/RoleService.java | 2 +- .../modules/system/service/UserService.java | 2 +- .../modules/system/service/dto/DeptDTO.java | 2 +- .../system/service/dto/DeptQueryCriteria.java | 2 +- .../system/service/dto/DeptSmallDTO.java | 22 ++++++++ .../modules/system/service/dto/DictDTO.java | 2 +- .../system/service/dto/DictDetailDTO.java | 2 +- .../service/dto/DictDetailQueryCriteria.java | 2 +- .../modules/system/service/dto/JobDTO.java | 2 +- .../system/service/dto/JobQueryCriteria.java | 2 +- .../system/service/dto/JobSmallDTO.java | 24 ++++++++ .../modules/system/service/dto/MenuDTO.java | 2 +- .../system/service/dto/PermissionDTO.java | 2 +- .../modules/system/service/dto/RoleDTO.java | 2 +- .../system/service/dto/RoleSmallDTO.java | 2 +- .../modules/system/service/dto/UserDTO.java | 6 +- .../system/service/dto/UserQueryCriteria.java | 2 +- .../system/service/impl/DeptServiceImpl.java | 2 +- .../service/impl/DictDetailServiceImpl.java | 2 +- .../system/service/impl/DictServiceImpl.java | 2 +- .../system/service/impl/JobServiceImpl.java | 2 +- .../service/impl/PermissionServiceImpl.java | 2 +- .../system/service/impl/RoleServiceImpl.java | 2 +- .../system/service/impl/UserServiceImpl.java | 2 +- .../system/service/mapper/DeptMapper.java | 2 +- .../service/mapper/DeptSmallMapper.java | 16 ++++++ .../service/mapper/DictDetailMapper.java | 2 +- .../system/service/mapper/DictMapper.java | 2 +- .../system/service/mapper/JobMapper.java | 2 +- .../system/service/mapper/JobSmallMapper.java | 16 ++++++ .../system/service/mapper/MenuMapper.java | 2 +- .../service/mapper/PermissionMapper.java | 2 +- .../system/service/mapper/RoleMapper.java | 2 +- .../service/mapper/RoleSmallMapper.java | 2 +- .../system/service/mapper/UserMapper.java | 2 +- .../java/me/zhengjie/domain/AlipayConfig.java | 2 +- .../java/me/zhengjie/domain/EmailConfig.java | 2 +- .../main/java/me/zhengjie/domain/Picture.java | 2 +- .../java/me/zhengjie/domain/QiniuConfig.java | 2 +- .../java/me/zhengjie/domain/QiniuContent.java | 2 +- .../me/zhengjie/domain/VerificationCode.java | 2 +- .../java/me/zhengjie/domain/vo/TradeVo.java | 2 +- .../zhengjie/repository/AlipayRepository.java | 2 +- .../zhengjie/repository/EmailRepository.java | 2 +- .../repository/PictureRepository.java | 2 +- .../repository/QiNiuConfigRepository.java | 2 +- .../repository/QiniuContentRepository.java | 2 +- .../VerificationCodeRepository.java | 2 +- .../me/zhengjie/rest/AliPayController.java | 2 +- .../rest/VerificationCodeController.java | 2 +- .../me/zhengjie/service/AlipayService.java | 2 +- .../me/zhengjie/service/EmailService.java | 2 +- .../me/zhengjie/service/PictureService.java | 2 +- .../me/zhengjie/service/QiNiuService.java | 2 +- .../service/VerificationCodeService.java | 2 +- .../service/dto/PictureQueryCriteria.java | 2 +- .../service/dto/QiniuQueryCriteria.java | 2 +- .../service/impl/AlipayServiceImpl.java | 2 +- .../service/impl/EmailServiceImpl.java | 2 +- .../service/impl/PictureServiceImpl.java | 2 +- .../service/impl/QiNiuServiceImpl.java | 2 +- .../impl/VerificationCodeServiceImpl.java | 2 +- .../java/me/zhengjie/utils/QiNiuUtil.java | 2 +- 172 files changed, 378 insertions(+), 200 deletions(-) create mode 100644 eladmin-system/src/main/java/me/zhengjie/modules/security/security/ImgResult.java create mode 100644 eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/DeptSmallDTO.java create mode 100644 eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/JobSmallDTO.java create mode 100644 eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/DeptSmallMapper.java create mode 100644 eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/JobSmallMapper.java diff --git a/README.md b/README.md index 9df373e5..bcb758ea 100644 --- a/README.md +++ b/README.md @@ -35,7 +35,6 @@ eladmin基于 Spring Boot 2.1.0 、 Jpa、 Spring Security、redis、Vue的前 - 操作日志：记录用户操作的日志 - 异常日志：记录异常日志，方便开发人员定位错误 - 系统缓存：使用jedis将缓存操作可视化，并提供对redis的基本操作，可根据需求自行扩展 -- 实时控制台：实时打印logback日志 - SQL监控：采用druid 监控数据库访问性能，默认用户名admin，密码123456 - 定时任务：整合Quartz做定时任务，加入任务日志，任务运行情况一目了然 - 代码生成：高灵活度一键生成前后端代码，减少百分之80左右的工作任务 @@ -71,10 +70,9 @@ eladmin基于 Spring Boot 2.1.0 、 Jpa、 Spring Security、redis、Vue的前 - - - + + diff --git a/eladmin-common/src/main/java/me/zhengjie/annotation/Query.java b/eladmin-common/src/main/java/me/zhengjie/annotation/Query.java index b9e670d8..c1a3160d 100644 --- a/eladmin-common/src/main/java/me/zhengjie/annotation/Query.java +++ b/eladmin-common/src/main/java/me/zhengjie/annotation/Query.java @@ -6,7 +6,7 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; /** - * @author jie + * @author Zheng Jie * @date 2019-6-4 13:52:30 */ @Target(ElementType.FIELD) @@ -49,7 +49,7 @@ public @interface Query { } /** - * @author jie + * @author Zheng Jie * 适用于简单连接查询，复杂的请自定义该注解，或者使用sql查询 */ enum Join { diff --git a/eladmin-common/src/main/java/me/zhengjie/aspect/LimitAspect.java b/eladmin-common/src/main/java/me/zhengjie/aspect/LimitAspect.java index 76e714b9..555774c7 100644 --- a/eladmin-common/src/main/java/me/zhengjie/aspect/LimitAspect.java +++ b/eladmin-common/src/main/java/me/zhengjie/aspect/LimitAspect.java @@ -39,7 +39,6 @@ public class LimitAspect { Method signatureMethod = signature.getMethod(); Limit limit = signatureMethod.getAnnotation(Limit.class); LimitType limitType = limit.limitType(); - String name = limit.name(); String key = limit.key(); if (StringUtils.isEmpty(key)) { switch (limitType) { diff --git a/eladmin-common/src/main/java/me/zhengjie/exception/BadRequestException.java b/eladmin-common/src/main/java/me/zhengjie/exception/BadRequestException.java index fda001e8..adef657a 100644 --- a/eladmin-common/src/main/java/me/zhengjie/exception/BadRequestException.java +++ b/eladmin-common/src/main/java/me/zhengjie/exception/BadRequestException.java @@ -6,7 +6,7 @@ import org.springframework.http.HttpStatus; import static org.springframework.http.HttpStatus.BAD_REQUEST; /** - * @author jie + * @author Zheng Jie * @date 2018-11-23 * 统一异常处理 */ diff --git a/eladmin-common/src/main/java/me/zhengjie/exception/EntityExistException.java b/eladmin-common/src/main/java/me/zhengjie/exception/EntityExistException.java index 2f086b6d..23417a72 100644 --- a/eladmin-common/src/main/java/me/zhengjie/exception/EntityExistException.java +++ b/eladmin-common/src/main/java/me/zhengjie/exception/EntityExistException.java @@ -7,7 +7,7 @@ import java.util.Map; import java.util.stream.IntStream; /** - * @author jie + * @author Zheng Jie * @date 2018-11-23 */ public class EntityExistException extends RuntimeException { diff --git a/eladmin-common/src/main/java/me/zhengjie/exception/EntityNotFoundException.java b/eladmin-common/src/main/java/me/zhengjie/exception/EntityNotFoundException.java index a7262288..31e1cbdf 100644 --- a/eladmin-common/src/main/java/me/zhengjie/exception/EntityNotFoundException.java +++ b/eladmin-common/src/main/java/me/zhengjie/exception/EntityNotFoundException.java @@ -7,7 +7,7 @@ import java.util.Map; import java.util.stream.IntStream; /** - * @author jie + * @author Zheng Jie * @date 2018-11-23 */ public class EntityNotFoundException extends RuntimeException { diff --git a/eladmin-common/src/main/java/me/zhengjie/exception/handler/ApiError.java b/eladmin-common/src/main/java/me/zhengjie/exception/handler/ApiError.java index 91861a3a..db43891e 100644 --- a/eladmin-common/src/main/java/me/zhengjie/exception/handler/ApiError.java +++ b/eladmin-common/src/main/java/me/zhengjie/exception/handler/ApiError.java @@ -6,7 +6,7 @@ import lombok.Data; import java.time.LocalDateTime; /** - * @author jie + * @author Zheng Jie * @date 2018-11-23 */ @Data diff --git a/eladmin-common/src/main/java/me/zhengjie/exception/handler/GlobalExceptionHandler.java b/eladmin-common/src/main/java/me/zhengjie/exception/handler/GlobalExceptionHandler.java index 65a4937a..5e58c784 100644 --- a/eladmin-common/src/main/java/me/zhengjie/exception/handler/GlobalExceptionHandler.java +++ b/eladmin-common/src/main/java/me/zhengjie/exception/handler/GlobalExceptionHandler.java @@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.RestControllerAdvice; import static org.springframework.http.HttpStatus.*; /** - * @author jie + * @author Zheng Jie * @date 2018-11-23 */ @Slf4j diff --git a/eladmin-common/src/main/java/me/zhengjie/mapper/EntityMapper.java b/eladmin-common/src/main/java/me/zhengjie/mapper/EntityMapper.java index d02840fa..98bc55db 100644 --- a/eladmin-common/src/main/java/me/zhengjie/mapper/EntityMapper.java +++ b/eladmin-common/src/main/java/me/zhengjie/mapper/EntityMapper.java @@ -3,7 +3,7 @@ package me.zhengjie.mapper; import java.util.List; /** - * @author jie + * @author Zheng Jie * @date 2018-11-23 */ public interface EntityMapper { diff --git a/eladmin-common/src/main/java/me/zhengjie/redis/RedisConfig.java b/eladmin-common/src/main/java/me/zhengjie/redis/RedisConfig.java index 2539c2aa..a9486165 100644 --- a/eladmin-common/src/main/java/me/zhengjie/redis/RedisConfig.java +++ b/eladmin-common/src/main/java/me/zhengjie/redis/RedisConfig.java @@ -22,7 +22,7 @@ import org.springframework.data.redis.serializer.RedisSerializationContext; import java.time.Duration; /** - * @author jie + * @author Zheng Jie * @date 2018-11-24 */ @Slf4j diff --git a/eladmin-common/src/main/java/me/zhengjie/swagger2/SwaggerConfig.java b/eladmin-common/src/main/java/me/zhengjie/swagger2/SwaggerConfig.java index d71c498c..85aa638a 100644 --- a/eladmin-common/src/main/java/me/zhengjie/swagger2/SwaggerConfig.java +++ b/eladmin-common/src/main/java/me/zhengjie/swagger2/SwaggerConfig.java @@ -18,7 +18,7 @@ import java.util.List; /** * api页面 /swagger-ui.html - * @author jie + * @author Zheng Jie * @date 2018-11-23 */ diff --git a/eladmin-common/src/main/java/me/zhengjie/utils/ElAdminConstant.java b/eladmin-common/src/main/java/me/zhengjie/utils/ElAdminConstant.java index 46fdd09a..21357221 100644 --- a/eladmin-common/src/main/java/me/zhengjie/utils/ElAdminConstant.java +++ b/eladmin-common/src/main/java/me/zhengjie/utils/ElAdminConstant.java @@ -2,7 +2,7 @@ package me.zhengjie.utils; /** * 常用静态常量 - * @author jie + * @author Zheng Jie * @date 2018-12-26 */ public class ElAdminConstant { diff --git a/eladmin-common/src/main/java/me/zhengjie/utils/EncryptUtils.java b/eladmin-common/src/main/java/me/zhengjie/utils/EncryptUtils.java index d0a45ea6..5bddf3a5 100644 --- a/eladmin-common/src/main/java/me/zhengjie/utils/EncryptUtils.java +++ b/eladmin-common/src/main/java/me/zhengjie/utils/EncryptUtils.java @@ -9,7 +9,7 @@ import javax.crypto.spec.IvParameterSpec; /** * 加密 - * @author jie + * @author Zheng Jie * @date 2018-11-23 */ public class EncryptUtils { diff --git a/eladmin-common/src/main/java/me/zhengjie/utils/FileUtil.java b/eladmin-common/src/main/java/me/zhengjie/utils/FileUtil.java index ec60f3d1..5d217e11 100644 --- a/eladmin-common/src/main/java/me/zhengjie/utils/FileUtil.java +++ b/eladmin-common/src/main/java/me/zhengjie/utils/FileUtil.java @@ -8,7 +8,7 @@ import java.text.DecimalFormat; /** * File工具类，扩展 hutool 工具包 - * @author jie + * @author Zheng Jie * @date 2018-12-27 */ public class FileUtil extends cn.hutool.core.io.FileUtil { diff --git a/eladmin-common/src/main/java/me/zhengjie/utils/PageUtil.java b/eladmin-common/src/main/java/me/zhengjie/utils/PageUtil.java index 511d1c23..7c4c7e70 100644 --- a/eladmin-common/src/main/java/me/zhengjie/utils/PageUtil.java +++ b/eladmin-common/src/main/java/me/zhengjie/utils/PageUtil.java @@ -8,7 +8,7 @@ import java.util.Map; /** * 分页工具 - * @author jie + * @author Zheng Jie * @date 2018-12-10 */ public class PageUtil extends cn.hutool.core.util.PageUtil { diff --git a/eladmin-common/src/main/java/me/zhengjie/utils/QueryHelp.java b/eladmin-common/src/main/java/me/zhengjie/utils/QueryHelp.java index ef1fc984..5fd841e3 100644 --- a/eladmin-common/src/main/java/me/zhengjie/utils/QueryHelp.java +++ b/eladmin-common/src/main/java/me/zhengjie/utils/QueryHelp.java @@ -9,7 +9,7 @@ import java.lang.reflect.Field; import java.util.*; /** - * @author jie + * @author Zheng Jie * @date 2019-6-4 14:59:48 */ @Slf4j @@ -97,12 +97,14 @@ public class QueryHelp { return cb.and(list.toArray(new Predicate[list.size()])); } + @SuppressWarnings("unchecked") private static Expression getExpression(String attributeName, Join join, Root root) { if (ObjectUtil.isNotEmpty(join)) { return join.get(attributeName); } else return root.get(attributeName); } + @SuppressWarnings("unchecked") public static boolean isBlank(final CharSequence cs) { int strLen; if (cs == null || (strLen = cs.length()) == 0) { @@ -116,6 +118,7 @@ public class QueryHelp { return true; } + @SuppressWarnings("unchecked") private static List getAllFields(Class clazz, List fields) { if (clazz != null) { fields.addAll(Arrays.asList(clazz.getDeclaredFields())); diff --git a/eladmin-common/src/main/java/me/zhengjie/utils/RequestHolder.java b/eladmin-common/src/main/java/me/zhengjie/utils/RequestHolder.java index df78c4a5..343b451b 100644 --- a/eladmin-common/src/main/java/me/zhengjie/utils/RequestHolder.java +++ b/eladmin-common/src/main/java/me/zhengjie/utils/RequestHolder.java @@ -6,7 +6,7 @@ import javax.servlet.http.HttpServletRequest; /** * 获取 HttpServletRequest - * @author jie + * @author Zheng Jie * @date 2018-11-24 */ public class RequestHolder { diff --git a/eladmin-common/src/main/java/me/zhengjie/utils/SecurityUtils.java b/eladmin-common/src/main/java/me/zhengjie/utils/SecurityUtils.java index 07c6e92a..e040c111 100644 --- a/eladmin-common/src/main/java/me/zhengjie/utils/SecurityUtils.java +++ b/eladmin-common/src/main/java/me/zhengjie/utils/SecurityUtils.java @@ -7,7 +7,7 @@ import org.springframework.security.core.userdetails.UserDetails; /** * 获取当前登录的用户 - * @author jie + * @author Zheng Jie * @date 2019-01-17 */ public class SecurityUtils { diff --git a/eladmin-common/src/main/java/me/zhengjie/utils/ThrowableUtil.java b/eladmin-common/src/main/java/me/zhengjie/utils/ThrowableUtil.java index aa9e427d..3725a1a1 100644 --- a/eladmin-common/src/main/java/me/zhengjie/utils/ThrowableUtil.java +++ b/eladmin-common/src/main/java/me/zhengjie/utils/ThrowableUtil.java @@ -5,7 +5,7 @@ import java.io.StringWriter; /** * 异常工具 - * @author jie + * @author Zheng Jie * @date 2019-01-06 */ public class ThrowableUtil { diff --git a/eladmin-common/src/main/java/me/zhengjie/utils/ValidationUtil.java b/eladmin-common/src/main/java/me/zhengjie/utils/ValidationUtil.java index 33e13bbe..fa8e7baf 100644 --- a/eladmin-common/src/main/java/me/zhengjie/utils/ValidationUtil.java +++ b/eladmin-common/src/main/java/me/zhengjie/utils/ValidationUtil.java @@ -5,7 +5,7 @@ import java.util.Optional; /** * 验证工具 - * @author jie + * @author Zheng Jie * @date 2018-11-23 */ public class ValidationUtil{ diff --git a/eladmin-generator/src/main/java/me/zhengjie/domain/GenConfig.java b/eladmin-generator/src/main/java/me/zhengjie/domain/GenConfig.java index 927d46fc..1f79a911 100644 --- a/eladmin-generator/src/main/java/me/zhengjie/domain/GenConfig.java +++ b/eladmin-generator/src/main/java/me/zhengjie/domain/GenConfig.java @@ -5,7 +5,7 @@ import javax.persistence.*; /** * 代码生成配置 - * @author jie + * @author Zheng Jie * @date 2019-01-03 */ @Data diff --git a/eladmin-generator/src/main/java/me/zhengjie/domain/vo/ColumnInfo.java b/eladmin-generator/src/main/java/me/zhengjie/domain/vo/ColumnInfo.java index e751cbaa..5a8475a2 100644 --- a/eladmin-generator/src/main/java/me/zhengjie/domain/vo/ColumnInfo.java +++ b/eladmin-generator/src/main/java/me/zhengjie/domain/vo/ColumnInfo.java @@ -6,7 +6,7 @@ import lombok.NoArgsConstructor; /** * 列的数据信息 - * @author jie + * @author Zheng Jie * @date 2019-01-02 */ @Data diff --git a/eladmin-generator/src/main/java/me/zhengjie/domain/vo/TableInfo.java b/eladmin-generator/src/main/java/me/zhengjie/domain/vo/TableInfo.java index d32fc508..46559dfd 100644 --- a/eladmin-generator/src/main/java/me/zhengjie/domain/vo/TableInfo.java +++ b/eladmin-generator/src/main/java/me/zhengjie/domain/vo/TableInfo.java @@ -6,7 +6,7 @@ import lombok.NoArgsConstructor; /** * 表的数据信息 - * @author jie + * @author Zheng Jie * @date 2019-01-02 */ @Data diff --git a/eladmin-generator/src/main/java/me/zhengjie/repository/GenConfigRepository.java b/eladmin-generator/src/main/java/me/zhengjie/repository/GenConfigRepository.java index f905a302..d72787d0 100644 --- a/eladmin-generator/src/main/java/me/zhengjie/repository/GenConfigRepository.java +++ b/eladmin-generator/src/main/java/me/zhengjie/repository/GenConfigRepository.java @@ -4,7 +4,7 @@ import me.zhengjie.domain.GenConfig; import org.springframework.data.jpa.repository.JpaRepository; /** - * @author jie + * @author Zheng Jie * @date 2019-01-14 */ public interface GenConfigRepository extends JpaRepository { diff --git a/eladmin-generator/src/main/java/me/zhengjie/rest/GenConfigController.java b/eladmin-generator/src/main/java/me/zhengjie/rest/GenConfigController.java index 3d2d15e1..19c092f8 100644 --- a/eladmin-generator/src/main/java/me/zhengjie/rest/GenConfigController.java +++ b/eladmin-generator/src/main/java/me/zhengjie/rest/GenConfigController.java @@ -9,7 +9,7 @@ import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; /** - * @author jie + * @author Zheng Jie * @date 2019-01-14 */ @RestController diff --git a/eladmin-generator/src/main/java/me/zhengjie/rest/GeneratorController.java b/eladmin-generator/src/main/java/me/zhengjie/rest/GeneratorController.java index ccc7dbd4..65158981 100644 --- a/eladmin-generator/src/main/java/me/zhengjie/rest/GeneratorController.java +++ b/eladmin-generator/src/main/java/me/zhengjie/rest/GeneratorController.java @@ -13,7 +13,7 @@ import org.springframework.web.bind.annotation.*; import java.util.List; /** - * @author jie + * @author Zheng Jie * @date 2019-01-02 */ @RestController diff --git a/eladmin-generator/src/main/java/me/zhengjie/service/GenConfigService.java b/eladmin-generator/src/main/java/me/zhengjie/service/GenConfigService.java index 52499d3b..14213617 100644 --- a/eladmin-generator/src/main/java/me/zhengjie/service/GenConfigService.java +++ b/eladmin-generator/src/main/java/me/zhengjie/service/GenConfigService.java @@ -7,7 +7,7 @@ import org.springframework.cache.annotation.CachePut; import org.springframework.cache.annotation.Cacheable; /** - * @author jie + * @author Zheng Jie * @date 2019-01-14 */ @CacheConfig(cacheNames = "genConfig") diff --git a/eladmin-generator/src/main/java/me/zhengjie/service/GeneratorService.java b/eladmin-generator/src/main/java/me/zhengjie/service/GeneratorService.java index f2158b08..8b9158a9 100644 --- a/eladmin-generator/src/main/java/me/zhengjie/service/GeneratorService.java +++ b/eladmin-generator/src/main/java/me/zhengjie/service/GeneratorService.java @@ -5,7 +5,7 @@ import me.zhengjie.domain.vo.ColumnInfo; import java.util.List; /** - * @author jie + * @author Zheng Jie * @date 2019-01-02 */ public interface GeneratorService { diff --git a/eladmin-generator/src/main/java/me/zhengjie/service/impl/GenConfigServiceImpl.java b/eladmin-generator/src/main/java/me/zhengjie/service/impl/GenConfigServiceImpl.java index a075dcdf..ec53052e 100644 --- a/eladmin-generator/src/main/java/me/zhengjie/service/impl/GenConfigServiceImpl.java +++ b/eladmin-generator/src/main/java/me/zhengjie/service/impl/GenConfigServiceImpl.java @@ -8,7 +8,7 @@ import org.springframework.stereotype.Service; import java.util.Optional; /** - * @author jie + * @author Zheng Jie * @date 2019-01-14 */ @Service diff --git a/eladmin-generator/src/main/java/me/zhengjie/service/impl/GeneratorServiceImpl.java b/eladmin-generator/src/main/java/me/zhengjie/service/impl/GeneratorServiceImpl.java index 846dac84..434e76b4 100644 --- a/eladmin-generator/src/main/java/me/zhengjie/service/impl/GeneratorServiceImpl.java +++ b/eladmin-generator/src/main/java/me/zhengjie/service/impl/GeneratorServiceImpl.java @@ -17,7 +17,7 @@ import java.util.ArrayList; import java.util.List; /** - * @author jie + * @author Zheng Jie * @date 2019-01-02 */ @Service diff --git a/eladmin-generator/src/main/java/me/zhengjie/utils/ColUtil.java b/eladmin-generator/src/main/java/me/zhengjie/utils/ColUtil.java index 7fefccbd..66026d94 100644 --- a/eladmin-generator/src/main/java/me/zhengjie/utils/ColUtil.java +++ b/eladmin-generator/src/main/java/me/zhengjie/utils/ColUtil.java @@ -5,7 +5,7 @@ import org.apache.commons.configuration.*; /** * sql字段转java * - * @author jie + * @author Zheng Jie * @date 2019-01-03 */ public class ColUtil { diff --git a/eladmin-generator/src/main/java/me/zhengjie/utils/GenUtil.java b/eladmin-generator/src/main/java/me/zhengjie/utils/GenUtil.java index b3aad8a0..45e7f306 100644 --- a/eladmin-generator/src/main/java/me/zhengjie/utils/GenUtil.java +++ b/eladmin-generator/src/main/java/me/zhengjie/utils/GenUtil.java @@ -18,7 +18,7 @@ import java.util.Map; /** * 代码生成 - * @author jie + * @author Zheng Jie * @date 2019-01-02 */ @Slf4j diff --git a/eladmin-logging/src/main/java/me/zhengjie/aop/log/Log.java b/eladmin-logging/src/main/java/me/zhengjie/aop/log/Log.java index 48e096d6..3b6f7e0a 100644 --- a/eladmin-logging/src/main/java/me/zhengjie/aop/log/Log.java +++ b/eladmin-logging/src/main/java/me/zhengjie/aop/log/Log.java @@ -6,7 +6,7 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; /** - * @author jie + * @author Zheng Jie * @date 2018-11-24 */ @Target(ElementType.METHOD) diff --git a/eladmin-logging/src/main/java/me/zhengjie/aspect/LogAspect.java b/eladmin-logging/src/main/java/me/zhengjie/aspect/LogAspect.java index f4015b86..1fbf7cfa 100644 --- a/eladmin-logging/src/main/java/me/zhengjie/aspect/LogAspect.java +++ b/eladmin-logging/src/main/java/me/zhengjie/aspect/LogAspect.java @@ -20,7 +20,7 @@ import org.springframework.stereotype.Component; import javax.servlet.http.HttpServletRequest; /** - * @author jie + * @author Zheng Jie * @date 2018-11-24 */ @Component @@ -65,7 +65,7 @@ public class LogAspect { @AfterThrowing(pointcut = "logPointcut()", throwing = "e") public void logAfterThrowing(JoinPoint joinPoint, Throwable e) { Log log = new Log("ERROR",System.currentTimeMillis() - currentTime); - log.setExceptionDetail(ThrowableUtil.getStackTrace(e)); + log.setExceptionDetail(ThrowableUtil.getStackTrace(e).getBytes()); logService.save(getUsername(), StringUtils.getIP(RequestHolder.getHttpServletRequest()), (ProceedingJoinPoint)joinPoint, log); } diff --git a/eladmin-logging/src/main/java/me/zhengjie/domain/Log.java b/eladmin-logging/src/main/java/me/zhengjie/domain/Log.java index e9ef6dea..33ed3cf1 100644 --- a/eladmin-logging/src/main/java/me/zhengjie/domain/Log.java +++ b/eladmin-logging/src/main/java/me/zhengjie/domain/Log.java @@ -8,7 +8,7 @@ import java.io.Serializable; import java.sql.Timestamp; /** - * @author jie + * @author Zheng Jie * @date 2018-11-24 */ @Entity @@ -63,7 +63,7 @@ public class Log implements Serializable { * 异常详细 */ @Column(name = "exception_detail", columnDefinition = "text") - private String exceptionDetail; + private byte[] exceptionDetail; /** * 创建日期 diff --git a/eladmin-logging/src/main/java/me/zhengjie/repository/LogRepository.java b/eladmin-logging/src/main/java/me/zhengjie/repository/LogRepository.java index 7d340107..1f190ae7 100644 --- a/eladmin-logging/src/main/java/me/zhengjie/repository/LogRepository.java +++ b/eladmin-logging/src/main/java/me/zhengjie/repository/LogRepository.java @@ -7,7 +7,7 @@ import org.springframework.data.jpa.repository.Query; import org.springframework.stereotype.Repository; /** - * @author jie + * @author Zheng Jie * @date 2018-11-24 */ @Repository diff --git a/eladmin-logging/src/main/java/me/zhengjie/rest/LogController.java b/eladmin-logging/src/main/java/me/zhengjie/rest/LogController.java index 046811cc..2b2f0876 100644 --- a/eladmin-logging/src/main/java/me/zhengjie/rest/LogController.java +++ b/eladmin-logging/src/main/java/me/zhengjie/rest/LogController.java @@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; /** - * @author jie + * @author Zheng Jie * @date 2018-11-24 */ @RestController diff --git a/eladmin-logging/src/main/java/me/zhengjie/service/LogService.java b/eladmin-logging/src/main/java/me/zhengjie/service/LogService.java index 61a35f41..fde7a6b3 100644 --- a/eladmin-logging/src/main/java/me/zhengjie/service/LogService.java +++ b/eladmin-logging/src/main/java/me/zhengjie/service/LogService.java @@ -7,7 +7,7 @@ import org.springframework.data.domain.Pageable; import org.springframework.scheduling.annotation.Async; /** - * @author jie + * @author Zheng Jie * @date 2018-11-24 */ public interface LogService { diff --git a/eladmin-logging/src/main/java/me/zhengjie/service/dto/LogErrorDTO.java b/eladmin-logging/src/main/java/me/zhengjie/service/dto/LogErrorDTO.java index 8cf95e6a..10711c5b 100644 --- a/eladmin-logging/src/main/java/me/zhengjie/service/dto/LogErrorDTO.java +++ b/eladmin-logging/src/main/java/me/zhengjie/service/dto/LogErrorDTO.java @@ -5,7 +5,7 @@ import java.io.Serializable; import java.sql.Timestamp; /** -* @author jie +* @author Zheng Jie * @date 2019-5-22 */ @Data diff --git a/eladmin-logging/src/main/java/me/zhengjie/service/dto/LogQueryCriteria.java b/eladmin-logging/src/main/java/me/zhengjie/service/dto/LogQueryCriteria.java index adde2c22..4d583995 100644 --- a/eladmin-logging/src/main/java/me/zhengjie/service/dto/LogQueryCriteria.java +++ b/eladmin-logging/src/main/java/me/zhengjie/service/dto/LogQueryCriteria.java @@ -5,7 +5,7 @@ import me.zhengjie.annotation.Query; /** * 日志查询类 - * @author jie + * @author Zheng Jie * @date 2019-6-4 09:23:07 */ @Data diff --git a/eladmin-logging/src/main/java/me/zhengjie/service/dto/LogSmallDTO.java b/eladmin-logging/src/main/java/me/zhengjie/service/dto/LogSmallDTO.java index b67b715f..7c92180b 100644 --- a/eladmin-logging/src/main/java/me/zhengjie/service/dto/LogSmallDTO.java +++ b/eladmin-logging/src/main/java/me/zhengjie/service/dto/LogSmallDTO.java @@ -6,7 +6,7 @@ import java.io.Serializable; import java.sql.Timestamp; /** - * @author jie + * @author Zheng Jie * @date 2019-5-22 */ @Data diff --git a/eladmin-logging/src/main/java/me/zhengjie/service/impl/LogServiceImpl.java b/eladmin-logging/src/main/java/me/zhengjie/service/impl/LogServiceImpl.java index bf9f0c45..d5d42971 100644 --- a/eladmin-logging/src/main/java/me/zhengjie/service/impl/LogServiceImpl.java +++ b/eladmin-logging/src/main/java/me/zhengjie/service/impl/LogServiceImpl.java @@ -21,7 +21,7 @@ import org.springframework.transaction.annotation.Transactional; import java.lang.reflect.Method; /** - * @author jie + * @author Zheng Jie * @date 2018-11-24 */ @Service diff --git a/eladmin-logging/src/main/java/me/zhengjie/service/mapper/LogErrorMapper.java b/eladmin-logging/src/main/java/me/zhengjie/service/mapper/LogErrorMapper.java index 202a073e..a2fc4b87 100644 --- a/eladmin-logging/src/main/java/me/zhengjie/service/mapper/LogErrorMapper.java +++ b/eladmin-logging/src/main/java/me/zhengjie/service/mapper/LogErrorMapper.java @@ -7,7 +7,7 @@ import org.mapstruct.Mapper; import org.mapstruct.ReportingPolicy; /** - * @author jie + * @author Zheng Jie * @date 2019-5-22 */ @Mapper(componentModel = "spring",uses = {},unmappedTargetPolicy = ReportingPolicy.IGNORE) diff --git a/eladmin-logging/src/main/java/me/zhengjie/service/mapper/LogSmallMapper.java b/eladmin-logging/src/main/java/me/zhengjie/service/mapper/LogSmallMapper.java index a92e8646..8c6d2c63 100644 --- a/eladmin-logging/src/main/java/me/zhengjie/service/mapper/LogSmallMapper.java +++ b/eladmin-logging/src/main/java/me/zhengjie/service/mapper/LogSmallMapper.java @@ -7,7 +7,7 @@ import org.mapstruct.Mapper; import org.mapstruct.ReportingPolicy; /** - * @author jie + * @author Zheng Jie * @date 2019-5-22 */ @Mapper(componentModel = "spring",uses = {},unmappedTargetPolicy = ReportingPolicy.IGNORE) diff --git a/eladmin-system/pom.xml b/eladmin-system/pom.xml index 208a3628..227c5859 100644 --- a/eladmin-system/pom.xml +++ b/eladmin-system/pom.xml @@ -15,8 +15,22 @@ 0.9.1 + + + jitpack.io + https://jitpack.io + + + + + + com.github.whvcse + EasyCaptcha + 1.5.0 + + me.zhengjie eladmin-generator diff --git a/eladmin-system/src/main/java/me/zhengjie/AppRun.java b/eladmin-system/src/main/java/me/zhengjie/AppRun.java index a009e115..1a14e9eb 100644 --- a/eladmin-system/src/main/java/me/zhengjie/AppRun.java +++ b/eladmin-system/src/main/java/me/zhengjie/AppRun.java @@ -8,7 +8,7 @@ import org.springframework.scheduling.annotation.EnableAsync; import org.springframework.transaction.annotation.EnableTransactionManagement; /** - * @author jie + * @author Zheng Jie * @date 2018/11/15 9:20:19 */ @EnableAsync diff --git a/eladmin-system/src/main/java/me/zhengjie/config/ConfigurerAdapter.java b/eladmin-system/src/main/java/me/zhengjie/config/ConfigurerAdapter.java index 2e79b5b2..24d0b831 100644 --- a/eladmin-system/src/main/java/me/zhengjie/config/ConfigurerAdapter.java +++ b/eladmin-system/src/main/java/me/zhengjie/config/ConfigurerAdapter.java @@ -18,7 +18,7 @@ import java.util.List; /** * WebMvcConfigurer * - * @author jie + * @author Zheng Jie * @date 2018-11-30 */ @Configuration diff --git a/eladmin-system/src/main/java/me/zhengjie/config/DataScope.java b/eladmin-system/src/main/java/me/zhengjie/config/DataScope.java index bca4a629..0ae0ff07 100644 --- a/eladmin-system/src/main/java/me/zhengjie/config/DataScope.java +++ b/eladmin-system/src/main/java/me/zhengjie/config/DataScope.java @@ -17,7 +17,7 @@ import java.util.Set; /** * 数据权限配置 - * @author jie + * @author Zheng Jie * @date 2019-4-1 */ @Component diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/monitor/config/VisitsInitialization.java b/eladmin-system/src/main/java/me/zhengjie/modules/monitor/config/VisitsInitialization.java index d356da20..f44d72ad 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/monitor/config/VisitsInitialization.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/monitor/config/VisitsInitialization.java @@ -8,7 +8,7 @@ import org.springframework.stereotype.Component; /** * 初始化站点统计 - * @author jie + * @author Zheng Jie */ @Component public class VisitsInitialization implements ApplicationRunner { diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/monitor/domain/Visits.java b/eladmin-system/src/main/java/me/zhengjie/modules/monitor/domain/Visits.java index e0dff08e..8784121d 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/monitor/domain/Visits.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/monitor/domain/Visits.java @@ -9,7 +9,7 @@ import java.sql.Timestamp; /** * pv 与 ip 统计 * - * @author jie + * @author Zheng Jie * @date 2018-12-13 */ @Entity diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/monitor/domain/vo/RedisVo.java b/eladmin-system/src/main/java/me/zhengjie/modules/monitor/domain/vo/RedisVo.java index 434607d4..019a92c0 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/monitor/domain/vo/RedisVo.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/monitor/domain/vo/RedisVo.java @@ -8,7 +8,7 @@ import javax.validation.constraints.NotBlank; import java.io.Serializable; /** - * @author jie + * @author Zheng Jie * @date 2018-12-10 */ @Data diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/monitor/repository/VisitsRepository.java b/eladmin-system/src/main/java/me/zhengjie/modules/monitor/repository/VisitsRepository.java index 4cf75261..7a41c8f9 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/monitor/repository/VisitsRepository.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/monitor/repository/VisitsRepository.java @@ -8,7 +8,7 @@ import org.springframework.stereotype.Repository; import java.util.List; /** - * @author jie + * @author Zheng Jie * @date 2018-12-13 */ @Repository diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/monitor/rest/RedisController.java b/eladmin-system/src/main/java/me/zhengjie/modules/monitor/rest/RedisController.java index ca52f3c8..f1cca13c 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/monitor/rest/RedisController.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/monitor/rest/RedisController.java @@ -12,7 +12,7 @@ import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; /** - * @author jie + * @author Zheng Jie * @date 2018-12-10 */ @RestController diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/monitor/rest/VisitsController.java b/eladmin-system/src/main/java/me/zhengjie/modules/monitor/rest/VisitsController.java index 9adb6227..bd73228f 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/monitor/rest/VisitsController.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/monitor/rest/VisitsController.java @@ -11,7 +11,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; /** - * @author jie + * @author Zheng Jie * @date 2018-12-13 */ @RestController diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/monitor/service/RedisService.java b/eladmin-system/src/main/java/me/zhengjie/modules/monitor/service/RedisService.java index b39570fc..c31d05c3 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/monitor/service/RedisService.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/monitor/service/RedisService.java @@ -6,7 +6,7 @@ import org.springframework.data.domain.Pageable; /** * 可自行扩展 - * @author jie + * @author Zheng Jie * @date 2018-12-10 */ public interface RedisService { @@ -16,16 +16,30 @@ public interface RedisService { * @param key * @return */ - public Page findByKey(String key, Pageable pageable); + Page findByKey(String key, Pageable pageable); + + /** + * 查询验证码的值 + * @param key + * @return + */ + String getCodeVal(String key); + + /** + * 保存验证码 + * @param key + * @param val + */ + void saveCode(String key, Object val); /** * delete * @param key */ - public void delete(String key); + void delete(String key); /** * 清空所有缓存 */ - public void flushdb(); + void flushdb(); } diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/monitor/service/VisitsService.java b/eladmin-system/src/main/java/me/zhengjie/modules/monitor/service/VisitsService.java index 4efd0ff3..2f80df2c 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/monitor/service/VisitsService.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/monitor/service/VisitsService.java @@ -5,7 +5,7 @@ import org.springframework.scheduling.annotation.Async; import javax.servlet.http.HttpServletRequest; /** - * @author jie + * @author Zheng Jie * @date 2018-12-13 */ public interface VisitsService { diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/monitor/service/impl/RedisServiceImpl.java b/eladmin-system/src/main/java/me/zhengjie/modules/monitor/service/impl/RedisServiceImpl.java index 929a72f9..e85294ae 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/monitor/service/impl/RedisServiceImpl.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/monitor/service/impl/RedisServiceImpl.java @@ -13,7 +13,7 @@ import java.util.ArrayList; import java.util.List; /** - * @author jie + * @author Zheng Jie * @date 2018-12-10 */ @Service @@ -23,7 +23,7 @@ public class RedisServiceImpl implements RedisService { RedisTemplate redisTemplate; @Override - public Page findByKey(String key, Pageable pageable){ + public Page findByKey(String key, Pageable pageable){ List redisVos = new ArrayList<>(); if(!key.equals("*")){ key = "*" + key + "*"; @@ -43,6 +43,8 @@ public class RedisServiceImpl implements RedisService { return page; } + + @Override public void delete(String key) { redisTemplate.delete(key); @@ -51,6 +53,20 @@ public class RedisServiceImpl implements RedisService { @Override public void flushdb() { redisTemplate.getConnectionFactory().getConnection().flushDb(); + } + @Override + public String getCodeVal(String key) { + try { + String value = redisTemplate.opsForValue().get(key).toString(); + return value; + }catch (Exception e){ + return ""; + } + } + + @Override + public void saveCode(String key, Object val) { + redisTemplate.opsForValue().set(key,val,2000); } } diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/monitor/service/impl/VisitsServiceImpl.java b/eladmin-system/src/main/java/me/zhengjie/modules/monitor/service/impl/VisitsServiceImpl.java index 6dc3bb99..fa00b02d 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/monitor/service/impl/VisitsServiceImpl.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/monitor/service/impl/VisitsServiceImpl.java @@ -18,7 +18,7 @@ import java.util.Map; import java.util.stream.Collectors; /** - * @author jie + * @author Zheng Jie * @date 2018-12-13 */ @Slf4j diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/quartz/config/JobRunner.java b/eladmin-system/src/main/java/me/zhengjie/modules/quartz/config/JobRunner.java index ccd2adc2..a66ec06e 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/quartz/config/JobRunner.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/quartz/config/JobRunner.java @@ -11,7 +11,7 @@ import org.springframework.stereotype.Component; import java.util.List; /** - * @author jie + * @author Zheng Jie * @date 2019-01-07 */ @Component diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/quartz/domain/QuartzJob.java b/eladmin-system/src/main/java/me/zhengjie/modules/quartz/domain/QuartzJob.java index 78a7c761..65692d07 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/quartz/domain/QuartzJob.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/quartz/domain/QuartzJob.java @@ -10,7 +10,7 @@ import java.io.Serializable; import java.sql.Timestamp; /** - * @author jie + * @author Zheng Jie * @date 2019-01-07 */ @Data diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/quartz/domain/QuartzLog.java b/eladmin-system/src/main/java/me/zhengjie/modules/quartz/domain/QuartzLog.java index c53eee1e..9bd347a6 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/quartz/domain/QuartzLog.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/quartz/domain/QuartzLog.java @@ -8,7 +8,7 @@ import java.io.Serializable; import java.sql.Timestamp; /** - * @author jie + * @author Zheng Jie * @date 2019-01-07 */ @Entity diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/quartz/repository/QuartzJobRepository.java b/eladmin-system/src/main/java/me/zhengjie/modules/quartz/repository/QuartzJobRepository.java index 901e20b8..087f0617 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/quartz/repository/QuartzJobRepository.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/quartz/repository/QuartzJobRepository.java @@ -3,28 +3,16 @@ package me.zhengjie.modules.quartz.repository; import me.zhengjie.modules.quartz.domain.QuartzJob; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaSpecificationExecutor; -import org.springframework.data.jpa.repository.Modifying; -import org.springframework.data.jpa.repository.Query; -import org.springframework.transaction.annotation.Transactional; import java.util.List; /** - * @author jie + * @author Zheng Jie * @date 2019-01-07 */ public interface QuartzJobRepository extends JpaRepository, JpaSpecificationExecutor { /** - * 更新状态 - * @param id - */ - @Transactional(rollbackFor = Exception.class) - @Modifying - @Query(value = "update quartz_job set is_pause = 1 where id = ?1",nativeQuery = true) - void updateIsPause(Long id); - - /** - * 查询不是启用的任务 + * 查询启用的任务 * @return */ List findByIsPauseIsFalse(); diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/quartz/repository/QuartzLogRepository.java b/eladmin-system/src/main/java/me/zhengjie/modules/quartz/repository/QuartzLogRepository.java index 6d412617..6b78d460 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/quartz/repository/QuartzLogRepository.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/quartz/repository/QuartzLogRepository.java @@ -5,7 +5,7 @@ import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaSpecificationExecutor; /** - * @author jie + * @author Zheng Jie * @date 2019-01-07 */ public interface QuartzLogRepository extends JpaRepository, JpaSpecificationExecutor { diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/quartz/rest/QuartzJobController.java b/eladmin-system/src/main/java/me/zhengjie/modules/quartz/rest/QuartzJobController.java index 017e116a..1a604930 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/quartz/rest/QuartzJobController.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/quartz/rest/QuartzJobController.java @@ -15,7 +15,7 @@ import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; /** - * @author jie + * @author Zheng Jie * @date 2019-01-07 */ @Slf4j diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/quartz/service/QuartzJobService.java b/eladmin-system/src/main/java/me/zhengjie/modules/quartz/service/QuartzJobService.java index 1ce70676..4acd76fb 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/quartz/service/QuartzJobService.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/quartz/service/QuartzJobService.java @@ -9,7 +9,7 @@ import org.springframework.cache.annotation.Cacheable; import org.springframework.data.domain.Pageable; /** - * @author jie + * @author Zheng Jie * @date 2019-01-07 */ @CacheConfig(cacheNames = "quartzJob") diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/quartz/service/dto/JobQueryCriteria.java b/eladmin-system/src/main/java/me/zhengjie/modules/quartz/service/dto/JobQueryCriteria.java index a5ecaa6a..182d8f7c 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/quartz/service/dto/JobQueryCriteria.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/quartz/service/dto/JobQueryCriteria.java @@ -4,7 +4,7 @@ import lombok.Data; import me.zhengjie.annotation.Query; /** - * @author jie + * @author Zheng Jie * @date 2019-6-4 10:33:02 */ @Data diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/quartz/service/impl/QuartzJobServiceImpl.java b/eladmin-system/src/main/java/me/zhengjie/modules/quartz/service/impl/QuartzJobServiceImpl.java index d7479d8e..b0681e06 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/quartz/service/impl/QuartzJobServiceImpl.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/quartz/service/impl/QuartzJobServiceImpl.java @@ -19,7 +19,7 @@ import org.springframework.transaction.annotation.Transactional; import java.util.Optional; /** - * @author jie + * @author Zheng Jie * @date 2019-01-07 */ @Service(value = "quartzJobService") diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/quartz/task/TestTask.java b/eladmin-system/src/main/java/me/zhengjie/modules/quartz/task/TestTask.java index 4a0ba905..757703bb 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/quartz/task/TestTask.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/quartz/task/TestTask.java @@ -5,7 +5,7 @@ import org.springframework.stereotype.Component; /** * 测试用 - * @author jie + * @author Zheng Jie * @date 2019-01-08 */ @Slf4j diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/quartz/task/VisitsTask.java b/eladmin-system/src/main/java/me/zhengjie/modules/quartz/task/VisitsTask.java index f04d6fe5..01e238e2 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/quartz/task/VisitsTask.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/quartz/task/VisitsTask.java @@ -5,7 +5,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; /** - * @author jie + * @author Zheng Jie * @date 2018-12-25 */ @Component diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/quartz/utils/QuartzManage.java b/eladmin-system/src/main/java/me/zhengjie/modules/quartz/utils/QuartzManage.java index 97b68e7a..c6786515 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/quartz/utils/QuartzManage.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/quartz/utils/QuartzManage.java @@ -11,7 +11,7 @@ import java.util.Date; import static org.quartz.TriggerBuilder.newTrigger; /** - * @author jie + * @author Zheng Jie * @date 2019-01-07 */ @Slf4j diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/security/config/SecurityConfig.java b/eladmin-system/src/main/java/me/zhengjie/modules/security/config/SecurityConfig.java index 2fe42d67..d7f006c1 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/security/config/SecurityConfig.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/security/config/SecurityConfig.java @@ -92,14 +92,11 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter { ).anonymous() .antMatchers( HttpMethod.POST,"/auth/"+loginPath).anonymous() - .antMatchers("/websocket/**").anonymous() + .antMatchers("/auth/vCode").anonymous() // 支付宝回调 .antMatchers("/api/aliPay/return").anonymous() .antMatchers("/api/aliPay/notify").anonymous() - // 系统监控 - .antMatchers("/actuator/**").anonymous() - // swagger start .antMatchers("/swagger-ui.html").anonymous() .antMatchers("/swagger-resources/**").anonymous() diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/security/rest/AuthenticationController.java b/eladmin-system/src/main/java/me/zhengjie/modules/security/rest/AuthenticationController.java index 19de5ddf..bca95fc9 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/security/rest/AuthenticationController.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/security/rest/AuthenticationController.java @@ -1,13 +1,21 @@ package me.zhengjie.modules.security.rest; +import cn.hutool.core.codec.Base64; +import cn.hutool.core.util.IdUtil; +import com.wf.captcha.Captcha; +import com.wf.captcha.SpecCaptcha; import lombok.extern.slf4j.Slf4j; import me.zhengjie.aop.log.Log; +import me.zhengjie.exception.BadRequestException; +import me.zhengjie.modules.monitor.service.RedisService; import me.zhengjie.modules.security.security.AuthenticationInfo; import me.zhengjie.modules.security.security.AuthorizationUser; +import me.zhengjie.modules.security.security.ImgResult; import me.zhengjie.modules.security.security.JwtUser; import me.zhengjie.utils.EncryptUtils; import me.zhengjie.modules.security.utils.JwtTokenUtil; import me.zhengjie.utils.SecurityUtils; +import me.zhengjie.utils.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.beans.factory.annotation.Value; @@ -16,9 +24,12 @@ import org.springframework.security.authentication.AccountExpiredException; import org.springframework.security.core.userdetails.UserDetailsService; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletResponse; +import java.io.ByteArrayOutputStream; +import java.io.IOException; /** - * @author jie + * @author Zheng Jie * @date 2018-11-23 * 授权、根据token获取用户详细信息 */ @@ -33,6 +44,9 @@ public class AuthenticationController { @Autowired private JwtTokenUtil jwtTokenUtil; + @Autowired + private RedisService redisService; + @Autowired @Qualifier("jwtUserDetailsService") private UserDetailsService userDetailsService; @@ -46,6 +60,16 @@ public class AuthenticationController { @PostMapping(value = "${jwt.auth.path}") public ResponseEntity login(@Validated @RequestBody AuthorizationUser authorizationUser){ + // 查询验证码 + String code = redisService.getCodeVal(authorizationUser.getUuid()); + // 清除验证码 + redisService.delete(authorizationUser.getUuid()); + if (StringUtils.isBlank(code)) { + throw new BadRequestException("验证码已过期"); + } + if (StringUtils.isBlank(authorizationUser.getCode()) || !authorizationUser.getCode().equalsIgnoreCase(code)) { + throw new BadRequestException("验证码错误"); + } final JwtUser jwtUser = (JwtUser) userDetailsService.loadUserByUsername(authorizationUser.getUsername()); if(!jwtUser.getPassword().equals(EncryptUtils.encryptPassword(authorizationUser.getPassword()))){ @@ -72,4 +96,33 @@ public class AuthenticationController { JwtUser jwtUser = (JwtUser)userDetailsService.loadUserByUsername(SecurityUtils.getUsername()); return ResponseEntity.ok(jwtUser); } + + /** + * 获取验证码 + */ + @GetMapping(value = "vCode") + public ImgResult getCode(HttpServletResponse response) throws IOException { + // 三个参数分别为宽、高、位数 + SpecCaptcha specCaptcha = new SpecCaptcha(105, 33, 4); + + // 设置类型，纯数字、纯字母、字母数字混合 + specCaptcha.setCharType(Captcha.TYPE_DEFAULT); + + // 生成的验证码 + String code = specCaptcha.text(); + + String uuid = IdUtil.simpleUUID(); + redisService.saveCode(uuid,code); + response.addHeader("codeUuid",uuid); + ByteArrayOutputStream stream = new ByteArrayOutputStream(); + try { + specCaptcha.out(stream); + return new ImgResult(Base64.encode(stream.toByteArray()),uuid); + } catch (Exception e) { + e.printStackTrace(); + return null; + } finally { + stream.close(); + } + } } diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/security/security/AuthenticationInfo.java b/eladmin-system/src/main/java/me/zhengjie/modules/security/security/AuthenticationInfo.java index 399590fe..65fa7232 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/security/security/AuthenticationInfo.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/security/security/AuthenticationInfo.java @@ -5,7 +5,7 @@ import lombok.Getter; import java.io.Serializable; /** - * @author jie + * @author Zheng Jie * @date 2018-11-23 * 返回token */ diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/security/security/AuthorizationUser.java b/eladmin-system/src/main/java/me/zhengjie/modules/security/security/AuthorizationUser.java index ca449f54..1b93aca5 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/security/security/AuthorizationUser.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/security/security/AuthorizationUser.java @@ -6,7 +6,7 @@ import lombok.Setter; import javax.validation.constraints.NotBlank; /** - * @author jie + * @author Zheng Jie * @date 2018-11-30 */ @Getter @@ -19,6 +19,10 @@ public class AuthorizationUser { @NotBlank private String password; + private String code; + + private String uuid = ""; + @Override public String toString() { return "{username=" + username + ", password= ******}"; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/security/security/ImgResult.java b/eladmin-system/src/main/java/me/zhengjie/modules/security/security/ImgResult.java new file mode 100644 index 00000000..488ff9e7 --- /dev/null +++ b/eladmin-system/src/main/java/me/zhengjie/modules/security/security/ImgResult.java @@ -0,0 +1,17 @@ +package me.zhengjie.modules.security.security; + +import lombok.AllArgsConstructor; +import lombok.Data; + +/** + * @author Zheng Jie + * @date 2019-6-5 17:29:57 + */ +@Data +@AllArgsConstructor +public class ImgResult { + + private String img; + + private String uuid; +} diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/security/security/JwtUser.java b/eladmin-system/src/main/java/me/zhengjie/modules/security/security/JwtUser.java index 303f4b34..bc39e9a1 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/security/security/JwtUser.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/security/security/JwtUser.java @@ -11,7 +11,7 @@ import java.util.Date; import java.util.stream.Collectors; /** - * @author jie + * @author Zheng Jie * @date 2018-11-23 */ @Getter diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/security/service/JwtUserDetailsService.java b/eladmin-system/src/main/java/me/zhengjie/modules/security/service/JwtUserDetailsService.java index 30d8c699..91239a04 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/security/service/JwtUserDetailsService.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/security/service/JwtUserDetailsService.java @@ -1,12 +1,9 @@ package me.zhengjie.modules.security.service; import me.zhengjie.exception.BadRequestException; -import me.zhengjie.modules.system.domain.*; import me.zhengjie.modules.security.security.JwtUser; import me.zhengjie.modules.system.service.UserService; -import me.zhengjie.modules.system.service.dto.DeptDTO; -import me.zhengjie.modules.system.service.dto.JobDTO; -import me.zhengjie.modules.system.service.dto.UserDTO; +import me.zhengjie.modules.system.service.dto.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.core.userdetails.UserDetails; import org.springframework.security.core.userdetails.UserDetailsService; @@ -16,7 +13,7 @@ import org.springframework.transaction.annotation.Transactional; import java.util.Optional; /** - * @author jie + * @author Zheng Jie * @date 2018-11-22 */ @Service @@ -48,8 +45,8 @@ public class JwtUserDetailsService implements UserDetailsService { user.getAvatar(), user.getEmail(), user.getPhone(), - Optional.ofNullable(user.getDept()).map(DeptDTO::getName).orElse(null), - Optional.ofNullable(user.getJob()).map(JobDTO::getName).orElse(null), + Optional.ofNullable(user.getDept()).map(DeptSmallDTO::getName).orElse(null), + Optional.ofNullable(user.getJob()).map(JobSmallDTO::getName).orElse(null), permissionService.mapToGrantedAuthorities(user), user.getEnabled(), user.getCreateTime(), diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/Dept.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/Dept.java index 60d38d45..5fe611c8 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/Dept.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/Dept.java @@ -11,7 +11,7 @@ import java.io.Serializable; import java.util.Set; /** -* @author jie +* @author Zheng Jie * @date 2019-03-25 */ @Entity diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/Dict.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/Dict.java index 391d55aa..782a01fe 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/Dict.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/Dict.java @@ -10,7 +10,7 @@ import java.util.List; import java.util.Set; /** -* @author jie +* @author Zheng Jie * @date 2019-04-10 */ @Entity diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/DictDetail.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/DictDetail.java index 7c7d96ca..a3799a31 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/DictDetail.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/DictDetail.java @@ -6,7 +6,7 @@ import javax.validation.constraints.NotNull; import java.io.Serializable; /** -* @author jie +* @author Zheng Jie * @date 2019-04-10 */ @Entity diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/Job.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/Job.java index c4850b58..58f3fd95 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/Job.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/Job.java @@ -11,7 +11,7 @@ import java.sql.Timestamp; import java.io.Serializable; /** -* @author jie +* @author Zheng Jie * @date 2019-03-29 */ @Entity diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/Menu.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/Menu.java index daab02f9..082edba1 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/Menu.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/Menu.java @@ -12,7 +12,7 @@ import java.sql.Timestamp; import java.util.Set; /** - * @author jie + * @author Zheng Jie * @date 2018-12-17 */ @Entity diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/Permission.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/Permission.java index 0be5a892..69272186 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/Permission.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/Permission.java @@ -12,7 +12,7 @@ import java.sql.Timestamp; import java.util.Set; /** - * @author jie + * @author Zheng Jie * @date 2018-12-03 */ @Entity diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/Role.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/Role.java index 56f363bd..6a8846f7 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/Role.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/Role.java @@ -15,7 +15,7 @@ import java.util.Set; /** * 角色 - * @author jie + * @author Zheng Jie * @date 2018-11-22 */ @Entity diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/User.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/User.java index bd686c6e..b728e285 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/User.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/User.java @@ -15,7 +15,7 @@ import java.util.Date; import java.util.Set; /** - * @author jie + * @author Zheng Jie * @date 2018-11-22 */ @Entity diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/vo/MenuMetaVo.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/vo/MenuMetaVo.java index 4c012f96..d6fc9ddd 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/vo/MenuMetaVo.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/vo/MenuMetaVo.java @@ -5,7 +5,7 @@ import lombok.Data; import java.io.Serializable; /** - * @author jie + * @author Zheng Jie * @date 2018-12-20 */ @Data diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/vo/MenuVo.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/vo/MenuVo.java index 1e7f80ac..ea0610ba 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/vo/MenuVo.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/vo/MenuVo.java @@ -8,7 +8,7 @@ import java.util.List; /** * 构建前端路由时用到 - * @author jie + * @author Zheng Jie * @date 2018-12-20 */ @Data diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/repository/DeptRepository.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/repository/DeptRepository.java index 084dd0bb..12feee12 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/repository/DeptRepository.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/repository/DeptRepository.java @@ -9,7 +9,7 @@ import java.util.List; import java.util.Set; /** -* @author jie +* @author Zheng Jie * @date 2019-03-25 */ public interface DeptRepository extends JpaRepository, JpaSpecificationExecutor { diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/repository/DictDetailRepository.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/repository/DictDetailRepository.java index 1dda5787..6a8a036f 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/repository/DictDetailRepository.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/repository/DictDetailRepository.java @@ -5,7 +5,7 @@ import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaSpecificationExecutor; /** -* @author jie +* @author Zheng Jie * @date 2019-04-10 */ public interface DictDetailRepository extends JpaRepository, JpaSpecificationExecutor { diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/repository/DictRepository.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/repository/DictRepository.java index 16cb946a..699f130b 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/repository/DictRepository.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/repository/DictRepository.java @@ -5,7 +5,7 @@ import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaSpecificationExecutor; /** -* @author jie +* @author Zheng Jie * @date 2019-04-10 */ public interface DictRepository extends JpaRepository, JpaSpecificationExecutor { diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/repository/JobRepository.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/repository/JobRepository.java index d0af61be..38908a28 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/repository/JobRepository.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/repository/JobRepository.java @@ -5,7 +5,7 @@ import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaSpecificationExecutor; /** -* @author jie +* @author Zheng Jie * @date 2019-03-29 */ public interface JobRepository extends JpaRepository, JpaSpecificationExecutor { diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/repository/MenuRepository.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/repository/MenuRepository.java index 86d25563..220ca061 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/repository/MenuRepository.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/repository/MenuRepository.java @@ -11,7 +11,7 @@ import java.util.List; import java.util.Set; /** - * @author jie + * @author Zheng Jie * @date 2018-12-17 */ public interface MenuRepository extends JpaRepository, JpaSpecificationExecutor { diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/repository/PermissionRepository.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/repository/PermissionRepository.java index bb5ba0ef..3d586fcd 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/repository/PermissionRepository.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/repository/PermissionRepository.java @@ -10,7 +10,7 @@ import java.util.List; import java.util.Set; /** - * @author jie + * @author Zheng Jie * @date 2018-12-03 */ public interface PermissionRepository extends JpaRepository, JpaSpecificationExecutor { diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/repository/RoleRepository.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/repository/RoleRepository.java index 646db5e0..1cd840b7 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/repository/RoleRepository.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/repository/RoleRepository.java @@ -7,7 +7,7 @@ import org.springframework.data.jpa.repository.JpaSpecificationExecutor; import java.util.Set; /** - * @author jie + * @author Zheng Jie * @date 2018-12-03 */ public interface RoleRepository extends JpaRepository, JpaSpecificationExecutor { diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/repository/UserRepository.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/repository/UserRepository.java index f666afa6..6ccf3fdb 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/repository/UserRepository.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/repository/UserRepository.java @@ -12,7 +12,7 @@ import java.util.Date; import java.util.List; /** - * @author jie + * @author Zheng Jie * @date 2018-11-22 */ public interface UserRepository extends JpaRepository, JpaSpecificationExecutor { diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/DeptController.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/DeptController.java index 81862e3c..39d90436 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/DeptController.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/DeptController.java @@ -16,7 +16,7 @@ import org.springframework.web.bind.annotation.*; import java.util.List; /** -* @author jie +* @author Zheng Jie * @date 2019-03-25 */ @RestController diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/DictController.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/DictController.java index 195e989f..437392e7 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/DictController.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/DictController.java @@ -14,7 +14,7 @@ import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; /** -* @author jie +* @author Zheng Jie * @date 2019-04-10 */ @RestController diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/DictDetailController.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/DictDetailController.java index 37a27cd9..0b775e8c 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/DictDetailController.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/DictDetailController.java @@ -16,7 +16,7 @@ import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; /** -* @author jie +* @author Zheng Jie * @date 2019-04-10 */ @RestController diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/JobController.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/JobController.java index cb34a6c7..76d94886 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/JobController.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/JobController.java @@ -17,7 +17,7 @@ import org.springframework.web.bind.annotation.*; import java.util.Set; /** -* @author jie +* @author Zheng Jie * @date 2019-03-29 */ @RestController diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/MenuController.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/MenuController.java index 4ab779c2..dca2c700 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/MenuController.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/MenuController.java @@ -19,7 +19,7 @@ import org.springframework.web.bind.annotation.*; import java.util.List; /** - * @author jie + * @author Zheng Jie * @date 2018-12-03 */ @RestController diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/PermissionController.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/PermissionController.java index d55065b6..3cb805a3 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/PermissionController.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/PermissionController.java @@ -16,7 +16,7 @@ import org.springframework.web.bind.annotation.*; import java.util.List; /** - * @author jie + * @author Zheng Jie * @date 2018-12-03 */ @RestController diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/RoleController.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/RoleController.java index 4a061053..8c1d2793 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/RoleController.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/RoleController.java @@ -22,7 +22,7 @@ import java.util.List; import java.util.stream.Collectors; /** - * @author jie + * @author Zheng Jie * @date 2018-12-03 */ @RestController diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/UserController.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/UserController.java index 61c4aed0..6bc4337b 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/UserController.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/UserController.java @@ -29,7 +29,7 @@ import java.util.*; import java.util.stream.Collectors; /** - * @author jie + * @author Zheng Jie * @date 2018-11-23 */ @RestController diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/DeptService.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/DeptService.java index 6301346d..4ed093fb 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/DeptService.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/DeptService.java @@ -11,7 +11,7 @@ import java.util.List; import java.util.Set; /** -* @author jie +* @author Zheng Jie * @date 2019-03-25 */ @CacheConfig(cacheNames = "dept") diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/DictDetailService.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/DictDetailService.java index ca52dd9d..6c4d3dcd 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/DictDetailService.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/DictDetailService.java @@ -9,7 +9,7 @@ import org.springframework.cache.annotation.Cacheable; import org.springframework.data.domain.Pageable; /** -* @author jie +* @author Zheng Jie * @date 2019-04-10 */ @CacheConfig(cacheNames = "dictDetail") diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/DictService.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/DictService.java index ea50319f..32557370 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/DictService.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/DictService.java @@ -8,7 +8,7 @@ import org.springframework.cache.annotation.Cacheable; import org.springframework.data.domain.Pageable; /** -* @author jie +* @author Zheng Jie * @date 2019-04-10 */ @CacheConfig(cacheNames = "dict") diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/JobService.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/JobService.java index 27fe6665..ecd92a04 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/JobService.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/JobService.java @@ -9,7 +9,7 @@ import org.springframework.cache.annotation.Cacheable; import org.springframework.data.domain.Pageable; /** -* @author jie +* @author Zheng Jie * @date 2019-03-29 */ @CacheConfig(cacheNames = "job") diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/MenuService.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/MenuService.java index 871cc772..b4d4f8b1 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/MenuService.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/MenuService.java @@ -13,7 +13,7 @@ import java.util.Map; import java.util.Set; /** - * @author jie + * @author Zheng Jie * @date 2018-12-17 */ @CacheConfig(cacheNames = "menu") diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/PermissionService.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/PermissionService.java index 790a3079..d01e6691 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/PermissionService.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/PermissionService.java @@ -11,7 +11,7 @@ import java.util.Collection; import java.util.List; /** - * @author jie + * @author Zheng Jie * @date 2018-12-08 */ @CacheConfig(cacheNames = "permission") diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/RoleService.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/RoleService.java index f2f35042..36722e8b 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/RoleService.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/RoleService.java @@ -14,7 +14,7 @@ import java.util.List; import java.util.Set; /** - * @author jie + * @author Zheng Jie * @date 2018-12-03 */ @CacheConfig(cacheNames = "role") diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/UserService.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/UserService.java index 5e57890e..5fe40b5f 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/UserService.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/UserService.java @@ -10,7 +10,7 @@ import org.springframework.cache.annotation.Cacheable; import org.springframework.data.domain.Pageable; /** - * @author jie + * @author Zheng Jie * @date 2018-11-23 */ @CacheConfig(cacheNames = "user") diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/DeptDTO.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/DeptDTO.java index f1032f75..47e808ee 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/DeptDTO.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/DeptDTO.java @@ -9,7 +9,7 @@ import java.io.Serializable; import java.util.List; /** -* @author jie +* @author Zheng Jie * @date 2019-03-25 */ @Data diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/DeptQueryCriteria.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/DeptQueryCriteria.java index e5c6c27e..bb5000eb 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/DeptQueryCriteria.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/DeptQueryCriteria.java @@ -5,7 +5,7 @@ import me.zhengjie.annotation.Query; import java.util.Set; /** -* @author jie +* @author Zheng Jie * @date 2019-03-25 */ @Data diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/DeptSmallDTO.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/DeptSmallDTO.java new file mode 100644 index 00000000..10620264 --- /dev/null +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/DeptSmallDTO.java @@ -0,0 +1,22 @@ +package me.zhengjie.modules.system.service.dto; + +import lombok.Data; +import java.io.Serializable; + +/** +* @author Zheng Jie +* @date 2019-6-10 16:32:18 +*/ +@Data +public class DeptSmallDTO implements Serializable { + + /** + * ID + */ + private Long id; + + /** + * 名称 + */ + private String name; +} \ No newline at end of file diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/DictDTO.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/DictDTO.java index f841b5ef..ce30039d 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/DictDTO.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/DictDTO.java @@ -6,7 +6,7 @@ import me.zhengjie.annotation.Query; import java.io.Serializable; /** -* @author jie +* @author Zheng Jie * @date 2019-04-10 */ @Data diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/DictDetailDTO.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/DictDetailDTO.java index b575344b..bf2bb433 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/DictDetailDTO.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/DictDetailDTO.java @@ -4,7 +4,7 @@ import lombok.Data; import java.io.Serializable; /** -* @author jie +* @author Zheng Jie * @date 2019-04-10 */ @Data diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/DictDetailQueryCriteria.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/DictDetailQueryCriteria.java index ebf7df75..4678d8a9 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/DictDetailQueryCriteria.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/DictDetailQueryCriteria.java @@ -4,7 +4,7 @@ import lombok.Data; import me.zhengjie.annotation.Query; /** -* @author jie +* @author Zheng Jie * @date 2019-04-10 */ @Data diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/JobDTO.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/JobDTO.java index f3c83ab3..d61c5ee5 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/JobDTO.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/JobDTO.java @@ -9,7 +9,7 @@ import java.sql.Timestamp; import java.io.Serializable; /** -* @author jie +* @author Zheng Jie * @date 2019-03-29 */ @Data diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/JobQueryCriteria.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/JobQueryCriteria.java index 92b3d71b..8d535fb5 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/JobQueryCriteria.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/JobQueryCriteria.java @@ -9,7 +9,7 @@ import java.sql.Timestamp; import java.util.Set; /** -* @author jie +* @author Zheng Jie * @date 2019-6-4 14:49:34 */ @Data diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/JobSmallDTO.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/JobSmallDTO.java new file mode 100644 index 00000000..2a364547 --- /dev/null +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/JobSmallDTO.java @@ -0,0 +1,24 @@ +package me.zhengjie.modules.system.service.dto; + +import lombok.Data; +import lombok.NoArgsConstructor; +import java.io.Serializable; + +/** +* @author Zheng Jie +* @date 2019-6-10 16:32:18 +*/ +@Data +@NoArgsConstructor +public class JobSmallDTO implements Serializable { + + /** + * ID + */ + private Long id; + + /** + * 名称 + */ + private String name; +} \ No newline at end of file diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/MenuDTO.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/MenuDTO.java index 045ff6da..9dd8bd61 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/MenuDTO.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/MenuDTO.java @@ -7,7 +7,7 @@ import java.util.List; import java.util.Set; /** - * @author jie + * @author Zheng Jie * @date 2018-12-17 */ @Data diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/PermissionDTO.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/PermissionDTO.java index 9fb74848..3ae4eb6a 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/PermissionDTO.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/PermissionDTO.java @@ -7,7 +7,7 @@ import java.sql.Timestamp; import java.util.List; /** - * @author jie + * @author Zheng Jie * @date 2018-12-03 */ @Data diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/RoleDTO.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/RoleDTO.java index 6055eb73..c6d68073 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/RoleDTO.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/RoleDTO.java @@ -6,7 +6,7 @@ import java.sql.Timestamp; import java.util.Set; /** - * @author jie + * @author Zheng Jie * @date 2018-11-23 */ @Data diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/RoleSmallDTO.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/RoleSmallDTO.java index c522da98..7e9d9fc1 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/RoleSmallDTO.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/RoleSmallDTO.java @@ -7,7 +7,7 @@ import java.sql.Timestamp; import java.util.Set; /** - * @author jie + * @author Zheng Jie * @date 2018-11-23 */ @Data diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/UserDTO.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/UserDTO.java index 4178bd62..3065471b 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/UserDTO.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/UserDTO.java @@ -9,7 +9,7 @@ import java.util.Date; import java.util.Set; /** - * @author jie + * @author Zheng Jie * @date 2018-11-23 */ @Data @@ -39,9 +39,9 @@ public class UserDTO implements Serializable { private Set roles; @ApiModelProperty(hidden = true) - private JobDTO job; + private JobSmallDTO job; - private DeptDTO dept; + private DeptSmallDTO dept; private Long deptId; } diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/UserQueryCriteria.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/UserQueryCriteria.java index 351012ef..a0b6c168 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/UserQueryCriteria.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/UserQueryCriteria.java @@ -6,7 +6,7 @@ import java.io.Serializable; import java.util.Set; /** - * @author jie + * @author Zheng Jie * @date 2018-11-23 */ @Data diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/DeptServiceImpl.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/DeptServiceImpl.java index 24726e45..3113e39e 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/DeptServiceImpl.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/DeptServiceImpl.java @@ -18,7 +18,7 @@ import java.util.*; import java.util.stream.Collectors; /** -* @author jie +* @author Zheng Jie * @date 2019-03-25 */ @Service diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/DictDetailServiceImpl.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/DictDetailServiceImpl.java index f7c8304a..dc4de1c4 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/DictDetailServiceImpl.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/DictDetailServiceImpl.java @@ -18,7 +18,7 @@ import org.springframework.transaction.annotation.Transactional; import java.util.Optional; /** -* @author jie +* @author Zheng Jie * @date 2019-04-10 */ @Service diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/DictServiceImpl.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/DictServiceImpl.java index abb2c7b0..dd944c5d 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/DictServiceImpl.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/DictServiceImpl.java @@ -17,7 +17,7 @@ import org.springframework.transaction.annotation.Transactional; import java.util.Optional; /** -* @author jie +* @author Zheng Jie * @date 2019-04-10 */ @Service diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/JobServiceImpl.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/JobServiceImpl.java index fd1d260f..45894b44 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/JobServiceImpl.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/JobServiceImpl.java @@ -21,7 +21,7 @@ import java.util.List; import java.util.Optional; /** -* @author jie +* @author Zheng Jie * @date 2019-03-29 */ @Service diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/PermissionServiceImpl.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/PermissionServiceImpl.java index bb5a99b8..e0097941 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/PermissionServiceImpl.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/PermissionServiceImpl.java @@ -17,7 +17,7 @@ import org.springframework.transaction.annotation.Transactional; import java.util.*; /** - * @author jie + * @author Zheng Jie * @date 2018-12-03 */ @Service diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/RoleServiceImpl.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/RoleServiceImpl.java index cc49a64b..1b5bbbb0 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/RoleServiceImpl.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/RoleServiceImpl.java @@ -23,7 +23,7 @@ import java.util.*; import java.util.stream.Collectors; /** - * @author jie + * @author Zheng Jie * @date 2018-12-03 */ @Service diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/UserServiceImpl.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/UserServiceImpl.java index b8b7ce77..8a951b38 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/UserServiceImpl.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/UserServiceImpl.java @@ -22,7 +22,7 @@ import java.util.Date; import java.util.Optional; /** - * @author jie + * @author Zheng Jie * @date 2018-11-23 */ @Service diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/DeptMapper.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/DeptMapper.java index 921a72e4..46da4c2c 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/DeptMapper.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/DeptMapper.java @@ -7,7 +7,7 @@ import org.mapstruct.Mapper; import org.mapstruct.ReportingPolicy; /** -* @author jie +* @author Zheng Jie * @date 2019-03-25 */ @Mapper(componentModel = "spring",uses = {},unmappedTargetPolicy = ReportingPolicy.IGNORE) diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/DeptSmallMapper.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/DeptSmallMapper.java new file mode 100644 index 00000000..338d55a4 --- /dev/null +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/DeptSmallMapper.java @@ -0,0 +1,16 @@ +package me.zhengjie.modules.system.service.mapper; + +import me.zhengjie.mapper.EntityMapper; +import me.zhengjie.modules.system.domain.Dept; +import me.zhengjie.modules.system.service.dto.DeptSmallDTO; +import org.mapstruct.Mapper; +import org.mapstruct.ReportingPolicy; + +/** +* @author Zheng Jie +* @date 2019-03-25 +*/ +@Mapper(componentModel = "spring",uses = {},unmappedTargetPolicy = ReportingPolicy.IGNORE) +public interface DeptSmallMapper extends EntityMapper { + +} \ No newline at end of file diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/DictDetailMapper.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/DictDetailMapper.java index a6148647..797c1dab 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/DictDetailMapper.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/DictDetailMapper.java @@ -7,7 +7,7 @@ import org.mapstruct.Mapper; import org.mapstruct.ReportingPolicy; /** -* @author jie +* @author Zheng Jie * @date 2019-04-10 */ @Mapper(componentModel = "spring",uses = {},unmappedTargetPolicy = ReportingPolicy.IGNORE) diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/DictMapper.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/DictMapper.java index 6919c234..1d1f93d5 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/DictMapper.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/DictMapper.java @@ -7,7 +7,7 @@ import org.mapstruct.Mapper; import org.mapstruct.ReportingPolicy; /** -* @author jie +* @author Zheng Jie * @date 2019-04-10 */ @Mapper(componentModel = "spring",uses = {},unmappedTargetPolicy = ReportingPolicy.IGNORE) diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/JobMapper.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/JobMapper.java index a8463482..b4d2b347 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/JobMapper.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/JobMapper.java @@ -8,7 +8,7 @@ import org.mapstruct.Mapping; import org.mapstruct.ReportingPolicy; /** -* @author jie +* @author Zheng Jie * @date 2019-03-29 */ @Mapper(componentModel = "spring",uses = {DeptMapper.class},unmappedTargetPolicy = ReportingPolicy.IGNORE) diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/JobSmallMapper.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/JobSmallMapper.java new file mode 100644 index 00000000..c48b4d36 --- /dev/null +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/JobSmallMapper.java @@ -0,0 +1,16 @@ +package me.zhengjie.modules.system.service.mapper; + +import me.zhengjie.mapper.EntityMapper; +import me.zhengjie.modules.system.domain.Job; +import me.zhengjie.modules.system.service.dto.JobSmallDTO; +import org.mapstruct.Mapper; +import org.mapstruct.ReportingPolicy; + +/** +* @author Zheng Jie +* @date 2019-03-29 +*/ +@Mapper(componentModel = "spring",uses = {},unmappedTargetPolicy = ReportingPolicy.IGNORE) +public interface JobSmallMapper extends EntityMapper { + +} \ No newline at end of file diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/MenuMapper.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/MenuMapper.java index ca78dc46..513f1bc3 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/MenuMapper.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/MenuMapper.java @@ -7,7 +7,7 @@ import org.mapstruct.Mapper; import org.mapstruct.ReportingPolicy; /** - * @author jie + * @author Zheng Jie * @date 2018-12-17 */ @Mapper(componentModel = "spring",uses = {},unmappedTargetPolicy = ReportingPolicy.IGNORE) diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/PermissionMapper.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/PermissionMapper.java index b65c392c..f86c9d4c 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/PermissionMapper.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/PermissionMapper.java @@ -7,7 +7,7 @@ import org.mapstruct.Mapper; import org.mapstruct.ReportingPolicy; /** - * @author jie + * @author Zheng Jie * @date 2018-11-23 */ @Mapper(componentModel = "spring",unmappedTargetPolicy = ReportingPolicy.IGNORE) diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/RoleMapper.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/RoleMapper.java index b59f4f60..9acaf31b 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/RoleMapper.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/RoleMapper.java @@ -7,7 +7,7 @@ import org.mapstruct.Mapper; import org.mapstruct.ReportingPolicy; /** - * @author jie + * @author Zheng Jie * @date 2018-11-23 */ @Mapper(componentModel = "spring", uses = {PermissionMapper.class, MenuMapper.class, DeptMapper.class}, unmappedTargetPolicy = ReportingPolicy.IGNORE) diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/RoleSmallMapper.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/RoleSmallMapper.java index 98c7b545..c5858fb4 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/RoleSmallMapper.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/RoleSmallMapper.java @@ -8,7 +8,7 @@ import org.mapstruct.Mapper; import org.mapstruct.ReportingPolicy; /** - * @author jie + * @author Zheng Jie * @date 2019-5-23 */ @Mapper(componentModel = "spring", uses = {}, unmappedTargetPolicy = ReportingPolicy.IGNORE) diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/UserMapper.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/UserMapper.java index e0341412..50cbfb8f 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/UserMapper.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/UserMapper.java @@ -7,7 +7,7 @@ import org.mapstruct.Mapper; import org.mapstruct.ReportingPolicy; /** - * @author jie + * @author Zheng Jie * @date 2018-11-23 */ @Mapper(componentModel = "spring",uses = {RoleMapper.class, DeptMapper.class, JobMapper.class},unmappedTargetPolicy = ReportingPolicy.IGNORE) diff --git a/eladmin-tools/src/main/java/me/zhengjie/domain/AlipayConfig.java b/eladmin-tools/src/main/java/me/zhengjie/domain/AlipayConfig.java index 8976c91c..ac3f4861 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/domain/AlipayConfig.java +++ b/eladmin-tools/src/main/java/me/zhengjie/domain/AlipayConfig.java @@ -7,7 +7,7 @@ import java.io.Serializable; /** * 支付宝配置类 - * @author jie + * @author Zheng Jie * @date 2018-12-31 */ @Data diff --git a/eladmin-tools/src/main/java/me/zhengjie/domain/EmailConfig.java b/eladmin-tools/src/main/java/me/zhengjie/domain/EmailConfig.java index 84b07b09..04157e78 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/domain/EmailConfig.java +++ b/eladmin-tools/src/main/java/me/zhengjie/domain/EmailConfig.java @@ -8,7 +8,7 @@ import java.io.Serializable; /** * 邮件配置类，数据存覆盖式存入数据存 - * @author jie + * @author Zheng Jie * @date 2018-12-26 */ @Entity diff --git a/eladmin-tools/src/main/java/me/zhengjie/domain/Picture.java b/eladmin-tools/src/main/java/me/zhengjie/domain/Picture.java index 21c9ef72..8999cd84 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/domain/Picture.java +++ b/eladmin-tools/src/main/java/me/zhengjie/domain/Picture.java @@ -10,7 +10,7 @@ import java.sql.Timestamp; /** * sm.ms图床 * - * @author jie + * @author Zheng Jie * @date 2018-12-27 */ @Data diff --git a/eladmin-tools/src/main/java/me/zhengjie/domain/QiniuConfig.java b/eladmin-tools/src/main/java/me/zhengjie/domain/QiniuConfig.java index 5fbdcfc3..0fdd67dc 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/domain/QiniuConfig.java +++ b/eladmin-tools/src/main/java/me/zhengjie/domain/QiniuConfig.java @@ -7,7 +7,7 @@ import java.io.Serializable; /** * 七牛云对象存储配置类 - * @author jie + * @author Zheng Jie * @date 2018-12-31 */ @Data diff --git a/eladmin-tools/src/main/java/me/zhengjie/domain/QiniuContent.java b/eladmin-tools/src/main/java/me/zhengjie/domain/QiniuContent.java index fb2636a8..1a806bb7 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/domain/QiniuContent.java +++ b/eladmin-tools/src/main/java/me/zhengjie/domain/QiniuContent.java @@ -9,7 +9,7 @@ import java.sql.Timestamp; /** * 上传成功后，存储结果 - * @author jie + * @author Zheng Jie * @date 2018-12-31 */ @Data diff --git a/eladmin-tools/src/main/java/me/zhengjie/domain/VerificationCode.java b/eladmin-tools/src/main/java/me/zhengjie/domain/VerificationCode.java index 4f2b23db..6fd573a1 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/domain/VerificationCode.java +++ b/eladmin-tools/src/main/java/me/zhengjie/domain/VerificationCode.java @@ -10,7 +10,7 @@ import javax.validation.constraints.NotBlank; import java.sql.Timestamp; /** - * @author jie + * @author Zheng Jie * @date 2018-12-26 */ @Data diff --git a/eladmin-tools/src/main/java/me/zhengjie/domain/vo/TradeVo.java b/eladmin-tools/src/main/java/me/zhengjie/domain/vo/TradeVo.java index aca9c026..6927dafe 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/domain/vo/TradeVo.java +++ b/eladmin-tools/src/main/java/me/zhengjie/domain/vo/TradeVo.java @@ -9,7 +9,7 @@ import java.sql.Timestamp; /** * 交易详情，按需应该存入数据库，这里存入数据库，仅供临时测试 - * @author jie + * @author Zheng Jie * @date 2018-12-31 */ @Data diff --git a/eladmin-tools/src/main/java/me/zhengjie/repository/AlipayRepository.java b/eladmin-tools/src/main/java/me/zhengjie/repository/AlipayRepository.java index 7935cd65..fe1c0080 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/repository/AlipayRepository.java +++ b/eladmin-tools/src/main/java/me/zhengjie/repository/AlipayRepository.java @@ -4,7 +4,7 @@ import me.zhengjie.domain.AlipayConfig; import org.springframework.data.jpa.repository.JpaRepository; /** - * @author jie + * @author Zheng Jie * @date 2018-12-31 */ public interface AlipayRepository extends JpaRepository { diff --git a/eladmin-tools/src/main/java/me/zhengjie/repository/EmailRepository.java b/eladmin-tools/src/main/java/me/zhengjie/repository/EmailRepository.java index 380cbf46..d5fb22fc 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/repository/EmailRepository.java +++ b/eladmin-tools/src/main/java/me/zhengjie/repository/EmailRepository.java @@ -4,7 +4,7 @@ import me.zhengjie.domain.EmailConfig; import org.springframework.data.jpa.repository.JpaRepository; /** - * @author jie + * @author Zheng Jie * @date 2018-12-26 */ public interface EmailRepository extends JpaRepository { diff --git a/eladmin-tools/src/main/java/me/zhengjie/repository/PictureRepository.java b/eladmin-tools/src/main/java/me/zhengjie/repository/PictureRepository.java index 2d6fd27a..27ab0351 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/repository/PictureRepository.java +++ b/eladmin-tools/src/main/java/me/zhengjie/repository/PictureRepository.java @@ -5,7 +5,7 @@ import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaSpecificationExecutor; /** - * @author jie + * @author Zheng Jie * @date 2018-12-27 */ public interface PictureRepository extends JpaRepository, JpaSpecificationExecutor { diff --git a/eladmin-tools/src/main/java/me/zhengjie/repository/QiNiuConfigRepository.java b/eladmin-tools/src/main/java/me/zhengjie/repository/QiNiuConfigRepository.java index 83c39f5b..c238e468 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/repository/QiNiuConfigRepository.java +++ b/eladmin-tools/src/main/java/me/zhengjie/repository/QiNiuConfigRepository.java @@ -4,7 +4,7 @@ import me.zhengjie.domain.QiniuConfig; import org.springframework.data.jpa.repository.JpaRepository; /** - * @author jie + * @author Zheng Jie * @date 2018-12-31 */ public interface QiNiuConfigRepository extends JpaRepository { diff --git a/eladmin-tools/src/main/java/me/zhengjie/repository/QiniuContentRepository.java b/eladmin-tools/src/main/java/me/zhengjie/repository/QiniuContentRepository.java index 553fa94e..1bd887e6 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/repository/QiniuContentRepository.java +++ b/eladmin-tools/src/main/java/me/zhengjie/repository/QiniuContentRepository.java @@ -5,7 +5,7 @@ import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaSpecificationExecutor; /** - * @author jie + * @author Zheng Jie * @date 2018-12-31 */ public interface QiniuContentRepository extends JpaRepository, JpaSpecificationExecutor { diff --git a/eladmin-tools/src/main/java/me/zhengjie/repository/VerificationCodeRepository.java b/eladmin-tools/src/main/java/me/zhengjie/repository/VerificationCodeRepository.java index c482da23..9085d928 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/repository/VerificationCodeRepository.java +++ b/eladmin-tools/src/main/java/me/zhengjie/repository/VerificationCodeRepository.java @@ -4,7 +4,7 @@ import me.zhengjie.domain.VerificationCode; import org.springframework.data.jpa.repository.JpaRepository; /** - * @author jie + * @author Zheng Jie * @date 2018-12-26 */ public interface VerificationCodeRepository extends JpaRepository { diff --git a/eladmin-tools/src/main/java/me/zhengjie/rest/AliPayController.java b/eladmin-tools/src/main/java/me/zhengjie/rest/AliPayController.java index da8fb4d7..f15feab7 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/rest/AliPayController.java +++ b/eladmin-tools/src/main/java/me/zhengjie/rest/AliPayController.java @@ -19,7 +19,7 @@ import javax.servlet.http.HttpServletResponse; import java.util.Map; /** - * @author jie + * @author Zheng Jie * @date 2018-12-31 */ @Slf4j diff --git a/eladmin-tools/src/main/java/me/zhengjie/rest/VerificationCodeController.java b/eladmin-tools/src/main/java/me/zhengjie/rest/VerificationCodeController.java index 2e074746..557631ad 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/rest/VerificationCodeController.java +++ b/eladmin-tools/src/main/java/me/zhengjie/rest/VerificationCodeController.java @@ -13,7 +13,7 @@ import org.springframework.security.core.userdetails.UserDetailsService; import org.springframework.web.bind.annotation.*; /** - * @author jie + * @author Zheng Jie * @date 2018-12-26 */ @RestController diff --git a/eladmin-tools/src/main/java/me/zhengjie/service/AlipayService.java b/eladmin-tools/src/main/java/me/zhengjie/service/AlipayService.java index 6c7173f9..f4e09423 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/service/AlipayService.java +++ b/eladmin-tools/src/main/java/me/zhengjie/service/AlipayService.java @@ -7,7 +7,7 @@ import org.springframework.cache.annotation.CachePut; import org.springframework.cache.annotation.Cacheable; /** - * @author jie + * @author Zheng Jie * @date 2018-12-31 */ @CacheConfig(cacheNames = "alipay") diff --git a/eladmin-tools/src/main/java/me/zhengjie/service/EmailService.java b/eladmin-tools/src/main/java/me/zhengjie/service/EmailService.java index 503bc0f9..deae90c1 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/service/EmailService.java +++ b/eladmin-tools/src/main/java/me/zhengjie/service/EmailService.java @@ -8,7 +8,7 @@ import org.springframework.cache.annotation.Cacheable; import org.springframework.scheduling.annotation.Async; /** - * @author jie + * @author Zheng Jie * @date 2018-12-26 */ @CacheConfig(cacheNames = "email") diff --git a/eladmin-tools/src/main/java/me/zhengjie/service/PictureService.java b/eladmin-tools/src/main/java/me/zhengjie/service/PictureService.java index caf02598..27091829 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/service/PictureService.java +++ b/eladmin-tools/src/main/java/me/zhengjie/service/PictureService.java @@ -8,7 +8,7 @@ import org.springframework.cache.annotation.Cacheable; import org.springframework.data.domain.Pageable; import org.springframework.web.multipart.MultipartFile; /** - * @author jie + * @author Zheng Jie * @date 2018-12-27 */ @CacheConfig(cacheNames = "picture") diff --git a/eladmin-tools/src/main/java/me/zhengjie/service/QiNiuService.java b/eladmin-tools/src/main/java/me/zhengjie/service/QiNiuService.java index c3716c42..81b4bbeb 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/service/QiNiuService.java +++ b/eladmin-tools/src/main/java/me/zhengjie/service/QiNiuService.java @@ -11,7 +11,7 @@ import org.springframework.data.domain.Pageable; import org.springframework.web.multipart.MultipartFile; /** - * @author jie + * @author Zheng Jie * @date 2018-12-31 */ @CacheConfig(cacheNames = "qiNiu") diff --git a/eladmin-tools/src/main/java/me/zhengjie/service/VerificationCodeService.java b/eladmin-tools/src/main/java/me/zhengjie/service/VerificationCodeService.java index ee295d3c..eaf8f0ec 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/service/VerificationCodeService.java +++ b/eladmin-tools/src/main/java/me/zhengjie/service/VerificationCodeService.java @@ -4,7 +4,7 @@ import me.zhengjie.domain.VerificationCode; import me.zhengjie.domain.vo.EmailVo; /** - * @author jie + * @author Zheng Jie * @date 2018-12-26 */ public interface VerificationCodeService { diff --git a/eladmin-tools/src/main/java/me/zhengjie/service/dto/PictureQueryCriteria.java b/eladmin-tools/src/main/java/me/zhengjie/service/dto/PictureQueryCriteria.java index 529c6224..f2d2c6ef 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/service/dto/PictureQueryCriteria.java +++ b/eladmin-tools/src/main/java/me/zhengjie/service/dto/PictureQueryCriteria.java @@ -6,7 +6,7 @@ import me.zhengjie.annotation.Query; /** * sm.ms图床 * - * @author jie + * @author Zheng Jie * @date 2019-6-4 09:52:09 */ @Data diff --git a/eladmin-tools/src/main/java/me/zhengjie/service/dto/QiniuQueryCriteria.java b/eladmin-tools/src/main/java/me/zhengjie/service/dto/QiniuQueryCriteria.java index ba09abea..f3195651 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/service/dto/QiniuQueryCriteria.java +++ b/eladmin-tools/src/main/java/me/zhengjie/service/dto/QiniuQueryCriteria.java @@ -4,7 +4,7 @@ import lombok.Data; import me.zhengjie.annotation.Query; /** - * @author jie + * @author Zheng Jie * @date 2019-6-4 09:54:37 */ @Data diff --git a/eladmin-tools/src/main/java/me/zhengjie/service/impl/AlipayServiceImpl.java b/eladmin-tools/src/main/java/me/zhengjie/service/impl/AlipayServiceImpl.java index 68221815..63715b5a 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/service/impl/AlipayServiceImpl.java +++ b/eladmin-tools/src/main/java/me/zhengjie/service/impl/AlipayServiceImpl.java @@ -17,7 +17,7 @@ import org.springframework.transaction.annotation.Transactional; import java.util.Optional; /** - * @author jie + * @author Zheng Jie * @date 2018-12-31 */ @Service diff --git a/eladmin-tools/src/main/java/me/zhengjie/service/impl/EmailServiceImpl.java b/eladmin-tools/src/main/java/me/zhengjie/service/impl/EmailServiceImpl.java index 30cd2f3d..31f38bf0 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/service/impl/EmailServiceImpl.java +++ b/eladmin-tools/src/main/java/me/zhengjie/service/impl/EmailServiceImpl.java @@ -17,7 +17,7 @@ import org.springframework.transaction.annotation.Transactional; import java.util.Optional; /** - * @author jie + * @author Zheng Jie * @date 2018-12-26 */ @Service diff --git a/eladmin-tools/src/main/java/me/zhengjie/service/impl/PictureServiceImpl.java b/eladmin-tools/src/main/java/me/zhengjie/service/impl/PictureServiceImpl.java index f9b9a639..408b3c41 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/service/impl/PictureServiceImpl.java +++ b/eladmin-tools/src/main/java/me/zhengjie/service/impl/PictureServiceImpl.java @@ -22,7 +22,7 @@ import java.util.HashMap; import java.util.Optional; /** - * @author jie + * @author Zheng Jie * @date 2018-12-27 */ @Slf4j diff --git a/eladmin-tools/src/main/java/me/zhengjie/service/impl/QiNiuServiceImpl.java b/eladmin-tools/src/main/java/me/zhengjie/service/impl/QiNiuServiceImpl.java index c5f03a71..a66711de 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/service/impl/QiNiuServiceImpl.java +++ b/eladmin-tools/src/main/java/me/zhengjie/service/impl/QiNiuServiceImpl.java @@ -27,7 +27,7 @@ import org.springframework.web.multipart.MultipartFile; import java.util.Optional; /** - * @author jie + * @author Zheng Jie * @date 2018-12-31 */ @Service diff --git a/eladmin-tools/src/main/java/me/zhengjie/service/impl/VerificationCodeServiceImpl.java b/eladmin-tools/src/main/java/me/zhengjie/service/impl/VerificationCodeServiceImpl.java index 524394f9..ebac5e1a 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/service/impl/VerificationCodeServiceImpl.java +++ b/eladmin-tools/src/main/java/me/zhengjie/service/impl/VerificationCodeServiceImpl.java @@ -20,7 +20,7 @@ import java.util.Arrays; import java.util.concurrent.*; /** - * @author jie + * @author Zheng Jie * @date 2018-12-26 */ @Service diff --git a/eladmin-tools/src/main/java/me/zhengjie/utils/QiNiuUtil.java b/eladmin-tools/src/main/java/me/zhengjie/utils/QiNiuUtil.java index bc0d13f6..92b8d062 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/utils/QiNiuUtil.java +++ b/eladmin-tools/src/main/java/me/zhengjie/utils/QiNiuUtil.java @@ -8,7 +8,7 @@ import java.util.Date; /** * 七牛云存储工具类 - * @author jie + * @author Zheng Jie * @date 2018-12-31 */ public class QiNiuUtil {