v2.1 version is released. For details, please see: https://github.com…

…/elunez/eladmin/releases/tag/v2.1
dawsongzhao · Jun 30, 2019 · 9726436 · 9726436
1 parent c4fc3da
commit 9726436
Show file tree

Hide file tree

Showing 16 changed files with 17 additions and 33 deletions.
diff --git a/eladmin-common/pom.xml b/eladmin-common/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>eladmin</artifactId>
         <groupId>me.zhengjie</groupId>
-        <version>2.0</version>
+        <version>2.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/eladmin-common/src/main/java/me/zhengjie/swagger2/SwaggerConfig.java b/eladmin-common/src/main/java/me/zhengjie/swagger2/SwaggerConfig.java
@@ -55,7 +55,7 @@ public Docket createRestApi() {
     private ApiInfo apiInfo() {
         return new ApiInfoBuilder()
                 .title("eladmin 接口文档")
-                .version("2.0")
+                .version("2.1")
                 .build();
     }
 

diff --git a/eladmin-generator/pom.xml b/eladmin-generator/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>eladmin</artifactId>
         <groupId>me.zhengjie</groupId>
-        <version>2.0</version>
+        <version>2.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -19,7 +19,7 @@
         <dependency>
             <groupId>me.zhengjie</groupId>
             <artifactId>eladmin-common</artifactId>
-            <version>2.0</version>
+            <version>2.1</version>
         </dependency>
 
         <!--模板引擎-->

diff --git a/eladmin-generator/src/main/java/me/zhengjie/utils/GenUtil.java b/eladmin-generator/src/main/java/me/zhengjie/utils/GenUtil.java
@@ -120,6 +120,7 @@ public static void generatorCode(List<ColumnInfo> columnInfos, GenConfig genConf
             listMap.put("changeColumnName",changeColumnName);
             listMap.put("capitalColumnName",capitalColumnName);
 
+            // 判断是否有查询，如有则把查询的字段set进columnQuery
             if(!StringUtils.isBlank(column.getColumnQuery())){
                 listMap.put("columnQuery",column.getColumnQuery());
                 map.put("hasQuery",true);
@@ -140,10 +141,8 @@ public static void generatorCode(List<ColumnInfo> columnInfos, GenConfig genConf
             File file = new File(filePath);
 
             // 如果非覆盖生成
-            if(!genConfig.getCover()){
-                if(FileUtil.exist(file)){
-                    continue;
-                }
+            if(!genConfig.getCover() && FileUtil.exist(file)){
+                continue;
             }
             // 生成代码
             genFile(file, template, map);
@@ -158,10 +157,8 @@ public static void generatorCode(List<ColumnInfo> columnInfos, GenConfig genConf
             File file = new File(filePath);
 
             // 如果非覆盖生成
-            if(!genConfig.getCover()){
-                if(FileUtil.exist(file)){
-                    continue;
-                }
+            if(!genConfig.getCover() && FileUtil.exist(file)){
+                continue;
             }
             // 生成代码
             genFile(file, template, map);

diff --git a/eladmin-logging/pom.xml b/eladmin-logging/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>eladmin</artifactId>
         <groupId>me.zhengjie</groupId>
-        <version>2.0</version>
+        <version>2.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -15,7 +15,7 @@
         <dependency>
             <groupId>me.zhengjie</groupId>
             <artifactId>eladmin-common</artifactId>
-            <version>2.0</version>
+            <version>2.1</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/eladmin-system/pom.xml b/eladmin-system/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>eladmin</artifactId>
         <groupId>me.zhengjie</groupId>
-        <version>2.0</version>
+        <version>2.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -19,7 +19,7 @@
         <dependency>
             <groupId>me.zhengjie</groupId>
             <artifactId>eladmin-generator</artifactId>
-            <version>2.0</version>
+            <version>2.1</version>
             <exclusions>
                 <exclusion>
                     <groupId>me.zhengjie</groupId>
@@ -31,7 +31,7 @@
         <dependency>
             <groupId>me.zhengjie</groupId>
             <artifactId>eladmin-tools</artifactId>
-            <version>2.0</version>
+            <version>2.1</version>
         </dependency>
 
         <!--jwt-->

diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/security/utils/VerifyCodeUtils.java b/eladmin-system/src/main/java/me/zhengjie/modules/security/utils/VerifyCodeUtils.java
@@ -199,6 +199,5 @@ private static void shearY(Graphics g, int w1, int h1, Color color) {
             }
 
         }
-
     }
 }
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
@@ -1,13 +1,11 @@
 package me.zhengjie.modules.system.domain;
 
-import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
 import javax.persistence.*;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 import java.util.List;
-import java.util.Set;
 
 /**
 * @author Zheng Jie

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
@@ -4,7 +4,6 @@
 import lombok.Getter;
 import lombok.Setter;
 import org.hibernate.annotations.CreationTimestamp;
-
 import javax.persistence.*;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;

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
@@ -1,10 +1,8 @@
 package me.zhengjie.modules.system.domain;
 
-import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Getter;
 import lombok.Setter;
 import org.hibernate.annotations.CreationTimestamp;
-
 import javax.persistence.*;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;

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
@@ -105,9 +105,7 @@ public void update(Dept resources) {
         }
         Optional<Dept> optionalDept = deptRepository.findById(resources.getId());
         ValidationUtil.isNull( optionalDept,"Dept","id",resources.getId());
-
         Dept dept = optionalDept.get();
-        // 此处需自己修改
         resources.setId(dept.getId());
         deptRepository.save(resources);
     }

diff --git a/...n-system/src/main/java/me/zhengjie/modules/system/service/impl/DictDetailServiceImpl.java b/...n-system/src/main/java/me/zhengjie/modules/system/service/impl/DictDetailServiceImpl.java
@@ -57,9 +57,7 @@ public DictDetailDTO create(DictDetail resources) {
     public void update(DictDetail resources) {
         Optional<DictDetail> optionalDictDetail = dictDetailRepository.findById(resources.getId());
         ValidationUtil.isNull( optionalDictDetail,"DictDetail","id",resources.getId());
-
         DictDetail dictDetail = optionalDictDetail.get();
-        // 此处需自己修改
         resources.setId(dictDetail.getId());
         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
@@ -54,9 +54,7 @@ public DictDTO create(Dict resources) {
     public void update(Dict resources) {
         Optional<Dict> optionalDict = dictRepository.findById(resources.getId());
         ValidationUtil.isNull( optionalDict,"Dict","id",resources.getId());
-
         Dict dict = optionalDict.get();
-        // 此处需自己修改
         resources.setId(dict.getId());
         dictRepository.save(resources);
     }

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
@@ -67,7 +67,6 @@ public void update(Job resources) {
         ValidationUtil.isNull( optionalJob,"Job","id",resources.getId());
 
         Job job = optionalJob.get();
-        // 此处需自己修改
         resources.setId(job.getId());
         jobRepository.save(resources);
     }

diff --git a/eladmin-tools/pom.xml b/eladmin-tools/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>eladmin</artifactId>
         <groupId>me.zhengjie</groupId>
-        <version>2.0</version>
+        <version>2.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -22,7 +22,7 @@
         <dependency>
             <groupId>me.zhengjie</groupId>
             <artifactId>eladmin-logging</artifactId>
-            <version>2.0</version>
+            <version>2.1</version>
         </dependency>
 
         <!--邮件依赖-->

diff --git a/pom.xml b/pom.xml
@@ -7,7 +7,7 @@
     <groupId>me.zhengjie</groupId>
     <artifactId>eladmin</artifactId>
     <packaging>pom</packaging>
-    <version>2.0</version>
+    <version>2.1</version>
 
     <modules>
         <module>eladmin-common</module>
-Original file line number
+Diff line change
@@ Expand Up @@
                 }
             }
         }
     }