diff --git a/eladmin-common/pom.xml b/eladmin-common/pom.xml
index 7557bbc6..49018491 100644
--- a/eladmin-common/pom.xml
+++ b/eladmin-common/pom.xml
@@ -5,7 +5,7 @@
eladmin
me.zhengjie
- 2.0
+ 2.1
4.0.0
diff --git a/eladmin-common/src/main/java/me/zhengjie/swagger2/SwaggerConfig.java b/eladmin-common/src/main/java/me/zhengjie/swagger2/SwaggerConfig.java
index 85aa638a..207873cd 100644
--- 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();
}
diff --git a/eladmin-generator/pom.xml b/eladmin-generator/pom.xml
index 0aa4089c..bf69a3a4 100644
--- a/eladmin-generator/pom.xml
+++ b/eladmin-generator/pom.xml
@@ -5,7 +5,7 @@
eladmin
me.zhengjie
- 2.0
+ 2.1
4.0.0
@@ -19,7 +19,7 @@
me.zhengjie
eladmin-common
- 2.0
+ 2.1
diff --git a/eladmin-generator/src/main/java/me/zhengjie/utils/GenUtil.java b/eladmin-generator/src/main/java/me/zhengjie/utils/GenUtil.java
index 2c60b7cd..ca198b31 100644
--- 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);
diff --git a/eladmin-logging/pom.xml b/eladmin-logging/pom.xml
index 180e0781..d899d23b 100644
--- a/eladmin-logging/pom.xml
+++ b/eladmin-logging/pom.xml
@@ -5,7 +5,7 @@
eladmin
me.zhengjie
- 2.0
+ 2.1
4.0.0
@@ -15,7 +15,7 @@
me.zhengjie
eladmin-common
- 2.0
+ 2.1
\ No newline at end of file
diff --git a/eladmin-system/pom.xml b/eladmin-system/pom.xml
index 909b74a8..62691647 100644
--- a/eladmin-system/pom.xml
+++ b/eladmin-system/pom.xml
@@ -5,7 +5,7 @@
eladmin
me.zhengjie
- 2.0
+ 2.1
4.0.0
@@ -19,7 +19,7 @@
me.zhengjie
eladmin-generator
- 2.0
+ 2.1
me.zhengjie
@@ -31,7 +31,7 @@
me.zhengjie
eladmin-tools
- 2.0
+ 2.1
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
index e3beabd3..74eb04a6 100644
--- 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{
}
}
-
}
}
\ No newline at end of file
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 782a01fe..83183d3e 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,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
index 6a8846f7..c44c97fb 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,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;
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 b728e285..b801b558 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
@@ -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
index 3113e39e..f56e1903 100644
--- 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 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/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 049c7a34..d8970219 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
@@ -57,9 +57,7 @@ public class DictDetailServiceImpl implements DictDetailService {
public void update(DictDetail resources) {
Optional 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
index dd944c5d..4d13e66d 100644
--- 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 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
index 45894b44..64c90972 100644
--- 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);
}
diff --git a/eladmin-tools/pom.xml b/eladmin-tools/pom.xml
index c530ed4e..dbefcd2b 100644
--- a/eladmin-tools/pom.xml
+++ b/eladmin-tools/pom.xml
@@ -5,7 +5,7 @@
eladmin
me.zhengjie
- 2.0
+ 2.1
4.0.0
@@ -22,7 +22,7 @@
me.zhengjie
eladmin-logging
- 2.0
+ 2.1
diff --git a/pom.xml b/pom.xml
index 7c7a8016..c28a16a5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
me.zhengjie
eladmin
pom
- 2.0
+ 2.1
eladmin-common