From 0c738b1ef3c8a0ac05d3d5625ffb625c3a383e78 Mon Sep 17 00:00:00 2001 From: dqjdda <201507802@qq.com> Date: Sat, 26 Oct 2019 11:58:07 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96=EF=BC=8C?= =?UTF-8?q?=E8=8E=B7=E5=8F=96Ip=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/me/zhengjie/aspect/LimitAspect.java | 8 ++--- .../java/me/zhengjie/base/BaseEntity.java | 2 -- .../java/me/zhengjie/config/RedisConfig.java | 7 ++--- .../me/zhengjie/config/SwaggerConfig.java | 30 +++---------------- .../java/me/zhengjie/utils/StringUtils.java | 24 ++++++++++----- .../me/zhengjie/service/GenConfigService.java | 4 --- .../service/impl/GeneratorServiceImpl.java | 2 ++ .../java/me/zhengjie/aspect/LogAspect.java | 11 ++++--- .../monitor/config/VisitsInitialization.java | 2 +- .../monitor/rest/VisitsController.java | 1 - .../modules/monitor/service/RedisService.java | 1 - .../modules/quartz/domain/QuartzJob.java | 6 ++-- .../modules/quartz/task/TestTask.java | 3 +- .../modules/quartz/utils/ExecutionJob.java | 1 + .../zhengjie/modules/system/domain/Dept.java | 1 - .../zhengjie/modules/system/domain/Dict.java | 3 -- .../modules/system/domain/DictDetail.java | 3 -- .../zhengjie/modules/system/domain/Job.java | 4 --- .../zhengjie/modules/system/domain/Menu.java | 3 -- .../modules/system/domain/Permission.java | 3 -- .../zhengjie/modules/system/domain/Role.java | 3 -- .../zhengjie/modules/system/domain/User.java | 2 +- .../modules/system/domain/UserAvatar.java | 3 -- .../modules/system/rest/DictController.java | 1 - .../system/rest/DictDetailController.java | 9 ++---- .../modules/system/rest/JobController.java | 3 -- .../modules/system/rest/MenuController.java | 4 ++- .../system/service/dto/RoleSmallDTO.java | 3 -- .../service/impl/DictDetailServiceImpl.java | 2 -- .../java/me/zhengjie/domain/QiniuContent.java | 2 +- .../repository/PictureRepository.java | 2 -- .../VerificationCodeRepository.java | 6 ++-- .../me/zhengjie/service/AlipayService.java | 3 -- .../me/zhengjie/service/EmailService.java | 2 +- .../service/mapper/LocalStorageMapper.java | 2 +- 35 files changed, 54 insertions(+), 112 deletions(-) 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 17e2c469..b8b6cf9f 100644 --- a/eladmin-common/src/main/java/me/zhengjie/aspect/LimitAspect.java +++ b/eladmin-common/src/main/java/me/zhengjie/aspect/LimitAspect.java @@ -23,10 +23,10 @@ import java.lang.reflect.Method; @Component public class LimitAspect { - private final RedisTemplate redisTemplate; + private final RedisTemplate redisTemplate; private static final Logger logger = LoggerFactory.getLogger(LimitAspect.class); - public LimitAspect(RedisTemplate redisTemplate) { + public LimitAspect(RedisTemplate redisTemplate) { this.redisTemplate = redisTemplate; } @@ -50,11 +50,11 @@ public class LimitAspect { } } - ImmutableList keys = ImmutableList.of(StringUtils.join(limit.prefix(), "_", key, "_", request.getRequestURI().replaceAll("/","_"))); + ImmutableList keys = ImmutableList.of(StringUtils.join(limit.prefix(), "_", key, "_", request.getRequestURI().replaceAll("/","_"))); String luaScript = buildLuaScript(); RedisScript redisScript = new DefaultRedisScript<>(luaScript, Number.class); - Number count = (Number) redisTemplate.execute(redisScript, keys, limit.count(), limit.period()); + Number count = redisTemplate.execute(redisScript, keys, limit.count(), limit.period()); if (null != count && count.intValue() <= limit.count()) { logger.info("第{}次访问key为 {}，描述为 [{}] 的接口", count, keys, limit.name()); return joinPoint.proceed(); 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 a1fdda06..2e9cc934 100644 --- a/eladmin-common/src/main/java/me/zhengjie/base/BaseEntity.java +++ b/eladmin-common/src/main/java/me/zhengjie/base/BaseEntity.java @@ -31,8 +31,6 @@ public class BaseEntity implements Serializable { @UpdateTimestamp private Timestamp updateTime; - public @interface New {} - public @interface Update {} @Override 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 f8d76c96..99413a72 100644 --- a/eladmin-common/src/main/java/me/zhengjie/config/RedisConfig.java +++ b/eladmin-common/src/main/java/me/zhengjie/config/RedisConfig.java @@ -23,7 +23,6 @@ import org.springframework.data.redis.core.RedisOperations; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.data.redis.serializer.RedisSerializationContext; import org.springframework.data.redis.serializer.RedisSerializer; -import org.springframework.data.redis.serializer.SerializationException; import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; import java.time.Duration; @@ -56,7 +55,7 @@ public class RedisConfig extends CachingConfigurerSupport { public RedisTemplate redisTemplate(RedisConnectionFactory redisConnectionFactory) { RedisTemplate template = new RedisTemplate<>(); //序列化 - FastJsonRedisSerializer fastJsonRedisSerializer = new FastJsonRedisSerializer(Object.class); + FastJsonRedisSerializer fastJsonRedisSerializer = new FastJsonRedisSerializer<>(Object.class); // value值的序列化采用fastJsonRedisSerializer template.setValueSerializer(fastJsonRedisSerializer); template.setHashValueSerializer(fastJsonRedisSerializer); @@ -140,7 +139,7 @@ public class RedisConfig extends CachingConfigurerSupport { } @Override - public byte[] serialize(T t) throws SerializationException { + public byte[] serialize(T t) { if (t == null) { return new byte[0]; } @@ -148,7 +147,7 @@ public class RedisConfig extends CachingConfigurerSupport { } @Override - public T deserialize(byte[] bytes) throws SerializationException { + public T deserialize(byte[] bytes) { if (bytes == null || bytes.length <= 0) { return null; } diff --git a/eladmin-common/src/main/java/me/zhengjie/config/SwaggerConfig.java b/eladmin-common/src/main/java/me/zhengjie/config/SwaggerConfig.java index de7dde31..6e6b3ff7 100644 --- a/eladmin-common/src/main/java/me/zhengjie/config/SwaggerConfig.java +++ b/eladmin-common/src/main/java/me/zhengjie/config/SwaggerConfig.java @@ -4,6 +4,7 @@ import com.fasterxml.classmate.TypeResolver; import com.google.common.base.Predicates; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import lombok.Data; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -22,7 +23,6 @@ import springfox.documentation.spring.web.plugins.Docket; import springfox.documentation.swagger2.annotations.EnableSwagger2; import java.util.ArrayList; import java.util.List; - import static com.google.common.collect.Lists.newArrayList; import static springfox.documentation.schema.AlternateTypeRules.newRule; @@ -43,6 +43,7 @@ public class SwaggerConfig { private Boolean enabled; @Bean + @SuppressWarnings("all") public Docket createRestApi() { ParameterBuilder ticketPar = new ParameterBuilder(); List pars = new ArrayList<>(); @@ -93,7 +94,8 @@ class SwaggerDataConfig { } @ApiModel - static class Page { + @Data + private static class Page { @ApiModelProperty("页码 (0..N)") private Integer page; @@ -102,29 +104,5 @@ class SwaggerDataConfig { @ApiModelProperty("以下列格式排序标准：property[,asc | desc]。 默认排序顺序为升序。 支持多种排序条件：如：id,asc") private List sort; - - public Integer getPage() { - return page; - } - - public void setPage(Integer page) { - this.page = page; - } - - public Integer getSize() { - return size; - } - - public void setSize(Integer size) { - this.size = size; - } - - public List getSort() { - return sort; - } - - public void setSort(List sort) { - this.sort = sort; - } } } 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 d440bcb9..264fee0e 100644 --- a/eladmin-common/src/main/java/me/zhengjie/utils/StringUtils.java +++ b/eladmin-common/src/main/java/me/zhengjie/utils/StringUtils.java @@ -4,11 +4,11 @@ import cn.hutool.core.io.resource.ClassPathResource; import org.lionsoul.ip2region.DataBlock; import org.lionsoul.ip2region.DbConfig; import org.lionsoul.ip2region.DbSearcher; - import javax.servlet.http.HttpServletRequest; import java.io.File; -import java.io.UnsupportedEncodingException; import java.lang.reflect.Method; +import java.net.InetAddress; +import java.net.UnknownHostException; import java.util.Calendar; import java.util.Date; @@ -109,17 +109,27 @@ 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(); } - String[] ips = ip.split(","); - return "0:0:0:0:0:0:0:1".equals(ips[0])?"127.0.0.1":ips[0]; + if (ip.contains(",")) { + ip = ip.split(",")[0]; + } + if ("127.0.0.1".equals(ip)) { + // 获取本机真正的ip地址 + try { + ip = InetAddress.getLocalHost().getHostAddress(); + } catch (UnknownHostException e) { + e.printStackTrace(); + } + } + return ip; } /** 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 e47fca92..67afbbf5 100644 --- a/eladmin-generator/src/main/java/me/zhengjie/service/GenConfigService.java +++ b/eladmin-generator/src/main/java/me/zhengjie/service/GenConfigService.java @@ -1,10 +1,6 @@ package me.zhengjie.service; import me.zhengjie.domain.GenConfig; -import org.springframework.cache.annotation.CacheConfig; -import org.springframework.cache.annotation.CacheEvict; -import org.springframework.cache.annotation.CachePut; -import org.springframework.cache.annotation.Cacheable; /** * @author Zheng Jie 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 1decf842..51198e56 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 @@ -28,6 +28,7 @@ public class GeneratorServiceImpl implements GeneratorService { private EntityManager em; @Override + @SuppressWarnings("all") public Object getTables(String name, int[] startEnd) { // 使用预编译防止sql注入 String sql = "select table_name ,create_time , engine, table_collation, table_comment from information_schema.tables " + @@ -49,6 +50,7 @@ public class GeneratorServiceImpl implements GeneratorService { } @Override + @SuppressWarnings("all") public Object getColumns(String name) { // 使用预编译防止sql注入 String sql = "select column_name, is_nullable, data_type, column_comment, column_key, extra from information_schema.columns " + diff --git a/eladmin-logging/src/main/java/me/zhengjie/aspect/LogAspect.java b/eladmin-logging/src/main/java/me/zhengjie/aspect/LogAspect.java index 989a74c6..9f6d4912 100644 --- a/eladmin-logging/src/main/java/me/zhengjie/aspect/LogAspect.java +++ b/eladmin-logging/src/main/java/me/zhengjie/aspect/LogAspect.java @@ -2,7 +2,6 @@ package me.zhengjie.aspect; import lombok.extern.slf4j.Slf4j; import me.zhengjie.domain.Log; -import me.zhengjie.exception.BadRequestException; import me.zhengjie.service.LogService; import me.zhengjie.utils.RequestHolder; import me.zhengjie.utils.SecurityUtils; @@ -14,11 +13,8 @@ import org.aspectj.lang.annotation.AfterThrowing; import org.aspectj.lang.annotation.Around; import org.aspectj.lang.annotation.Aspect; import org.aspectj.lang.annotation.Pointcut; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import javax.servlet.http.HttpServletRequest; - /** * @author Zheng Jie * @date 2018-11-24 @@ -28,11 +24,14 @@ import javax.servlet.http.HttpServletRequest; @Slf4j public class LogAspect { - @Autowired - private LogService logService; + private final LogService logService; private long currentTime = 0L; + public LogAspect(LogService logService) { + this.logService = logService; + } + /** * 配置切入点 */ diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/monitor/config/VisitsInitialization.java b/eladmin-system/src/main/java/me/zhengjie/modules/monitor/config/VisitsInitialization.java index 236a9c3c..f27e32e3 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/monitor/config/VisitsInitialization.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/monitor/config/VisitsInitialization.java @@ -19,7 +19,7 @@ public class VisitsInitialization implements ApplicationRunner { } @Override - public void run(ApplicationArguments args) throws Exception { + public void run(ApplicationArguments args){ System.out.println("--------------- 初始化站点统计，如果存在今日统计则跳过 ---------------"); visitsService.save(); System.out.println("--------------- 初始化站点统计完成 ---------------"); diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/monitor/rest/VisitsController.java b/eladmin-system/src/main/java/me/zhengjie/modules/monitor/rest/VisitsController.java index f8e33423..077ee3d4 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/monitor/rest/VisitsController.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/monitor/rest/VisitsController.java @@ -4,7 +4,6 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import me.zhengjie.modules.monitor.service.VisitsService; import me.zhengjie.utils.RequestHolder; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.GetMapping; 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 2065dfe9..90fd2fba 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 @@ -1,6 +1,5 @@ package me.zhengjie.modules.monitor.service; -import me.zhengjie.modules.monitor.domain.vo.RedisVo; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; 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 56216a1e..8faa1500 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 @@ -1,6 +1,7 @@ package me.zhengjie.modules.quartz.domain; -import lombok.Data; +import lombok.Getter; +import lombok.Setter; import me.zhengjie.base.BaseEntity; import javax.persistence.*; import javax.validation.constraints.NotBlank; @@ -10,7 +11,8 @@ import javax.validation.constraints.NotNull; * @author Zheng Jie * @date 2019-01-07 */ -@Data +@Getter +@Setter @Entity @Table(name = "quartz_job") public class QuartzJob extends BaseEntity { diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/quartz/task/TestTask.java b/eladmin-system/src/main/java/me/zhengjie/modules/quartz/task/TestTask.java index 680e9f1d..025edd90 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/quartz/task/TestTask.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/quartz/task/TestTask.java @@ -1,7 +1,6 @@ package me.zhengjie.modules.quartz.task; import lombok.extern.slf4j.Slf4j; -import me.zhengjie.exception.BadRequestException; import org.springframework.stereotype.Component; /** @@ -12,7 +11,7 @@ import org.springframework.stereotype.Component; @Slf4j @Component public class TestTask { - + public void run(){ log.info("执行成功"); } 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 31209f0a..eb442381 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 @@ -29,6 +29,7 @@ public class ExecutionJob extends QuartzJobBean { private ExecutorService executorService = Executors.newSingleThreadExecutor(); @Override + @SuppressWarnings("unchecked") protected void executeInternal(JobExecutionContext context) { QuartzJob quartzJob = (QuartzJob) context.getMergedJobDataMap().get(QuartzJob.JOB_KEY); // 获取spring bean 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 1b392aa8..303b364b 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 @@ -1,7 +1,6 @@ package me.zhengjie.modules.system.domain; import com.fasterxml.jackson.annotation.JsonIgnore; -import lombok.Data; import lombok.Getter; import lombok.Setter; import me.zhengjie.base.BaseEntity; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/Dict.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/Dict.java index d9c6ca1d..567b7beb 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/Dict.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/Dict.java @@ -1,14 +1,11 @@ package me.zhengjie.modules.system.domain; -import lombok.Data; import lombok.Getter; import lombok.Setter; import me.zhengjie.base.BaseEntity; - import javax.persistence.*; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; -import java.io.Serializable; import java.util.List; /** 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 48e52c00..524491b7 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 @@ -1,13 +1,10 @@ package me.zhengjie.modules.system.domain; -import lombok.Data; import lombok.Getter; import lombok.Setter; import me.zhengjie.base.BaseEntity; - import javax.persistence.*; import javax.validation.constraints.NotNull; -import java.io.Serializable; /** * @author Zheng Jie 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 e6f6b82c..a70347b3 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 @@ -1,17 +1,13 @@ package me.zhengjie.modules.system.domain; -import lombok.Data; import lombok.Getter; import lombok.Setter; import me.zhengjie.base.BaseEntity; -import org.hibernate.annotations.*; import javax.persistence.*; import javax.persistence.Entity; import javax.persistence.Table; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; -import java.sql.Timestamp; -import java.io.Serializable; /** * @author Zheng Jie 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 20ab89ca..b9fb2292 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 @@ -4,12 +4,9 @@ import com.fasterxml.jackson.annotation.JsonIgnore; 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/Permission.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/Permission.java index d0305a4d..e6f252be 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/Permission.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/Permission.java @@ -4,12 +4,9 @@ import com.fasterxml.jackson.annotation.JsonIgnore; 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.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 39e93114..8690c889 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 @@ -4,12 +4,9 @@ import com.fasterxml.jackson.annotation.JsonIgnore; 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/User.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/User.java index 9eef82dd..0e0c89a8 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 @@ -34,7 +34,7 @@ public class User extends BaseEntity { private UserAvatar userAvatar; @NotBlank - @Pattern(regexp = "([a-z0-9A-Z]+[-|\\.]?)+[a-z0-9A-Z]@([a-z0-9A-Z]+(-[a-z0-9A-Z]+)?\\.)+[a-zA-Z]{2,}",message = "格式错误") + @Pattern(regexp = "([a-z0-9A-Z]+[-|.]?)+[a-z0-9A-Z]@([a-z0-9A-Z]+(-[a-z0-9A-Z]+)?\\.)+[a-zA-Z]{2,}",message = "格式错误") private String email; @NotBlank diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/UserAvatar.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/UserAvatar.java index f7470d10..c0d1997f 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/UserAvatar.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/UserAvatar.java @@ -1,14 +1,11 @@ package me.zhengjie.modules.system.domain; import cn.hutool.core.util.ObjectUtil; -import lombok.Data; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; import me.zhengjie.base.BaseEntity; - import javax.persistence.*; -import java.sql.Timestamp; /** * @author Zheng Jie diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/DictController.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/DictController.java index cd60339d..c2a8b28a 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/DictController.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/DictController.java @@ -7,7 +7,6 @@ import me.zhengjie.exception.BadRequestException; import me.zhengjie.modules.system.domain.Dict; import me.zhengjie.modules.system.service.DictService; import me.zhengjie.modules.system.service.dto.DictQueryCriteria; -import org.springframework.beans.factory.annotation.Autowired; 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/rest/DictDetailController.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/DictDetailController.java index 02e78ffa..20214aac 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 @@ -7,7 +7,6 @@ import me.zhengjie.exception.BadRequestException; import me.zhengjie.modules.system.domain.DictDetail; import me.zhengjie.modules.system.service.DictDetailService; import me.zhengjie.modules.system.service.dto.DictDetailQueryCriteria; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Sort; import org.springframework.data.web.PageableDefault; @@ -16,11 +15,8 @@ import org.springframework.http.ResponseEntity; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; - -import java.util.Arrays; import java.util.HashMap; import java.util.Map; -import java.util.stream.Collectors; /** * @author Zheng Jie @@ -43,8 +39,7 @@ public class DictDetailController { @ApiOperation("查询字典详情") @GetMapping public ResponseEntity getDictDetails(DictDetailQueryCriteria criteria, - @PageableDefault(value = 10, sort = {"sort"}, direction = Sort.Direction.ASC) Pageable pageable){ - String[] names = criteria.getDictName().split(","); + @PageableDefault(sort = {"sort"}, direction = Sort.Direction.ASC) Pageable pageable){ return new ResponseEntity<>(dictDetailService.queryAll(criteria,pageable),HttpStatus.OK); } @@ -52,7 +47,7 @@ public class DictDetailController { @ApiOperation("查询多个字典详情") @GetMapping(value = "/map") public ResponseEntity getDictDetailMaps(DictDetailQueryCriteria criteria, - @PageableDefault(value = 10, sort = {"sort"}, direction = Sort.Direction.ASC) Pageable pageable){ + @PageableDefault(sort = {"sort"}, direction = Sort.Direction.ASC) Pageable pageable){ String[] names = criteria.getDictName().split(","); Map map = new HashMap<>(names.length); for (String name : names) { 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 1f455aaa..6b1ba897 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 @@ -9,7 +9,6 @@ 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.beans.factory.annotation.Autowired; import org.springframework.data.domain.Pageable; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; @@ -17,8 +16,6 @@ import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import java.util.Set; - /** * @author Zheng Jie * @date 2019-03-29 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 03ce9ed5..e5070a1b 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 @@ -28,6 +28,7 @@ import java.util.Set; @Api(tags = "系统：菜单管理") @RestController @RequestMapping("/api/menus") +@SuppressWarnings("unchecked") public class MenuController { private final MenuService menuService; @@ -49,7 +50,8 @@ public class MenuController { public ResponseEntity buildMenus(){ UserDTO user = userService.findByName(SecurityUtils.getUsername()); List menuDTOList = menuService.findByRoles(roleService.findByUsers_Id(user.getId())); - return new ResponseEntity<>(menuService.buildMenus((List) menuService.buildTree(menuDTOList).get("content")),HttpStatus.OK); + List menuDTOS = (List) menuService.buildTree(menuDTOList).get("content"); + return new ResponseEntity<>(menuService.buildMenus(menuDTOS),HttpStatus.OK); } @ApiOperation("返回全部的菜单") diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/RoleSmallDTO.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/RoleSmallDTO.java index 7e9d9fc1..1a6c7a04 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 @@ -1,10 +1,7 @@ package me.zhengjie.modules.system.service.dto; import lombok.Data; - import java.io.Serializable; -import java.sql.Timestamp; -import java.util.Set; /** * @author Zheng Jie 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 a977dfe1..1374202f 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 @@ -17,9 +17,7 @@ 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.Map; -import java.util.Optional; /** * @author Zheng Jie 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 20b1ada5..3d1b7a06 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/domain/QiniuContent.java +++ b/eladmin-tools/src/main/java/me/zhengjie/domain/QiniuContent.java @@ -22,7 +22,7 @@ public class QiniuContent implements Serializable { private Long id; // 文件名 - @Column(name = "name",unique = false) + @Column(name = "name") private String key; // 空间名 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 60bdc609..59c66945 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/repository/PictureRepository.java +++ b/eladmin-tools/src/main/java/me/zhengjie/repository/PictureRepository.java @@ -10,7 +10,5 @@ import org.springframework.data.jpa.repository.JpaSpecificationExecutor; */ public interface PictureRepository extends JpaRepository, JpaSpecificationExecutor { - Picture findByUrl(String url); - Picture findByMd5Code(String code); } diff --git a/eladmin-tools/src/main/java/me/zhengjie/repository/VerificationCodeRepository.java b/eladmin-tools/src/main/java/me/zhengjie/repository/VerificationCodeRepository.java index 9085d928..c602a45e 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/repository/VerificationCodeRepository.java +++ b/eladmin-tools/src/main/java/me/zhengjie/repository/VerificationCodeRepository.java @@ -12,9 +12,9 @@ public interface VerificationCodeRepository extends JpaRepository { } \ No newline at end of file