github
/
eladmin
mirror of https://github.com/elunez/eladmin
1
0
Fork 0
Code Issues Releases Wiki Activity

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

pull/99/head
zhengjie 2019-06-30 08:11:32 +08:00
parent c4fc3da175
commit 9726436d78
16 changed files with 17 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
eladmin-common/pom.xml
View File

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>eladmin</artifactId> <artifactId>eladmin</artifactId>
<groupId>me.zhengjie</groupId> <groupId>me.zhengjie</groupId>
<version>2.0</version> <version>2.1</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

2
eladmin-common/src/main/java/me/zhengjie/swagger2/SwaggerConfig.java
View File

@ -55,7 +55,7 @@ public class SwaggerConfig {
private ApiInfo apiInfo() { private ApiInfo apiInfo() {
return new ApiInfoBuilder() return new ApiInfoBuilder()
.title("eladmin 接口文档") .title("eladmin 接口文档")
.version("2.0") .version("2.1")
.build(); .build();
} }

4
eladmin-generator/pom.xml
View File

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

13
eladmin-generator/src/main/java/me/zhengjie/utils/GenUtil.java
View File

@ -120,6 +120,7 @@ public class GenUtil {
listMap.put("changeColumnName",changeColumnName); listMap.put("changeColumnName",changeColumnName);
listMap.put("capitalColumnName",capitalColumnName); listMap.put("capitalColumnName",capitalColumnName);
// 判断是否有查询，如有则把查询的字段set进columnQuery
if(!StringUtils.isBlank(column.getColumnQuery())){ if(!StringUtils.isBlank(column.getColumnQuery())){
listMap.put("columnQuery",column.getColumnQuery()); listMap.put("columnQuery",column.getColumnQuery());
map.put("hasQuery",true); map.put("hasQuery",true);
@ -140,10 +141,8 @@ public class GenUtil {
File file = new File(filePath); File file = new File(filePath);
// 如果非覆盖生成 // 如果非覆盖生成
if(!genConfig.getCover()){ if(!genConfig.getCover() && FileUtil.exist(file)){
if(FileUtil.exist(file)){ continue;
continue;
}
} }
// 生成代码 // 生成代码
genFile(file, template, map); genFile(file, template, map);
@ -158,10 +157,8 @@ public class GenUtil {
File file = new File(filePath); File file = new File(filePath);
// 如果非覆盖生成 // 如果非覆盖生成
if(!genConfig.getCover()){ if(!genConfig.getCover() && FileUtil.exist(file)){
if(FileUtil.exist(file)){ continue;
continue;
}
} }
// 生成代码 // 生成代码
genFile(file, template, map); genFile(file, template, map);

4
eladmin-logging/pom.xml
View File

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>eladmin</artifactId> <artifactId>eladmin</artifactId>
<groupId>me.zhengjie</groupId> <groupId>me.zhengjie</groupId>
<version>2.0</version> <version>2.1</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
@ -15,7 +15,7 @@
<dependency> <dependency>
<groupId>me.zhengjie</groupId> <groupId>me.zhengjie</groupId>
<artifactId>eladmin-common</artifactId> <artifactId>eladmin-common</artifactId>
<version>2.0</version> <version>2.1</version>
</dependency> </dependency>
</dependencies> </dependencies>
</project> </project>

6
eladmin-system/pom.xml
View File

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>eladmin</artifactId> <artifactId>eladmin</artifactId>
<groupId>me.zhengjie</groupId> <groupId>me.zhengjie</groupId>
<version>2.0</version> <version>2.1</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
@ -19,7 +19,7 @@
<dependency> <dependency>
<groupId>me.zhengjie</groupId> <groupId>me.zhengjie</groupId>
<artifactId>eladmin-generator</artifactId> <artifactId>eladmin-generator</artifactId>
<version>2.0</version> <version>2.1</version>
<exclusions> <exclusions>
<exclusion> <exclusion>
<groupId>me.zhengjie</groupId> <groupId>me.zhengjie</groupId>
@ -31,7 +31,7 @@
<dependency> <dependency>
<groupId>me.zhengjie</groupId> <groupId>me.zhengjie</groupId>
<artifactId>eladmin-tools</artifactId> <artifactId>eladmin-tools</artifactId>
<version>2.0</version> <version>2.1</version>
</dependency> </dependency>
<!--jwt--> <!--jwt-->

1
eladmin-system/src/main/java/me/zhengjie/modules/security/utils/VerifyCodeUtils.java
View File

@ -199,6 +199,5 @@ public class VerifyCodeUtils{
} }
} }
} }
} }

