From e4ca7afc70b7e164db578eb54ea00ee9f5a57f7c Mon Sep 17 00:00:00 2001 From: dqjdda <201507802@qq.com> Date: Mon, 25 Nov 2019 16:43:11 +0800 Subject: [PATCH] =?UTF-8?q?=E9=98=BF=E9=87=8C=E5=B7=B4=E5=B7=B4=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E8=A7=84=E8=8C=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- eladmin-common/pom.xml | 12 ++ .../java/me/zhengjie/aspect/LimitAspect.java | 3 + .../main/java/me/zhengjie/base/BaseDTO.java | 9 + .../java/me/zhengjie/base/BaseEntity.java | 2 +- .../java/me/zhengjie/base/BaseMapper.java | 8 + .../zhengjie/config/ElPermissionConfig.java | 3 + .../java/me/zhengjie/config/RedisConfig.java | 11 +- .../handler/GlobalExceptionHandler.java | 3 +- .../java/me/zhengjie/utils/EncryptUtils.java | 58 +++--- .../main/java/me/zhengjie/utils/FileUtil.java | 9 +- .../java/me/zhengjie/utils/QueryHelp.java | 2 +- .../java/me/zhengjie/utils/StringUtils.java | 18 +- .../me/zhengjie/utils/TranslatorUtil.java | 4 + .../java/me/zhengjie/domain/ColumnInfo.java | 24 +-- .../java/me/zhengjie/domain/GenConfig.java | 14 +- .../java/me/zhengjie/domain/vo/TableInfo.java | 10 +- .../repository/ColumnInfoRepository.java | 5 + .../repository/GenConfigRepository.java | 5 + .../me/zhengjie/service/GenConfigService.java | 11 ++ .../service/impl/GenConfigServiceImpl.java | 9 +- .../service/impl/GeneratorServiceImpl.java | 2 +- .../main/java/me/zhengjie/utils/GenUtil.java | 5 +- .../src/main/java/me/zhengjie/domain/Log.java | 20 +- .../me/zhengjie/repository/LogRepository.java | 6 +- .../java/me/zhengjie/service/LogService.java | 33 +++- .../me/zhengjie/service/dto/LogErrorDTO.java | 7 - .../service/dto/LogQueryCriteria.java | 1 - .../me/zhengjie/service/dto/LogSmallDTO.java | 4 - .../zhengjie/service/impl/LogServiceImpl.java | 16 +- .../zhengjie/res/ServerMonitorController.java | 18 +- .../java/me/zhengjie/utils/SigarUtil.java | 174 +++++++++--------- .../java/me/zhengjie/config/DataScope.java | 12 +- .../config/thread/AsyncTaskExecutePool.java | 2 +- .../config/thread/TheadFactoryName.java | 4 +- .../modules/mnt/domain/ServerDeploy.java | 3 - .../repository/ServerDeployRepository.java | 5 + .../modules/mnt/service/AppService.java | 35 +++- .../modules/mnt/service/DatabaseService.java | 35 +++- .../mnt/service/DeployHistoryService.java | 34 +++- .../modules/mnt/service/DeployService.java | 41 ++++- .../mnt/service/ServerDeployService.java | 42 ++++- .../service/dto/{AppDTO.java => AppDto.java} | 4 +- .../{DatabaseDTO.java => DatabaseDto.java} | 2 +- .../dto/{DeployDTO.java => DeployDto.java} | 8 +- ...yHistoryDTO.java => DeployHistoryDto.java} | 2 +- ...verDeployDTO.java => ServerDeployDto.java} | 2 +- .../mnt/service/impl/AppServiceImpl.java | 6 +- .../mnt/service/impl/DatabaseServiceImpl.java | 6 +- .../impl/DeployHistoryServiceImpl.java | 6 +- .../mnt/service/impl/DeployServiceImpl.java | 41 +++-- .../service/impl/ServerDeployServiceImpl.java | 8 +- .../modules/mnt/service/mapper/AppMapper.java | 4 +- .../mnt/service/mapper/DatabaseMapper.java | 4 +- .../service/mapper/DeployHistoryMapper.java | 4 +- .../mnt/service/mapper/DeployMapper.java | 4 +- .../service/mapper/ServerDeployMapper.java | 4 +- .../modules/mnt/util/ScpClientUtil.java | 8 +- .../modules/mnt/websocket/MsgType.java | 9 +- .../mnt/websocket/WebSocketServer.java | 31 +++- .../modules/monitor/rest/LimitController.java | 2 +- .../monitor/rest/ServerController.java | 18 +- .../modules/monitor/service/RedisService.java | 6 +- .../monitor/service/ServerService.java | 13 ++ .../monitor/service/dto/ServerDTO.java | 22 +-- .../service/dto/ServerQueryCriteria.java | 1 - .../service/impl/ServerServiceImpl.java | 1 - .../service/impl/VisitsServiceImpl.java | 5 +- .../modules/quartz/domain/QuartzJob.java | 14 +- .../modules/quartz/domain/QuartzLog.java | 18 +- .../quartz/service/QuartzJobService.java | 52 ++++++ .../service/impl/QuartzJobServiceImpl.java | 2 +- .../modules/quartz/utils/ExecutionJob.java | 6 +- .../modules/quartz/utils/QuartzManage.java | 8 +- .../security/config/SecurityConfig.java | 12 +- .../rest/AuthenticationController.java | 2 +- .../security/rest/OnlineController.java | 3 + .../security/JwtAuthenticationEntryPoint.java | 3 + .../security/JwtAuthorizationTokenFilter.java | 5 +- ...ice.java => JwtPermissionServiceImpl.java} | 12 +- ...ce.java => JwtUserDetailsServiceImpl.java} | 14 +- .../modules/security/utils/JwtTokenUtil.java | 8 +- .../zhengjie/modules/system/domain/Dept.java | 19 ++ .../modules/system/domain/DictDetail.java | 7 +- .../zhengjie/modules/system/domain/Menu.java | 16 +- .../zhengjie/modules/system/domain/Role.java | 14 +- .../zhengjie/modules/system/domain/User.java | 19 ++ .../system/repository/DeptRepository.java | 16 ++ .../system/repository/MenuRepository.java | 22 +++ .../system/repository/RoleRepository.java | 15 ++ .../system/repository/UserRepository.java | 21 +++ .../modules/system/rest/DeptController.java | 6 +- .../modules/system/rest/MenuController.java | 16 +- .../modules/system/rest/RoleController.java | 4 +- .../modules/system/rest/UserController.java | 12 +- .../modules/system/service/DeptService.java | 56 +++++- .../system/service/DictDetailService.java | 32 +++- .../modules/system/service/DictService.java | 47 ++++- .../modules/system/service/JobService.java | 45 ++++- .../modules/system/service/MenuService.java | 83 ++++++++- .../modules/system/service/RoleService.java | 75 +++++++- .../modules/system/service/UserService.java | 66 ++++++- .../dto/{DeptDTO.java => DeptDto.java} | 11 +- .../{DeptSmallDTO.java => DeptSmallDto.java} | 2 +- ...{DictDetailDTO.java => DictDetailDto.java} | 4 +- .../dto/{DictDTO.java => DictDto.java} | 4 +- .../system/service/dto/DictQueryCriteria.java | 2 +- .../{DictSmallDTO.java => DictSmallDto.java} | 2 +- .../service/dto/{JobDTO.java => JobDto.java} | 6 +- .../{JobSmallDTO.java => JobSmallDto.java} | 2 +- .../dto/{MenuDTO.java => MenuDto.java} | 11 +- .../system/service/dto/MenuQueryCriteria.java | 2 +- .../dto/{RoleDTO.java => RoleDto.java} | 13 +- .../system/service/dto/RoleQueryCriteria.java | 2 +- .../{RoleSmallDTO.java => RoleSmallDto.java} | 2 +- .../dto/{UserDTO.java => UserDto.java} | 15 +- .../system/service/dto/UserQueryCriteria.java | 1 - .../system/service/impl/DeptServiceImpl.java | 35 ++-- .../service/impl/DictDetailServiceImpl.java | 6 +- .../system/service/impl/DictServiceImpl.java | 16 +- .../system/service/impl/JobServiceImpl.java | 14 +- .../system/service/impl/MenuServiceImpl.java | 54 +++--- .../system/service/impl/RoleServiceImpl.java | 24 +-- .../system/service/impl/UserServiceImpl.java | 18 +- .../system/service/mapper/DeptMapper.java | 4 +- .../service/mapper/DeptSmallMapper.java | 4 +- .../service/mapper/DictDetailMapper.java | 4 +- .../system/service/mapper/DictMapper.java | 4 +- .../service/mapper/DictSmallMapper.java | 5 +- .../system/service/mapper/JobMapper.java | 12 +- .../system/service/mapper/JobSmallMapper.java | 4 +- .../system/service/mapper/MenuMapper.java | 4 +- .../system/service/mapper/RoleMapper.java | 4 +- .../service/mapper/RoleSmallMapper.java | 4 +- .../system/service/mapper/UserMapper.java | 12 +- .../template/generator/admin/Service.ftl | 14 +- .../java/me/zhengjie/domain/AlipayConfig.java | 22 +-- .../java/me/zhengjie/domain/EmailConfig.java | 8 +- .../java/me/zhengjie/domain/LocalStorage.java | 14 +- .../main/java/me/zhengjie/domain/Picture.java | 2 +- .../java/me/zhengjie/domain/QiniuConfig.java | 10 +- .../java/me/zhengjie/domain/QiniuContent.java | 11 +- .../me/zhengjie/domain/VerificationCode.java | 10 +- .../java/me/zhengjie/domain/vo/EmailVo.java | 2 +- .../java/me/zhengjie/domain/vo/TradeVo.java | 16 +- ...yRepository.java => AliPayRepository.java} | 2 +- .../repository/PictureRepository.java | 5 + .../repository/QiNiuConfigRepository.java | 4 + .../me/zhengjie/rest/AliPayController.java | 13 +- ...{AlipayService.java => AliPayService.java} | 4 +- .../zhengjie/service/LocalStorageService.java | 51 ++++- .../me/zhengjie/service/PictureService.java | 38 +++- .../me/zhengjie/service/QiNiuService.java | 14 +- ...alStorageDTO.java => LocalStorageDto.java} | 15 +- .../dto/LocalStorageQueryCriteria.java | 1 - ...erviceImpl.java => AliPayServiceImpl.java} | 24 +-- .../service/impl/LocalStorageServiceImpl.java | 14 +- .../service/impl/QiNiuServiceImpl.java | 8 +- .../service/mapper/LocalStorageMapper.java | 4 +- .../me/zhengjie/utils/AliPayStatusEnum.java | 4 + pom.xml | 7 - 160 files changed, 1588 insertions(+), 726 deletions(-) rename eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/dto/{AppDTO.java => AppDto.java} (89%) rename eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/dto/{DatabaseDTO.java => DatabaseDto.java} (89%) rename eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/dto/{DeployDTO.java => DeployDto.java} (77%) rename eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/dto/{DeployHistoryDTO.java => DeployHistoryDto.java} (89%) rename eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/dto/{ServerDeployDTO.java => ServerDeployDto.java} (86%) rename eladmin-system/src/main/java/me/zhengjie/modules/security/service/{JwtPermissionService.java => JwtPermissionServiceImpl.java} (89%) rename eladmin-system/src/main/java/me/zhengjie/modules/security/service/{JwtUserDetailsService.java => JwtUserDetailsServiceImpl.java} (80%) rename eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/{DeptDTO.java => DeptDto.java} (79%) rename eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/{DeptSmallDTO.java => DeptSmallDto.java} (79%) rename eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/{DictDetailDTO.java => DictDetailDto.java} (80%) rename eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/{DictDTO.java => DictDto.java} (79%) rename eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/{DictSmallDTO.java => DictSmallDto.java} (80%) rename eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/{JobDTO.java => JobDto.java} (80%) rename eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/{JobSmallDTO.java => JobSmallDto.java} (83%) rename eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/{MenuDTO.java => MenuDto.java} (79%) rename eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/{RoleDTO.java => RoleDto.java} (69%) rename eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/{RoleSmallDTO.java => RoleSmallDto.java} (83%) rename eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/{UserDTO.java => UserDto.java} (78%) rename eladmin-tools/src/main/java/me/zhengjie/repository/{AlipayRepository.java => AliPayRepository.java} (75%) rename eladmin-tools/src/main/java/me/zhengjie/service/{AlipayService.java => AliPayService.java} (89%) rename eladmin-tools/src/main/java/me/zhengjie/service/dto/{LocalStorageDTO.java => LocalStorageDto.java} (63%) rename eladmin-tools/src/main/java/me/zhengjie/service/impl/{AlipayServiceImpl.java => AliPayServiceImpl.java} (87%) diff --git a/eladmin-common/pom.xml b/eladmin-common/pom.xml index 0bdd114f..ba40e4c9 100644 --- a/eladmin-common/pom.xml +++ b/eladmin-common/pom.xml @@ -8,7 +8,19 @@ 2.3 4.0.0 + + [4.1.12,) + eladmin-common 公共模块 + + + + + cn.hutool + hutool-all + ${hutool.version} + + \ No newline at end of file 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 b8b6cf9f..f495e85a 100644 --- a/eladmin-common/src/main/java/me/zhengjie/aspect/LimitAspect.java +++ b/eladmin-common/src/main/java/me/zhengjie/aspect/LimitAspect.java @@ -19,6 +19,9 @@ import org.springframework.stereotype.Component; import javax.servlet.http.HttpServletRequest; import java.lang.reflect.Method; +/** + * @author / + */ @Aspect @Component public class LimitAspect { diff --git a/eladmin-common/src/main/java/me/zhengjie/base/BaseDTO.java b/eladmin-common/src/main/java/me/zhengjie/base/BaseDTO.java index 903904df..e6b5c30d 100644 --- a/eladmin-common/src/main/java/me/zhengjie/base/BaseDTO.java +++ b/eladmin-common/src/main/java/me/zhengjie/base/BaseDTO.java @@ -18,4 +18,13 @@ public class BaseDTO implements Serializable { private Timestamp createTime; private Timestamp updateTime; + + @Override + public String toString() { + return "BaseDTO{" + + "isDelete=" + isDelete + + ", createTime=" + createTime + + ", updateTime=" + updateTime + + '}'; + } } diff --git a/eladmin-common/src/main/java/me/zhengjie/base/BaseEntity.java b/eladmin-common/src/main/java/me/zhengjie/base/BaseEntity.java index 2e9cc934..d1d40045 100644 --- a/eladmin-common/src/main/java/me/zhengjie/base/BaseEntity.java +++ b/eladmin-common/src/main/java/me/zhengjie/base/BaseEntity.java @@ -19,7 +19,7 @@ import java.lang.reflect.Field; @MappedSuperclass public class BaseEntity implements Serializable { - // 删除标识 + /** 删除标识 **/ @Column(name = "is_delete", columnDefinition = "bit default 0") private Boolean isDelete = false; diff --git a/eladmin-common/src/main/java/me/zhengjie/base/BaseMapper.java b/eladmin-common/src/main/java/me/zhengjie/base/BaseMapper.java index 82609e50..7671325b 100644 --- a/eladmin-common/src/main/java/me/zhengjie/base/BaseMapper.java +++ b/eladmin-common/src/main/java/me/zhengjie/base/BaseMapper.java @@ -10,21 +10,29 @@ public interface BaseMapper { /** * DTO转Entity + * @param dto / + * @return / */ E toEntity(D dto); /** * Entity转DTO + * @param entity / + * @return / */ D toDto(E entity); /** * DTO集合转Entity集合 + * @param dtoList / + * @return / */ List toEntity(List dtoList); /** * Entity集合转DTO集合 + * @param entityList / + * @return / */ List toDto(List entityList); } diff --git a/eladmin-common/src/main/java/me/zhengjie/config/ElPermissionConfig.java b/eladmin-common/src/main/java/me/zhengjie/config/ElPermissionConfig.java index d7f6aa7e..35212914 100644 --- a/eladmin-common/src/main/java/me/zhengjie/config/ElPermissionConfig.java +++ b/eladmin-common/src/main/java/me/zhengjie/config/ElPermissionConfig.java @@ -7,6 +7,9 @@ import java.util.Arrays; import java.util.List; import java.util.stream.Collectors; +/** + * @author Zheng Jie + */ @Service(value = "el") public class ElPermissionConfig { diff --git a/eladmin-common/src/main/java/me/zhengjie/config/RedisConfig.java b/eladmin-common/src/main/java/me/zhengjie/config/RedisConfig.java index 6e2d21ef..a4a34ae6 100644 --- a/eladmin-common/src/main/java/me/zhengjie/config/RedisConfig.java +++ b/eladmin-common/src/main/java/me/zhengjie/config/RedisConfig.java @@ -53,6 +53,7 @@ public class RedisConfig extends CachingConfigurerSupport { return configuration; } + @SuppressWarnings("all") @Bean(name = "redisTemplate") @ConditionalOnMissingBean(name = "redisTemplate") public RedisTemplate redisTemplate(RedisConnectionFactory redisConnectionFactory) { @@ -65,13 +66,7 @@ public class RedisConfig extends CachingConfigurerSupport { // 全局开启AutoType，这里方便开发，使用全局的方式 ParserConfig.getGlobalInstance().setAutoTypeSupport(true); // 建议使用这种方式，小范围指定白名单 -// ParserConfig.getGlobalInstance().addAccept("me.zhengjie.domain"); -// ParserConfig.getGlobalInstance().addAccept("me.zhengjie.modules.system.service.dto"); -// ParserConfig.getGlobalInstance().addAccept("me.zhengjie.service.dto"); -// ParserConfig.getGlobalInstance().addAccept("me.zhengjie.modules.system.domain"); -// ParserConfig.getGlobalInstance().addAccept("me.zhengjie.modules.quartz.domain"); -// ParserConfig.getGlobalInstance().addAccept("me.zhengjie.modules.monitor.domain"); -// ParserConfig.getGlobalInstance().addAccept("me.zhengjie.modules.security.security"); + // ParserConfig.getGlobalInstance().addAccept("me.zhengjie.domain"); // key的序列化采用StringRedisSerializer template.setKeySerializer(new StringRedisSerializer()); template.setHashKeySerializer(new StringRedisSerializer()); @@ -86,7 +81,7 @@ public class RedisConfig extends CachingConfigurerSupport { @Override public KeyGenerator keyGenerator() { return (target, method, params) -> { - Map container = new HashMap<>(); + Map container = new HashMap<>(3); Class targetClassClass = target.getClass(); // 类地址 container.put("class",targetClassClass.toGenericString()); 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 2d0385b9..8b87fdec 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 @@ -81,7 +81,8 @@ public class GlobalExceptionHandler { log.error(ThrowableUtil.getStackTrace(e)); String[] str = Objects.requireNonNull(e.getBindingResult().getAllErrors().get(0).getCodes())[1].split("\\."); String message = e.getBindingResult().getAllErrors().get(0).getDefaultMessage(); - if("不能为空".equals(message)){ + String msg = "不能为空"; + if(msg.equals(message)){ message = str[1] + ":" + message; } return buildResponseEntity(ApiError.error(message)); 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 1cf6fa16..b9d28c3e 100644 --- a/eladmin-common/src/main/java/me/zhengjie/utils/EncryptUtils.java +++ b/eladmin-common/src/main/java/me/zhengjie/utils/EncryptUtils.java @@ -15,25 +15,46 @@ import java.nio.charset.StandardCharsets; */ public class EncryptUtils { - private static String strKey = "Passw0rd", strParam = "Passw0rd"; + private static String strParam = "Passw0rd"; + + private static Cipher cipher; + + private static IvParameterSpec iv = new IvParameterSpec(strParam.getBytes(StandardCharsets.UTF_8)); + + private static DESKeySpec getDesKeySpec(String source) throws Exception { + if (source == null || source.length() == 0){ + return null; + } + cipher = Cipher.getInstance("DES/CBC/PKCS5Padding"); + String strKey = "Passw0rd"; + return new DESKeySpec(strKey.getBytes(StandardCharsets.UTF_8)); + } /** * 对称加密 */ public static String desEncrypt(String source) throws Exception { - if (source == null || source.length() == 0){ - return null; - } - Cipher cipher = Cipher.getInstance("DES/CBC/PKCS5Padding"); - DESKeySpec desKeySpec = new DESKeySpec(strKey.getBytes(StandardCharsets.UTF_8)); + DESKeySpec desKeySpec = getDesKeySpec(source); SecretKeyFactory keyFactory = SecretKeyFactory.getInstance("DES"); SecretKey secretKey = keyFactory.generateSecret(desKeySpec); - IvParameterSpec iv = new IvParameterSpec(strParam.getBytes(StandardCharsets.UTF_8)); cipher.init(Cipher.ENCRYPT_MODE, secretKey, iv); return byte2hex( cipher.doFinal(source.getBytes(StandardCharsets.UTF_8))).toUpperCase(); } + /** + * 对称解密 + */ + public static String desDecrypt(String source) throws Exception { + byte[] src = hex2byte(source.getBytes()); + DESKeySpec desKeySpec = getDesKeySpec(source); + SecretKeyFactory keyFactory = SecretKeyFactory.getInstance("DES"); + SecretKey secretKey = keyFactory.generateSecret(desKeySpec); + cipher.init(Cipher.DECRYPT_MODE, secretKey, iv); + byte[] retByte = cipher.doFinal(src); + return new String(retByte); + } + private static String byte2hex(byte[] inStr) { String stmp; StringBuilder out = new StringBuilder(inStr.length * 2); @@ -50,35 +71,18 @@ public class EncryptUtils { } private static byte[] hex2byte(byte[] b) { - if ((b.length % 2) != 0){ + int size = 2; + if ((b.length % size) != 0){ throw new IllegalArgumentException("长度不是偶数"); } byte[] b2 = new byte[b.length / 2]; - for (int n = 0; n < b.length; n += 2) { + for (int n = 0; n < b.length; n += size) { String item = new String(b, n, 2); b2[n / 2] = (byte) Integer.parseInt(item, 16); } return b2; } - /** - * 对称解密 - */ - public static String desDecrypt(String source) throws Exception { - if (source == null || source.length() == 0){ - return null; - } - byte[] src = hex2byte(source.getBytes()); - Cipher cipher = Cipher.getInstance("DES/CBC/PKCS5Padding"); - DESKeySpec desKeySpec = new DESKeySpec(strKey.getBytes(StandardCharsets.UTF_8)); - SecretKeyFactory keyFactory = SecretKeyFactory.getInstance("DES"); - SecretKey secretKey = keyFactory.generateSecret(desKeySpec); - IvParameterSpec iv = new IvParameterSpec(strParam.getBytes(StandardCharsets.UTF_8)); - cipher.init(Cipher.DECRYPT_MODE, secretKey, iv); - byte[] retByte = cipher.doFinal(src); - return new String(retByte); - } - /** * 密码加密 */ 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 ae1c3547..3ce35cc8 100644 --- a/eladmin-common/src/main/java/me/zhengjie/utils/FileUtil.java +++ b/eladmin-common/src/main/java/me/zhengjie/utils/FileUtil.java @@ -119,8 +119,9 @@ public class FileUtil extends cn.hutool.core.io.FileUtil { } OutputStream os = new FileOutputStream(file); int bytesRead; - byte[] buffer = new byte[8192]; - while ((bytesRead = ins.read(buffer, 0, 8192)) != -1) { + int len = 8192; + byte[] buffer = new byte[len]; + while ((bytesRead = ins.read(buffer, 0, len)) != -1) { os.write(buffer, 0, bytesRead); } os.close(); @@ -210,7 +211,9 @@ public class FileUtil extends cn.hutool.core.io.FileUtil { } public static void checkSize(long maxSize, long size) { - if(size > (maxSize * 1024 * 1024)){ + // 1M + int len = 1024 * 1024; + if(size > (maxSize * len)){ throw new BadRequestException("文件超出规定大小"); } } 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 607e618c..438bf008 100644 --- a/eladmin-common/src/main/java/me/zhengjie/utils/QueryHelp.java +++ b/eladmin-common/src/main/java/me/zhengjie/utils/QueryHelp.java @@ -15,7 +15,7 @@ import java.util.*; @Slf4j public class QueryHelp { - @SuppressWarnings("unchecked") + @SuppressWarnings("all") public static Predicate getPredicate(Root root, Q query, CriteriaBuilder cb) { List list = new ArrayList<>(); diff --git a/eladmin-common/src/main/java/me/zhengjie/utils/StringUtils.java b/eladmin-common/src/main/java/me/zhengjie/utils/StringUtils.java index 8f865f2e..277e3dca 100644 --- a/eladmin-common/src/main/java/me/zhengjie/utils/StringUtils.java +++ b/eladmin-common/src/main/java/me/zhengjie/utils/StringUtils.java @@ -15,12 +15,15 @@ import java.util.Calendar; import java.util.Date; /** + * @author Zheng Jie * 字符串工具类, 继承org.apache.commons.lang3.StringUtils类 */ public class StringUtils extends org.apache.commons.lang3.StringUtils { private static final char SEPARATOR = '_'; + private static final String UNKNOWN = "unknown"; + /** * 驼峰命名法工具 * @@ -111,19 +114,21 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils { */ public static String getIp(HttpServletRequest request) { String ip = request.getHeader("x-forwarded-for"); - if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) { + if (ip == null || ip.length() == 0 || UNKNOWN.equalsIgnoreCase(ip)) { ip = request.getHeader("Proxy-Client-IP"); } - if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) { + if (ip == null || ip.length() == 0 || UNKNOWN.equalsIgnoreCase(ip)) { ip = request.getHeader("WL-Proxy-Client-IP"); } - if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) { + if (ip == null || ip.length() == 0 || UNKNOWN.equalsIgnoreCase(ip)) { ip = request.getRemoteAddr(); } - if (ip.contains(",")) { + String comma = ","; + String localhost = "127.0.0.1"; + if (ip.contains(comma)) { ip = ip.split(",")[0]; } - if ("127.0.0.1".equals(ip)) { + if (localhost.equals(ip)) { // 获取本机真正的ip地址 try { ip = InetAddress.getLocalHost().getHostAddress(); @@ -149,7 +154,8 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils { DataBlock dataBlock; dataBlock = (DataBlock) method.invoke(searcher, ip); String address = dataBlock.getRegion().replace("0|",""); - if(address.charAt(address.length()-1) == '|'){ + char symbol = '|'; + if(address.charAt(address.length()-1) == symbol){ address = address.substring(0,address.length() - 1); } return address.equals(ElAdminConstant.REGION)?"内网IP":address; diff --git a/eladmin-common/src/main/java/me/zhengjie/utils/TranslatorUtil.java b/eladmin-common/src/main/java/me/zhengjie/utils/TranslatorUtil.java index 7a45a810..ad5c6e2c 100644 --- a/eladmin-common/src/main/java/me/zhengjie/utils/TranslatorUtil.java +++ b/eladmin-common/src/main/java/me/zhengjie/utils/TranslatorUtil.java @@ -7,6 +7,10 @@ import java.net.HttpURLConnection; import java.net.URL; import java.net.URLEncoder; +/** + * @author Zheng Jie + * 翻译工具类 + */ public class TranslatorUtil { public static String translate(String word){ diff --git a/eladmin-generator/src/main/java/me/zhengjie/domain/ColumnInfo.java b/eladmin-generator/src/main/java/me/zhengjie/domain/ColumnInfo.java index fcdcfc2d..0f298764 100644 --- a/eladmin-generator/src/main/java/me/zhengjie/domain/ColumnInfo.java +++ b/eladmin-generator/src/main/java/me/zhengjie/domain/ColumnInfo.java @@ -23,40 +23,40 @@ public class ColumnInfo { private String tableName; - // 数据库字段名称 + /** 数据库字段名称 */ private String columnName; - // 数据库字段类型 + /** 数据库字段类型 */ private String columnType; - // 数据库字段键类型 + /** 数据库字段键类型 */ private String keyType; - // 字段额外的参数 + /** 字段额外的参数 */ private String extra; - // 数据库字段描述 + /** 数据库字段描述 */ private String remark; - // 必填 + /** 必填 */ private Boolean notNull; - // 是否在列表显示 + /** 是否在列表显示 */ private Boolean listShow; - // 是否表单显示 + /** 是否表单显示 */ private Boolean formShow; - // 表单类型 + /** 表单类型 */ private String formType; - // 查询 1:模糊 2：精确 + /** 查询 1:模糊 2：精确 */ private String queryType; - // 字典名称 + /** 字典名称 */ private String dictName; - // 日期注解 + /** 日期注解 */ private String dateAnnotation; public ColumnInfo(String tableName, String columnName, Boolean notNull, String columnType, String remark, String keyType, String extra) { 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 96a9cc36..c494f5bf 100644 --- a/eladmin-generator/src/main/java/me/zhengjie/domain/GenConfig.java +++ b/eladmin-generator/src/main/java/me/zhengjie/domain/GenConfig.java @@ -30,29 +30,29 @@ public class GenConfig { @NotBlank private String tableName; - // 包路径 + /** 包路径 */ @NotBlank private String pack; - // 模块名 + /** 模块名 */ @Column(name = "module_name") @NotBlank private String moduleName; - // 前端文件路径 + /** 前端文件路径 */ @NotBlank private String path; - // 前端文件路径 + /** 前端文件路径 */ @Column(name = "api_path") private String apiPath; - // 作者 + /** 作者 */ private String author; - // 表前缀 + /** 表前缀 */ private String prefix; - // 是否覆盖 + /** 是否覆盖 */ private Boolean cover; } 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 b1b6ba4e..7b5df94e 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 @@ -14,19 +14,19 @@ import lombok.NoArgsConstructor; @NoArgsConstructor public class TableInfo { - // 表名称 + /** 表名称 */ private Object tableName; - // 创建日期 + /** 创建日期 */ private Object createTime; - // 数据库引擎 + /** 数据库引擎 */ private Object engine; - // 编码集 + /** 编码集 */ private Object coding; - // 备注 + /** 备注 */ private Object remark; diff --git a/eladmin-generator/src/main/java/me/zhengjie/repository/ColumnInfoRepository.java b/eladmin-generator/src/main/java/me/zhengjie/repository/ColumnInfoRepository.java index 57d39078..4e8ea1f7 100644 --- a/eladmin-generator/src/main/java/me/zhengjie/repository/ColumnInfoRepository.java +++ b/eladmin-generator/src/main/java/me/zhengjie/repository/ColumnInfoRepository.java @@ -10,5 +10,10 @@ import java.util.List; */ public interface ColumnInfoRepository extends JpaRepository { + /** + * 查询表信息 + * @param tableName 表格名 + * @return 表信息 + */ List findByTableNameOrderByIdAsc(String tableName); } 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 645c217c..7e029af6 100644 --- a/eladmin-generator/src/main/java/me/zhengjie/repository/GenConfigRepository.java +++ b/eladmin-generator/src/main/java/me/zhengjie/repository/GenConfigRepository.java @@ -9,5 +9,10 @@ import org.springframework.data.jpa.repository.JpaRepository; */ public interface GenConfigRepository extends JpaRepository { + /** + * 查询表配置 + * @param tableName 表名 + * @return / + */ GenConfig findByTableName(String tableName); } 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 2c61e368..3b0faacd 100644 --- a/eladmin-generator/src/main/java/me/zhengjie/service/GenConfigService.java +++ b/eladmin-generator/src/main/java/me/zhengjie/service/GenConfigService.java @@ -8,7 +8,18 @@ import me.zhengjie.domain.GenConfig; */ public interface GenConfigService { + /** + * 查询表配置 + * @param tableName 表名 + * @return 表配置 + */ GenConfig find(String tableName); + /** + * 更新表配置 + * @param tableName 表名 + * @param genConfig 表配置 + * @return 表配置 + */ GenConfig update(String tableName, GenConfig genConfig); } 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 3f07e0c9..38a9e6ee 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 @@ -39,14 +39,17 @@ public class GenConfigServiceImpl implements GenConfigService { // 自动设置Api路径，注释掉前需要同步取消前端的注释 String separator = File.separator; String[] paths; - if (separator.equals("\\")) { + String symbol = "\\"; + if (symbol.equals(separator)) { paths = genConfig.getPath().split("\\\\"); - } else paths = genConfig.getPath().split(File.separator); + } else { + paths = genConfig.getPath().split(File.separator); + } StringBuilder api = new StringBuilder(); for (String path : paths) { api.append(path); api.append(separator); - if (path.equals("src")) { + if ("src".equals(path)) { api.append("api"); break; } 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 88b6af9d..4a2168a0 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 @@ -92,7 +92,7 @@ public class GeneratorServiceImpl implements GeneratorService { new ColumnInfo( tableName, arr[0].toString(), - arr[1].equals("NO"), + "NO".equals(arr[1]), arr[2].toString(), ObjectUtil.isNotNull(arr[3]) ? arr[3].toString() : null, ObjectUtil.isNotNull(arr[4]) ? arr[4].toString() : null, 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 ae7c352e..62b72051 100644 --- a/eladmin-generator/src/main/java/me/zhengjie/utils/GenUtil.java +++ b/eladmin-generator/src/main/java/me/zhengjie/utils/GenUtil.java @@ -22,6 +22,7 @@ import java.util.Map; * @date 2019-01-02 */ @Slf4j +@SuppressWarnings("all") public class GenUtil { private static final String TIMESTAMP = "Timestamp"; @@ -63,7 +64,7 @@ public class GenUtil { public static void generatorCode(List columnInfos, GenConfig genConfig) throws IOException { // 存储模版字段数据 - Map genMap = new HashMap<>(); + Map genMap = new HashMap<>(16); // 包名称 genMap.put("package",genConfig.getPack()); // 模块名称 @@ -115,7 +116,7 @@ public class GenUtil { List> isNotNullColumns = new ArrayList<>(); for (ColumnInfo column : columnInfos) { - Map listMap = new HashMap<>(); + Map listMap = new HashMap<>(16); // 字段描述 listMap.put("remark",column.getRemark()); // 字段类型 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 a977fee9..ac0facc5 100644 --- a/eladmin-logging/src/main/java/me/zhengjie/domain/Log.java +++ b/eladmin-logging/src/main/java/me/zhengjie/domain/Log.java @@ -21,40 +21,42 @@ public class Log implements Serializable { @GeneratedValue(strategy = GenerationType.IDENTITY) private Long id; - // 操作用户 + /** 操作用户 */ private String username; - // 描述 + /** 描述 */ private String description; - // 方法名 + /** 方法名 */ private String method; - // 参数 + /** 参数 */ @Column(columnDefinition = "text") private String params; - // 日志类型 + /** 日志类型 */ @Column(name = "log_type") private String logType; - // 请求ip + /** 请求ip */ @Column(name = "request_ip") private String requestIp; + /** 地址 */ @Column(name = "address") private String address; + /** 浏览器 */ private String browser; - // 请求耗时 + /** 请求耗时 */ private Long time; - // 异常详细 + /** 异常详细 */ @Column(name = "exception_detail", columnDefinition = "text") private byte[] exceptionDetail; - // 创建日期 + /** 创建日期 */ @CreationTimestamp @Column(name = "create_time") private Timestamp createTime; 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 903386e3..03bee453 100644 --- a/eladmin-logging/src/main/java/me/zhengjie/repository/LogRepository.java +++ b/eladmin-logging/src/main/java/me/zhengjie/repository/LogRepository.java @@ -15,10 +15,10 @@ public interface LogRepository extends JpaRepository, JpaSpecification /** * 获取一个时间段的IP记录 + * @param date1 startTime + * @param date2 entTime + * @return IP数目 */ @Query(value = "select count(*) FROM (select request_ip FROM log where create_time between ?1 and ?2 GROUP BY request_ip) as s",nativeQuery = true) Long findIp(String date1, String date2); - - @Query(value = "select l FROM Log l where l.id = ?1") - Log findExceptionById(Long id); } 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 166da508..6fbcad75 100644 --- a/eladmin-logging/src/main/java/me/zhengjie/service/LogService.java +++ b/eladmin-logging/src/main/java/me/zhengjie/service/LogService.java @@ -16,12 +16,37 @@ import java.util.List; */ public interface LogService { + /** + * 分页查询 + * @param criteria 查询条件 + * @param pageable 分页参数 + * @return / + */ Object queryAll(LogQueryCriteria criteria, Pageable pageable); + /** + * 查询全部数据 + * @param criteria 查询条件 + * @return / + */ List queryAll(LogQueryCriteria criteria); + /** + * 查询用户日志 + * @param criteria 查询条件 + * @param pageable 分页参数 + * @return - + */ Object queryAllByUser(LogQueryCriteria criteria, Pageable pageable); + /** + * 保存日志数据 + * @param username 用户 + * @param browser 浏览器 + * @param ip 请求IP + * @param joinPoint / + * @param log 日志实体 + */ @Async void save(String username, String browser, String ip, ProceedingJoinPoint joinPoint, Log log); @@ -32,5 +57,11 @@ public interface LogService { */ Object findByErrDetail(Long id); - void download(List queryAll, HttpServletResponse response) throws IOException; + /** + * 导出日志 + * @param logs 待导出的数据 + * @param response / + * @throws IOException / + */ + void download(List logs, HttpServletResponse response) throws IOException; } 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 1548ef00..286f2b8e 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 @@ -13,26 +13,19 @@ public class LogErrorDTO implements Serializable { private Long id; - // 操作用户 private String username; - // 描述 private String description; - // 方法名 private String method; - // 参数 private String params; private String browser; - // 请求ip private String requestIp; private String address; - - // 创建日期 private Timestamp createTime; } \ No newline at end of file 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 651f55c2..40ac94c0 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 @@ -13,7 +13,6 @@ import java.util.List; @Data public class LogQueryCriteria { - // 多字段模糊 @Query(blurry = "username,description,address,requestIp,method,params") private String blurry; 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 22e41fb2..91ca642a 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 @@ -11,19 +11,15 @@ import java.sql.Timestamp; @Data public class LogSmallDTO implements Serializable { - // 描述 private String description; - // 请求ip private String requestIp; - // 请求耗时 private Long time; private String address; private String browser; - // 创建日期 private Timestamp createTime; } 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 8eb59092..56f7a6d1 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 @@ -9,10 +9,7 @@ import me.zhengjie.service.LogService; import me.zhengjie.service.dto.LogQueryCriteria; import me.zhengjie.service.mapper.LogErrorMapper; import me.zhengjie.service.mapper.LogSmallMapper; -import me.zhengjie.utils.FileUtil; -import me.zhengjie.utils.PageUtil; -import me.zhengjie.utils.QueryHelp; -import me.zhengjie.utils.StringUtils; +import me.zhengjie.utils.*; import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.reflect.MethodSignature; import org.springframework.data.domain.Page; @@ -52,7 +49,8 @@ public class LogServiceImpl implements LogService { @Override public Object queryAll(LogQueryCriteria criteria, Pageable pageable){ Page page = logRepository.findAll(((root, criteriaQuery, cb) -> QueryHelp.getPredicate(root, criteria, cb)),pageable); - if ("ERROR".equals(criteria.getLogType())) { + String status = "ERROR"; + if (status.equals(criteria.getLogType())) { return PageUtil.toPage(page.map(logErrorMapper::toDto)); } return page; @@ -97,8 +95,8 @@ public class LogServiceImpl implements LogService { assert log != null; log.setRequestIp(ip); - String LOGINPATH = "login"; - if(LOGINPATH.equals(signature.getName())){ + String loginPath = "login"; + if(loginPath.equals(signature.getName())){ try { assert argValues != null; username = new JSONObject(argValues[0]).get("username").toString(); @@ -116,7 +114,9 @@ public class LogServiceImpl implements LogService { @Override public Object findByErrDetail(Long id) { - byte[] details = logRepository.findExceptionById(id).getExceptionDetail(); + Log log = logRepository.findById(id).orElseGet(Log::new); + ValidationUtil.isNull( log.getId(),"Log","id", id); + byte[] details = log.getExceptionDetail(); return Dict.create().set("exception",new String(ObjectUtil.isNotNull(details) ? details : "".getBytes())); } diff --git a/eladmin-monitor/src/main/java/me/zhengjie/res/ServerMonitorController.java b/eladmin-monitor/src/main/java/me/zhengjie/res/ServerMonitorController.java index 72a71dbe..0a3fcf5d 100644 --- a/eladmin-monitor/src/main/java/me/zhengjie/res/ServerMonitorController.java +++ b/eladmin-monitor/src/main/java/me/zhengjie/res/ServerMonitorController.java @@ -36,19 +36,17 @@ public class ServerMonitorController { FileSystem[] fsArray = sigar.getFileSystemList(); double diskTotal = 0; double diskUsed = 0; - for (int i = 0; i < fsArray.length; i++) { + for (FileSystem fileSystem : fsArray) { try { - FileSystem fs = fsArray[i]; FileSystemUsage usage = null; - usage = sigar.getFileSystemUsage(fs.getDirName()); - switch (fs.getType()) { - case 2: - //本地硬盘 - diskTotal += usage.getTotal()/GB*1024; - diskUsed += usage.getUsed()/GB*1024; - break; + usage = sigar.getFileSystemUsage(fileSystem.getDirName()); + // 本地硬盘 + if (fileSystem.getType() == 2) { + diskTotal += usage.getTotal() / GB * 1024; + diskUsed += usage.getUsed() / GB * 1024; } - } catch (Exception e) {} + } catch (Exception ignored) { + } } resultMap.put("diskTotal",diskTotal); resultMap.put("diskUsed",diskUsed); diff --git a/eladmin-monitor/src/main/java/me/zhengjie/utils/SigarUtil.java b/eladmin-monitor/src/main/java/me/zhengjie/utils/SigarUtil.java index 7e2f70a6..388379d9 100644 --- a/eladmin-monitor/src/main/java/me/zhengjie/utils/SigarUtil.java +++ b/eladmin-monitor/src/main/java/me/zhengjie/utils/SigarUtil.java @@ -1,15 +1,14 @@ package me.zhengjie.utils; import org.hyperic.sigar.*; - import java.net.InetAddress; import java.net.UnknownHostException; import java.util.Map; import java.util.Properties; /** - * @author: ZhangHouYing - * @date: 2019-11-03 15:04 + * @author ZhangHouYing + * @date 2019-11-03 15:04 */ public class SigarUtil { @@ -51,9 +50,12 @@ public class SigarUtil { addr = InetAddress.getLocalHost(); String ip = addr.getHostAddress(); Map map = System.getenv(); - String userName = map.get("USERNAME");// 获取用户名 - String computerName = map.get("COMPUTERNAME");// 获取计算机名 - String userDomain = map.get("USERDOMAIN");// 获取计算机域名 + // 获取用户名 + String userName = map.get("USERNAME"); + // 获取计算机名 + String computerName = map.get("COMPUTERNAME"); + // 获取计算机域名 + String userDomain = map.get("USERDOMAIN"); System.out.println("用户名: " + userName); System.out.println("计算机名: " + computerName); System.out.println("计算机域名: " + userDomain); @@ -111,97 +113,100 @@ public class SigarUtil { private static void cpu() throws SigarException { Sigar sigar = new Sigar(); - CpuInfo infos[] = sigar.getCpuInfoList(); - CpuPerc cpuList[] = null; + CpuInfo[] infos = sigar.getCpuInfoList(); + CpuPerc[] cpuList; System.out.println("cpu 总量参数情况:" + sigar.getCpu()); System.out.println("cpu 总百分比情况:" + sigar.getCpuPerc()); cpuList = sigar.getCpuPercList(); - for (int i = 0; i < infos.length; i++) {// 不管是单块CPU还是多CPU都适用 + // 不管是单块CPU还是多CPU都适用 + for (int i = 0; i < infos.length; i++) { CpuInfo info = infos[i]; System.out.println("第" + (i + 1) + "块CPU信息"); - System.out.println("CPU的总量MHz: " + info.getMhz());// CPU的总量MHz - System.out.println("CPU生产商: " + info.getVendor());// 获得CPU的卖主，如：Intel - System.out.println("CPU类别: " + info.getModel());// 获得CPU的类别，如：Celeron - System.out.println("CPU缓存数量: " + info.getCacheSize());// 缓冲存储器数量 + // CPU的总量MHz + System.out.println("CPU的总量MHz: " + info.getMhz()); + // 获得CPU的卖主，如：Intel + System.out.println("CPU生产商: " + info.getVendor()); + // 获得CPU的类别 + System.out.println("CPU类别: " + info.getModel()); + // 缓冲存储器数量 + System.out.println("CPU缓存数量: " + info.getCacheSize()); printCpuPerc(cpuList[i]); } } private static void printCpuPerc(CpuPerc cpu) { - System.out.println("CPU用户使用率: " + CpuPerc.format(cpu.getUser()));// 用户使用率 - System.out.println("CPU系统使用率: " + CpuPerc.format(cpu.getSys()));// 系统使用率 - System.out.println("CPU当前等待率: " + CpuPerc.format(cpu.getWait()));// 当前等待率 - System.out.println("CPU当前错误率: " + CpuPerc.format(cpu.getNice()));// - System.out.println("CPU当前空闲率: " + CpuPerc.format(cpu.getIdle()));// 当前空闲率 - System.out.println("CPU总的使用率: " + CpuPerc.format(cpu.getCombined()));// 总的使用率 + System.out.println("CPU用户使用率: " + CpuPerc.format(cpu.getUser())); + System.out.println("CPU系统使用率: " + CpuPerc.format(cpu.getSys())); + System.out.println("CPU当前等待率: " + CpuPerc.format(cpu.getWait())); + System.out.println("CPU当前错误率: " + CpuPerc.format(cpu.getNice())); + System.out.println("CPU当前空闲率: " + CpuPerc.format(cpu.getIdle())); + System.out.println("CPU总的使用率: " + CpuPerc.format(cpu.getCombined())); } private static void os() { - OperatingSystem OS = OperatingSystem.getInstance(); + OperatingSystem os = OperatingSystem.getInstance(); // 操作系统内核类型如： 386、486、586等x86 - System.out.println("操作系统: " + OS.getArch()); - System.out.println("操作系统CpuEndian(): " + OS.getCpuEndian());// - System.out.println("操作系统DataModel(): " + OS.getDataModel());// + System.out.println("操作系统: " + os.getArch()); + System.out.println("操作系统CpuEndian(): " + os.getCpuEndian()); + System.out.println("操作系统DataModel(): " + os.getDataModel()); // 系统描述 - System.out.println("操作系统的描述: " + OS.getDescription()); + System.out.println("操作系统的描述: " + os.getDescription()); // 操作系统类型 - // System.out.println("OS.getName(): " + OS.getName()); - // System.out.println("OS.getPatchLevel(): " + OS.getPatchLevel());// + System.out.println("OS.getName(): " + os.getName()); + System.out.println("OS.getPatchLevel(): " + os.getPatchLevel()); // 操作系统的卖主 - System.out.println("操作系统的卖主: " + OS.getVendor()); + System.out.println("操作系统的卖主: " + os.getVendor()); // 卖主名称 - System.out.println("操作系统的卖主名: " + OS.getVendorCodeName()); + System.out.println("操作系统的卖主名: " + os.getVendorCodeName()); // 操作系统名称 - System.out.println("操作系统名称: " + OS.getVendorName()); + System.out.println("操作系统名称: " + os.getVendorName()); // 操作系统卖主类型 - System.out.println("操作系统卖主类型: " + OS.getVendorVersion()); + System.out.println("操作系统卖主类型: " + os.getVendorVersion()); // 操作系统的版本号 - System.out.println("操作系统的版本号: " + OS.getVersion()); + System.out.println("操作系统的版本号: " + os.getVersion()); } private static void who() throws SigarException { Sigar sigar = new Sigar(); - Who who[] = sigar.getWhoList(); - if (who != null && who.length > 0) { - for (int i = 0; i < who.length; i++) { - // System.out.println("当前系统进程表中的用户名" + String.valueOf(i)); - Who _who = who[i]; - System.out.println("用户控制台: " + _who.getDevice()); - System.out.println("用户host: " + _who.getHost()); - // System.out.println("getTime(): " + _who.getTime()); + Who[] whos = sigar.getWhoList(); + if (whos != null && whos.length > 0) { + for (Who who : whos) { + System.out.println("用户控制台: " + who.getDevice()); + System.out.println("用户host: " + who.getHost()); // 当前系统进程表中的用户名 - System.out.println("当前系统进程表中的用户名: " + _who.getUser()); + System.out.println("当前系统进程表中的用户名: " + who.getUser()); } } } private static void file() throws Exception { Sigar sigar = new Sigar(); - FileSystem fslist[] = sigar.getFileSystemList(); - for (int i = 0; i < fslist.length; i++) { + FileSystem[] fsList = sigar.getFileSystemList(); + for (int i = 0; i < fsList.length; i++) { System.out.println("分区的盘符名称" + i); - FileSystem fs = fslist[i]; + FileSystem fs = fsList[i]; // 分区的盘符名称 System.out.println("盘符名称: " + fs.getDevName()); // 分区的盘符名称 System.out.println("盘符路径: " + fs.getDirName()); - System.out.println("盘符标志: " + fs.getFlags());// + System.out.println("盘符标志: " + fs.getFlags()); // 文件系统类型，比如 FAT32、NTFS System.out.println("盘符类型: " + fs.getSysTypeName()); // 文件系统类型名，比如本地硬盘、光驱、网络文件系统等 System.out.println("盘符类型名: " + fs.getTypeName()); // 文件系统类型 System.out.println("盘符文件系统类型: " + fs.getType()); - FileSystemUsage usage = null; + FileSystemUsage usage; usage = sigar.getFileSystemUsage(fs.getDirName()); switch (fs.getType()) { - case 0: // TYPE_UNKNOWN ：未知 - break; - case 1: // TYPE_NONE - break; - case 2: // TYPE_LOCAL_DISK : 本地硬盘 + // TYPE_UNKNOWN ：未知 + case 0: break; + // TYPE_NONE + case 1: break; + // TYPE_LOCAL_DISK : 本地硬盘 + case 2: // 文件系统总大小 System.out.println(fs.getDevName() + "总大小: " + usage.getTotal() + "KB"); // 文件系统剩余大小 @@ -214,62 +219,61 @@ public class SigarUtil { // 文件系统资源的利用率 System.out.println(fs.getDevName() + "资源的利用率: " + usePercent + "%"); break; - case 3:// TYPE_NETWORK ：网络 - break; - case 4:// TYPE_RAM_DISK ：闪存 - break; - case 5:// TYPE_CDROM ：光驱 - break; - case 6:// TYPE_SWAP ：页面交换 - break; + // TYPE_NETWORK ：网络 + case 3: break; + // TYPE_RAM_DISK ：闪存 + case 4: break; + // TYPE_CD_ROM ：光驱 + case 5: break; + // TYPE_SWAP ：页面交换 + case 6: break; + default: break; } - System.out.println(fs.getDevName() + "读出： " + usage.getDiskReads()); - System.out.println(fs.getDevName() + "写入： " + usage.getDiskWrites()); + System.out.println(fs.getDevName() + "读出：" + usage.getDiskReads()); + System.out.println(fs.getDevName() + "写入：" + usage.getDiskWrites()); } - return; } private static void net() throws Exception { Sigar sigar = new Sigar(); - String ifNames[] = sigar.getNetInterfaceList(); - for (int i = 0; i < ifNames.length; i++) { - String name = ifNames[i]; + String[] ifNames = sigar.getNetInterfaceList(); + for (String name : ifNames) { NetInterfaceConfig ifconfig = sigar.getNetInterfaceConfig(name); - System.out.println("网络设备名: " + name);// 网络设备名 - System.out.println("IP地址: " + ifconfig.getAddress());// IP地址 - System.out.println("子网掩码: " + ifconfig.getNetmask());// 子网掩码 + System.out.println("网络设备名: " + name); + System.out.println("IP地址: " + ifconfig.getAddress()); + System.out.println("子网掩码: " + ifconfig.getNetmask()); if ((ifconfig.getFlags() & 1L) <= 0L) { System.out.println("!IFF_UP...skipping getNetInterfaceStat"); continue; } NetInterfaceStat ifstat = sigar.getNetInterfaceStat(name); - System.out.println(name + "接收的总包裹数:" + ifstat.getRxPackets());// 接收的总包裹数 - System.out.println(name + "发送的总包裹数:" + ifstat.getTxPackets());// 发送的总包裹数 - System.out.println(name + "接收到的总字节数:" + ifstat.getRxBytes());// 接收到的总字节数 - System.out.println(name + "发送的总字节数:" + ifstat.getTxBytes());// 发送的总字节数 - System.out.println(name + "接收到的错误包数:" + ifstat.getRxErrors());// 接收到的错误包数 - System.out.println(name + "发送数据包时的错误数:" + ifstat.getTxErrors());// 发送数据包时的错误数 - System.out.println(name + "接收时丢弃的包数:" + ifstat.getRxDropped());// 接收时丢弃的包数 - System.out.println(name + "发送时丢弃的包数:" + ifstat.getTxDropped());// 发送时丢弃的包数 + System.out.println(name + "接收的总包裹数:" + ifstat.getRxPackets()); + System.out.println(name + "发送的总包裹数:" + ifstat.getTxPackets()); + System.out.println(name + "接收到的总字节数:" + ifstat.getRxBytes()); + System.out.println(name + "发送的总字节数:" + ifstat.getTxBytes()); + System.out.println(name + "接收到的错误包数:" + ifstat.getRxErrors()); + System.out.println(name + "发送数据包时的错误数:" + ifstat.getTxErrors()); + System.out.println(name + "接收时丢弃的包数:" + ifstat.getRxDropped()); + System.out.println(name + "发送时丢弃的包数:" + ifstat.getTxDropped()); } } private static void ethernet() throws SigarException { - Sigar sigar = null; + Sigar sigar; sigar = new Sigar(); - String[] ifaces = sigar.getNetInterfaceList(); - for (int i = 0; i < ifaces.length; i++) { - NetInterfaceConfig cfg = sigar.getNetInterfaceConfig(ifaces[i]); + String[] ifAces = sigar.getNetInterfaceList(); + for (String ifAce : ifAces) { + NetInterfaceConfig cfg = sigar.getNetInterfaceConfig(ifAce); if (NetFlags.LOOPBACK_ADDRESS.equals(cfg.getAddress()) || (cfg.getFlags() & NetFlags.IFF_LOOPBACK) != 0 || NetFlags.NULL_HWADDR.equals(cfg.getHwaddr())) { continue; } - System.out.println(cfg.getName() + "IP地址:" + cfg.getAddress());// IP地址 - System.out.println(cfg.getName() + "网关广播地址:" + cfg.getBroadcast());// 网关广播地址 - System.out.println(cfg.getName() + "网卡MAC地址:" + cfg.getHwaddr());// 网卡MAC地址 - System.out.println(cfg.getName() + "子网掩码:" + cfg.getNetmask());// 子网掩码 - System.out.println(cfg.getName() + "网卡描述信息:" + cfg.getDescription());// 网卡描述信息 - System.out.println(cfg.getName() + "网卡类型" + cfg.getType());// + System.out.println(cfg.getName() + "IP地址:" + cfg.getAddress()); + System.out.println(cfg.getName() + "网关广播地址:" + cfg.getBroadcast()); + System.out.println(cfg.getName() + "网卡MAC地址:" + cfg.getHwaddr()); + System.out.println(cfg.getName() + "子网掩码:" + cfg.getNetmask()); + System.out.println(cfg.getName() + "网卡描述信息:" + cfg.getDescription()); + System.out.println(cfg.getName() + "网卡类型" + cfg.getType()); } } } 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 13daa454..6c03ead2 100644 --- a/eladmin-system/src/main/java/me/zhengjie/config/DataScope.java +++ b/eladmin-system/src/main/java/me/zhengjie/config/DataScope.java @@ -4,11 +4,9 @@ import me.zhengjie.modules.system.domain.Dept; import me.zhengjie.modules.system.service.DeptService; import me.zhengjie.modules.system.service.RoleService; import me.zhengjie.modules.system.service.UserService; -import me.zhengjie.modules.system.service.dto.DeptDTO; -import me.zhengjie.modules.system.service.dto.RoleSmallDTO; -import me.zhengjie.modules.system.service.dto.UserDTO; +import me.zhengjie.modules.system.service.dto.RoleSmallDto; +import me.zhengjie.modules.system.service.dto.UserDto; import me.zhengjie.utils.SecurityUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import java.util.ArrayList; import java.util.HashSet; @@ -39,15 +37,15 @@ public class DataScope { public Set getDeptIds() { - UserDTO user = userService.findByName(SecurityUtils.getUsername()); + UserDto user = userService.findByName(SecurityUtils.getUsername()); // 用于存储部门id Set deptIds = new HashSet<>(); // 查询用户角色 - List roleSet = roleService.findByUsers_Id(user.getId()); + List roleSet = roleService.findByUsersId(user.getId()); - for (RoleSmallDTO role : roleSet) { + for (RoleSmallDto role : roleSet) { if (scopeType[0].equals(role.getDataScope())) { return new HashSet<>() ; diff --git a/eladmin-system/src/main/java/me/zhengjie/config/thread/AsyncTaskExecutePool.java b/eladmin-system/src/main/java/me/zhengjie/config/thread/AsyncTaskExecutePool.java index 105aad45..b1e3f609 100644 --- a/eladmin-system/src/main/java/me/zhengjie/config/thread/AsyncTaskExecutePool.java +++ b/eladmin-system/src/main/java/me/zhengjie/config/thread/AsyncTaskExecutePool.java @@ -17,7 +17,7 @@ import java.util.concurrent.ThreadPoolExecutor; @Configuration public class AsyncTaskExecutePool implements AsyncConfigurer { - //注入配置类 + /** 注入配置类 */ private final AsyncTaskProperties config; public AsyncTaskExecutePool(AsyncTaskProperties config) { diff --git a/eladmin-system/src/main/java/me/zhengjie/config/thread/TheadFactoryName.java b/eladmin-system/src/main/java/me/zhengjie/config/thread/TheadFactoryName.java index d5cb656c..482be948 100644 --- a/eladmin-system/src/main/java/me/zhengjie/config/thread/TheadFactoryName.java +++ b/eladmin-system/src/main/java/me/zhengjie/config/thread/TheadFactoryName.java @@ -13,7 +13,7 @@ import java.util.concurrent.atomic.AtomicInteger; @Component public class TheadFactoryName implements ThreadFactory { - private static final AtomicInteger poolNumber = new AtomicInteger(1); + private static final AtomicInteger POOL_NUMBER = new AtomicInteger(1); private final ThreadGroup group; private final AtomicInteger threadNumber = new AtomicInteger(1); private final String namePrefix; @@ -28,7 +28,7 @@ public class TheadFactoryName implements ThreadFactory { Thread.currentThread().getThreadGroup(); //此时namePrefix就是 name + 第几个用这个工厂创建线程池的 this.namePrefix = name + - poolNumber.getAndIncrement(); + POOL_NUMBER.getAndIncrement(); } @Override diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/domain/ServerDeploy.java b/eladmin-system/src/main/java/me/zhengjie/modules/mnt/domain/ServerDeploy.java index adfc5ca1..cf49ecce 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/domain/ServerDeploy.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/mnt/domain/ServerDeploy.java @@ -18,9 +18,6 @@ import java.sql.Timestamp; @Table(name="mnt_server") public class ServerDeploy implements Serializable { - /** - * 服务器IP - */ @Id @GeneratedValue(strategy = GenerationType.IDENTITY) private Long id; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/repository/ServerDeployRepository.java b/eladmin-system/src/main/java/me/zhengjie/modules/mnt/repository/ServerDeployRepository.java index 634cb4c7..a7db416a 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/repository/ServerDeployRepository.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/mnt/repository/ServerDeployRepository.java @@ -12,5 +12,10 @@ import org.springframework.data.jpa.repository.Query; */ public interface ServerDeployRepository extends JpaRepository, JpaSpecificationExecutor { + /** + * 根据IP查询 + * @param ip / + * @return / + */ ServerDeploy findByIp(String ip); } diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/AppService.java b/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/AppService.java index 69ce5c45..110dd9c8 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/AppService.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/AppService.java @@ -1,7 +1,7 @@ package me.zhengjie.modules.mnt.service; import me.zhengjie.modules.mnt.domain.App; -import me.zhengjie.modules.mnt.service.dto.AppDTO; +import me.zhengjie.modules.mnt.service.dto.AppDto; import me.zhengjie.modules.mnt.service.dto.AppQueryCriteria; import org.springframework.data.domain.Pageable; @@ -11,15 +11,44 @@ import org.springframework.data.domain.Pageable; */ public interface AppService { + /** + * 分页查询 + * @param criteria 条件 + * @param pageable 分页参数 + * @return / + */ Object queryAll(AppQueryCriteria criteria, Pageable pageable); + /** + * 查询全部数据 + * @param criteria 条件 + * @return / + */ Object queryAll(AppQueryCriteria criteria); - AppDTO findById(Long id); + /** + * 根据ID查询 + * @param id / + * @return / + */ + AppDto findById(Long id); - AppDTO create(App resources); + /** + * 创建 + * @param resources / + * @return / + */ + AppDto create(App resources); + /** + * 编辑 + * @param resources / + */ void update(App resources); + /** + * 删除 + * @param id / + */ void delete(Long id); } diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/DatabaseService.java b/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/DatabaseService.java index c3ba2305..9e2e7b18 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/DatabaseService.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/DatabaseService.java @@ -1,7 +1,7 @@ package me.zhengjie.modules.mnt.service; import me.zhengjie.modules.mnt.domain.Database; -import me.zhengjie.modules.mnt.service.dto.DatabaseDTO; +import me.zhengjie.modules.mnt.service.dto.DatabaseDto; import me.zhengjie.modules.mnt.service.dto.DatabaseQueryCriteria; import org.springframework.data.domain.Pageable; @@ -11,15 +11,44 @@ import org.springframework.data.domain.Pageable; */ public interface DatabaseService { + /** + * 分页查询 + * @param criteria 条件 + * @param pageable 分页参数 + * @return / + */ Object queryAll(DatabaseQueryCriteria criteria, Pageable pageable); + /** + * 查询全部 + * @param criteria 条件 + * @return / + */ Object queryAll(DatabaseQueryCriteria criteria); - DatabaseDTO findById(String id); + /** + * 根据ID查询 + * @param id / + * @return / + */ + DatabaseDto findById(String id); - DatabaseDTO create(Database resources); + /** + * 创建 + * @param resources / + * @return / + */ + DatabaseDto create(Database resources); + /** + * 编辑 + * @param resources / + */ void update(Database resources); + /** + * 删除 + * @param id / + */ void delete(String id); } diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/DeployHistoryService.java b/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/DeployHistoryService.java index 41fb340d..760ae39f 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/DeployHistoryService.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/DeployHistoryService.java @@ -1,19 +1,47 @@ package me.zhengjie.modules.mnt.service; import me.zhengjie.modules.mnt.domain.DeployHistory; -import me.zhengjie.modules.mnt.service.dto.DeployHistoryDTO; +import me.zhengjie.modules.mnt.service.dto.DeployHistoryDto; import me.zhengjie.modules.mnt.service.dto.DeployHistoryQueryCriteria; import org.springframework.data.domain.Pageable; +/** + * @author zhanghouying + */ public interface DeployHistoryService { + /** + * 分页查询 + * @param criteria 条件 + * @param pageable 分页参数 + * @return / + */ Object queryAll(DeployHistoryQueryCriteria criteria, Pageable pageable); + /** + * 查询全部 + * @param criteria 条件 + * @return / + */ Object queryAll(DeployHistoryQueryCriteria criteria); - DeployHistoryDTO findById(String id); + /** + * 根据ID查询 + * @param id / + * @return / + */ + DeployHistoryDto findById(String id); - DeployHistoryDTO create(DeployHistory resources); + /** + * 创建 + * @param resources / + * @return / + */ + DeployHistoryDto create(DeployHistory resources); + /** + * 删除 + * @param id / + */ void delete(String id); } diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/DeployService.java b/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/DeployService.java index cf7e96e2..c1c47303 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/DeployService.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/DeployService.java @@ -2,7 +2,7 @@ package me.zhengjie.modules.mnt.service; import me.zhengjie.modules.mnt.domain.Deploy; import me.zhengjie.modules.mnt.domain.DeployHistory; -import me.zhengjie.modules.mnt.service.dto.DeployDTO; +import me.zhengjie.modules.mnt.service.dto.DeployDto; import me.zhengjie.modules.mnt.service.dto.DeployQueryCriteria; import org.springframework.data.domain.Pageable; @@ -12,25 +12,54 @@ import org.springframework.data.domain.Pageable; */ public interface DeployService { + /** + * 分页查询 + * @param criteria 条件 + * @param pageable 分页参数 + * @return / + */ Object queryAll(DeployQueryCriteria criteria, Pageable pageable); + /** + * 查询全部数据 + * @param criteria 条件 + * @return / + */ Object queryAll(DeployQueryCriteria criteria); - DeployDTO findById(Long id); + /** + * 根据ID查询 + * @param id / + * @return / + */ + DeployDto findById(Long id); - DeployDTO create(Deploy resources); + /** + * 创建 + * @param resources / + * @return / + */ + DeployDto create(Deploy resources); + + /** + * 编辑 + * @param resources / + */ void update(Deploy resources); + /** + * 删除 + * @param id / + */ void delete(Long id); /** * 部署文件到服务器 * @param fileSavePath 文件路径 * @param appId 应用ID - * @return / - */ - String deploy(String fileSavePath, Long appId); + */ + void deploy(String fileSavePath, Long appId); /** * 查询部署状态 diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/ServerDeployService.java b/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/ServerDeployService.java index 1f11e766..851e4d1f 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/ServerDeployService.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/ServerDeployService.java @@ -1,7 +1,7 @@ package me.zhengjie.modules.mnt.service; import me.zhengjie.modules.mnt.domain.ServerDeploy; -import me.zhengjie.modules.mnt.service.dto.ServerDeployDTO; +import me.zhengjie.modules.mnt.service.dto.ServerDeployDto; import me.zhengjie.modules.mnt.service.dto.ServerDeployQueryCriteria; import org.springframework.data.domain.Pageable; @@ -11,17 +11,51 @@ import org.springframework.data.domain.Pageable; */ public interface ServerDeployService { + /** + * 分页查询 + * @param criteria 条件 + * @param pageable 分页参数 + * @return / + */ Object queryAll(ServerDeployQueryCriteria criteria, Pageable pageable); + /** + * 查询全部数据 + * @param criteria 条件 + * @return / + */ Object queryAll(ServerDeployQueryCriteria criteria); - ServerDeployDTO findById(Long id); + /** + * 根据ID查询 + * @param id / + * @return / + */ + ServerDeployDto findById(Long id); - ServerDeployDTO create(ServerDeploy resources); + /** + * 创建 + * @param resources / + * @return / + */ + ServerDeployDto create(ServerDeploy resources); + /** + * 编辑 + * @param resources / + */ void update(ServerDeploy resources); + /** + * 删除 + * @param id / + */ void delete(Long id); - ServerDeployDTO findByIp(String ip); + /** + * 根据IP查询 + * @param ip / + * @return / + */ + ServerDeployDto findByIp(String ip); } diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/dto/AppDTO.java b/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/dto/AppDto.java similarity index 89% rename from eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/dto/AppDTO.java rename to eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/dto/AppDto.java index 4c32e55c..a9f52b09 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/dto/AppDTO.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/dto/AppDto.java @@ -11,7 +11,7 @@ import java.sql.Timestamp; * @date 2019-08-24 */ @Data -public class AppDTO implements Serializable { +public class AppDto implements Serializable { /** * 应用编号 @@ -26,7 +26,7 @@ public class AppDTO implements Serializable { /** * 端口 */ - private int port; + private Integer port; /** * 上传目录 diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/dto/DatabaseDTO.java b/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/dto/DatabaseDto.java similarity index 89% rename from eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/dto/DatabaseDTO.java rename to eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/dto/DatabaseDto.java index 90ac5653..ae62bfb7 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/dto/DatabaseDTO.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/dto/DatabaseDto.java @@ -9,7 +9,7 @@ import java.io.Serializable; * @date 2019-08-24 */ @Data -public class DatabaseDTO implements Serializable { +public class DatabaseDto implements Serializable { /** * id diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/dto/DeployDTO.java b/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/dto/DeployDto.java similarity index 77% rename from eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/dto/DeployDTO.java rename to eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/dto/DeployDto.java index ee7e1cf0..0344a261 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/dto/DeployDTO.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/dto/DeployDto.java @@ -13,19 +13,19 @@ import java.util.stream.Collectors; * @date 2019-08-24 */ @Data -public class DeployDTO implements Serializable { +public class DeployDto implements Serializable { /** * 部署编号 */ private String id; - private AppDTO app; + private AppDto app; /** * 服务器 */ - private Set deploys; + private Set deploys; private String servers; @@ -38,7 +38,7 @@ public class DeployDTO implements Serializable { public String getServers() { if(CollectionUtil.isNotEmpty(deploys)){ - return deploys.stream().map(ServerDeployDTO::getName).collect(Collectors.joining(",")); + return deploys.stream().map(ServerDeployDto::getName).collect(Collectors.joining(",")); } return servers; } diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/dto/DeployHistoryDTO.java b/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/dto/DeployHistoryDto.java similarity index 89% rename from eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/dto/DeployHistoryDTO.java rename to eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/dto/DeployHistoryDto.java index 59c6743b..1dd0939f 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/dto/DeployHistoryDTO.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/dto/DeployHistoryDto.java @@ -10,7 +10,7 @@ import java.sql.Timestamp; * @date 2019-08-24 */ @Data -public class DeployHistoryDTO implements Serializable { +public class DeployHistoryDto implements Serializable { /** * 编号 diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/dto/ServerDeployDTO.java b/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/dto/ServerDeployDto.java similarity index 86% rename from eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/dto/ServerDeployDTO.java rename to eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/dto/ServerDeployDto.java index 981bec76..acdc830d 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/dto/ServerDeployDTO.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/dto/ServerDeployDto.java @@ -10,7 +10,7 @@ import java.sql.Timestamp; * @date 2019-08-24 */ @Data -public class ServerDeployDTO implements Serializable { +public class ServerDeployDto implements Serializable { private Long id; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/impl/AppServiceImpl.java b/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/impl/AppServiceImpl.java index 6476875d..795e52a9 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/impl/AppServiceImpl.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/impl/AppServiceImpl.java @@ -3,7 +3,7 @@ package me.zhengjie.modules.mnt.service.impl; import me.zhengjie.modules.mnt.domain.App; import me.zhengjie.modules.mnt.repository.AppRepository; import me.zhengjie.modules.mnt.service.AppService; -import me.zhengjie.modules.mnt.service.dto.AppDTO; +import me.zhengjie.modules.mnt.service.dto.AppDto; import me.zhengjie.modules.mnt.service.dto.AppQueryCriteria; import me.zhengjie.modules.mnt.service.mapper.AppMapper; import me.zhengjie.utils.PageUtil; @@ -44,7 +44,7 @@ public class AppServiceImpl implements AppService { } @Override - public AppDTO findById(Long id) { + public AppDto findById(Long id) { App app = appRepository.findById(id).orElseGet(App::new); ValidationUtil.isNull(app.getId(),"App","id",id); return appMapper.toDto(app); @@ -52,7 +52,7 @@ public class AppServiceImpl implements AppService { @Override @Transactional(rollbackFor = Exception.class) - public AppDTO create(App resources) { + public AppDto create(App resources) { return appMapper.toDto(appRepository.save(resources)); } diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/impl/DatabaseServiceImpl.java b/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/impl/DatabaseServiceImpl.java index 033fa92f..aa9e3cf7 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/impl/DatabaseServiceImpl.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/impl/DatabaseServiceImpl.java @@ -4,7 +4,7 @@ import cn.hutool.core.util.IdUtil; import me.zhengjie.modules.mnt.domain.Database; import me.zhengjie.modules.mnt.repository.DatabaseRepository; import me.zhengjie.modules.mnt.service.DatabaseService; -import me.zhengjie.modules.mnt.service.dto.DatabaseDTO; +import me.zhengjie.modules.mnt.service.dto.DatabaseDto; import me.zhengjie.modules.mnt.service.dto.DatabaseQueryCriteria; import me.zhengjie.modules.mnt.service.mapper.DatabaseMapper; import me.zhengjie.utils.PageUtil; @@ -45,7 +45,7 @@ public class DatabaseServiceImpl implements DatabaseService { } @Override - public DatabaseDTO findById(String id) { + public DatabaseDto findById(String id) { Database database = databaseRepository.findById(id).orElseGet(Database::new); ValidationUtil.isNull(database.getId(),"Database","id",id); return databaseMapper.toDto(database); @@ -53,7 +53,7 @@ public class DatabaseServiceImpl implements DatabaseService { @Override @Transactional(rollbackFor = Exception.class) - public DatabaseDTO create(Database resources) { + public DatabaseDto create(Database resources) { resources.setId(IdUtil.simpleUUID()); return databaseMapper.toDto(databaseRepository.save(resources)); } diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/impl/DeployHistoryServiceImpl.java b/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/impl/DeployHistoryServiceImpl.java index 6d044fc9..62040dcc 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/impl/DeployHistoryServiceImpl.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/impl/DeployHistoryServiceImpl.java @@ -4,7 +4,7 @@ import cn.hutool.core.util.IdUtil; import me.zhengjie.modules.mnt.domain.DeployHistory; import me.zhengjie.modules.mnt.repository.DeployHistoryRepository; import me.zhengjie.modules.mnt.service.DeployHistoryService; -import me.zhengjie.modules.mnt.service.dto.DeployHistoryDTO; +import me.zhengjie.modules.mnt.service.dto.DeployHistoryDto; import me.zhengjie.modules.mnt.service.dto.DeployHistoryQueryCriteria; import me.zhengjie.modules.mnt.service.mapper.DeployHistoryMapper; import me.zhengjie.utils.PageUtil; @@ -45,7 +45,7 @@ public class DeployHistoryServiceImpl implements DeployHistoryService { } @Override - public DeployHistoryDTO findById(String id) { + public DeployHistoryDto findById(String id) { DeployHistory deployhistory = deployhistoryRepository.findById(id).orElseGet(DeployHistory::new); ValidationUtil.isNull(deployhistory.getId(),"DeployHistory","id",id); return deployhistoryMapper.toDto(deployhistory); @@ -53,7 +53,7 @@ public class DeployHistoryServiceImpl implements DeployHistoryService { @Override @Transactional(rollbackFor = Exception.class) - public DeployHistoryDTO create(DeployHistory resources) { + public DeployHistoryDto create(DeployHistory resources) { resources.setId(IdUtil.simpleUUID()); return deployhistoryMapper.toDto(deployhistoryRepository.save(resources)); } diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/impl/DeployServiceImpl.java b/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/impl/DeployServiceImpl.java index f72e6401..ec6602ba 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/impl/DeployServiceImpl.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/impl/DeployServiceImpl.java @@ -67,30 +67,30 @@ public class DeployServiceImpl implements DeployService { } @Override - public List queryAll(DeployQueryCriteria criteria) { + public List queryAll(DeployQueryCriteria criteria) { return deployMapper.toDto(deployRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root, criteria, criteriaBuilder))); } @Override - public DeployDTO findById(Long id) { - Deploy Deploy = deployRepository.findById(id).orElseGet(Deploy::new); - ValidationUtil.isNull(Deploy.getId(), "Deploy", "id", id); - return deployMapper.toDto(Deploy); + public DeployDto findById(Long id) { + Deploy deploy = deployRepository.findById(id).orElseGet(Deploy::new); + ValidationUtil.isNull(deploy.getId(), "Deploy", "id", id); + return deployMapper.toDto(deploy); } @Override @Transactional(rollbackFor = Exception.class) - public DeployDTO create(Deploy resources) { + public DeployDto create(Deploy resources) { return deployMapper.toDto(deployRepository.save(resources)); } @Override @Transactional(rollbackFor = Exception.class) public void update(Deploy resources) { - Deploy Deploy = deployRepository.findById(resources.getId()).orElseGet(Deploy::new); - ValidationUtil.isNull(Deploy.getId(), "Deploy", "id", resources.getId()); - Deploy.copy(resources); - deployRepository.save(Deploy); + Deploy deploy = deployRepository.findById(resources.getId()).orElseGet(Deploy::new); + ValidationUtil.isNull(deploy.getId(), "Deploy", "id", resources.getId()); + deploy.copy(resources); + deployRepository.save(deploy); } @Override @@ -100,8 +100,8 @@ public class DeployServiceImpl implements DeployService { } @Override - public String deploy(String fileSavePath, Long id) { - return deployApp(fileSavePath, id); + public void deploy(String fileSavePath, Long id) { + deployApp(fileSavePath, id); } /** @@ -111,12 +111,12 @@ public class DeployServiceImpl implements DeployService { */ private String deployApp(String fileSavePath, Long id) { - DeployDTO deploy = findById(id); + DeployDto deploy = findById(id); if (deploy == null) { sendMsg("部署信息不存在", MsgType.ERROR); throw new BadRequestException("部署信息不存在"); } - AppDTO app = deploy.getApp(); + AppDto app = deploy.getApp(); if (app == null) { sendMsg("包对应应用信息不存在", MsgType.ERROR); throw new BadRequestException("包对应应用信息不存在"); @@ -126,8 +126,8 @@ public class DeployServiceImpl implements DeployService { String uploadPath = app.getUploadPath(); StringBuilder sb = new StringBuilder(); String msg; - Set deploys = deploy.getDeploys(); - for (ServerDeployDTO deployDTO : deploys) { + Set deploys = deploy.getDeploys(); + for (ServerDeployDto deployDTO : deploys) { String ip = deployDTO.getIp(); ExecuteShellUtil executeShellUtil = getExecuteShellUtil(ip); //判断是否第一次部署 @@ -252,7 +252,7 @@ public class DeployServiceImpl implements DeployService { return "执行完毕"; } - private boolean checkFile(ExecuteShellUtil executeShellUtil, AppDTO appDTO) { + private boolean checkFile(ExecuteShellUtil executeShellUtil, AppDto appDTO) { String sb = "find " + appDTO.getDeployPath() + " -name " + @@ -346,7 +346,8 @@ public class DeployServiceImpl implements DeployService { //删除原来应用 sendMsg("删除应用", MsgType.INFO); //考虑到系统安全性，必须限制下操作目录 - if (!deployPath.startsWith("/opt")) { + String path = "/opt"; + if (!deployPath.startsWith(path)) { throw new BadRequestException("部署路径必须在opt目录下：" + deployPath); } executeShellUtil.execute("rm -rf " + deployPath + FILE_SEPARATOR + resources.getAppName()); @@ -366,7 +367,7 @@ public class DeployServiceImpl implements DeployService { } private ExecuteShellUtil getExecuteShellUtil(String ip) { - ServerDeployDTO serverDeployDTO = serverDeployService.findByIp(ip); + ServerDeployDto serverDeployDTO = serverDeployService.findByIp(ip); if (serverDeployDTO == null) { sendMsg("IP对应服务器信息不存在：" + ip, MsgType.ERROR); throw new BadRequestException("IP对应服务器信息不存在：" + ip); @@ -375,7 +376,7 @@ public class DeployServiceImpl implements DeployService { } private ScpClientUtil getScpClientUtil(String ip) { - ServerDeployDTO serverDeployDTO = serverDeployService.findByIp(ip); + ServerDeployDto serverDeployDTO = serverDeployService.findByIp(ip); if (serverDeployDTO == null) { sendMsg("IP对应服务器信息不存在：" + ip, MsgType.ERROR); throw new BadRequestException("IP对应服务器信息不存在：" + ip); diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/impl/ServerDeployServiceImpl.java b/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/impl/ServerDeployServiceImpl.java index d4eb030a..542e1257 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/impl/ServerDeployServiceImpl.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/impl/ServerDeployServiceImpl.java @@ -3,7 +3,7 @@ package me.zhengjie.modules.mnt.service.impl; import me.zhengjie.modules.mnt.domain.ServerDeploy; import me.zhengjie.modules.mnt.repository.ServerDeployRepository; import me.zhengjie.modules.mnt.service.ServerDeployService; -import me.zhengjie.modules.mnt.service.dto.ServerDeployDTO; +import me.zhengjie.modules.mnt.service.dto.ServerDeployDto; import me.zhengjie.modules.mnt.service.dto.ServerDeployQueryCriteria; import me.zhengjie.modules.mnt.service.mapper.ServerDeployMapper; import me.zhengjie.utils.PageUtil; @@ -44,21 +44,21 @@ public class ServerDeployServiceImpl implements ServerDeployService { } @Override - public ServerDeployDTO findById(Long id) { + public ServerDeployDto findById(Long id) { ServerDeploy server = serverDeployRepository.findById(id).orElseGet(ServerDeploy::new); ValidationUtil.isNull(server.getId(),"ServerDeploy","id",id); return serverDeployMapper.toDto(server); } @Override - public ServerDeployDTO findByIp(String ip) { + public ServerDeployDto findByIp(String ip) { ServerDeploy deploy = serverDeployRepository.findByIp(ip); return serverDeployMapper.toDto(deploy); } @Override @Transactional(rollbackFor = Exception.class) - public ServerDeployDTO create(ServerDeploy resources) { + public ServerDeployDto create(ServerDeploy resources) { return serverDeployMapper.toDto(serverDeployRepository.save(resources)); } diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/mapper/AppMapper.java b/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/mapper/AppMapper.java index bdda85f6..e03c0bcc 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/mapper/AppMapper.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/mapper/AppMapper.java @@ -2,7 +2,7 @@ package me.zhengjie.modules.mnt.service.mapper; import me.zhengjie.base.BaseMapper; import me.zhengjie.modules.mnt.domain.App; -import me.zhengjie.modules.mnt.service.dto.AppDTO; +import me.zhengjie.modules.mnt.service.dto.AppDto; import org.mapstruct.Mapper; import org.mapstruct.ReportingPolicy; @@ -11,6 +11,6 @@ import org.mapstruct.ReportingPolicy; * @date 2019-08-24 */ @Mapper(componentModel = "spring",uses = {},unmappedTargetPolicy = ReportingPolicy.IGNORE) -public interface AppMapper extends BaseMapper { +public interface AppMapper extends BaseMapper { } diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/mapper/DatabaseMapper.java b/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/mapper/DatabaseMapper.java index 244b28d4..872c7849 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/mapper/DatabaseMapper.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/mapper/DatabaseMapper.java @@ -2,7 +2,7 @@ package me.zhengjie.modules.mnt.service.mapper; import me.zhengjie.base.BaseMapper; import me.zhengjie.modules.mnt.domain.Database; -import me.zhengjie.modules.mnt.service.dto.DatabaseDTO; +import me.zhengjie.modules.mnt.service.dto.DatabaseDto; import org.mapstruct.Mapper; import org.mapstruct.ReportingPolicy; @@ -11,6 +11,6 @@ import org.mapstruct.ReportingPolicy; * @date 2019-08-24 */ @Mapper(componentModel = "spring",unmappedTargetPolicy = ReportingPolicy.IGNORE) -public interface DatabaseMapper extends BaseMapper { +public interface DatabaseMapper extends BaseMapper { } diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/mapper/DeployHistoryMapper.java b/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/mapper/DeployHistoryMapper.java index 811b68da..30538b64 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/mapper/DeployHistoryMapper.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/mapper/DeployHistoryMapper.java @@ -2,7 +2,7 @@ package me.zhengjie.modules.mnt.service.mapper; import me.zhengjie.base.BaseMapper; import me.zhengjie.modules.mnt.domain.DeployHistory; -import me.zhengjie.modules.mnt.service.dto.DeployHistoryDTO; +import me.zhengjie.modules.mnt.service.dto.DeployHistoryDto; import org.mapstruct.Mapper; import org.mapstruct.ReportingPolicy; @@ -11,6 +11,6 @@ import org.mapstruct.ReportingPolicy; * @date 2019-08-24 */ @Mapper(componentModel = "spring",uses = {},unmappedTargetPolicy = ReportingPolicy.IGNORE) -public interface DeployHistoryMapper extends BaseMapper { +public interface DeployHistoryMapper extends BaseMapper { } diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/mapper/DeployMapper.java b/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/mapper/DeployMapper.java index d276a637..2071775a 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/mapper/DeployMapper.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/mapper/DeployMapper.java @@ -2,7 +2,7 @@ package me.zhengjie.modules.mnt.service.mapper; import me.zhengjie.base.BaseMapper; import me.zhengjie.modules.mnt.domain.Deploy; -import me.zhengjie.modules.mnt.service.dto.DeployDTO; +import me.zhengjie.modules.mnt.service.dto.DeployDto; import org.mapstruct.Mapper; import org.mapstruct.ReportingPolicy; @@ -11,6 +11,6 @@ import org.mapstruct.ReportingPolicy; * @date 2019-08-24 */ @Mapper(componentModel = "spring",uses = {AppMapper.class, ServerDeployMapper.class},unmappedTargetPolicy = ReportingPolicy.IGNORE) -public interface DeployMapper extends BaseMapper { +public interface DeployMapper extends BaseMapper { } diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/mapper/ServerDeployMapper.java b/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/mapper/ServerDeployMapper.java index 757e1909..7fdf4a5b 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/mapper/ServerDeployMapper.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/mapper/ServerDeployMapper.java @@ -2,7 +2,7 @@ package me.zhengjie.modules.mnt.service.mapper; import me.zhengjie.base.BaseMapper; import me.zhengjie.modules.mnt.domain.ServerDeploy; -import me.zhengjie.modules.mnt.service.dto.ServerDeployDTO; +import me.zhengjie.modules.mnt.service.dto.ServerDeployDto; import org.mapstruct.Mapper; import org.mapstruct.ReportingPolicy; @@ -11,6 +11,6 @@ import org.mapstruct.ReportingPolicy; * @date 2019-08-24 */ @Mapper(componentModel = "spring",uses = {},unmappedTargetPolicy = ReportingPolicy.IGNORE) -public interface ServerDeployMapper extends BaseMapper { +public interface ServerDeployMapper extends BaseMapper { } diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/util/ScpClientUtil.java b/eladmin-system/src/main/java/me/zhengjie/modules/mnt/util/ScpClientUtil.java index a5dd59bc..0736ddc7 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/util/ScpClientUtil.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/mnt/util/ScpClientUtil.java @@ -16,15 +16,15 @@ public class ScpClientUtil { static private ScpClientUtil instance; - static synchronized public ScpClientUtil getInstance(String IP, int port, String username, String passward) { + static synchronized public ScpClientUtil getInstance(String ip, int port, String username, String passward) { if (instance == null) { - instance = new ScpClientUtil(IP, port, username, passward); + instance = new ScpClientUtil(ip, port, username, passward); } return instance; } - public ScpClientUtil(String IP, int port, String username, String passward) { - this.ip = IP; + public ScpClientUtil(String ip, int port, String username, String passward) { + this.ip = ip; this.port = port; this.username = username; this.password = passward; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/websocket/MsgType.java b/eladmin-system/src/main/java/me/zhengjie/modules/mnt/websocket/MsgType.java index 1efd4de2..5981a97d 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/websocket/MsgType.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/mnt/websocket/MsgType.java @@ -5,5 +5,12 @@ package me.zhengjie.modules.mnt.websocket; * @date: 2019-08-10 9:56 */ public enum MsgType { - CONNECT,CLOSE,INFO,ERROR + /** 连接 */ + CONNECT, + /** 关闭 */ + CLOSE, + /** 信息 */ + INFO, + /** 错误 */ + ERROR } diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/websocket/WebSocketServer.java b/eladmin-system/src/main/java/me/zhengjie/modules/mnt/websocket/WebSocketServer.java index 627d65c7..dad338d2 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/websocket/WebSocketServer.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/mnt/websocket/WebSocketServer.java @@ -8,6 +8,7 @@ import javax.websocket.*; import javax.websocket.server.PathParam; import javax.websocket.server.ServerEndpoint; import java.io.IOException; +import java.util.Objects; import java.util.concurrent.CopyOnWriteArraySet; /** * @author: ZhangHouYing @@ -58,7 +59,6 @@ public class WebSocketServer { /** * 收到客户端消息后调用的方法 - * * @param message 客户端发送过来的消息*/ @OnMessage public void onMessage(String message, Session session) { @@ -73,11 +73,6 @@ public class WebSocketServer { } } - /** - * - * @param session - * @param error - */ @OnError public void onError(Session session, Throwable error) { log.error("发生错误"); @@ -86,7 +81,7 @@ public class WebSocketServer { /** * 实现服务器主动推送 */ - public void sendMessage(String message) throws IOException { + private void sendMessage(String message) throws IOException { this.session.getBasicRemote().sendText(message); } @@ -105,9 +100,25 @@ public class WebSocketServer { }else if(item.sid.equals(sid)){ item.sendMessage(message); } - } catch (IOException e) { - continue; - } + } catch (IOException ignored) { } } } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + WebSocketServer that = (WebSocketServer) o; + return Objects.equals(session, that.session) && + Objects.equals(sid, that.sid); + } + + @Override + public int hashCode() { + return Objects.hash(session, sid); + } } diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/monitor/rest/LimitController.java b/eladmin-system/src/main/java/me/zhengjie/modules/monitor/rest/LimitController.java index 3e369061..243f061c 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/monitor/rest/LimitController.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/monitor/rest/LimitController.java @@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.RestController; import java.util.concurrent.atomic.AtomicInteger; /** - * + * @author / * 接口限流测试类 */ @RestController diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/monitor/rest/ServerController.java b/eladmin-system/src/main/java/me/zhengjie/modules/monitor/rest/ServerController.java index 0e0a494e..c6a963fb 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/monitor/rest/ServerController.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/monitor/rest/ServerController.java @@ -17,7 +17,7 @@ import org.springframework.web.bind.annotation.*; * @author Zhang houying * @date 2019-11-03 */ -@Api(tags = "Server管理") +@Api(tags = "服务监控管理") @RestController @RequestMapping("/api/server") public class ServerController { @@ -29,24 +29,24 @@ public class ServerController { } @GetMapping - @Log("查询Server") - @ApiOperation("查询Server") + @Log("查询服务监控") + @ApiOperation("查询服务监控") @PreAuthorize("@el.check('server:list')") public ResponseEntity getServers(ServerQueryCriteria criteria, Pageable pageable){ return new ResponseEntity<>(serverService.queryAll(criteria,pageable),HttpStatus.OK); } @PostMapping - @Log("新增Server") - @ApiOperation("新增Server") + @Log("新增服务监控") + @ApiOperation("新增服务监控") @PreAuthorize("@el.check('server:add')") public ResponseEntity create(@Validated @RequestBody Server resources){ return new ResponseEntity<>(serverService.create(resources),HttpStatus.CREATED); } @PutMapping - @Log("修改Server") - @ApiOperation("修改Server") + @Log("修改服务监控") + @ApiOperation("修改服务监控") @PreAuthorize("@el.check('server:edit')") public ResponseEntity update(@Validated @RequestBody Server resources){ serverService.update(resources); @@ -54,8 +54,8 @@ public class ServerController { } @DeleteMapping(value = "/{id}") - @Log("删除Server") - @ApiOperation("删除Server") + @Log("删除服务监控") + @ApiOperation("删除服务监控") @PreAuthorize("@el.check('server:del')") public ResponseEntity delete(@PathVariable Integer id){ serverService.delete(id); 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 47cc977b..3f5271a6 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 @@ -16,8 +16,9 @@ import java.util.List; public interface RedisService { /** - * findById + * 根据KEY查询 * @param key 键 + * @param pageable 分页参数 * @return / */ Page findByKey(String key, Pageable pageable); @@ -55,9 +56,10 @@ public interface RedisService { void deleteAll(); /** - * + * 导出数据 * @param redisVos / * @param response / + * @throws IOException / */ void download(List redisVos, HttpServletResponse response) throws IOException; } diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/monitor/service/ServerService.java b/eladmin-system/src/main/java/me/zhengjie/modules/monitor/service/ServerService.java index 009349ec..c12da3f8 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/monitor/service/ServerService.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/monitor/service/ServerService.java @@ -36,10 +36,23 @@ public interface ServerService { */ ServerDTO findById(Integer id); + /** + * 创建服务监控 + * @param resources / + * @return / + */ ServerDTO create(Server resources); + /** + * 编辑服务监控 + * @param resources / + */ void update(Server resources); + /** + * 删除 + * @param id / + */ void delete(Integer id); } diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/monitor/service/dto/ServerDTO.java b/eladmin-system/src/main/java/me/zhengjie/modules/monitor/service/dto/ServerDTO.java index f7845a56..a78c9fa8 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/monitor/service/dto/ServerDTO.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/monitor/service/dto/ServerDTO.java @@ -11,45 +11,39 @@ import java.io.Serializable; @Data public class ServerDTO implements Serializable { - // 编号 private Integer id; - // 名称 private String name; - // IP地址 private String address; - // 访问端口 private Integer port; - // 状态 private String state; - // CPU使用率 + /** CPU使用率 */ private Float cpuRate; - // CPU内核数 + /** CPU内核数 */ private Integer cpuCore; - // 内存总数 + /** 内存总数 */ private Float memTotal; - // 内存使用量 + /** 内存使用量 */ private Float memUsed; - // 磁盘总量 + /** 磁盘总量 */ private Float diskTotal; - // 磁盘使用量 + /** 磁盘使用量 */ private Float diskUsed; - // 交换区总量 + /** 交换区总量 */ private Float swapTotal; - // 交换区使用量 + /** 交换区使用量 */ private Float swapUsed; - // 排序 private Integer sort; } diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/monitor/service/dto/ServerQueryCriteria.java b/eladmin-system/src/main/java/me/zhengjie/modules/monitor/service/dto/ServerQueryCriteria.java index 355747bf..217e87f6 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/monitor/service/dto/ServerQueryCriteria.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/monitor/service/dto/ServerQueryCriteria.java @@ -10,7 +10,6 @@ import me.zhengjie.annotation.Query; @Data public class ServerQueryCriteria{ - // 模糊 @Query(blurry = "name,address") private String blurry; } \ No newline at end of file diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/monitor/service/impl/ServerServiceImpl.java b/eladmin-system/src/main/java/me/zhengjie/modules/monitor/service/impl/ServerServiceImpl.java index 2bc72782..0de0177b 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/monitor/service/impl/ServerServiceImpl.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/monitor/service/impl/ServerServiceImpl.java @@ -16,7 +16,6 @@ import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; - import java.util.List; import java.util.Map; 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 ebf93bb5..213f5eb3 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 @@ -6,7 +6,6 @@ import me.zhengjie.modules.monitor.repository.VisitsRepository; import me.zhengjie.modules.monitor.service.VisitsService; import me.zhengjie.repository.LogRepository; import me.zhengjie.utils.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; @@ -61,7 +60,7 @@ public class VisitsServiceImpl implements VisitsService { @Override public Object get() { - Map map = new HashMap<>(); + Map map = new HashMap<>(4); LocalDate localDate = LocalDate.now(); Visits visits = visitsRepository.findByDate(localDate.toString()); List list = visitsRepository.findAllVisits(localDate.minusDays(6).toString(),localDate.plusDays(1).toString()); @@ -80,7 +79,7 @@ public class VisitsServiceImpl implements VisitsService { @Override public Object getChartData() { - Map map = new HashMap<>(); + Map map = new HashMap<>(3); LocalDate localDate = LocalDate.now(); List list = visitsRepository.findAllVisits(localDate.minusDays(6).toString(),localDate.plusDays(1).toString()); map.put("weekDays",list.stream().map(Visits::getWeekDay).collect(Collectors.toList())); 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 a93f6dce..6b664796 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 @@ -26,34 +26,34 @@ public class QuartzJob implements Serializable { @NotNull(groups = {Update.class}) private Long id; - // 定时器名称 + /** 定时器名称 */ @Column(name = "job_name") private String jobName; - // Bean名称 + /** Bean名称 */ @Column(name = "bean_name") @NotBlank private String beanName; - // 方法名称 + /** 方法名称 */ @Column(name = "method_name") @NotBlank private String methodName; - // 参数 + /** 参数 */ @Column(name = "params") private String params; - // cron表达式 + /** cron表达式 */ @Column(name = "cron_expression") @NotBlank private String cronExpression; - // 状态 + /** 状态 */ @Column(name = "is_pause") private Boolean isPause = false; - // 备注 + /** 备注 */ @Column(name = "remark") @NotBlank private String remark; 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 9958ce6c..a20c2f67 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 @@ -20,38 +20,38 @@ public class QuartzLog implements Serializable { @GeneratedValue(strategy = GenerationType.IDENTITY) private Long id; - // 任务名称 + /** 任务名称 */ @Column(name = "job_name") private String jobName; - // Bean名称 + /** Bean名称 */ @Column(name = "baen_name") private String beanName; - // 方法名称 + /** 方法名称 */ @Column(name = "method_name") private String methodName; - // 参数 + /** 参数 */ @Column(name = "params") private String params; - // cron表达式 + /** cron表达式 */ @Column(name = "cron_expression") private String cronExpression; - // 状态 + /** 状态 */ @Column(name = "is_success") private Boolean isSuccess; - // 异常详细 + /** 异常详细 */ @Column(name = "exception_detail",columnDefinition = "text") private String exceptionDetail; - // 耗时（毫秒） + /** 耗时（毫秒） */ private Long time; - // 创建日期 + /** 创建日期 */ @CreationTimestamp @Column(name = "create_time") private Timestamp createTime; 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 3a42ab50..63805782 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 @@ -15,20 +15,60 @@ import java.util.List; */ public interface QuartzJobService { + /** + * 分页查询 + * @param criteria 条件 + * @param pageable 分页参数 + * @return / + */ Object queryAll(JobQueryCriteria criteria, Pageable pageable); + /** + * 查询全部 + * @param criteria 条件 + * @return / + */ List queryAll(JobQueryCriteria criteria); + /** + * 分页查询日志 + * @param criteria 条件 + * @param pageable 分页参数 + * @return / + */ Object queryAllLog(JobQueryCriteria criteria, Pageable pageable); + /** + * 查询全部 + * @param criteria 条件 + * @return / + */ List queryAllLog(JobQueryCriteria criteria); + /** + * 创建 + * @param resources / + * @return / + */ QuartzJob create(QuartzJob resources); + /** + * 编辑 + * @param resources / + */ void update(QuartzJob resources); + /** + * 删除任务 + * @param quartzJob / + */ void delete(QuartzJob quartzJob); + /** + * 根据ID查询 + * @param id ID + * @return / + */ QuartzJob findById(Long id); /** @@ -43,7 +83,19 @@ public interface QuartzJobService { */ void execution(QuartzJob quartzJob); + /** + * 导出定时任务 + * @param queryAll 待导出的数据 + * @param response / + * @throws IOException / + */ void download(List queryAll, HttpServletResponse response) throws IOException; + /** + * 导出定时任务日志 + * @param queryAllLog 待导出的数据 + * @param response / + * @throws IOException / + */ void downloadLog(List queryAllLog, HttpServletResponse response) throws IOException; } 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 1c430c66..0f111e80 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 @@ -125,7 +125,7 @@ public class QuartzJobServiceImpl implements QuartzJobService { if(quartzJob.getId().equals(1L)){ throw new BadRequestException("该任务不可操作"); } - quartzManage.runAJobNow(quartzJob); + quartzManage.runJobNow(quartzJob); } @Override diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/quartz/utils/ExecutionJob.java b/eladmin-system/src/main/java/me/zhengjie/modules/quartz/utils/ExecutionJob.java index 1c0713fd..5d112534 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/quartz/utils/ExecutionJob.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/quartz/utils/ExecutionJob.java @@ -25,8 +25,8 @@ public class ExecutionJob extends QuartzJobBean { private Logger logger = LoggerFactory.getLogger(this.getClass()); - // 该处仅供参考 - private final static ThreadPoolExecutor executor = ThreadPoolExecutorUtil.getPoll(); + /** 该处仅供参考 */ + private final static ThreadPoolExecutor EXECUTOR = ThreadPoolExecutorUtil.getPoll(); @Override @SuppressWarnings("unchecked") @@ -48,7 +48,7 @@ public class ExecutionJob extends QuartzJobBean { logger.info("任务准备执行，任务名称：{}", quartzJob.getJobName()); QuartzRunnable task = new QuartzRunnable(quartzJob.getBeanName(), quartzJob.getMethodName(), quartzJob.getParams()); - Future future = executor.submit(task); + Future future = EXECUTOR.submit(task); future.get(); long times = System.currentTimeMillis() - startTime; log.setTime(times); 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 1cb6a2ce..21ed2135 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 @@ -109,8 +109,9 @@ public class QuartzManage { TriggerKey triggerKey = TriggerKey.triggerKey(JOB_NAME + quartzJob.getId()); CronTrigger trigger = (CronTrigger) scheduler.getTrigger(triggerKey); // 如果不存在则创建一个定时任务 - if(trigger == null) + if(trigger == null) { addJob(quartzJob); + } JobKey jobKey = JobKey.jobKey(JOB_NAME + quartzJob.getId()); scheduler.resumeJob(jobKey); } catch (Exception e){ @@ -123,13 +124,14 @@ public class QuartzManage { * 立即执行job * @param quartzJob / */ - public void runAJobNow(QuartzJob quartzJob){ + public void runJobNow(QuartzJob quartzJob){ try { TriggerKey triggerKey = TriggerKey.triggerKey(JOB_NAME + quartzJob.getId()); CronTrigger trigger = (CronTrigger) scheduler.getTrigger(triggerKey); // 如果不存在则创建一个定时任务 - if(trigger == null) + if(trigger == null) { addJob(quartzJob); + } JobDataMap dataMap = new JobDataMap(); dataMap.put(QuartzJob.JOB_KEY, quartzJob); JobKey jobKey = JobKey.jobKey(JOB_NAME + quartzJob.getId()); 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 1b097a1b..241cf132 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 @@ -3,7 +3,7 @@ package me.zhengjie.modules.security.config; import me.zhengjie.annotation.AnonymousAccess; import me.zhengjie.modules.security.security.JwtAuthenticationEntryPoint; import me.zhengjie.modules.security.security.JwtAuthorizationTokenFilter; -import me.zhengjie.modules.security.service.JwtUserDetailsService; +import me.zhengjie.modules.security.service.JwtUserDetailsServiceImpl; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.ApplicationContext; @@ -25,11 +25,13 @@ import org.springframework.security.web.authentication.UsernamePasswordAuthentic import org.springframework.web.method.HandlerMethod; import org.springframework.web.servlet.mvc.method.RequestMappingInfo; import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping; - import java.util.HashSet; import java.util.Map; import java.util.Set; +/** + * @author Zheng Jie + */ @Configuration @EnableWebSecurity @EnableGlobalMethodSecurity(prePostEnabled = true) @@ -37,17 +39,17 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter { private final JwtAuthenticationEntryPoint unauthorizedHandler; - private final JwtUserDetailsService jwtUserDetailsService; + private final JwtUserDetailsServiceImpl jwtUserDetailsService; private final ApplicationContext applicationContext; - // 自定义基于JWT的安全过滤器 + /** 自定义基于JWT的安全过滤器 */ private final JwtAuthorizationTokenFilter authenticationTokenFilter; @Value("${jwt.header}") private String tokenHeader; - public SecurityConfig(JwtAuthenticationEntryPoint unauthorizedHandler, JwtUserDetailsService jwtUserDetailsService, JwtAuthorizationTokenFilter authenticationTokenFilter, ApplicationContext applicationContext) { + public SecurityConfig(JwtAuthenticationEntryPoint unauthorizedHandler, JwtUserDetailsServiceImpl jwtUserDetailsService, JwtAuthorizationTokenFilter authenticationTokenFilter, ApplicationContext applicationContext) { this.unauthorizedHandler = unauthorizedHandler; this.jwtUserDetailsService = jwtUserDetailsService; this.authenticationTokenFilter = authenticationTokenFilter; 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 916453cb..0f30d7a8 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 @@ -50,7 +50,7 @@ public class AuthenticationController { private final OnlineUserService onlineUserService; - public AuthenticationController(JwtTokenUtil jwtTokenUtil, RedisService redisService, @Qualifier("jwtUserDetailsService") UserDetailsService userDetailsService, OnlineUserService onlineUserService) { + public AuthenticationController(JwtTokenUtil jwtTokenUtil, RedisService redisService, @Qualifier("jwtUserDetailsServiceImpl") UserDetailsService userDetailsService, OnlineUserService onlineUserService) { this.jwtTokenUtil = jwtTokenUtil; this.redisService = redisService; this.userDetailsService = userDetailsService; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/security/rest/OnlineController.java b/eladmin-system/src/main/java/me/zhengjie/modules/security/rest/OnlineController.java index 5a9ccfb5..22e3dbe8 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/security/rest/OnlineController.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/security/rest/OnlineController.java @@ -13,6 +13,9 @@ import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; import java.io.IOException; +/** + * @author Zheng Jie + */ @RestController @RequestMapping("/auth/online") @Api(tags = "系统：在线用户管理") diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/security/security/JwtAuthenticationEntryPoint.java b/eladmin-system/src/main/java/me/zhengjie/modules/security/security/JwtAuthenticationEntryPoint.java index 9569c8be..61eb2c50 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/security/security/JwtAuthenticationEntryPoint.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/security/security/JwtAuthenticationEntryPoint.java @@ -9,6 +9,9 @@ import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.Serializable; +/** + * @author Zheng Jie + */ @Component public class JwtAuthenticationEntryPoint implements AuthenticationEntryPoint, Serializable { diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/security/security/JwtAuthorizationTokenFilter.java b/eladmin-system/src/main/java/me/zhengjie/modules/security/security/JwtAuthorizationTokenFilter.java index c1e57b12..7fe95574 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/security/security/JwtAuthorizationTokenFilter.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/security/security/JwtAuthorizationTokenFilter.java @@ -19,6 +19,9 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.IOException; +/** + * @author Zheng Jie + */ @Slf4j @Component public class JwtAuthorizationTokenFilter extends OncePerRequestFilter { @@ -31,7 +34,7 @@ public class JwtAuthorizationTokenFilter extends OncePerRequestFilter { private final JwtTokenUtil jwtTokenUtil; private final RedisTemplate redisTemplate; - public JwtAuthorizationTokenFilter(@Qualifier("jwtUserDetailsService") UserDetailsService userDetailsService, JwtTokenUtil jwtTokenUtil, RedisTemplate redisTemplate) { + public JwtAuthorizationTokenFilter(@Qualifier("jwtUserDetailsServiceImpl") UserDetailsService userDetailsService, JwtTokenUtil jwtTokenUtil, RedisTemplate redisTemplate) { this.userDetailsService = userDetailsService; this.jwtTokenUtil = jwtTokenUtil; this.redisTemplate = redisTemplate; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/security/service/JwtPermissionService.java b/eladmin-system/src/main/java/me/zhengjie/modules/security/service/JwtPermissionServiceImpl.java similarity index 89% rename from eladmin-system/src/main/java/me/zhengjie/modules/security/service/JwtPermissionService.java rename to eladmin-system/src/main/java/me/zhengjie/modules/security/service/JwtPermissionServiceImpl.java index 461841ff..a8df0bd3 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/security/service/JwtPermissionService.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/security/service/JwtPermissionServiceImpl.java @@ -3,7 +3,7 @@ package me.zhengjie.modules.security.service; import me.zhengjie.modules.system.domain.Menu; import me.zhengjie.modules.system.domain.Role; import me.zhengjie.modules.system.repository.RoleRepository; -import me.zhengjie.modules.system.service.dto.UserDTO; +import me.zhengjie.modules.system.service.dto.UserDto; import me.zhengjie.utils.StringUtils; import org.springframework.cache.annotation.CacheConfig; import org.springframework.cache.annotation.Cacheable; @@ -11,17 +11,19 @@ import org.springframework.security.core.GrantedAuthority; import org.springframework.security.core.authority.SimpleGrantedAuthority; import org.springframework.stereotype.Service; import java.util.Collection; -import java.util.List; import java.util.Set; import java.util.stream.Collectors; +/** + * @author Zheng Jie + */ @Service @CacheConfig(cacheNames = "role") -public class JwtPermissionService { +public class JwtPermissionServiceImpl { private final RoleRepository roleRepository; - public JwtPermissionService(RoleRepository roleRepository) { + public JwtPermissionServiceImpl(RoleRepository roleRepository) { this.roleRepository = roleRepository; } @@ -31,7 +33,7 @@ public class JwtPermissionService { * @return Collection */ @Cacheable(key = "'loadPermissionByUser:' + #p0.username") - public Collection mapToGrantedAuthorities(UserDTO user) { + public Collection mapToGrantedAuthorities(UserDto user) { System.out.println("--------------------loadPermissionByUser:" + user.getUsername() + "---------------------"); 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/JwtUserDetailsServiceImpl.java similarity index 80% rename from eladmin-system/src/main/java/me/zhengjie/modules/security/service/JwtUserDetailsService.java rename to eladmin-system/src/main/java/me/zhengjie/modules/security/service/JwtUserDetailsServiceImpl.java index 51656245..0da88846 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/JwtUserDetailsServiceImpl.java @@ -17,13 +17,13 @@ import java.util.Optional; */ @Service @Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class) -public class JwtUserDetailsService implements UserDetailsService { +public class JwtUserDetailsServiceImpl implements UserDetailsService { private final UserService userService; - private final JwtPermissionService permissionService; + private final JwtPermissionServiceImpl permissionService; - public JwtUserDetailsService(UserService userService, JwtPermissionService permissionService) { + public JwtUserDetailsServiceImpl(UserService userService, JwtPermissionServiceImpl permissionService) { this.userService = userService; this.permissionService = permissionService; } @@ -31,7 +31,7 @@ public class JwtUserDetailsService implements UserDetailsService { @Override public UserDetails loadUserByUsername(String username){ - UserDTO user = userService.findByName(username); + UserDto user = userService.findByName(username); if (user == null) { throw new BadRequestException("账号不存在"); } else { @@ -39,7 +39,7 @@ public class JwtUserDetailsService implements UserDetailsService { } } - public UserDetails createJwtUser(UserDTO user) { + public UserDetails createJwtUser(UserDto user) { return new JwtUser( user.getId(), user.getUsername(), @@ -47,8 +47,8 @@ public class JwtUserDetailsService implements UserDetailsService { user.getAvatar(), user.getEmail(), user.getPhone(), - Optional.ofNullable(user.getDept()).map(DeptSmallDTO::getName).orElse(null), - Optional.ofNullable(user.getJob()).map(JobSmallDTO::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/security/utils/JwtTokenUtil.java b/eladmin-system/src/main/java/me/zhengjie/modules/security/utils/JwtTokenUtil.java index 8a0f2fa1..7c4183f6 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/security/utils/JwtTokenUtil.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/security/utils/JwtTokenUtil.java @@ -14,6 +14,9 @@ import java.util.HashMap; import java.util.Map; import java.util.function.Function; +/** + * @author / + */ @Component public class JwtTokenUtil implements Serializable { @@ -68,7 +71,7 @@ public class JwtTokenUtil implements Serializable { } public String generateToken(UserDetails userDetails) { - Map claims = new HashMap<>(); + Map claims = new HashMap<>(16); return doGenerateToken(claims, userDetails.getUsername()); } @@ -107,7 +110,8 @@ public class JwtTokenUtil implements Serializable { public String getToken(HttpServletRequest request){ final String requestHeader = request.getHeader(tokenHeader); - if (requestHeader != null && requestHeader.startsWith("Bearer ")) { + String startsWith = "Bearer "; + if (requestHeader != null && requestHeader.startsWith(startsWith)) { return requestHeader.substring(7); } return null; 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 d21273a0..711283bb 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 @@ -9,6 +9,7 @@ import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; import java.io.Serializable; import java.sql.Timestamp; +import java.util.Objects; import java.util.Set; /** @@ -47,4 +48,22 @@ public class Dept implements Serializable { private Timestamp createTime; public @interface Update {} + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + Dept dept = (Dept) o; + return Objects.equals(id, dept.id) && + Objects.equals(name, dept.name); + } + + @Override + public int hashCode() { + return Objects.hash(id, name); + } } \ No newline at end of file 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 a06e81ec..a6d870e6 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 @@ -24,19 +24,18 @@ public class DictDetail implements Serializable { @NotNull(groups = Update.class) private Long id; - // 字典标签 + /** 字典标签 */ @Column(name = "label",nullable = false) private String label; - // 字典值 + /** 字典值 */ @Column(name = "value",nullable = false) private String value; - // 排序 + /** 排序 */ @Column(name = "sort") private String sort = "999"; - // 字典id @ManyToOne(fetch=FetchType.LAZY) @JoinColumn(name = "dict_id") private Dict dict; 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 e4c76d05..4b1f5003 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 @@ -38,11 +38,11 @@ public class Menu implements Serializable { private String component; - // 类型 + /** 类型，目录、菜单、按钮 */ @Column(name = "type") private Integer type; - // 权限 + /** 权限 */ @Column(name = "permission") private String permission; @@ -57,11 +57,11 @@ public class Menu implements Serializable { @Column(columnDefinition = "bit(1) default 0") private Boolean hidden; - // 上级菜单ID + /** 上级菜单ID */ @Column(name = "pid",nullable = false) private Long pid; - // 是否为外链 true/false + /** 是否为外链 true/false */ @Column(name = "i_frame") private Boolean iFrame; @@ -77,8 +77,12 @@ public class Menu implements Serializable { @Override public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } Menu menu = (Menu) o; return Objects.equals(id, menu.id); } 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 922c7d45..ea13ddf2 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 @@ -32,18 +32,18 @@ public class Role implements Serializable { @NotBlank private String name; - // 数据权限类型 全部 、 本级 、 自定义 + /** 数据权限类型 全部 、 本级 、 自定义 */ @Column(name = "data_scope") private String dataScope = "本级"; - // 数值越小，级别越大 + /** 数值越小，级别越大 */ @Column(name = "level") private Integer level = 3; @Column private String remark; - // 权限 + /** 权限 */ @Column(name = "permission") private String permission; @@ -67,8 +67,12 @@ public class Role implements Serializable { @Override public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } Role role = (Role) o; return Objects.equals(id, role.id); } 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 a6e994c6..678a3740 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 @@ -10,6 +10,7 @@ import javax.validation.constraints.Pattern; import java.io.Serializable; import java.sql.Timestamp; import java.util.Date; +import java.util.Objects; import java.util.Set; /** @@ -67,4 +68,22 @@ public class User implements Serializable { private Dept dept; public @interface Update {} + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + User user = (User) o; + return Objects.equals(id, user.id) && + Objects.equals(username, user.username); + } + + @Override + public int hashCode() { + return Objects.hash(id, username); + } } \ No newline at end of file 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 d8817f7c..7949e2c2 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 @@ -11,12 +11,28 @@ import java.util.Set; * @author Zheng Jie * @date 2019-03-25 */ +@SuppressWarnings("all") public interface DeptRepository extends JpaRepository, JpaSpecificationExecutor { + /** + * 根据 PID 查询 + * @param id pid + * @return 、 + */ List findByPid(Long id); + /** + * 根据ID查询名称 + * @param id ID + * @return / + */ @Query(value = "select name from dept where id = ?1",nativeQuery = true) String findNameById(Long id); + /** + * 根据角色ID 查询 + * @param id 角色ID + * @return / + */ Set findByRoles_Id(Long id); } \ No newline at end of file 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 0d0876be..97f4b111 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 @@ -10,13 +10,35 @@ import java.util.List; * @author Zheng Jie * @date 2018-12-17 */ +@SuppressWarnings("all") public interface MenuRepository extends JpaRepository, JpaSpecificationExecutor { + /** + * 根据菜单名称查询 + * @param name 菜单名称 + * @return / + */ Menu findByName(String name); + /** + * 根据组件名称查询 + * @param name 组件名称 + * @return / + */ Menu findByComponentName(String name); + /** + * 根据菜单的 PID 查询 + * @param pid / + * @return / + */ List findByPid(long pid); + /** + * 根据角色ID与菜单类型查询菜单 + * @param id roleID + * @param type 类型 + * @return / + */ LinkedHashSet findByRoles_IdAndTypeIsNotInOrderBySortAsc(Long id, Integer type); } 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 7731ade5..0479d4ee 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 @@ -11,12 +11,27 @@ import java.util.Set; * @author Zheng Jie * @date 2018-12-03 */ +@SuppressWarnings("all") public interface RoleRepository extends JpaRepository, JpaSpecificationExecutor { + /** + * 根据名称查询 + * @param name / + * @return / + */ Role findByName(String name); + /** + * 根据用户ID查询 + * @param id 用户ID + * @return + */ Set findByUsers_Id(Long id); + /** + * 解绑角色菜单 + * @param id 菜单ID + */ @Modifying @Query(value = "delete from roles_menus where menu_id = ?1",nativeQuery = true) void untiedMenu(Long id); 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 186ecf02..acf1224e 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 @@ -13,14 +13,35 @@ import java.util.Date; */ public interface UserRepository extends JpaRepository, JpaSpecificationExecutor { + /** + * 根据用户名查询 + * @param username 用户名 + * @return / + */ User findByUsername(String username); + /** + * 根据邮箱查询 + * @param email 邮箱 + * @return / + */ User findByEmail(String email); + /** + * 修改密码 + * @param username 用户名 + * @param pass 密码 + * @param lastPasswordResetTime / + */ @Modifying @Query(value = "update user set password = ?2 , last_password_reset_time = ?3 where username = ?1",nativeQuery = true) void updatePass(String username, String pass, Date lastPasswordResetTime); + /** + * 修改邮箱 + * @param username 用户名 + * @param email 邮箱 + */ @Modifying @Query(value = "update user set email = ?2 where username = ?1",nativeQuery = true) void updateEmail(String username, String email); 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 ecebf634..d7547337 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 @@ -7,7 +7,7 @@ import me.zhengjie.config.DataScope; import me.zhengjie.exception.BadRequestException; import me.zhengjie.modules.system.domain.Dept; import me.zhengjie.modules.system.service.DeptService; -import me.zhengjie.modules.system.service.dto.DeptDTO; +import me.zhengjie.modules.system.service.dto.DeptDto; import me.zhengjie.modules.system.service.dto.DeptQueryCriteria; import me.zhengjie.utils.ThrowableUtil; import org.springframework.http.HttpStatus; @@ -55,8 +55,8 @@ public class DeptController { public ResponseEntity getDepts(DeptQueryCriteria criteria){ // 数据权限 criteria.setIds(dataScope.getDeptIds()); - List deptDTOS = deptService.queryAll(criteria); - return new ResponseEntity<>(deptService.buildTree(deptDTOS),HttpStatus.OK); + List deptDtos = deptService.queryAll(criteria); + return new ResponseEntity<>(deptService.buildTree(deptDtos),HttpStatus.OK); } @Log("新增部门") 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 6d718602..5e8179b7 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 @@ -8,9 +8,9 @@ import me.zhengjie.exception.BadRequestException; import me.zhengjie.modules.system.service.MenuService; import me.zhengjie.modules.system.service.RoleService; import me.zhengjie.modules.system.service.UserService; -import me.zhengjie.modules.system.service.dto.MenuDTO; +import me.zhengjie.modules.system.service.dto.MenuDto; import me.zhengjie.modules.system.service.dto.MenuQueryCriteria; -import me.zhengjie.modules.system.service.dto.UserDTO; +import me.zhengjie.modules.system.service.dto.UserDto; import me.zhengjie.utils.SecurityUtils; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; @@ -59,10 +59,10 @@ public class MenuController { @ApiOperation("获取前端所需菜单") @GetMapping(value = "/build") public ResponseEntity buildMenus(){ - UserDTO user = userService.findByName(SecurityUtils.getUsername()); - List menuDTOList = menuService.findByRoles(roleService.findByUsers_Id(user.getId())); - List menuDTOS = (List) menuService.buildTree(menuDTOList).get("content"); - return new ResponseEntity<>(menuService.buildMenus(menuDTOS),HttpStatus.OK); + UserDto user = userService.findByName(SecurityUtils.getUsername()); + List menuDtoList = menuService.findByRoles(roleService.findByUsersId(user.getId())); + List menuDtos = (List) menuService.buildTree(menuDtoList).get("content"); + return new ResponseEntity<>(menuService.buildMenus(menuDtos),HttpStatus.OK); } @ApiOperation("返回全部的菜单") @@ -77,8 +77,8 @@ public class MenuController { @GetMapping @PreAuthorize("@el.check('menu:list')") public ResponseEntity getMenus(MenuQueryCriteria criteria){ - List menuDTOList = menuService.queryAll(criteria); - return new ResponseEntity<>(menuService.buildTree(menuDTOList),HttpStatus.OK); + List menuDtoList = menuService.queryAll(criteria); + return new ResponseEntity<>(menuService.buildTree(menuDtoList),HttpStatus.OK); } @Log("新增菜单") 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 cbbb7d96..28b29d7a 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 @@ -8,7 +8,7 @@ import me.zhengjie.modules.system.domain.Role; import me.zhengjie.exception.BadRequestException; import me.zhengjie.modules.system.service.RoleService; import me.zhengjie.modules.system.service.dto.RoleQueryCriteria; -import me.zhengjie.modules.system.service.dto.RoleSmallDTO; +import me.zhengjie.modules.system.service.dto.RoleSmallDto; import me.zhengjie.utils.SecurityUtils; import me.zhengjie.utils.ThrowableUtil; import org.springframework.data.domain.Pageable; @@ -76,7 +76,7 @@ public class RoleController { @ApiOperation("获取用户级别") @GetMapping(value = "/level") public ResponseEntity getLevel(){ - List levels = roleService.findByUsers_Id(SecurityUtils.getUserId()).stream().map(RoleSmallDTO::getLevel).collect(Collectors.toList()); + List levels = roleService.findByUsersId(SecurityUtils.getUserId()).stream().map(RoleSmallDto::getLevel).collect(Collectors.toList()); return new ResponseEntity<>(Dict.create().set("level", Collections.min(levels)),HttpStatus.OK); } 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 4084e068..cc21d304 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 @@ -10,7 +10,7 @@ import me.zhengjie.exception.BadRequestException; import me.zhengjie.modules.system.domain.vo.UserPassVo; import me.zhengjie.modules.system.service.DeptService; import me.zhengjie.modules.system.service.RoleService; -import me.zhengjie.modules.system.service.dto.RoleSmallDTO; +import me.zhengjie.modules.system.service.dto.RoleSmallDto; import me.zhengjie.modules.system.service.dto.UserQueryCriteria; import me.zhengjie.service.VerificationCodeService; import me.zhengjie.utils.*; @@ -87,7 +87,9 @@ public class UserController { criteria.setDeptIds(result); if(result.size() == 0){ return new ResponseEntity<>(PageUtil.toPage(null,0),HttpStatus.OK); - } else return new ResponseEntity<>(userService.queryAll(criteria,pageable),HttpStatus.OK); + } else { + return new ResponseEntity<>(userService.queryAll(criteria,pageable),HttpStatus.OK); + } // 否则取并集 } else { result.addAll(deptSet); @@ -121,8 +123,8 @@ public class UserController { @DeleteMapping(value = "/{id}") @PreAuthorize("@el.check('user:del')") public ResponseEntity delete(@PathVariable Long id){ - Integer currentLevel = Collections.min(roleService.findByUsers_Id(SecurityUtils.getUserId()).stream().map(RoleSmallDTO::getLevel).collect(Collectors.toList())); - Integer optLevel = Collections.min(roleService.findByUsers_Id(id).stream().map(RoleSmallDTO::getLevel).collect(Collectors.toList())); + Integer currentLevel = Collections.min(roleService.findByUsersId(SecurityUtils.getUserId()).stream().map(RoleSmallDto::getLevel).collect(Collectors.toList())); + Integer optLevel = Collections.min(roleService.findByUsersId(id).stream().map(RoleSmallDto::getLevel).collect(Collectors.toList())); if (currentLevel > optLevel) { throw new BadRequestException("角色权限不足"); @@ -171,7 +173,7 @@ public class UserController { * @param resources / */ private void checkLevel(User resources) { - Integer currentLevel = Collections.min(roleService.findByUsers_Id(SecurityUtils.getUserId()).stream().map(RoleSmallDTO::getLevel).collect(Collectors.toList())); + Integer currentLevel = Collections.min(roleService.findByUsersId(SecurityUtils.getUserId()).stream().map(RoleSmallDto::getLevel).collect(Collectors.toList())); Integer optLevel = roleService.findByRoles(resources.getRoles()); if (currentLevel > optLevel) { throw new BadRequestException("角色权限不足"); 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 10c342c8..fa230bf5 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 @@ -1,7 +1,7 @@ package me.zhengjie.modules.system.service; import me.zhengjie.modules.system.domain.Dept; -import me.zhengjie.modules.system.service.dto.DeptDTO; +import me.zhengjie.modules.system.service.dto.DeptDto; import me.zhengjie.modules.system.service.dto.DeptQueryCriteria; import javax.servlet.http.HttpServletResponse; @@ -15,21 +15,65 @@ import java.util.Set; */ public interface DeptService { - List queryAll(DeptQueryCriteria criteria); + /** + * 查询所有数据 + * @param criteria 条件 + * @return / + */ + List queryAll(DeptQueryCriteria criteria); - DeptDTO findById(Long id); + /** + * 根据ID查询 + * @param id / + * @return / + */ + DeptDto findById(Long id); - DeptDTO create(Dept resources); + /** + * 创建 + * @param resources / + * @return / + */ + DeptDto create(Dept resources); + /** + * 编辑 + * @param resources / + */ void update(Dept resources); + /** + * 删除 + * @param id / + */ void delete(Long id); - Object buildTree(List deptDTOS); + /** + * 构建树形数据 + * @param deptDtos 原始数据 + * @return / + */ + Object buildTree(List deptDtos); + /** + * 根据PID查询 + * @param pid / + * @return / + */ List findByPid(long pid); + /** + * 根据角色ID查询 + * @param id / + * @return / + */ Set findByRoleIds(Long id); - void download(List queryAll, HttpServletResponse response) throws IOException; + /** + * 导出数据 + * @param queryAll 待导出的数据 + * @param response / + * @throws IOException / + */ + void download(List queryAll, HttpServletResponse response) throws IOException; } \ No newline at end of file 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 f6811ded..fe570705 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 @@ -1,7 +1,7 @@ package me.zhengjie.modules.system.service; import me.zhengjie.modules.system.domain.DictDetail; -import me.zhengjie.modules.system.service.dto.DictDetailDTO; +import me.zhengjie.modules.system.service.dto.DictDetailDto; import me.zhengjie.modules.system.service.dto.DictDetailQueryCriteria; import org.springframework.data.domain.Pageable; import java.util.Map; @@ -12,13 +12,37 @@ import java.util.Map; */ public interface DictDetailService { - DictDetailDTO findById(Long id); + /** + * 根据ID查询 + * @param id / + * @return / + */ + DictDetailDto findById(Long id); - DictDetailDTO create(DictDetail resources); + /** + * 创建 + * @param resources / + * @return / + */ + DictDetailDto create(DictDetail resources); + /** + * 编辑 + * @param resources / + */ void update(DictDetail resources); + /** + * 删除 + * @param id / + */ void delete(Long id); - Map queryAll(DictDetailQueryCriteria criteria, Pageable pageable); + /** + * 分页查询 + * @param criteria 条件 + * @param pageable 分页参数 + * @return / + */ + Map queryAll(DictDetailQueryCriteria criteria, Pageable pageable); } \ No newline at end of file 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 8fa44130..82db54a2 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 @@ -1,7 +1,7 @@ package me.zhengjie.modules.system.service; import me.zhengjie.modules.system.domain.Dict; -import me.zhengjie.modules.system.service.dto.DictDTO; +import me.zhengjie.modules.system.service.dto.DictDto; import me.zhengjie.modules.system.service.dto.DictQueryCriteria; import org.springframework.data.domain.Pageable; @@ -16,17 +16,52 @@ import java.util.Map; */ public interface DictService { - Map queryAll(DictQueryCriteria dict, Pageable pageable); + /** + * 分页查询 + * @param criteria 条件 + * @param pageable 分页参数 + * @return / + */ + Map queryAll(DictQueryCriteria criteria, Pageable pageable); - List queryAll(DictQueryCriteria dict); + /** + * 查询全部数据 + * @param dict / + * @return / + */ + List queryAll(DictQueryCriteria dict); - DictDTO findById(Long id); + /** + * 根据ID查询 + * @param id / + * @return / + */ + DictDto findById(Long id); - DictDTO create(Dict resources); + /** + * 创建 + * @param resources / + * @return / + */ + DictDto create(Dict resources); + /** + * 编辑 + * @param resources / + */ void update(Dict resources); + /** + * 删除 + * @param id / + */ void delete(Long id); - void download(List queryAll, HttpServletResponse response) throws IOException; + /** + * 导出数据 + * @param queryAll 待导出的数据 + * @param response / + * @throws IOException / + */ + void download(List queryAll, HttpServletResponse response) throws IOException; } \ No newline at end of file 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 875b3bed..270d4f87 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 @@ -1,7 +1,7 @@ package me.zhengjie.modules.system.service; import me.zhengjie.modules.system.domain.Job; -import me.zhengjie.modules.system.service.dto.JobDTO; +import me.zhengjie.modules.system.service.dto.JobDto; import me.zhengjie.modules.system.service.dto.JobQueryCriteria; import org.springframework.data.domain.Pageable; @@ -16,17 +16,52 @@ import java.util.Map; */ public interface JobService { - JobDTO findById(Long id); + /** + * 根据ID查询 + * @param id / + * @return / + */ + JobDto findById(Long id); - JobDTO create(Job resources); + /** + * 创建 + * @param resources / + * @return / + */ + JobDto create(Job resources); + /** + * 编辑 + * @param resources / + */ void update(Job resources); + /** + * 删除 + * @param id / + */ void delete(Long id); + /** + * 分页查询 + * @param criteria 条件 + * @param pageable 分页参数 + * @return / + */ Map queryAll(JobQueryCriteria criteria, Pageable pageable); - List queryAll(JobQueryCriteria criteria); + /** + * 查询全部数据 + * @param criteria / + * @return / + */ + List queryAll(JobQueryCriteria criteria); - void download(List queryAll, HttpServletResponse response) throws IOException; + /** + * 导出数据 + * @param queryAll 待导出的数据 + * @param response / + * @throws IOException / + */ + void download(List queryAll, HttpServletResponse response) throws IOException; } \ No newline at end of file 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 cef99596..90ab9288 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 @@ -1,9 +1,9 @@ package me.zhengjie.modules.system.service; import me.zhengjie.modules.system.domain.Menu; -import me.zhengjie.modules.system.service.dto.MenuDTO; +import me.zhengjie.modules.system.service.dto.MenuDto; import me.zhengjie.modules.system.service.dto.MenuQueryCriteria; -import me.zhengjie.modules.system.service.dto.RoleSmallDTO; +import me.zhengjie.modules.system.service.dto.RoleSmallDto; import javax.servlet.http.HttpServletResponse; import java.io.IOException; @@ -17,29 +17,94 @@ import java.util.Set; */ public interface MenuService { - List queryAll(MenuQueryCriteria criteria); + /** + * 查询全部数据 + * @param criteria 条件 + * @return / + */ + List queryAll(MenuQueryCriteria criteria); - MenuDTO findById(long id); + /** + * 根据ID查询 + * @param id / + * @return / + */ + MenuDto findById(long id); - MenuDTO create(Menu resources); + /** + * 创建 + * @param resources / + * @return / + */ + MenuDto create(Menu resources); + /** + * 编辑 + * @param resources / + */ void update(Menu resources); + /** + * 获取待删除的菜单 + * @param menuList / + * @param menuSet / + * @return / + */ Set getDeleteMenus(List menuList, Set menuSet); + /** + * 获取菜单树 + * @param menus / + * @return / + */ Object getMenuTree(List menus); + /** + * 根据pid查询 + * @param pid / + * @return / + */ List findByPid(long pid); - Map buildTree(List menuDTOS); + /** + * 构建菜单树 + * @param menuDtos 原始数据 + * @return / + */ + Map buildTree(List menuDtos); - List findByRoles(List roles); + /** + * 根据角色查询 + * @param roles / + * @return / + */ + List findByRoles(List roles); - Object buildMenus(List byRoles); + /** + * 构建菜单树 + * @param menuDtos / + * @return / + */ + Object buildMenus(List menuDtos); + /** + * 根据ID查询 + * @param id / + * @return / + */ Menu findOne(Long id); + /** + * 删除 + * @param menuSet / + */ void delete(Set menuSet); - void download(List queryAll, HttpServletResponse response) throws IOException; + /** + * 导出 + * @param queryAll 待导出的数据 + * @param response / + * @throws IOException / + */ + void download(List queryAll, HttpServletResponse response) throws IOException; } 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 88b96538..bb4d3558 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 @@ -1,9 +1,9 @@ package me.zhengjie.modules.system.service; import me.zhengjie.modules.system.domain.Role; -import me.zhengjie.modules.system.service.dto.RoleDTO; +import me.zhengjie.modules.system.service.dto.RoleDto; import me.zhengjie.modules.system.service.dto.RoleQueryCriteria; -import me.zhengjie.modules.system.service.dto.RoleSmallDTO; +import me.zhengjie.modules.system.service.dto.RoleSmallDto; import org.springframework.data.domain.Pageable; import javax.servlet.http.HttpServletResponse; @@ -17,27 +17,86 @@ import java.util.Set; */ public interface RoleService { - RoleDTO findById(long id); + /** + * 根据ID查询 + * @param id / + * @return / + */ + RoleDto findById(long id); - RoleDTO create(Role resources); + /** + * 创建 + * @param resources / + * @return / + */ + RoleDto create(Role resources); + /** + * 编辑 + * @param resources / + */ void update(Role resources); + /** + * 删除 + * @param id / + */ void delete(Long id); - List findByUsers_Id(Long id); + /** + * 根据用户ID查询 + * @param id 用户ID + * @return / + */ + List findByUsersId(Long id); + /** + * 根据角色查询角色级别 + * @param roles / + * @return / + */ Integer findByRoles(Set roles); - void updateMenu(Role resources, RoleDTO roleDTO); + /** + * 修改绑定的菜单 + * @param resources / + * @param roleDTO / + */ + void updateMenu(Role resources, RoleDto roleDTO); + /** + * 解绑菜单 + * @param id / + */ void untiedMenu(Long id); + /** + * 不带条件分页查询 + * @param pageable 分页参数 + * @return / + */ Object queryAll(Pageable pageable); + /** + * 待条件分页查询 + * @param criteria 条件 + * @param pageable 分页参数 + * @return / + */ Object queryAll(RoleQueryCriteria criteria, Pageable pageable); - List queryAll(RoleQueryCriteria criteria); + /** + * 查询全部 + * @param criteria 条件 + * @return / + */ + List queryAll(RoleQueryCriteria criteria); - void download(List queryAll, HttpServletResponse response) throws IOException; + /** + * 导出数据 + * @param queryAll 待导出的数据 + * @param response / + * @throws IOException / + */ + void download(List queryAll, HttpServletResponse response) throws IOException; } 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 c404900b..ee4ed0ff 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 @@ -1,7 +1,7 @@ package me.zhengjie.modules.system.service; import me.zhengjie.modules.system.domain.User; -import me.zhengjie.modules.system.service.dto.UserDTO; +import me.zhengjie.modules.system.service.dto.UserDto; import me.zhengjie.modules.system.service.dto.UserQueryCriteria; import org.springframework.data.domain.Pageable; import org.springframework.web.multipart.MultipartFile; @@ -15,25 +15,79 @@ import java.util.List; */ public interface UserService { - UserDTO findById(long id); + /** + * 根据ID查询 + * @param id ID + * @return / + */ + UserDto findById(long id); - UserDTO create(User resources); + /** + * 新增用户 + * @param resources / + * @return / + */ + UserDto create(User resources); + /** + * 编辑用户 + * @param resources / + */ void update(User resources); + /** + * 删除用户 + * @param id / + */ void delete(Long id); - UserDTO findByName(String userName); + /** + * 根据用户名查询 + * @param userName / + * @return / + */ + UserDto findByName(String userName); + /** + * 修改密码 + * @param username 用户名 + * @param encryptPassword 密码 + */ void updatePass(String username, String encryptPassword); + /** + * 修改头像 + * @param file 文件 + */ void updateAvatar(MultipartFile file); + /** + * 修改邮箱 + * @param username 用户名 + * @param email 邮箱 + */ void updateEmail(String username, String email); + /** + * 查询全部 + * @param criteria 条件 + * @param pageable 分页参数 + * @return / + */ Object queryAll(UserQueryCriteria criteria, Pageable pageable); - List queryAll(UserQueryCriteria criteria); + /** + * 查询全部不分页 + * @param criteria 条件 + * @return / + */ + List queryAll(UserQueryCriteria criteria); - void download(List queryAll, HttpServletResponse response) throws IOException; + /** + * 导出数据 + * @param queryAll 待导出的数据 + * @param response / + * @throws IOException / + */ + void download(List queryAll, HttpServletResponse response) throws IOException; } 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 similarity index 79% rename from eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/DeptDTO.java rename to eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/DeptDto.java index 2ef07409..d77e9c81 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 @@ -1,6 +1,7 @@ package me.zhengjie.modules.system.service.dto; import com.fasterxml.jackson.annotation.JsonInclude; +import lombok.Data; import lombok.Getter; import lombok.Setter; import javax.validation.constraints.NotNull; @@ -12,24 +13,20 @@ import java.util.List; * @author Zheng Jie * @date 2019-03-25 */ -@Getter -@Setter -public class DeptDTO implements Serializable { +@Data +public class DeptDto implements Serializable { - // ID private Long id; - // 名称 private String name; @NotNull private Boolean enabled; - // 上级部门 private Long pid; @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List children; + private List children; private Timestamp createTime; 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 similarity index 79% rename from eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/DeptSmallDTO.java rename to eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/DeptSmallDto.java index 0956825d..13ff737c 100644 --- 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 @@ -8,7 +8,7 @@ import java.io.Serializable; * @date 2019-6-10 16:32:18 */ @Data -public class DeptSmallDTO implements Serializable { +public class DeptSmallDto implements Serializable { private Long id; 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 similarity index 80% rename from eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/DictDetailDTO.java rename to eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/DictDetailDto.java index 85b65e0a..36c29006 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 @@ -12,7 +12,7 @@ import java.sql.Timestamp; */ @Getter @Setter -public class DictDetailDTO implements Serializable { +public class DictDetailDto implements Serializable { private Long id; @@ -22,7 +22,7 @@ public class DictDetailDTO implements Serializable { private String sort; - private DictSmallDTO dict; + private DictSmallDto dict; private Timestamp createTime; } \ 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 similarity index 79% rename from eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/DictDTO.java rename to eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/DictDto.java index c9753848..ea462abb 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 @@ -13,7 +13,7 @@ import java.util.List; */ @Getter @Setter -public class DictDTO implements Serializable { +public class DictDto implements Serializable { private Long id; @@ -21,7 +21,7 @@ public class DictDTO implements Serializable { private String remark; - private List dictDetails; + private List dictDetails; private Timestamp createTime; } diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/DictQueryCriteria.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/DictQueryCriteria.java index fe2e2193..c336754a 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/DictQueryCriteria.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/DictQueryCriteria.java @@ -4,12 +4,12 @@ import lombok.Data; import me.zhengjie.annotation.Query; /** + * @author Zheng Jie * 公共查询类 */ @Data public class DictQueryCriteria { - // 多字段模糊 @Query(blurry = "name,remark") private String blurry; } diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/DictSmallDTO.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/DictSmallDto.java similarity index 80% rename from eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/DictSmallDTO.java rename to eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/DictSmallDto.java index 6748df07..4448307f 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/DictSmallDTO.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/DictSmallDto.java @@ -10,7 +10,7 @@ import java.io.Serializable; */ @Getter @Setter -public class DictSmallDTO implements Serializable { +public class DictSmallDto implements Serializable { private Long id; } 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 similarity index 80% rename from eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/JobDTO.java rename to eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/JobDto.java index 0f872195..f8900357 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 @@ -14,7 +14,7 @@ import java.sql.Timestamp; @Getter @Setter @NoArgsConstructor -public class JobDTO implements Serializable { +public class JobDto implements Serializable { private Long id; @@ -24,13 +24,13 @@ public class JobDTO implements Serializable { private Boolean enabled; - private DeptDTO dept; + private DeptDto dept; private String deptSuperiorName; private Timestamp createTime; - public JobDTO(String name, Boolean enabled) { + public JobDto(String name, Boolean enabled) { this.name = name; this.enabled = enabled; } 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 similarity index 83% rename from eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/JobSmallDTO.java rename to eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/JobSmallDto.java index 53c7c923..d71bf344 100644 --- 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 @@ -10,7 +10,7 @@ import java.io.Serializable; */ @Data @NoArgsConstructor -public class JobSmallDTO implements Serializable { +public class JobSmallDto implements Serializable { private Long id; 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 similarity index 79% rename from eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/MenuDTO.java rename to eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/MenuDto.java index 6a4877a3..8b2319a2 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 @@ -1,8 +1,6 @@ package me.zhengjie.modules.system.service.dto; -import lombok.Getter; -import lombok.Setter; - +import lombok.Data; import java.io.Serializable; import java.sql.Timestamp; import java.util.List; @@ -11,9 +9,8 @@ import java.util.List; * @author Zheng Jie * @date 2018-12-17 */ -@Getter -@Setter -public class MenuDTO implements Serializable { +@Data +public class MenuDto implements Serializable { private Long id; @@ -41,7 +38,7 @@ public class MenuDTO implements Serializable { private String icon; - private List children; + private List children; private Timestamp createTime; } diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/MenuQueryCriteria.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/MenuQueryCriteria.java index 0a4275a3..55f5c158 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/MenuQueryCriteria.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/MenuQueryCriteria.java @@ -7,12 +7,12 @@ import java.sql.Timestamp; import java.util.List; /** + * @author Zheng Jie * 公共查询类 */ @Data public class MenuQueryCriteria { - // 多字段模糊 @Query(blurry = "name,path,component") private String blurry; 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 similarity index 69% rename from eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/RoleDTO.java rename to eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/RoleDto.java index 5d6ef351..2b3a97b7 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 @@ -1,8 +1,6 @@ package me.zhengjie.modules.system.service.dto; -import lombok.Getter; -import lombok.Setter; - +import lombok.Data; import java.io.Serializable; import java.sql.Timestamp; import java.util.Set; @@ -11,9 +9,8 @@ import java.util.Set; * @author Zheng Jie * @date 2018-11-23 */ -@Getter -@Setter -public class RoleDTO implements Serializable { +@Data +public class RoleDto implements Serializable { private Long id; @@ -27,9 +24,9 @@ public class RoleDTO implements Serializable { private String permission; - private Set menus; + private Set menus; - private Set depts; + private Set depts; private Timestamp createTime; } diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/RoleQueryCriteria.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/RoleQueryCriteria.java index 29db87c6..6546b03c 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/RoleQueryCriteria.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/RoleQueryCriteria.java @@ -7,12 +7,12 @@ import java.sql.Timestamp; import java.util.List; /** + * @author Zheng Jie * 公共查询类 */ @Data public class RoleQueryCriteria { - // 多字段模糊 @Query(blurry = "name,remark") private String blurry; 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 similarity index 83% rename from eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/RoleSmallDTO.java rename to eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/RoleSmallDto.java index 1a6c7a04..9d5a1d50 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 @@ -8,7 +8,7 @@ import java.io.Serializable; * @date 2018-11-23 */ @Data -public class RoleSmallDTO implements Serializable { +public class RoleSmallDto implements Serializable { private Long id; 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 similarity index 78% rename from eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/UserDTO.java rename to eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/UserDto.java index 9fe06409..456a02ad 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 @@ -2,9 +2,7 @@ package me.zhengjie.modules.system.service.dto; import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.annotations.ApiModelProperty; -import lombok.Getter; -import lombok.Setter; - +import lombok.Data; import java.io.Serializable; import java.sql.Timestamp; import java.util.Date; @@ -14,9 +12,8 @@ import java.util.Set; * @author Zheng Jie * @date 2018-11-23 */ -@Getter -@Setter -public class UserDTO implements Serializable { +@Data +public class UserDto implements Serializable { @ApiModelProperty(hidden = true) private Long id; @@ -37,12 +34,12 @@ public class UserDTO implements Serializable { private Date lastPasswordResetTime; @ApiModelProperty(hidden = true) - private Set roles; + private Set roles; @ApiModelProperty(hidden = true) - private JobSmallDTO job; + private JobSmallDto job; - private DeptSmallDTO 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 56b1ddc0..47a4cff1 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 @@ -20,7 +20,6 @@ public class UserQueryCriteria implements Serializable { @Query(propName = "id", type = Query.Type.IN, joinName = "dept") private Set deptIds; - // 多字段模糊 @Query(blurry = "email,username") private String blurry; 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 20fed2d8..8c5c0636 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 @@ -2,13 +2,13 @@ package me.zhengjie.modules.system.service.impl; import me.zhengjie.exception.BadRequestException; import me.zhengjie.modules.system.domain.Dept; +import me.zhengjie.modules.system.service.dto.DeptDto; import me.zhengjie.modules.system.service.dto.DeptQueryCriteria; import me.zhengjie.utils.FileUtil; import me.zhengjie.utils.QueryHelp; import me.zhengjie.utils.ValidationUtil; import me.zhengjie.modules.system.repository.DeptRepository; import me.zhengjie.modules.system.service.DeptService; -import me.zhengjie.modules.system.service.dto.DeptDTO; import me.zhengjie.modules.system.service.mapper.DeptMapper; import org.springframework.cache.annotation.CacheConfig; import org.springframework.cache.annotation.CacheEvict; @@ -43,13 +43,13 @@ public class DeptServiceImpl implements DeptService { @Override @Cacheable - public List queryAll(DeptQueryCriteria criteria) { + public List queryAll(DeptQueryCriteria criteria) { return deptMapper.toDto(deptRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root,criteria,criteriaBuilder))); } @Override @Cacheable(key = "#p0") - public DeptDTO findById(Long id) { + public DeptDto findById(Long id) { Dept dept = deptRepository.findById(id).orElseGet(Dept::new); ValidationUtil.isNull(dept.getId(),"Dept","id",id); return deptMapper.toDto(dept); @@ -68,17 +68,17 @@ public class DeptServiceImpl implements DeptService { @Override @Cacheable - public Object buildTree(List deptDTOS) { - Set trees = new LinkedHashSet<>(); - Set depts= new LinkedHashSet<>(); - List deptNames = deptDTOS.stream().map(DeptDTO::getName).collect(Collectors.toList()); + public Object buildTree(List deptDtos) { + Set trees = new LinkedHashSet<>(); + Set depts= new LinkedHashSet<>(); + List deptNames = deptDtos.stream().map(DeptDto::getName).collect(Collectors.toList()); boolean isChild; - for (DeptDTO deptDTO : deptDTOS) { + for (DeptDto deptDTO : deptDtos) { isChild = false; if ("0".equals(deptDTO.getPid().toString())) { trees.add(deptDTO); } - for (DeptDTO it : deptDTOS) { + for (DeptDto it : deptDtos) { if (it.getPid().equals(deptDTO.getId())) { isChild = true; if (deptDTO.getChildren() == null) { @@ -87,28 +87,29 @@ public class DeptServiceImpl implements DeptService { deptDTO.getChildren().add(it); } } - if(isChild) + if(isChild) { depts.add(deptDTO); - else if(!deptNames.contains(deptRepository.findNameById(deptDTO.getPid()))) + } else if(!deptNames.contains(deptRepository.findNameById(deptDTO.getPid()))) { depts.add(deptDTO); + } } if (CollectionUtils.isEmpty(trees)) { trees = depts; } - Integer totalElements = deptDTOS.size(); + Integer totalElements = deptDtos.size(); - Map map = new HashMap<>(); + Map map = new HashMap<>(2); map.put("totalElements",totalElements); - map.put("content",CollectionUtils.isEmpty(trees)?deptDTOS:trees); + map.put("content",CollectionUtils.isEmpty(trees)? deptDtos :trees); return map; } @Override @CacheEvict(allEntries = true) @Transactional(rollbackFor = Exception.class) - public DeptDTO create(Dept resources) { + public DeptDto create(Dept resources) { return deptMapper.toDto(deptRepository.save(resources)); } @@ -133,9 +134,9 @@ public class DeptServiceImpl implements DeptService { } @Override - public void download(List deptDTOs, HttpServletResponse response) throws IOException { + public void download(List deptDtos, HttpServletResponse response) throws IOException { List> list = new ArrayList<>(); - for (DeptDTO deptDTO : deptDTOs) { + for (DeptDto deptDTO : deptDtos) { Map map = new LinkedHashMap<>(); map.put("部门名称", deptDTO.getName()); map.put("部门状态", deptDTO.getEnabled() ? "启用" : "停用"); 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 1374202f..6c9c990e 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 @@ -7,7 +7,7 @@ import me.zhengjie.utils.QueryHelp; import me.zhengjie.utils.ValidationUtil; import me.zhengjie.modules.system.repository.DictDetailRepository; import me.zhengjie.modules.system.service.DictDetailService; -import me.zhengjie.modules.system.service.dto.DictDetailDTO; +import me.zhengjie.modules.system.service.dto.DictDetailDto; import me.zhengjie.modules.system.service.mapper.DictDetailMapper; import org.springframework.cache.annotation.CacheConfig; import org.springframework.cache.annotation.CacheEvict; @@ -46,7 +46,7 @@ public class DictDetailServiceImpl implements DictDetailService { @Override @Cacheable(key = "#p0") - public DictDetailDTO findById(Long id) { + public DictDetailDto findById(Long id) { DictDetail dictDetail = dictDetailRepository.findById(id).orElseGet(DictDetail::new); ValidationUtil.isNull(dictDetail.getId(),"DictDetail","id",id); return dictDetailMapper.toDto(dictDetail); @@ -55,7 +55,7 @@ public class DictDetailServiceImpl implements DictDetailService { @Override @CacheEvict(allEntries = true) @Transactional(rollbackFor = Exception.class) - public DictDetailDTO create(DictDetail resources) { + public DictDetailDto create(DictDetail resources) { return dictDetailMapper.toDto(dictDetailRepository.save(resources)); } 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 e1128a50..b5fc87f1 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 @@ -2,7 +2,7 @@ package me.zhengjie.modules.system.service.impl; import cn.hutool.core.collection.CollectionUtil; import me.zhengjie.modules.system.domain.Dict; -import me.zhengjie.modules.system.service.dto.DictDetailDTO; +import me.zhengjie.modules.system.service.dto.DictDetailDto; import me.zhengjie.modules.system.service.dto.DictQueryCriteria; import me.zhengjie.utils.FileUtil; import me.zhengjie.utils.PageUtil; @@ -10,7 +10,7 @@ import me.zhengjie.utils.QueryHelp; import me.zhengjie.utils.ValidationUtil; import me.zhengjie.modules.system.repository.DictRepository; import me.zhengjie.modules.system.service.DictService; -import me.zhengjie.modules.system.service.dto.DictDTO; +import me.zhengjie.modules.system.service.dto.DictDto; import me.zhengjie.modules.system.service.mapper.DictMapper; import org.springframework.cache.annotation.CacheConfig; import org.springframework.cache.annotation.CacheEvict; @@ -54,14 +54,14 @@ public class DictServiceImpl implements DictService { } @Override - public List queryAll(DictQueryCriteria dict) { + public List queryAll(DictQueryCriteria dict) { List list = dictRepository.findAll((root, query, cb) -> QueryHelp.getPredicate(root, dict, cb)); return dictMapper.toDto(list); } @Override @Cacheable(key = "#p0") - public DictDTO findById(Long id) { + public DictDto findById(Long id) { Dict dict = dictRepository.findById(id).orElseGet(Dict::new); ValidationUtil.isNull(dict.getId(),"Dict","id",id); return dictMapper.toDto(dict); @@ -70,7 +70,7 @@ public class DictServiceImpl implements DictService { @Override @CacheEvict(allEntries = true) @Transactional(rollbackFor = Exception.class) - public DictDTO create(Dict resources) { + public DictDto create(Dict resources) { return dictMapper.toDto(dictRepository.save(resources)); } @@ -92,11 +92,11 @@ public class DictServiceImpl implements DictService { } @Override - public void download(List dictDTOS, HttpServletResponse response) throws IOException { + public void download(List dictDtos, HttpServletResponse response) throws IOException { List> list = new ArrayList<>(); - for (DictDTO dictDTO : dictDTOS) { + for (DictDto dictDTO : dictDtos) { if(CollectionUtil.isNotEmpty(dictDTO.getDictDetails())){ - for (DictDetailDTO dictDetail : dictDTO.getDictDetails()) { + for (DictDetailDto dictDetail : dictDTO.getDictDetails()) { Map map = new LinkedHashMap<>(); map.put("字典名称", dictDTO.getName()); map.put("字典描述", dictDTO.getRemark()); 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 ea37db69..268b71fe 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 @@ -9,7 +9,7 @@ import me.zhengjie.utils.QueryHelp; import me.zhengjie.utils.ValidationUtil; import me.zhengjie.modules.system.repository.JobRepository; import me.zhengjie.modules.system.service.JobService; -import me.zhengjie.modules.system.service.dto.JobDTO; +import me.zhengjie.modules.system.service.dto.JobDto; import me.zhengjie.modules.system.service.mapper.JobMapper; import org.springframework.cache.annotation.CacheConfig; import org.springframework.cache.annotation.CacheEvict; @@ -52,7 +52,7 @@ public class JobServiceImpl implements JobService { @Cacheable public Map queryAll(JobQueryCriteria criteria, Pageable pageable) { Page page = jobRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root,criteria,criteriaBuilder),pageable); - List jobs = new ArrayList<>(); + List jobs = new ArrayList<>(); for (Job job : page.getContent()) { jobs.add(jobMapper.toDto(job,deptRepository.findNameById(job.getDept().getPid()))); } @@ -61,14 +61,14 @@ public class JobServiceImpl implements JobService { @Override @Cacheable - public List queryAll(JobQueryCriteria criteria) { + public List queryAll(JobQueryCriteria criteria) { List list = jobRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root,criteria,criteriaBuilder)); return jobMapper.toDto(list); } @Override @Cacheable(key = "#p0") - public JobDTO findById(Long id) { + public JobDto findById(Long id) { Job job = jobRepository.findById(id).orElseGet(Job::new); ValidationUtil.isNull(job.getId(),"Job","id",id); return jobMapper.toDto(job); @@ -77,7 +77,7 @@ public class JobServiceImpl implements JobService { @Override @CacheEvict(allEntries = true) @Transactional(rollbackFor = Exception.class) - public JobDTO create(Job resources) { + public JobDto create(Job resources) { return jobMapper.toDto(jobRepository.save(resources)); } @@ -99,9 +99,9 @@ public class JobServiceImpl implements JobService { } @Override - public void download(List jobDTOs, HttpServletResponse response) throws IOException { + public void download(List jobDtos, HttpServletResponse response) throws IOException { List> list = new ArrayList<>(); - for (JobDTO jobDTO : jobDTOs) { + for (JobDto jobDTO : jobDtos) { Map map = new LinkedHashMap<>(); map.put("岗位名称", jobDTO.getName()); map.put("所属部门", jobDTO.getDept().getName()); diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/MenuServiceImpl.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/MenuServiceImpl.java index baadcfa2..5bdbcd23 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/MenuServiceImpl.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/MenuServiceImpl.java @@ -10,9 +10,9 @@ import me.zhengjie.exception.EntityExistException; import me.zhengjie.modules.system.repository.MenuRepository; import me.zhengjie.modules.system.service.MenuService; import me.zhengjie.modules.system.service.RoleService; -import me.zhengjie.modules.system.service.dto.MenuDTO; +import me.zhengjie.modules.system.service.dto.MenuDto; import me.zhengjie.modules.system.service.dto.MenuQueryCriteria; -import me.zhengjie.modules.system.service.dto.RoleSmallDTO; +import me.zhengjie.modules.system.service.dto.RoleSmallDto; import me.zhengjie.modules.system.service.mapper.MenuMapper; import me.zhengjie.utils.FileUtil; import me.zhengjie.utils.QueryHelp; @@ -21,7 +21,6 @@ import me.zhengjie.utils.ValidationUtil; import org.springframework.cache.annotation.CacheConfig; import org.springframework.cache.annotation.CacheEvict; import org.springframework.cache.annotation.Cacheable; -import org.springframework.data.domain.Sort; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; @@ -30,6 +29,9 @@ import java.io.IOException; import java.util.*; import java.util.stream.Collectors; +/** + * @author Zheng Jie + */ @Service @CacheConfig(cacheNames = "menu") @Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class) @@ -49,23 +51,23 @@ public class MenuServiceImpl implements MenuService { @Override @Cacheable - public List queryAll(MenuQueryCriteria criteria){ + public List queryAll(MenuQueryCriteria criteria){ // Sort sort = new Sort(Sort.Direction.DESC,"id"); return menuMapper.toDto(menuRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root,criteria,criteriaBuilder))); } @Override @Cacheable(key = "#p0") - public MenuDTO findById(long id) { + public MenuDto findById(long id) { Menu menu = menuRepository.findById(id).orElseGet(Menu::new); ValidationUtil.isNull(menu.getId(),"Menu","id",id); return menuMapper.toDto(menu); } @Override - public List findByRoles(List roles) { + public List findByRoles(List roles) { Set menus = new LinkedHashSet<>(); - for (RoleSmallDTO role : roles) { + for (RoleSmallDto role : roles) { List menus1 = new ArrayList<>(menuRepository.findByRoles_IdAndTypeIsNotInOrderBySortAsc(role.getId(), 2)); menus.addAll(menus1); } @@ -74,7 +76,7 @@ public class MenuServiceImpl implements MenuService { @Override @CacheEvict(allEntries = true) - public MenuDTO create(Menu resources) { + public MenuDto create(Menu resources) { if(menuRepository.findByName(resources.getName()) != null){ throw new EntityExistException(Menu.class,"name",resources.getName()); } @@ -84,7 +86,8 @@ public class MenuServiceImpl implements MenuService { } } if(resources.getIFrame()){ - if (!(resources.getPath().toLowerCase().startsWith("http://")||resources.getPath().toLowerCase().startsWith("https://"))) { + String http = "http://", https = "https://"; + if (!(resources.getPath().toLowerCase().startsWith(http)||resources.getPath().toLowerCase().startsWith(https))) { throw new BadRequestException("外链必须以http://或者https://开头"); } } @@ -101,7 +104,8 @@ public class MenuServiceImpl implements MenuService { ValidationUtil.isNull(menu.getId(),"Permission","id",resources.getId()); if(resources.getIFrame()){ - if (!(resources.getPath().toLowerCase().startsWith("http://")||resources.getPath().toLowerCase().startsWith("https://"))) { + String http = "http://", https = "https://"; + if (!(resources.getPath().toLowerCase().startsWith(http)||resources.getPath().toLowerCase().startsWith(https))) { throw new BadRequestException("外链必须以http://或者https://开头"); } } @@ -162,7 +166,7 @@ public class MenuServiceImpl implements MenuService { menus.forEach(menu -> { if (menu!=null){ List menuList = menuRepository.findByPid(menu.getId()); - Map map = new HashMap<>(); + Map map = new HashMap<>(16); map.put("id",menu.getId()); map.put("label",menu.getName()); if(menuList!=null && menuList.size()!=0){ @@ -182,14 +186,14 @@ public class MenuServiceImpl implements MenuService { } @Override - public Map buildTree(List menuDTOS) { - List trees = new ArrayList<>(); + public Map buildTree(List menuDtos) { + List trees = new ArrayList<>(); Set ids = new HashSet<>(); - for (MenuDTO menuDTO : menuDTOS) { + for (MenuDto menuDTO : menuDtos) { if (menuDTO.getPid() == 0) { trees.add(menuDTO); } - for (MenuDTO it : menuDTOS) { + for (MenuDto it : menuDtos) { if (it.getPid().equals(menuDTO.getId())) { if (menuDTO.getChildren() == null) { menuDTO.setChildren(new ArrayList<>()); @@ -199,21 +203,21 @@ public class MenuServiceImpl implements MenuService { } } } - Map map = new HashMap<>(); + Map map = new HashMap<>(2); if(trees.size() == 0){ - trees = menuDTOS.stream().filter(s -> !ids.contains(s.getId())).collect(Collectors.toList()); + trees = menuDtos.stream().filter(s -> !ids.contains(s.getId())).collect(Collectors.toList()); } map.put("content",trees); - map.put("totalElements", menuDTOS.size()); + map.put("totalElements", menuDtos.size()); return map; } @Override - public List buildMenus(List menuDTOS) { + public List buildMenus(List menuDtos) { List list = new LinkedList<>(); - menuDTOS.forEach(menuDTO -> { + menuDtos.forEach(menuDTO -> { if (menuDTO!=null){ - List menuDTOList = menuDTO.getChildren(); + List menuDtoList = menuDTO.getChildren(); MenuVo menuVo = new MenuVo(); menuVo.setName(ObjectUtil.isNotEmpty(menuDTO.getComponentName()) ? menuDTO.getComponentName() : menuDTO.getName()); // 一级目录需要加斜杠，不然会报警告 @@ -228,10 +232,10 @@ public class MenuServiceImpl implements MenuService { } } menuVo.setMeta(new MenuMetaVo(menuDTO.getName(),menuDTO.getIcon(),!menuDTO.getCache())); - if(menuDTOList!=null && menuDTOList.size()!=0){ + if(menuDtoList !=null && menuDtoList.size()!=0){ menuVo.setAlwaysShow(true); menuVo.setRedirect("noredirect"); - menuVo.setChildren(buildMenus(menuDTOList)); + menuVo.setChildren(buildMenus(menuDtoList)); // 处理是一级菜单并且没有子菜单的情况 } else if(menuDTO.getPid() == 0){ MenuVo menuVo1 = new MenuVo(); @@ -266,9 +270,9 @@ public class MenuServiceImpl implements MenuService { } @Override - public void download(List menuDTOS, HttpServletResponse response) throws IOException { + public void download(List menuDtos, HttpServletResponse response) throws IOException { List> list = new ArrayList<>(); - for (MenuDTO menuDTO : menuDTOS) { + for (MenuDto menuDTO : menuDtos) { Map map = new LinkedHashMap<>(); map.put("菜单名称", menuDTO.getName()); map.put("菜单类型", menuDTO.getType() == 0 ? "目录" : menuDTO.getType() == 1 ? "菜单" : "按钮"); 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 1b9725f0..e22b6b88 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 @@ -4,9 +4,9 @@ import me.zhengjie.modules.system.domain.Role; import me.zhengjie.exception.EntityExistException; import me.zhengjie.modules.system.repository.RoleRepository; import me.zhengjie.modules.system.service.RoleService; -import me.zhengjie.modules.system.service.dto.RoleDTO; +import me.zhengjie.modules.system.service.dto.RoleDto; import me.zhengjie.modules.system.service.dto.RoleQueryCriteria; -import me.zhengjie.modules.system.service.dto.RoleSmallDTO; +import me.zhengjie.modules.system.service.dto.RoleSmallDto; import me.zhengjie.modules.system.service.mapper.RoleMapper; import me.zhengjie.modules.system.service.mapper.RoleSmallMapper; import me.zhengjie.utils.FileUtil; @@ -56,7 +56,7 @@ public class RoleServiceImpl implements RoleService { @Override @Cacheable - public List queryAll(RoleQueryCriteria criteria) { + public List queryAll(RoleQueryCriteria criteria) { return roleMapper.toDto(roleRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root,criteria,criteriaBuilder))); } @@ -69,7 +69,7 @@ public class RoleServiceImpl implements RoleService { @Override @Cacheable(key = "#p0") - public RoleDTO findById(long id) { + public RoleDto findById(long id) { Role role = roleRepository.findById(id).orElseGet(Role::new); ValidationUtil.isNull(role.getId(),"Role","id",id); return roleMapper.toDto(role); @@ -78,7 +78,7 @@ public class RoleServiceImpl implements RoleService { @Override @CacheEvict(allEntries = true) @Transactional(rollbackFor = Exception.class) - public RoleDTO create(Role resources) { + public RoleDto create(Role resources) { if(roleRepository.findByName(resources.getName()) != null){ throw new EntityExistException(Role.class,"username",resources.getName()); } @@ -108,7 +108,7 @@ public class RoleServiceImpl implements RoleService { @Override @CacheEvict(allEntries = true) - public void updateMenu(Role resources, RoleDTO roleDTO) { + public void updateMenu(Role resources, RoleDto roleDTO) { Role role = roleMapper.toEntity(roleDTO); role.setMenus(resources.getMenus()); roleRepository.save(role); @@ -130,24 +130,24 @@ public class RoleServiceImpl implements RoleService { @Override @Cacheable(key = "'findByUsers_Id:' + #p0") - public List findByUsers_Id(Long id) { + public List findByUsersId(Long id) { return roleSmallMapper.toDto(new ArrayList<>(roleRepository.findByUsers_Id(id))); } @Override @Cacheable public Integer findByRoles(Set roles) { - Set roleDTOS = new HashSet<>(); + Set roleDtos = new HashSet<>(); for (Role role : roles) { - roleDTOS.add(findById(role.getId())); + roleDtos.add(findById(role.getId())); } - return Collections.min(roleDTOS.stream().map(RoleDTO::getLevel).collect(Collectors.toList())); + return Collections.min(roleDtos.stream().map(RoleDto::getLevel).collect(Collectors.toList())); } @Override - public void download(List roles, HttpServletResponse response) throws IOException { + public void download(List roles, HttpServletResponse response) throws IOException { List> list = new ArrayList<>(); - for (RoleDTO role : roles) { + for (RoleDto role : roles) { Map map = new LinkedHashMap<>(); map.put("角色名称", role.getName()); map.put("默认权限", role.getPermission()); 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 ee64b6bb..b71d638c 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 @@ -8,8 +8,8 @@ import me.zhengjie.modules.system.domain.UserAvatar; import me.zhengjie.modules.system.repository.UserAvatarRepository; import me.zhengjie.modules.system.repository.UserRepository; import me.zhengjie.modules.system.service.UserService; -import me.zhengjie.modules.system.service.dto.RoleSmallDTO; -import me.zhengjie.modules.system.service.dto.UserDTO; +import me.zhengjie.modules.system.service.dto.RoleSmallDto; +import me.zhengjie.modules.system.service.dto.UserDto; import me.zhengjie.modules.system.service.dto.UserQueryCriteria; import me.zhengjie.modules.system.service.mapper.UserMapper; import me.zhengjie.utils.*; @@ -65,14 +65,14 @@ public class UserServiceImpl implements UserService { @Override @Cacheable - public List queryAll(UserQueryCriteria criteria) { + public List queryAll(UserQueryCriteria criteria) { List users = userRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root,criteria,criteriaBuilder)); return userMapper.toDto(users); } @Override @Cacheable(key = "#p0") - public UserDTO findById(long id) { + public UserDto findById(long id) { User user = userRepository.findById(id).orElseGet(User::new); ValidationUtil.isNull(user.getId(),"User","id",id); return userMapper.toDto(user); @@ -81,7 +81,7 @@ public class UserServiceImpl implements UserService { @Override @CacheEvict(allEntries = true) @Transactional(rollbackFor = Exception.class) - public UserDTO create(User resources) { + public UserDto create(User resources) { if(userRepository.findByUsername(resources.getUsername())!=null){ throw new EntityExistException(User.class,"username",resources.getUsername()); @@ -140,7 +140,7 @@ public class UserServiceImpl implements UserService { @Override @Cacheable(key = "'loadUserByUsername:'+#p0") - public UserDTO findByName(String userName) { + public UserDto findByName(String userName) { User user; if(ValidationUtil.isEmail(userName)){ user = userRepository.findByEmail(userName); @@ -189,10 +189,10 @@ public class UserServiceImpl implements UserService { } @Override - public void download(List queryAll, HttpServletResponse response) throws IOException { + public void download(List queryAll, HttpServletResponse response) throws IOException { List> list = new ArrayList<>(); - for (UserDTO userDTO : queryAll) { - List roles = userDTO.getRoles().stream().map(RoleSmallDTO::getName).collect(Collectors.toList()); + for (UserDto userDTO : queryAll) { + List roles = userDTO.getRoles().stream().map(RoleSmallDto::getName).collect(Collectors.toList()); Map map = new LinkedHashMap<>(); map.put("用户名", userDTO.getUsername()); map.put("头像", userDTO.getAvatar()); 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 ba3be01d..190df4c3 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 @@ -2,7 +2,7 @@ package me.zhengjie.modules.system.service.mapper; import me.zhengjie.base.BaseMapper; import me.zhengjie.modules.system.domain.Dept; -import me.zhengjie.modules.system.service.dto.DeptDTO; +import me.zhengjie.modules.system.service.dto.DeptDto; import org.mapstruct.Mapper; import org.mapstruct.ReportingPolicy; @@ -11,6 +11,6 @@ import org.mapstruct.ReportingPolicy; * @date 2019-03-25 */ @Mapper(componentModel = "spring",unmappedTargetPolicy = ReportingPolicy.IGNORE) -public interface DeptMapper extends BaseMapper { +public interface DeptMapper extends BaseMapper { } \ No newline at end of file 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 index c964081d..48073faf 100644 --- 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 @@ -2,7 +2,7 @@ package me.zhengjie.modules.system.service.mapper; import me.zhengjie.base.BaseMapper; import me.zhengjie.modules.system.domain.Dept; -import me.zhengjie.modules.system.service.dto.DeptSmallDTO; +import me.zhengjie.modules.system.service.dto.DeptSmallDto; import org.mapstruct.Mapper; import org.mapstruct.ReportingPolicy; @@ -11,6 +11,6 @@ import org.mapstruct.ReportingPolicy; * @date 2019-03-25 */ @Mapper(componentModel = "spring",unmappedTargetPolicy = ReportingPolicy.IGNORE) -public interface DeptSmallMapper extends BaseMapper { +public interface DeptSmallMapper extends BaseMapper { } \ 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 51fd1f9c..482ff43b 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 @@ -2,7 +2,7 @@ package me.zhengjie.modules.system.service.mapper; import me.zhengjie.base.BaseMapper; import me.zhengjie.modules.system.domain.DictDetail; -import me.zhengjie.modules.system.service.dto.DictDetailDTO; +import me.zhengjie.modules.system.service.dto.DictDetailDto; import org.mapstruct.Mapper; import org.mapstruct.ReportingPolicy; @@ -11,6 +11,6 @@ import org.mapstruct.ReportingPolicy; * @date 2019-04-10 */ @Mapper(componentModel = "spring", uses = {DictSmallMapper.class}, unmappedTargetPolicy = ReportingPolicy.IGNORE) -public interface DictDetailMapper extends BaseMapper { +public interface DictDetailMapper extends BaseMapper { } \ No newline at end of file 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 c5b70a25..819cd58c 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 @@ -2,7 +2,7 @@ package me.zhengjie.modules.system.service.mapper; import me.zhengjie.base.BaseMapper; import me.zhengjie.modules.system.domain.Dict; -import me.zhengjie.modules.system.service.dto.DictDTO; +import me.zhengjie.modules.system.service.dto.DictDto; import org.mapstruct.Mapper; import org.mapstruct.ReportingPolicy; @@ -11,6 +11,6 @@ import org.mapstruct.ReportingPolicy; * @date 2019-04-10 */ @Mapper(componentModel = "spring",unmappedTargetPolicy = ReportingPolicy.IGNORE) -public interface DictMapper extends BaseMapper { +public interface DictMapper extends BaseMapper { } \ No newline at end of file diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/DictSmallMapper.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/DictSmallMapper.java index 22dce56d..ef48a885 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/DictSmallMapper.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/DictSmallMapper.java @@ -2,8 +2,7 @@ package me.zhengjie.modules.system.service.mapper; import me.zhengjie.base.BaseMapper; import me.zhengjie.modules.system.domain.Dict; -import me.zhengjie.modules.system.service.dto.DictDTO; -import me.zhengjie.modules.system.service.dto.DictSmallDTO; +import me.zhengjie.modules.system.service.dto.DictSmallDto; import org.mapstruct.Mapper; import org.mapstruct.ReportingPolicy; @@ -12,6 +11,6 @@ import org.mapstruct.ReportingPolicy; * @date 2019-04-10 */ @Mapper(componentModel = "spring",unmappedTargetPolicy = ReportingPolicy.IGNORE) -public interface DictSmallMapper extends BaseMapper { +public interface DictSmallMapper extends BaseMapper { } \ No newline at end of file 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 59565dfa..1938ef49 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 @@ -2,7 +2,7 @@ package me.zhengjie.modules.system.service.mapper; import me.zhengjie.base.BaseMapper; import me.zhengjie.modules.system.domain.Job; -import me.zhengjie.modules.system.service.dto.JobDTO; +import me.zhengjie.modules.system.service.dto.JobDto; import org.mapstruct.Mapper; import org.mapstruct.Mapping; import org.mapstruct.ReportingPolicy; @@ -12,8 +12,14 @@ import org.mapstruct.ReportingPolicy; * @date 2019-03-29 */ @Mapper(componentModel = "spring",uses = {DeptMapper.class},unmappedTargetPolicy = ReportingPolicy.IGNORE) -public interface JobMapper extends BaseMapper { +public interface JobMapper extends BaseMapper { + /** + * 转Dto + * @param job 原始数据 + * @param deptSuperiorName / + * @return / + */ @Mapping(source = "deptSuperiorName", target = "deptSuperiorName") - JobDTO toDto(Job job, String deptSuperiorName); + JobDto toDto(Job job, String deptSuperiorName); } \ No newline at end of file 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 index 96282b2c..57dfe336 100644 --- 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 @@ -2,7 +2,7 @@ package me.zhengjie.modules.system.service.mapper; import me.zhengjie.base.BaseMapper; import me.zhengjie.modules.system.domain.Job; -import me.zhengjie.modules.system.service.dto.JobSmallDTO; +import me.zhengjie.modules.system.service.dto.JobSmallDto; import org.mapstruct.Mapper; import org.mapstruct.ReportingPolicy; @@ -11,6 +11,6 @@ import org.mapstruct.ReportingPolicy; * @date 2019-03-29 */ @Mapper(componentModel = "spring",unmappedTargetPolicy = ReportingPolicy.IGNORE) -public interface JobSmallMapper extends BaseMapper { +public interface JobSmallMapper extends BaseMapper { } \ 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 6887537f..68fb1460 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 @@ -2,7 +2,7 @@ package me.zhengjie.modules.system.service.mapper; import me.zhengjie.base.BaseMapper; import me.zhengjie.modules.system.domain.Menu; -import me.zhengjie.modules.system.service.dto.MenuDTO; +import me.zhengjie.modules.system.service.dto.MenuDto; import org.mapstruct.Mapper; import org.mapstruct.ReportingPolicy; @@ -11,6 +11,6 @@ import org.mapstruct.ReportingPolicy; * @date 2018-12-17 */ @Mapper(componentModel = "spring",unmappedTargetPolicy = ReportingPolicy.IGNORE) -public interface MenuMapper extends BaseMapper { +public interface MenuMapper extends BaseMapper { } 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 d1533b0c..39b7f32c 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 @@ -2,7 +2,7 @@ package me.zhengjie.modules.system.service.mapper; import me.zhengjie.base.BaseMapper; import me.zhengjie.modules.system.domain.Role; -import me.zhengjie.modules.system.service.dto.RoleDTO; +import me.zhengjie.modules.system.service.dto.RoleDto; import org.mapstruct.Mapper; import org.mapstruct.ReportingPolicy; @@ -11,6 +11,6 @@ import org.mapstruct.ReportingPolicy; * @date 2018-11-23 */ @Mapper(componentModel = "spring", uses = {MenuMapper.class, DeptMapper.class}, unmappedTargetPolicy = ReportingPolicy.IGNORE) -public interface RoleMapper extends BaseMapper { +public interface RoleMapper extends BaseMapper { } 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 ae23cdd3..b2c854d1 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 @@ -2,7 +2,7 @@ package me.zhengjie.modules.system.service.mapper; import me.zhengjie.base.BaseMapper; import me.zhengjie.modules.system.domain.Role; -import me.zhengjie.modules.system.service.dto.RoleSmallDTO; +import me.zhengjie.modules.system.service.dto.RoleSmallDto; import org.mapstruct.Mapper; import org.mapstruct.ReportingPolicy; @@ -11,6 +11,6 @@ import org.mapstruct.ReportingPolicy; * @date 2019-5-23 */ @Mapper(componentModel = "spring",unmappedTargetPolicy = ReportingPolicy.IGNORE) -public interface RoleSmallMapper extends BaseMapper { +public interface RoleSmallMapper extends BaseMapper { } 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 13654868..8a42fbb5 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 @@ -2,7 +2,7 @@ package me.zhengjie.modules.system.service.mapper; import me.zhengjie.base.BaseMapper; import me.zhengjie.modules.system.domain.User; -import me.zhengjie.modules.system.service.dto.UserDTO; +import me.zhengjie.modules.system.service.dto.UserDto; import org.mapstruct.Mapper; import org.mapstruct.Mapping; import org.mapstruct.ReportingPolicy; @@ -12,8 +12,14 @@ import org.mapstruct.ReportingPolicy; * @date 2018-11-23 */ @Mapper(componentModel = "spring",uses = {RoleMapper.class, DeptMapper.class, JobMapper.class},unmappedTargetPolicy = ReportingPolicy.IGNORE) -public interface UserMapper extends BaseMapper { +public interface UserMapper extends BaseMapper { + /** + * 转换 + * @param user 原始数据 + * @return / + */ + @Override @Mapping(source = "user.userAvatar.realName",target = "avatar") - UserDTO toDto(User user); + UserDto toDto(User user); } diff --git a/eladmin-system/src/main/resources/template/generator/admin/Service.ftl b/eladmin-system/src/main/resources/template/generator/admin/Service.ftl index ecac0ab8..96bb534d 100644 --- a/eladmin-system/src/main/resources/template/generator/admin/Service.ftl +++ b/eladmin-system/src/main/resources/template/generator/admin/Service.ftl @@ -1,7 +1,7 @@ package ${package}.service; import ${package}.domain.${className}; -import ${package}.service.dto.${className}DTO; +import ${package}.service.dto.${className}Dto; import ${package}.service.dto.${className}QueryCriteria; import org.springframework.data.domain.Pageable; import java.util.Map; @@ -26,18 +26,18 @@ public interface ${className}Service { /** * 查询所有数据不分页 * @param criteria 条件参数 - * @return List<${className}DTO> + * @return List<${className}Dto> */ - List<${className}DTO> queryAll(${className}QueryCriteria criteria); + List<${className}Dto> queryAll(${className}QueryCriteria criteria); /** * 根据ID查询 * @param ${pkChangeColName} ID - * @return ${className}DTO + * @return ${className}Dto */ - ${className}DTO findById(${pkColumnType} ${pkChangeColName}); + ${className}Dto findById(${pkColumnType} ${pkChangeColName}); - ${className}DTO create(${className} resources); + ${className}Dto create(${className} resources); void update(${className} resources); @@ -45,5 +45,5 @@ public interface ${className}Service { void deleteAll(${pkColumnType}[] ids); - void download(List<${className}DTO> all, HttpServletResponse response) throws IOException; + void download(List<${className}Dto> all, HttpServletResponse response) throws IOException; } \ No newline at end of file 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 914adf75..9b39ede1 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/domain/AlipayConfig.java +++ b/eladmin-tools/src/main/java/me/zhengjie/domain/AlipayConfig.java @@ -18,46 +18,46 @@ public class AlipayConfig implements Serializable { @Id private Long id; - // 应用ID,APPID，收款账号既是APPID对应支付宝账号 + /** 应用ID,APPID，收款账号既是APPID对应支付宝账号 */ @NotBlank @Column(name = "app_id") - private String appID; + private String appId; - // 商户私钥，您的PKCS8格式RSA2私钥 + /** 商户私钥，您的PKCS8格式RSA2私钥 */ @NotBlank @Column(name = "private_key", columnDefinition = "text") private String privateKey; - // 支付宝公钥 + /** 支付宝公钥 */ @NotBlank @Column(name = "public_key", columnDefinition = "text") private String publicKey; - // 签名方式，固定格式 + /** 签名方式，固定格式 */ @Column(name = "sign_type") private String signType="RSA2"; - // 支付宝开放安全地址，一般不会变 + /** 支付宝开放安全地址，一般不会变 */ @Column(name = "gateway_url") private String gatewayUrl = "https://openapi.alipaydev.com/gateway.do"; - // 编码，固定格式 + /** 编码，固定格式 */ private String charset= "utf-8"; - // 异步通知地址 + /** 异步通知地址 */ @NotBlank @Column(name = "notify_url") private String notifyUrl; - // 订单完成后返回的页面 + /** 订单完成后返回的页面 */ @NotBlank @Column(name = "return_url") private String returnUrl; - // 类型，固定格式 + /** 类型，固定格式 */ private String format="JSON"; - // 商户号 + /** 商户号 */ @NotBlank @Column(name = "sys_service_provider_id") private String sysServiceProviderId; 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 c49131dc..d3c38057 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/domain/EmailConfig.java +++ b/eladmin-tools/src/main/java/me/zhengjie/domain/EmailConfig.java @@ -19,22 +19,22 @@ public class EmailConfig implements Serializable { @Id private Long id; - // 邮件服务器SMTP地址 + /** 邮件服务器SMTP地址 */ @NotBlank private String host; - // 邮件服务器SMTP端口 + /** 邮件服务器 SMTP 端口 */ @NotBlank private String port; - // 发件者用户名，默认为发件人邮箱前缀 + /** 发件者用户名，默认为发件人邮箱前缀 */ @NotBlank private String user; @NotBlank private String pass; - // 收件人 + /** 收件人 */ @NotBlank @Column(name = "from_user") private String fromUser; diff --git a/eladmin-tools/src/main/java/me/zhengjie/domain/LocalStorage.java b/eladmin-tools/src/main/java/me/zhengjie/domain/LocalStorage.java index 9d6e9fcf..ea5b4af7 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/domain/LocalStorage.java +++ b/eladmin-tools/src/main/java/me/zhengjie/domain/LocalStorage.java @@ -25,31 +25,31 @@ public class LocalStorage implements Serializable { @Column(name = "id") private Long id; - // 真实文件名 + /** 真实文件名 */ @Column(name = "real_name") private String realName; - // 文件名 + /**文件名 */ @Column(name = "name") private String name; - // 后缀 + /**后缀 */ @Column(name = "suffix") private String suffix; - // 路径 + /** 路径 */ @Column(name = "path") private String path; - // 类型 + /** 类型 */ @Column(name = "type") private String type; - // 大小 + /** 大小 */ @Column(name = "size") private String size; - // 操作人 + /** 操作人 */ @Column(name = "operate") private String operate; 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 09a2867e..b829c9a0 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/domain/Picture.java +++ b/eladmin-tools/src/main/java/me/zhengjie/domain/Picture.java @@ -41,7 +41,7 @@ public class Picture implements Serializable { @Column(name = "create_time") private Timestamp createTime; - // 用于检测文件是否重复 + /** 用于检测文件是否重复 */ private String md5Code; @Override 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 f4f84858..d713c9fe 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/domain/QiniuConfig.java +++ b/eladmin-tools/src/main/java/me/zhengjie/domain/QiniuConfig.java @@ -18,17 +18,17 @@ public class QiniuConfig implements Serializable { @Id private Long id; - // 一个账号最多拥有两对密钥(Access/Secret Key) + /** 一个账号最多拥有两对密钥(Access/Secret Key) */ @NotBlank @Column(name = "access_key", columnDefinition = "text") private String accessKey; - // 一个账号最多拥有两对密钥(Access/Secret Key) + /** 一个账号最多拥有两对密钥(Access/Secret Key) */ @NotBlank @Column(name = "secret_key", columnDefinition = "text") private String secretKey; - // 存储空间名称作为唯一的 Bucket 识别符 + /** 存储空间名称作为唯一的 Bucket 识别符 */ @NotBlank private String bucket; @@ -43,10 +43,10 @@ public class QiniuConfig implements Serializable { @NotBlank private String zone; - // 外链域名，可自定义，需在七牛云绑定 + /** 外链域名，可自定义，需在七牛云绑定 */ @NotBlank private String host; - // 空间类型：公开/私有 + /** 空间类型：公开/私有 */ private String type = "公开"; } 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 3d1b7a06..d584b344 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/domain/QiniuContent.java +++ b/eladmin-tools/src/main/java/me/zhengjie/domain/QiniuContent.java @@ -21,25 +21,24 @@ public class QiniuContent implements Serializable { @GeneratedValue(strategy = GenerationType.IDENTITY) private Long id; - // 文件名 + /** 文件名 */ @Column(name = "name") private String key; - // 空间名 + /** 空间名 */ private String bucket; - // 大小 + /** 大小 */ private String size; - // 文件地址 + /** 文件地址 */ private String url; private String suffix; - // 空间类型：公开/私有 + /** 空间类型：公开/私有 */ private String type = "公开"; - // 更新时间 @UpdateTimestamp @Column(name = "update_time") private Timestamp updateTime; 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 8fd96689..0d1ad76f 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/domain/VerificationCode.java +++ b/eladmin-tools/src/main/java/me/zhengjie/domain/VerificationCode.java @@ -27,21 +27,21 @@ public class VerificationCode implements Serializable { private String code; - // 使用场景，自己定义 + /** 使用场景，自己定义 */ private String scenes; - // true 为有效，false 为无效，验证时状态+时间+具体的邮箱或者手机号 + /** true 为有效，false 为无效，验证时状态+时间+具体的邮箱或者手机号 */ private Boolean status = true; - // 类型 ：phone 和 email + /** 类型 ：phone 和 email */ @NotBlank private String type; - // 具体的phone与email + /** 具体的phone与email */ @NotBlank private String value; - // 创建日期 + /** 创建日期 */ @CreationTimestamp @Column(name = "create_time") private Timestamp createTime; diff --git a/eladmin-tools/src/main/java/me/zhengjie/domain/vo/EmailVo.java b/eladmin-tools/src/main/java/me/zhengjie/domain/vo/EmailVo.java index 289aa30d..43cd181d 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/domain/vo/EmailVo.java +++ b/eladmin-tools/src/main/java/me/zhengjie/domain/vo/EmailVo.java @@ -18,7 +18,7 @@ import java.util.List; @NoArgsConstructor public class EmailVo { - // 收件人，支持多个收件人，用逗号分隔 + /** 收件人，支持多个收件人 */ @NotEmpty private List tos; 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 638ab9b5..2d8dcdbb 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 @@ -15,35 +15,35 @@ import java.sql.Timestamp; @Data public class TradeVo { - // （必填）商品描述 + /** （必填）商品描述 */ @NotBlank private String body; - // （必填）商品名称 + /** （必填）商品名称 */ @NotBlank private String subject; - // （必填）商户订单号，应该由后台生成 + /** （必填）商户订单号，应该由后台生成 */ @ApiModelProperty(hidden = true) private String outTradeNo; - // （必填）第三方订单号 + /** （必填）第三方订单号 */ @ApiModelProperty(hidden = true) private String tradeNo; - // （必填）价格 + /** （必填）价格 */ @NotBlank private String totalAmount; - // 订单状态,已支付，未支付，作废 + /** 订单状态,已支付，未支付，作废 */ @ApiModelProperty(hidden = true) private String state; - // 创建时间，存入数据库时需要 + /** 创建时间，存入数据库时需要 */ @ApiModelProperty(hidden = true) private Timestamp createTime; - // 作废时间，存入数据库时需要 + /** 作废时间，存入数据库时需要 */ @ApiModelProperty(hidden = true) private Date cancelTime; } diff --git a/eladmin-tools/src/main/java/me/zhengjie/repository/AlipayRepository.java b/eladmin-tools/src/main/java/me/zhengjie/repository/AliPayRepository.java similarity index 75% rename from eladmin-tools/src/main/java/me/zhengjie/repository/AlipayRepository.java rename to eladmin-tools/src/main/java/me/zhengjie/repository/AliPayRepository.java index fe1c0080..732435b3 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/repository/AlipayRepository.java +++ b/eladmin-tools/src/main/java/me/zhengjie/repository/AliPayRepository.java @@ -7,5 +7,5 @@ import org.springframework.data.jpa.repository.JpaRepository; * @author Zheng Jie * @date 2018-12-31 */ -public interface AlipayRepository extends JpaRepository { +public interface AliPayRepository 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 59c66945..49244872 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/repository/PictureRepository.java +++ b/eladmin-tools/src/main/java/me/zhengjie/repository/PictureRepository.java @@ -10,5 +10,10 @@ import org.springframework.data.jpa.repository.JpaSpecificationExecutor; */ public interface PictureRepository extends JpaRepository, JpaSpecificationExecutor { + /** + * 根据 Mds 值查询文件 + * @param code 值 + * @return / + */ Picture findByMd5Code(String code); } 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 86ff49c7..60f76138 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/repository/QiNiuConfigRepository.java +++ b/eladmin-tools/src/main/java/me/zhengjie/repository/QiNiuConfigRepository.java @@ -11,6 +11,10 @@ import org.springframework.data.jpa.repository.Query; */ public interface QiNiuConfigRepository extends JpaRepository { + /** + * 编辑类型 + * @param type + */ @Modifying @Query(value = "update QiniuConfig set type = ?1") void update(String type); 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 8994dcae..5fc02784 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/rest/AliPayController.java +++ b/eladmin-tools/src/main/java/me/zhengjie/rest/AliPayController.java @@ -9,7 +9,7 @@ import me.zhengjie.domain.vo.TradeVo; import me.zhengjie.domain.AlipayConfig; import me.zhengjie.utils.AliPayStatusEnum; import me.zhengjie.utils.AlipayUtils; -import me.zhengjie.service.AlipayService; +import me.zhengjie.service.AliPayService; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; @@ -32,9 +32,9 @@ public class AliPayController { private final AlipayUtils alipayUtils; - private final AlipayService alipayService; + private final AliPayService alipayService; - public AliPayController(AlipayUtils alipayUtils, AlipayService alipayService) { + public AliPayController(AlipayUtils alipayUtils, AliPayService alipayService) { this.alipayUtils = alipayUtils; this.alipayService = alipayService; } @@ -56,10 +56,10 @@ public class AliPayController { @Log("支付宝PC网页支付") @ApiOperation("PC网页支付") @PostMapping(value = "/toPayAsPC") - public ResponseEntity toPayAsPC(@Validated@RequestBody TradeVo trade) throws Exception{ - AlipayConfig alipay = alipayService.find(); + public ResponseEntity toPayAsPc(@Validated@RequestBody TradeVo trade) throws Exception{ + AlipayConfig aliPay = alipayService.find(); trade.setOutTradeNo(alipayUtils.getOrderCode()); - String payUrl = alipayService.toPayAsPC(alipay,trade); + String payUrl = alipayService.toPayAsPc(aliPay,trade); return ResponseEntity.ok(payUrl); } @@ -99,6 +99,7 @@ public class AliPayController { @ApiIgnore @RequestMapping("/notify") @AnonymousAccess + @SuppressWarnings("all") @ApiOperation("支付异步通知(要公网访问)，接收异步通知，检查通知内容app_id、out_trade_no、total_amount是否与请求中的一致，根据trade_status进行后续业务处理") public ResponseEntity notify(HttpServletRequest request){ AlipayConfig alipay = alipayService.find(); diff --git a/eladmin-tools/src/main/java/me/zhengjie/service/AlipayService.java b/eladmin-tools/src/main/java/me/zhengjie/service/AliPayService.java similarity index 89% rename from eladmin-tools/src/main/java/me/zhengjie/service/AlipayService.java rename to eladmin-tools/src/main/java/me/zhengjie/service/AliPayService.java index 1d5a82f5..7d729205 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 me.zhengjie.domain.AlipayConfig; * @author Zheng Jie * @date 2018-12-31 */ -public interface AlipayService { +public interface AliPayService { /** * 处理来自PC的交易请求 @@ -16,7 +16,7 @@ public interface AlipayService { * @return String * @throws Exception 异常 */ - String toPayAsPC(AlipayConfig alipay, TradeVo trade) throws Exception; + String toPayAsPc(AlipayConfig alipay, TradeVo trade) throws Exception; /** * 处理来自手机网页的交易请求 diff --git a/eladmin-tools/src/main/java/me/zhengjie/service/LocalStorageService.java b/eladmin-tools/src/main/java/me/zhengjie/service/LocalStorageService.java index f8990bad..1cd236c5 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/service/LocalStorageService.java +++ b/eladmin-tools/src/main/java/me/zhengjie/service/LocalStorageService.java @@ -1,11 +1,10 @@ package me.zhengjie.service; import me.zhengjie.domain.LocalStorage; -import me.zhengjie.service.dto.LocalStorageDTO; +import me.zhengjie.service.dto.LocalStorageDto; import me.zhengjie.service.dto.LocalStorageQueryCriteria; import org.springframework.data.domain.Pageable; import org.springframework.web.multipart.MultipartFile; - import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.List; @@ -16,19 +15,59 @@ import java.util.List; */ public interface LocalStorageService { + /** + * 分页查询 + * @param criteria 条件 + * @param pageable 分页参数 + * @return / + */ Object queryAll(LocalStorageQueryCriteria criteria, Pageable pageable); - List queryAll(LocalStorageQueryCriteria criteria); + /** + * 查询全部数据 + * @param criteria 条件 + * @return / + */ + List queryAll(LocalStorageQueryCriteria criteria); - LocalStorageDTO findById(Long id); + /** + * 根据ID查询 + * @param id / + * @return / + */ + LocalStorageDto findById(Long id); - LocalStorageDTO create(String name, MultipartFile file); + /** + * 上传 + * @param name 文件名称 + * @param file 文件 + * @return / + */ + LocalStorageDto create(String name, MultipartFile file); + /** + * 编辑 + * @param resources 文件信息 + */ void update(LocalStorage resources); + /** + * 根据ID删除 + * @param id / + */ void delete(Long id); + /** + * 多选删除 + * @param ids / + */ void deleteAll(Long[] ids); - void download(List queryAll, HttpServletResponse response) throws IOException; + /** + * 导出数据 + * @param localStorageDtos 待导出的数据 + * @param response / + * @throws IOException / + */ + void download(List localStorageDtos, HttpServletResponse response) throws IOException; } \ No newline at end of file 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 746ec580..a0b56f32 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/service/PictureService.java +++ b/eladmin-tools/src/main/java/me/zhengjie/service/PictureService.java @@ -15,17 +15,53 @@ import java.util.List; */ public interface PictureService { + /** + * 分页查询 + * @param criteria 条件 + * @param pageable 分页参数 + * @return / + */ Object queryAll(PictureQueryCriteria criteria, Pageable pageable); - + + /** + * 查询全部数据 + * @param criteria 条件 + * @return / + */ List queryAll(PictureQueryCriteria criteria); + /** + * 上传文件 + * @param file / + * @param username / + * @return / + */ Picture upload(MultipartFile file, String username); + /** + * 根据ID查询 + * @param id / + * @return / + */ Picture findById(Long id); + /** + * 删除图片 + * @param picture / + */ void delete(Picture picture); + /** + * 多选删除 + * @param ids / + */ void deleteAll(Long[] ids); + /** + * 导出 + * @param queryAll 待导出的数据 + * @param response / + * @throws IOException / + */ void download(List queryAll, HttpServletResponse response) throws IOException; } 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 4704f979..d24985e3 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/service/QiNiuService.java +++ b/eladmin-tools/src/main/java/me/zhengjie/service/QiNiuService.java @@ -16,13 +16,24 @@ import java.util.List; */ public interface QiNiuService { + /** + * 分页查询 + * @param criteria 条件 + * @param pageable 分页参数 + * @return / + */ Object queryAll(QiniuQueryCriteria criteria, Pageable pageable); + /** + * 查询全部 + * @param criteria 条件 + * @return / + */ List queryAll(QiniuQueryCriteria criteria); /** * 查配置 - * @return Cacheable + * @return QiniuConfig */ QiniuConfig find(); @@ -86,6 +97,7 @@ public interface QiNiuService { * 导出数据 * @param queryAll / * @param response / + * @throws IOException / */ void downloadList(List queryAll, HttpServletResponse response) throws IOException; } diff --git a/eladmin-tools/src/main/java/me/zhengjie/service/dto/LocalStorageDTO.java b/eladmin-tools/src/main/java/me/zhengjie/service/dto/LocalStorageDto.java similarity index 63% rename from eladmin-tools/src/main/java/me/zhengjie/service/dto/LocalStorageDTO.java rename to eladmin-tools/src/main/java/me/zhengjie/service/dto/LocalStorageDto.java index b71c687c..25399071 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/service/dto/LocalStorageDTO.java +++ b/eladmin-tools/src/main/java/me/zhengjie/service/dto/LocalStorageDto.java @@ -1,8 +1,6 @@ package me.zhengjie.service.dto; -import lombok.Getter; -import lombok.Setter; - +import lombok.Data; import java.io.Serializable; import java.sql.Timestamp; @@ -10,28 +8,21 @@ import java.sql.Timestamp; * @author Zheng Jie * @date 2019-09-05 */ -@Getter -@Setter -public class LocalStorageDTO implements Serializable { +@Data +public class LocalStorageDto implements Serializable { - // ID private Long id; private String realName; - // 文件名 private String name; - // 后缀 private String suffix; - // 类型 private String type; - // 大小 private String size; - // 操作人 private String operate; private Timestamp createTime; diff --git a/eladmin-tools/src/main/java/me/zhengjie/service/dto/LocalStorageQueryCriteria.java b/eladmin-tools/src/main/java/me/zhengjie/service/dto/LocalStorageQueryCriteria.java index 25d7389c..35a4c471 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/service/dto/LocalStorageQueryCriteria.java +++ b/eladmin-tools/src/main/java/me/zhengjie/service/dto/LocalStorageQueryCriteria.java @@ -13,7 +13,6 @@ import me.zhengjie.annotation.Query; @Data public class LocalStorageQueryCriteria{ - // 模糊 @Query(blurry = "name,suffix,type,operate,size") private String blurry; 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 similarity index 87% rename from eladmin-tools/src/main/java/me/zhengjie/service/impl/AlipayServiceImpl.java rename to eladmin-tools/src/main/java/me/zhengjie/service/impl/AliPayServiceImpl.java index f0ef1bb4..791c2cd8 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 @@ -7,8 +7,8 @@ import com.alipay.api.request.AlipayTradeWapPayRequest; import me.zhengjie.domain.vo.TradeVo; import me.zhengjie.domain.AlipayConfig; import me.zhengjie.exception.BadRequestException; -import me.zhengjie.repository.AlipayRepository; -import me.zhengjie.service.AlipayService; +import me.zhengjie.repository.AliPayRepository; +import me.zhengjie.service.AliPayService; import org.springframework.cache.annotation.CacheConfig; import org.springframework.cache.annotation.CachePut; import org.springframework.cache.annotation.Cacheable; @@ -23,24 +23,23 @@ import java.util.Optional; */ @Service @CacheConfig(cacheNames = "alipay") +@SuppressWarnings("all") @Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class) -public class AlipayServiceImpl implements AlipayService { +public class AliPayServiceImpl implements AliPayService { - private final AlipayRepository alipayRepository; + private final AliPayRepository alipayRepository; - public AlipayServiceImpl(AlipayRepository alipayRepository) { + public AliPayServiceImpl(AliPayRepository alipayRepository) { this.alipayRepository = alipayRepository; } @Override - public String toPayAsPC(AlipayConfig alipay, TradeVo trade) throws Exception { + public String toPayAsPc(AlipayConfig alipay, TradeVo trade) throws Exception { if(alipay.getId() == null){ throw new BadRequestException("请先添加相应配置，再操作"); } - AlipayClient alipayClient = new DefaultAlipayClient(alipay.getGatewayUrl(), alipay.getAppID(), alipay.getPrivateKey(), alipay.getFormat(), alipay.getCharset(), alipay.getPublicKey(), alipay.getSignType()); - -// double money = Double.parseDouble(trade.getTotalAmount()); + AlipayClient alipayClient = new DefaultAlipayClient(alipay.getGatewayUrl(), alipay.getAppId(), alipay.getPrivateKey(), alipay.getFormat(), alipay.getCharset(), alipay.getPublicKey(), alipay.getSignType()); // 创建API对应的request(电脑网页版) AlipayTradePagePayRequest request = new AlipayTradePagePayRequest(); @@ -69,10 +68,11 @@ public class AlipayServiceImpl implements AlipayService { if(alipay.getId() == null){ throw new BadRequestException("请先添加相应配置，再操作"); } - AlipayClient alipayClient = new DefaultAlipayClient(alipay.getGatewayUrl(), alipay.getAppID(), alipay.getPrivateKey(), alipay.getFormat(), alipay.getCharset(), alipay.getPublicKey(), alipay.getSignType()); + AlipayClient alipayClient = new DefaultAlipayClient(alipay.getGatewayUrl(), alipay.getAppId(), alipay.getPrivateKey(), alipay.getFormat(), alipay.getCharset(), alipay.getPublicKey(), alipay.getSignType()); double money = Double.parseDouble(trade.getTotalAmount()); - if(money <= 0 || money >= 5000){ + double maxMoney = 5000; + if(money <= 0 || money >= maxMoney){ throw new BadRequestException("测试金额过大"); } // 创建API对应的request(手机网页版) @@ -88,7 +88,7 @@ public class AlipayServiceImpl implements AlipayService { " \"extend_params\":{" + " \"sys_service_provider_id\":\""+alipay.getSysServiceProviderId()+"\"" + " }"+ - " }");//填充业务参数 + " }"); return alipayClient.pageExecute(request, "GET").getBody(); } diff --git a/eladmin-tools/src/main/java/me/zhengjie/service/impl/LocalStorageServiceImpl.java b/eladmin-tools/src/main/java/me/zhengjie/service/impl/LocalStorageServiceImpl.java index 0849ba2d..fa31e2fa 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/service/impl/LocalStorageServiceImpl.java +++ b/eladmin-tools/src/main/java/me/zhengjie/service/impl/LocalStorageServiceImpl.java @@ -2,7 +2,7 @@ package me.zhengjie.service.impl; import cn.hutool.core.util.ObjectUtil; import me.zhengjie.domain.LocalStorage; -import me.zhengjie.service.dto.LocalStorageDTO; +import me.zhengjie.service.dto.LocalStorageDto; import me.zhengjie.service.dto.LocalStorageQueryCriteria; import me.zhengjie.service.mapper.LocalStorageMapper; import me.zhengjie.exception.BadRequestException; @@ -62,13 +62,13 @@ public class LocalStorageServiceImpl implements LocalStorageService { @Override @Cacheable - public List queryAll(LocalStorageQueryCriteria criteria){ + public List queryAll(LocalStorageQueryCriteria criteria){ return localStorageMapper.toDto(localStorageRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root,criteria,criteriaBuilder))); } @Override @Cacheable(key = "#p0") - public LocalStorageDTO findById(Long id){ + public LocalStorageDto findById(Long id){ LocalStorage localStorage = localStorageRepository.findById(id).orElseGet(LocalStorage::new); ValidationUtil.isNull(localStorage.getId(),"LocalStorage","id",id); return localStorageMapper.toDto(localStorage); @@ -77,11 +77,9 @@ public class LocalStorageServiceImpl implements LocalStorageService { @Override @CacheEvict(allEntries = true) @Transactional(rollbackFor = Exception.class) - public LocalStorageDTO create(String name, MultipartFile multipartFile) { + public LocalStorageDto create(String name, MultipartFile multipartFile) { FileUtil.checkSize(maxSize, multipartFile.getSize()); String suffix = FileUtil.getExtensionName(multipartFile.getOriginalFilename()); - // 可自行选择方式 -// String type = FileUtil.getFileTypeByMimeType(suffix); String type = FileUtil.getFileType(suffix); File file = FileUtil.upload(multipartFile, path + type + File.separator); if(ObjectUtil.isNull(file)){ @@ -136,9 +134,9 @@ public class LocalStorageServiceImpl implements LocalStorageService { } @Override - public void download(List queryAll, HttpServletResponse response) throws IOException { + public void download(List queryAll, HttpServletResponse response) throws IOException { List> list = new ArrayList<>(); - for (LocalStorageDTO localStorageDTO : queryAll) { + for (LocalStorageDto localStorageDTO : queryAll) { Map map = new LinkedHashMap<>(); map.put("文件名", localStorageDTO.getRealName()); map.put("备注名", localStorageDTO.getName()); 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 3300fd80..e50bee3b 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 @@ -31,7 +31,6 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.multipart.MultipartFile; - import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.*; @@ -79,7 +78,8 @@ public class QiNiuServiceImpl implements QiNiuService { @CachePut(cacheNames = "qiNiuConfig", key = "'1'") @Transactional(rollbackFor = Exception.class) public QiniuConfig update(QiniuConfig qiniuConfig) { - if (!(qiniuConfig.getHost().toLowerCase().startsWith("http://")||qiniuConfig.getHost().toLowerCase().startsWith("https://"))) { + String http = "http://", https = "https://"; + if (!(qiniuConfig.getHost().toLowerCase().startsWith(http)||qiniuConfig.getHost().toLowerCase().startsWith(https))) { throw new BadRequestException("外链域名必须以http://或者https://开头"); } qiniuConfig.setId(1L); @@ -134,8 +134,8 @@ public class QiNiuServiceImpl implements QiNiuService { @Cacheable public String download(QiniuContent content,QiniuConfig config){ String finalUrl; - String TYPE = "公开"; - if(TYPE.equals(content.getType())){ + String type = "公开"; + if(type.equals(content.getType())){ finalUrl = content.getUrl(); } else { Auth auth = Auth.create(config.getAccessKey(), config.getSecretKey()); diff --git a/eladmin-tools/src/main/java/me/zhengjie/service/mapper/LocalStorageMapper.java b/eladmin-tools/src/main/java/me/zhengjie/service/mapper/LocalStorageMapper.java index e3fb8f0a..bb0935a9 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/service/mapper/LocalStorageMapper.java +++ b/eladmin-tools/src/main/java/me/zhengjie/service/mapper/LocalStorageMapper.java @@ -1,7 +1,7 @@ package me.zhengjie.service.mapper; import me.zhengjie.base.BaseMapper; -import me.zhengjie.service.dto.LocalStorageDTO; +import me.zhengjie.service.dto.LocalStorageDto; import me.zhengjie.domain.LocalStorage; import org.mapstruct.Mapper; import org.mapstruct.ReportingPolicy; @@ -11,6 +11,6 @@ import org.mapstruct.ReportingPolicy; * @date 2019-09-05 */ @Mapper(componentModel = "spring",unmappedTargetPolicy = ReportingPolicy.IGNORE) -public interface LocalStorageMapper extends BaseMapper { +public interface LocalStorageMapper extends BaseMapper { } \ No newline at end of file diff --git a/eladmin-tools/src/main/java/me/zhengjie/utils/AliPayStatusEnum.java b/eladmin-tools/src/main/java/me/zhengjie/utils/AliPayStatusEnum.java index 9bda06e8..fab42914 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/utils/AliPayStatusEnum.java +++ b/eladmin-tools/src/main/java/me/zhengjie/utils/AliPayStatusEnum.java @@ -7,12 +7,16 @@ package me.zhengjie.utils; */ public enum AliPayStatusEnum { + /** 交易成功 */ FINISHED("交易成功", "TRADE_FINISHED"), + /** 支付成功 */ SUCCESS("支付成功", "TRADE_SUCCESS"), + /** 交易创建 */ BUYER_PAY("交易创建", "WAIT_BUYER_PAY"), + /** 交易关闭 */ CLOSED("交易关闭", "TRADE_CLOSED"); private String value; diff --git a/pom.xml b/pom.xml index 824758aa..8fc44da4 100644 --- a/pom.xml +++ b/pom.xml @@ -36,7 +36,6 @@ 2.9.2 1.2.54 1.1.10 - [4.1.12,) 2.5.0 1.2.0.Final @@ -142,12 +141,6 @@ true - - - cn.hutool - hutool-all - ${hutool.version} - org.lionsoul