v1.6 版本发布，详情查看版本说明

vinfai · Feb 28, 2019 · 4e39694 · 4e39694
1 parent f63407f
commit 4e39694
Show file tree

Hide file tree

Showing 46 changed files with 348 additions and 432 deletions.
diff --git a/README.md b/README.md
@@ -109,7 +109,7 @@ eladmin-qt和eladmin-qd只是命名方式的区别，无其他区别
         <td><img src="https://i.loli.net/2018/12/22/5c1e10c7890ab.png"/></td>
     </tr>
     <tr>
-        <td><img src="https://i.loli.net/2018/12/22/5c1e10c782a05.png"/></td>
+        <td><img src="https://i.loli.net/2019/02/28/5c7795b707347.png"/></td>
         <td><img src="https://i.loli.net/2018/12/22/5c1e10c7b089b.png"/></td>
     </tr>
     <tr>

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
@@ -7,10 +7,10 @@
 import me.zhengjie.utils.ThrowableUtil;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
+import org.springframework.security.access.AccessDeniedException;
 import org.springframework.web.bind.MethodArgumentNotValidException;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.RestControllerAdvice;
-import java.nio.file.AccessDeniedException;
 import static org.springframework.http.HttpStatus.*;
 
 /**

diff --git a/eladmin-common/src/main/java/me/zhengjie/redis/RedisConfig.java b/eladmin-common/src/main/java/me/zhengjie/redis/RedisConfig.java
@@ -94,10 +94,9 @@ public RedisTemplate<Object, Object> redisTemplate(RedisConnectionFactory redisC
         // 全局开启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.modules.test.service.dto");
         ParserConfig.getGlobalInstance().addAccept("me.zhengjie.modules.system.domain");
-        ParserConfig.getGlobalInstance().addAccept("me.zhengjie.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");

diff --git a/eladmin-common/src/main/java/me/zhengjie/swagger2/SwaggerConfig.java b/eladmin-common/src/main/java/me/zhengjie/swagger2/SwaggerConfig.java
@@ -2,7 +2,6 @@
 
 import com.google.common.base.Predicates;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 import springfox.documentation.builders.ApiInfoBuilder;
 import springfox.documentation.builders.ParameterBuilder;
@@ -13,25 +12,17 @@
 import springfox.documentation.spi.DocumentationType;
 import springfox.documentation.spring.web.plugins.Docket;
 import springfox.documentation.swagger2.annotations.EnableSwagger2;
-
 import java.util.ArrayList;
 import java.util.List;
 
 /**
  * api页面 /swagger-ui.html
- * 如controller在不同的包中，@ComponentScan(basePackages = {"me.aurora.app.rest","..."})
  * @author jie
  * @date 2018-11-23
  */
 
 @Configuration
 @EnableSwagger2
-@ComponentScan(basePackages = {
-        "me.zhengjie.rest",
-        "me.zhengjie.modules.system.rest",
-        "me.zhengjie.modules.monitor.rest",
-        "me.zhengjie.modules.monitor.rest",
-        "me.zhengjie.modules.quartz.rest"})
 public class SwaggerConfig {
 
     @Bean

diff --git a/eladmin-common/src/main/java/me/zhengjie/utils/EncryptUtils.java b/eladmin-common/src/main/java/me/zhengjie/utils/EncryptUtils.java
@@ -1,7 +1,6 @@
 package me.zhengjie.utils;
 
 import org.springframework.util.DigestUtils;
-
 import javax.crypto.Cipher;
 import javax.crypto.SecretKey;
 import javax.crypto.SecretKeyFactory;

diff --git a/eladmin-common/src/main/java/me/zhengjie/utils/FileUtil.java b/eladmin-common/src/main/java/me/zhengjie/utils/FileUtil.java
@@ -2,7 +2,6 @@
 
 import cn.hutool.core.util.IdUtil;
 import org.springframework.web.multipart.MultipartFile;
-
 import java.io.File;
 import java.io.IOException;
 import java.text.DecimalFormat;

diff --git a/eladmin-common/src/main/java/me/zhengjie/utils/ListSortUtil.java b/eladmin-common/src/main/java/me/zhengjie/utils/ListSortUtil.java
diff --git a/eladmin-system/pom.xml b/eladmin-system/pom.xml
@@ -21,6 +21,12 @@
             <groupId>me.zhengjie</groupId>
             <artifactId>eladmin-generator</artifactId>
             <version>1.5</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>me.zhengjie</groupId>
+                    <artifactId>eladmin-common</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>