2
eladmin-system/src/main/java/me/zhengjie/modules/system/domain/Dict.java
View File

@ -1,13 +1,11 @@
package me.zhengjie.modules.system.domain; package me.zhengjie.modules.system.domain;
import com.fasterxml.jackson.annotation.JsonIgnore;
import lombok.Data; import lombok.Data;
import javax.persistence.*; import javax.persistence.*;
import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
import java.io.Serializable; import java.io.Serializable;
import java.util.List; import java.util.List;
import java.util.Set;
/** /**
* @author Zheng Jie * @author Zheng Jie

1
eladmin-system/src/main/java/me/zhengjie/modules/system/domain/Role.java
View File

@ -4,7 +4,6 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
import org.hibernate.annotations.CreationTimestamp; import org.hibernate.annotations.CreationTimestamp;
import javax.persistence.*; import javax.persistence.*;
import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;

2
eladmin-system/src/main/java/me/zhengjie/modules/system/domain/User.java
View File

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

2
eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/DeptServiceImpl.java
View File

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

2
eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/DictDetailServiceImpl.java
View File

@ -57,9 +57,7 @@ public class DictDetailServiceImpl implements DictDetailService {
public void update(DictDetail resources) { public void update(DictDetail resources) {
Optional<DictDetail> optionalDictDetail = dictDetailRepository.findById(resources.getId()); Optional<DictDetail> optionalDictDetail = dictDetailRepository.findById(resources.getId());
ValidationUtil.isNull( optionalDictDetail,"DictDetail","id",resources.getId()); ValidationUtil.isNull( optionalDictDetail,"DictDetail","id",resources.getId());
DictDetail dictDetail = optionalDictDetail.get(); DictDetail dictDetail = optionalDictDetail.get();
// 此处需自己修改
resources.setId(dictDetail.getId()); resources.setId(dictDetail.getId());
dictDetailRepository.save(resources); dictDetailRepository.save(resources);
} }

2
eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/DictServiceImpl.java
View File

@ -54,9 +54,7 @@ public class DictServiceImpl implements DictService {
public void update(Dict resources) { public void update(Dict resources) {
Optional<Dict> optionalDict = dictRepository.findById(resources.getId()); Optional<Dict> optionalDict = dictRepository.findById(resources.getId());
ValidationUtil.isNull( optionalDict,"Dict","id",resources.getId()); ValidationUtil.isNull( optionalDict,"Dict","id",resources.getId());
Dict dict = optionalDict.get(); Dict dict = optionalDict.get();
// 此处需自己修改
resources.setId(dict.getId()); resources.setId(dict.getId());
dictRepository.save(resources); dictRepository.save(resources);
} }

1
eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/JobServiceImpl.java
View File

@ -67,7 +67,6 @@ public class JobServiceImpl implements JobService {
ValidationUtil.isNull( optionalJob,"Job","id",resources.getId()); ValidationUtil.isNull( optionalJob,"Job","id",resources.getId());
Job job = optionalJob.get(); Job job = optionalJob.get();
// 此处需自己修改
resources.setId(job.getId()); resources.setId(job.getId());
jobRepository.save(resources); jobRepository.save(resources);
} }

4
eladmin-tools/pom.xml
View File

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

2
pom.xml
View File

@ -7,7 +7,7 @@
<groupId>me.zhengjie</groupId> <groupId>me.zhengjie</groupId>
<artifactId>eladmin</artifactId> <artifactId>eladmin</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<version>2.0</version> <version>2.1</version>
<modules> <modules>
<module>eladmin-common</module> <module>eladmin-common</module>