Skip to content
GitLab
Commit 9726436d authored by zhengjie's avatar zhengjie
Browse files

v2.1 version is released. For details, please see:... 

v2.1 version is released. For details, please see: https://github.com/elunez/eladmin/releases/tag/v2.1
parent c4fc3da1
Hide whitespace changes
Inline Side-by-side
eladmin-common/pom.xml
View file @ 9726436d
......@@ -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>
......
eladmin-common/src/main/java/me/zhengjie/swagger2/SwaggerConfig.java
View file @ 9726436d
......@@ -55,7 +55,7 @@ public class SwaggerConfig {
private ApiInfo apiInfo() {
return new ApiInfoBuilder()
.title("eladmin 接口文档")
.version("2.0")
.version("2.1")
.build();
}
......
eladmin-generator/pom.xml
View file @ 9726436d
......@@ -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>
<!--模板引擎-->
......
eladmin-generator/src/main/java/me/zhengjie/utils/GenUtil.java
View file @ 9726436d
......@@ -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);
......
eladmin-logging/pom.xml
View file @ 9726436d
......@@ -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>
\ No newline at end of file
eladmin-system/pom.xml
View file @ 9726436d
......@@ -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-->
......
eladmin-system/src/main/java/me/zhengjie/modules/security/utils/VerifyCodeUtils.java
View file @ 9726436d
......@@ -199,6 +199,5 @@ public class VerifyCodeUtils{
}
}
}
}
\ No newline at end of file
eladmin-system/src/main/java/me/zhengjie/modules/system/domain/Dict.java
View file @ 9726436d
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
......
eladmin-system/src/main/java/me/zhengjie/modules/system/domain/Role.java
View file @ 9726436d
......@@ -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;
......
eladmin-system/src/main/java/me/zhengjie/modules/system/domain/User.java
View file @ 9726436d
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;
......
eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/DeptServiceImpl.java
View file @ 9726436d
......@@ -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);
}
......
eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/DictDetailServiceImpl.java
View file @ 9726436d
......@@ -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);
}
......
eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/DictServiceImpl.java
View file @ 9726436d
......@@ -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);
}
......
eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/JobServiceImpl.java
View file @ 9726436d
......@@ -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);
}
......
eladmin-tools/pom.xml
View file @ 9726436d
......@@ -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>
<!--邮件依赖-->
......
pom.xml
View file @ 9726436d
......@@ -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>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment