From 5295f90990a57b43bd5f9b08a99345acc474345b Mon Sep 17 00:00:00 2001
From: ZhengJie <201507802@qq.com>
Date: Wed, 6 May 2020 22:55:29 +0800
Subject: [PATCH] =?UTF-8?q?[=E4=BB=A3=E7=A0=81=E5=AE=8C=E5=96=84](v2.5):?=
 =?UTF-8?q?=20v2.5=20beta=20=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90ftl?=
 =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E4=B8=AD=E4=BD=BF=E7=94=A8@RequiredArgsConst?=
 =?UTF-8?q?ructor=E6=B3=A8=E8=A7=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

2.5 Beta 详情：https://www.ydyno.com/archives/1225.html
---
 .../resources/template/generator/admin/Controller.ftl     | 8 +++-----
 .../resources/template/generator/admin/ServiceImpl.ftl    | 8 ++------
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/eladmin-system/src/main/resources/template/generator/admin/Controller.ftl b/eladmin-system/src/main/resources/template/generator/admin/Controller.ftl
index 703bc479..237ad73d 100644
--- a/eladmin-system/src/main/resources/template/generator/admin/Controller.ftl
+++ b/eladmin-system/src/main/resources/template/generator/admin/Controller.ftl
@@ -20,6 +20,7 @@ import ${package}.domain.${className};
 import ${package}.service.${className}Service;
 import ${package}.service.dto.${className}QueryCriteria;
 import org.springframework.data.domain.Pageable;
+import lombok.RequiredArgsConstructor;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -35,17 +36,14 @@ import javax.servlet.http.HttpServletResponse;
 * @author ${author}
 * @date ${date}
 **/
-@Api(tags = "${apiAlias}管理")
 @RestController
+@RequiredArgsConstructor
+@Api(tags = "${apiAlias}管理")
 @RequestMapping("/api/${changeClassName}")
 public class ${className}Controller {
 
     private final ${className}Service ${changeClassName}Service;
 
-    public ${className}Controller(${className}Service ${changeClassName}Service) {
-        this.${changeClassName}Service = ${changeClassName}Service;
-    }
-
     @Log("导出数据")
     @ApiOperation("导出数据")
     @GetMapping(value = "/download")
diff --git a/eladmin-system/src/main/resources/template/generator/admin/ServiceImpl.ftl b/eladmin-system/src/main/resources/template/generator/admin/ServiceImpl.ftl
index d47bf194..5dd3d1b6 100644
--- a/eladmin-system/src/main/resources/template/generator/admin/ServiceImpl.ftl
+++ b/eladmin-system/src/main/resources/template/generator/admin/ServiceImpl.ftl
@@ -27,6 +27,7 @@ import me.zhengjie.exception.EntityExistException;
 </#if>
 import me.zhengjie.utils.ValidationUtil;
 import me.zhengjie.utils.FileUtil;
+import lombok.RequiredArgsConstructor;
 import ${package}.repository.${className}Repository;
 import ${package}.service.${className}Service;
 import ${package}.service.dto.${className}Dto;
@@ -60,18 +61,13 @@ import java.util.LinkedHashMap;
 * @date ${date}
 **/
 @Service
+@RequiredArgsConstructor
 @Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class)
 public class ${className}ServiceImpl implements ${className}Service {
 
     private final ${className}Repository ${changeClassName}Repository;
-
     private final ${className}Mapper ${changeClassName}Mapper;
 
-    public ${className}ServiceImpl(${className}Repository ${changeClassName}Repository, ${className}Mapper ${changeClassName}Mapper) {
-        this.${changeClassName}Repository = ${changeClassName}Repository;
-        this.${changeClassName}Mapper = ${changeClassName}Mapper;
-    }
-
     @Override
     public Map<String,Object> queryAll(${className}QueryCriteria criteria, Pageable pageable){
         Page<${className}> page = ${changeClassName}Repository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root,criteria,criteriaBuilder),pageable);