From 5e95ae5bf1e0f854a55456c1b45b28d0edec66e7 Mon Sep 17 00:00:00 2001 From: SnailClimb Date: Sun, 15 Nov 2020 19:42:01 +0800 Subject: [PATCH] =?UTF-8?q?[=E4=BB=A3=E7=A0=81=E5=AE=8C=E5=96=84]=E7=A7=BB?= =?UTF-8?q?=E9=99=A4=E6=97=A0=E7=94=A8=E5=8C=85=20(#522)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/me/zhengjie/utils/RedisUtils.java | 1 - .../src/test/java/me/zhengjie/utils/DateUtilsTest.java | 2 +- .../main/java/me/zhengjie/service/impl/LogServiceImpl.java | 1 - .../modules/mnt/repository/ServerDeployRepository.java | 2 -- .../src/main/java/me/zhengjie/modules/mnt/util/SqlUtils.java | 1 - .../src/main/java/me/zhengjie/modules/mnt/util/ZipUtils.java | 3 +-- .../java/me/zhengjie/modules/quartz/utils/QuartzRunnable.java | 2 +- .../modules/security/config/bean/SecurityProperties.java | 2 -- .../modules/security/rest/AuthorizationController.java | 1 - .../security/security/JwtAuthenticationEntryPoint.java | 1 - .../modules/security/service/UserDetailsServiceImpl.java | 1 - .../src/main/java/me/zhengjie/modules/system/domain/Job.java | 2 -- .../src/main/java/me/zhengjie/modules/system/domain/Menu.java | 4 +--- .../src/main/java/me/zhengjie/modules/system/domain/Role.java | 3 +-- .../java/me/zhengjie/modules/system/rest/DeptController.java | 1 - .../me/zhengjie/modules/system/rest/DictDetailController.java | 1 - .../java/me/zhengjie/modules/system/rest/JobController.java | 1 - .../java/me/zhengjie/modules/system/service/MenuService.java | 2 +- .../me/zhengjie/modules/system/service/dto/DictDetailDto.java | 1 - .../java/me/zhengjie/modules/system/service/dto/JobDto.java | 1 - .../modules/system/service/impl/MonitorServiceImpl.java | 1 + .../src/main/java/me/zhengjie/service/EmailService.java | 1 - 22 files changed, 7 insertions(+), 28 deletions(-) diff --git a/eladmin-common/src/main/java/me/zhengjie/utils/RedisUtils.java b/eladmin-common/src/main/java/me/zhengjie/utils/RedisUtils.java index 2973cc50..eeeae0f5 100644 --- a/eladmin-common/src/main/java/me/zhengjie/utils/RedisUtils.java +++ b/eladmin-common/src/main/java/me/zhengjie/utils/RedisUtils.java @@ -24,7 +24,6 @@ import org.springframework.data.redis.connection.RedisConnection; import org.springframework.data.redis.connection.RedisConnectionFactory; import org.springframework.data.redis.core.*; import org.springframework.stereotype.Component; -import org.springframework.util.CollectionUtils; import java.util.*; import java.util.concurrent.TimeUnit; diff --git a/eladmin-common/src/test/java/me/zhengjie/utils/DateUtilsTest.java b/eladmin-common/src/test/java/me/zhengjie/utils/DateUtilsTest.java index a2d464cc..4f28ed37 100644 --- a/eladmin-common/src/test/java/me/zhengjie/utils/DateUtilsTest.java +++ b/eladmin-common/src/test/java/me/zhengjie/utils/DateUtilsTest.java @@ -10,7 +10,7 @@ public class DateUtilsTest { public void test1() { long l = System.currentTimeMillis() / 1000; LocalDateTime localDateTime = DateUtil.fromTimeStamp(l); - System.out.printf(DateUtil.localDateTimeFormatyMdHms(localDateTime)); + System.out.print(DateUtil.localDateTimeFormatyMdHms(localDateTime)); } @Test 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 b0c2554c..801078f1 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 @@ -17,7 +17,6 @@ package me.zhengjie.service.impl; import cn.hutool.core.lang.Dict; import cn.hutool.core.util.ObjectUtil; -import cn.hutool.json.JSONObject; import cn.hutool.json.JSONUtil; import lombok.RequiredArgsConstructor; import me.zhengjie.domain.Log; 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 15acfe70..4ca336c0 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 @@ -18,8 +18,6 @@ package me.zhengjie.modules.mnt.repository; import me.zhengjie.modules.mnt.domain.ServerDeploy; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaSpecificationExecutor; -import org.springframework.data.jpa.repository.Modifying; -import org.springframework.data.jpa.repository.Query; /** * @author zhanghouying diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/util/SqlUtils.java b/eladmin-system/src/main/java/me/zhengjie/modules/mnt/util/SqlUtils.java index 27acc0e7..26734ef1 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/util/SqlUtils.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/mnt/util/SqlUtils.java @@ -15,7 +15,6 @@ */ package me.zhengjie.modules.mnt.util; -import cn.hutool.crypto.SecureUtil; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.util.StringUtils; import com.google.common.collect.Lists; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/util/ZipUtils.java b/eladmin-system/src/main/java/me/zhengjie/modules/mnt/util/ZipUtils.java index 6cd5bc49..2bf4f34c 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/util/ZipUtils.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/mnt/util/ZipUtils.java @@ -131,8 +131,7 @@ public class ZipUtils { for (Enumeration entries = zf.entries(); entries.hasMoreElements(); ) { ZipEntry entry = ((ZipEntry) entries.nextElement()); InputStream in = zf.getInputStream(entry); - String str = folderPath; - File desFile = new File(str, java.net.URLEncoder.encode(entry.getName(), "UTF-8")); + File desFile = new File(folderPath, java.net.URLEncoder.encode(entry.getName(), "UTF-8")); if (!desFile.exists()) { File fileParentDir = desFile.getParentFile(); diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/quartz/utils/QuartzRunnable.java b/eladmin-system/src/main/java/me/zhengjie/modules/quartz/utils/QuartzRunnable.java index 24f999b2..faf334ca 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/quartz/utils/QuartzRunnable.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/quartz/utils/QuartzRunnable.java @@ -27,7 +27,7 @@ import java.util.concurrent.Callable; * @author / */ @Slf4j -public class QuartzRunnable implements Callable { +public class QuartzRunnable implements Callable { private final Object target; private final Method method; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/security/config/bean/SecurityProperties.java b/eladmin-system/src/main/java/me/zhengjie/modules/security/config/bean/SecurityProperties.java index 3b7655bb..16ec3cf0 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/security/config/bean/SecurityProperties.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/security/config/bean/SecurityProperties.java @@ -16,8 +16,6 @@ package me.zhengjie.modules.security.config.bean; import lombok.Data; -import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.context.annotation.Configuration; /** * Jwt参数配置 diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/security/rest/AuthorizationController.java b/eladmin-system/src/main/java/me/zhengjie/modules/security/rest/AuthorizationController.java index 3040d045..d7ff9b4a 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/security/rest/AuthorizationController.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/security/rest/AuthorizationController.java @@ -21,7 +21,6 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import me.zhengjie.annotation.Log; import me.zhengjie.annotation.rest.AnonymousDeleteMapping; import me.zhengjie.annotation.rest.AnonymousGetMapping; import me.zhengjie.annotation.rest.AnonymousPostMapping; 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 2ec7e645..f8815862 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 @@ -22,7 +22,6 @@ import org.springframework.stereotype.Component; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.IOException; -import java.io.Serializable; /** * @author Zheng Jie diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/security/service/UserDetailsServiceImpl.java b/eladmin-system/src/main/java/me/zhengjie/modules/security/service/UserDetailsServiceImpl.java index d9aaf93f..33435e1d 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/security/service/UserDetailsServiceImpl.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/security/service/UserDetailsServiceImpl.java @@ -24,7 +24,6 @@ import me.zhengjie.modules.system.service.DataService; import me.zhengjie.modules.system.service.RoleService; import me.zhengjie.modules.system.service.UserService; import me.zhengjie.modules.system.service.dto.UserDto; -import org.springframework.http.HttpStatus; import org.springframework.security.core.userdetails.UserDetailsService; import org.springframework.security.core.userdetails.UsernameNotFoundException; import org.springframework.stereotype.Service; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/Job.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/Job.java index cb0a311c..f2d358a6 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/Job.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/Job.java @@ -20,8 +20,6 @@ import lombok.Getter; import lombok.Setter; import me.zhengjie.base.BaseEntity; import javax.persistence.*; -import javax.persistence.Entity; -import javax.persistence.Table; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; import java.io.Serializable; 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 3e7b3939..c5f80385 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 @@ -20,12 +20,10 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Getter; import lombok.Setter; import me.zhengjie.base.BaseEntity; -import org.hibernate.annotations.CreationTimestamp; + import javax.persistence.*; -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; 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 47d495c4..0dffa3c4 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 @@ -21,12 +21,11 @@ import lombok.Getter; import lombok.Setter; import me.zhengjie.base.BaseEntity; import me.zhengjie.utils.enums.DataScopeEnum; -import org.hibernate.annotations.CreationTimestamp; + import javax.persistence.*; 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; 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 3100bf0d..9b3b0ef2 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 @@ -26,7 +26,6 @@ import me.zhengjie.modules.system.service.DeptService; import me.zhengjie.modules.system.service.dto.DeptDto; import me.zhengjie.modules.system.service.dto.DeptQueryCriteria; import me.zhengjie.utils.PageUtil; -import me.zhengjie.utils.ThrowableUtil; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.security.access.prepost.PreAuthorize; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/DictDetailController.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/DictDetailController.java index 15e8e7ff..92f65fdc 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/DictDetailController.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/DictDetailController.java @@ -33,7 +33,6 @@ import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import java.util.HashMap; -import java.util.LinkedHashMap; import java.util.List; import java.util.Map; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/JobController.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/JobController.java index 4e1a9b23..cac14c09 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/JobController.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/JobController.java @@ -23,7 +23,6 @@ import me.zhengjie.exception.BadRequestException; import me.zhengjie.modules.system.domain.Job; import me.zhengjie.modules.system.service.JobService; import me.zhengjie.modules.system.service.dto.JobQueryCriteria; -import me.zhengjie.utils.ThrowableUtil; import org.springframework.data.domain.Pageable; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; 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 ea7b349f..f7b8ecea 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 @@ -18,7 +18,7 @@ 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.MenuQueryCriteria; -import me.zhengjie.modules.system.service.dto.RoleSmallDto; + import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.List; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/DictDetailDto.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/DictDetailDto.java index 541493ce..a4b931b6 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 @@ -19,7 +19,6 @@ import lombok.Getter; import lombok.Setter; import me.zhengjie.base.BaseDTO; import java.io.Serializable; -import java.sql.Timestamp; /** * @author Zheng Jie diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/JobDto.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/JobDto.java index f2153e0e..8836d550 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 @@ -21,7 +21,6 @@ import lombok.Setter; import me.zhengjie.base.BaseDTO; import java.io.Serializable; -import java.sql.Timestamp; /** * @author Zheng Jie diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/MonitorServiceImpl.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/MonitorServiceImpl.java index 0d2aea58..87f9bc20 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/MonitorServiceImpl.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/MonitorServiceImpl.java @@ -50,6 +50,7 @@ public class MonitorServiceImpl implements MonitorService { HardwareAbstractionLayer hal = si.getHardware(); // 系统信息 resultMap.put("sys", getSystemInfo(os)); + // cpu 信息 resultMap.put("cpu", getCpuInfo(hal.getProcessor())); // 内存信息 diff --git a/eladmin-tools/src/main/java/me/zhengjie/service/EmailService.java b/eladmin-tools/src/main/java/me/zhengjie/service/EmailService.java index 2c61a534..aabfcb0a 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/service/EmailService.java +++ b/eladmin-tools/src/main/java/me/zhengjie/service/EmailService.java @@ -17,7 +17,6 @@ package me.zhengjie.service; import me.zhengjie.domain.vo.EmailVo; import me.zhengjie.domain.EmailConfig; -import org.springframework.scheduling.annotation.Async; /** * @author Zheng Jie