v2.1 version is released. For details, please see: https://github.com/elunez/eladmin/releases/tag/v2.1

2019-06-30 08:11:32 +08:00 · 2019-06-30 08:11:32 +08:00 · 9726436d78
parent c4fc3da175
commit 9726436d78
16 changed files with 17 additions and 33 deletions
--- 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>

--- 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 class SwaggerConfig {
    private ApiInfo apiInfo() {
        return new ApiInfoBuilder()
                .title("eladmin 接口文档")
-                .version("2.0")
+                .version("2.1")
                .build();
    }

--- 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>

        <!--模板引擎-->
--- 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 class GenUtil {
            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 class GenUtil {
            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 class GenUtil {
            File file = new File(filePath);

            // 如果非覆盖生成
-            if(!genConfig.getCover()){
-                if(FileUtil.exist(file)){
-                    continue;
-                }
+            if(!genConfig.getCover() && FileUtil.exist(file)){
+                continue;
            }
            // 生成代码
            genFile(file, template, map);
--- 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>
--- 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-->
--- 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 @@ public class VerifyCodeUtils{
            }

        }
-
    }
 }
--- 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
--- 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 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;
--- 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;
--- 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 class DeptServiceImpl implements DeptService {
        }
        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);
    }
--- 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
@ -57,9 +57,7 @@ public class DictDetailServiceImpl implements DictDetailService {
    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);
    }
--- 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 class DictServiceImpl implements DictService {
    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);
    }
--- 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 class JobServiceImpl implements JobService {
        ValidationUtil.isNull( optionalJob,"Job","id",resources.getId());

        Job job = optionalJob.get();
-        // 此处需自己修改
        resources.setId(job.getId());
        jobRepository.save(resources);
    }
--- 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>

        <!--邮件依赖-->
--- 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>