From 312fe508726b56723fafca0c3533bc22457e36ac Mon Sep 17 00:00:00 2001
From: smallchill <smallchill@163.com>
Date: Sat, 6 Jul 2019 17:30:44 +0800
Subject: [PATCH] :tada: 2.3.3.RELEASE

---
 .../resources/templates/controller.java.vm    | 154 ++++++++++++++++++
 .../main/resources/templates/wrapper.java.vm  |  45 +++++
 .../resources/templates/controller.java.vm    | 154 ++++++++++++++++++
 .../test/resources/templates/wrapper.java.vm  |  45 +++++
 .../desk/controller/NoticeController.java     |   4 +-
 .../desk/wrapper/NoticeWrapper.java           |   2 +-
 .../system/controller/DeptController.java     |   4 +-
 .../system/controller/DictController.java     |   4 +-
 .../system/controller/MenuController.java     |   4 +-
 .../system/controller/RoleController.java     |   4 +-
 .../system/wrapper/DeptWrapper.java           |   2 +-
 .../system/wrapper/DictWrapper.java           |   2 +-
 .../system/wrapper/MenuWrapper.java           |   2 +-
 .../system/wrapper/RoleWrapper.java           |   2 +-
 .../user/controller/UserController.java       |   4 +-
 .../system/user/wrapper/UserWrapper.java      |   2 +-
 16 files changed, 416 insertions(+), 18 deletions(-)
 create mode 100644 blade-ops/blade-develop/src/main/resources/templates/controller.java.vm
 create mode 100644 blade-ops/blade-develop/src/main/resources/templates/wrapper.java.vm
 create mode 100644 blade-ops/blade-develop/src/test/resources/templates/controller.java.vm
 create mode 100644 blade-ops/blade-develop/src/test/resources/templates/wrapper.java.vm

diff --git a/blade-ops/blade-develop/src/main/resources/templates/controller.java.vm b/blade-ops/blade-develop/src/main/resources/templates/controller.java.vm
new file mode 100644
index 00000000..95ba8684
--- /dev/null
+++ b/blade-ops/blade-develop/src/main/resources/templates/controller.java.vm
@@ -0,0 +1,154 @@
+/**
+ * Copyright (c) 2018-2028, Chill Zhuang 庄骞 (smallchill@163.com).
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package $!{package.Controller};
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiOperationSupport;
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import javax.validation.Valid;
+
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
+import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.Func;
+import org.springframework.web.bind.annotation.*;
+#if($!{superEntityClass})
+import org.springframework.web.bind.annotation.RequestParam;
+#end
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import $!{package.Entity}.$!{entity};
+#set($voPackage=$package.Entity.replace("entity","vo"))
+import $!{voPackage}.$!{entity}VO;
+#set($wrapperPackage=$package.Entity.replace("entity","wrapper"))
+import $!{wrapperPackage}.$!{entity}Wrapper;
+import $!{package.Service}.$!{table.serviceName};
+#if($!{superControllerClassPackage})
+import $!{superControllerClassPackage};
+#end
+#if(!$!{superEntityClass})
+#end
+import java.util.List;
+
+/**
+ * $!{table.comment} 控制器
+ *
+ * @author $!{author}
+ * @since $!{date}
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("#if($!{package.ModuleName})/$!{package.ModuleName}#end/$!{cfg.entityKey}")
+@Api(value = "$!{table.comment}", tags = "$!{table.comment}接口")
+#if($!{superControllerClass})
+public class $!{table.controllerName} extends $!{superControllerClass} {
+#else
+public class $!{table.controllerName} {
+#end
+
+	private $!{table.serviceName} $!{table.entityPath}Service;
+
+	/**
+	* 详情
+	*/
+	@GetMapping("/detail")
+    @ApiOperationSupport(order = 1)
+	@ApiOperation(value = "详情", notes = "传入$!{table.entityPath}")
+	public R<$!{entity}VO> detail($!{entity} $!{table.entityPath}) {
+		$!{entity} detail = $!{table.entityPath}Service.getOne(Condition.getQueryWrapper($!{table.entityPath}));
+		return R.data($!{entity}Wrapper.build().entityVO(detail));
+	}
+
+	/**
+	* 分页 $!{table.comment}
+	*/
+	@GetMapping("/list")
+    @ApiOperationSupport(order = 2)
+	@ApiOperation(value = "分页", notes = "传入$!{table.entityPath}")
+	public R<IPage<$!{entity}VO>> list($!{entity} $!{table.entityPath}, Query query) {
+		IPage<$!{entity}> pages = $!{table.entityPath}Service.page(Condition.getPage(query), Condition.getQueryWrapper($!{table.entityPath}));
+		return R.data($!{entity}Wrapper.build().pageVO(pages));
+	}
+
+	/**
+	* 自定义分页 $!{table.comment}
+	*/
+	@GetMapping("/page")
+    @ApiOperationSupport(order = 3)
+	@ApiOperation(value = "分页", notes = "传入$!{table.entityPath}")
+	public R<IPage<$!{entity}VO>> page($!{entity}VO $!{table.entityPath}, Query query) {
+		IPage<$!{entity}VO> pages = $!{table.entityPath}Service.select$!{entity}Page(Condition.getPage(query), $!{table.entityPath});
+		return R.data(pages);
+	}
+
+	/**
+	* 新增 $!{table.comment}
+	*/
+	@PostMapping("/save")
+    @ApiOperationSupport(order = 4)
+	@ApiOperation(value = "新增", notes = "传入$!{table.entityPath}")
+	public R save(@Valid @RequestBody $!{entity} $!{table.entityPath}) {
+		return R.status($!{table.entityPath}Service.save($!{table.entityPath}));
+	}
+
+	/**
+	* 修改 $!{table.comment}
+	*/
+	@PostMapping("/update")
+    @ApiOperationSupport(order = 5)
+	@ApiOperation(value = "修改", notes = "传入$!{table.entityPath}")
+	public R update(@Valid @RequestBody $!{entity} $!{table.entityPath}) {
+		return R.status($!{table.entityPath}Service.updateById($!{table.entityPath}));
+	}
+
+	/**
+	* 新增或修改 $!{table.comment}
+	*/
+	@PostMapping("/submit")
+    @ApiOperationSupport(order = 6)
+	@ApiOperation(value = "新增或修改", notes = "传入$!{table.entityPath}")
+	public R submit(@Valid @RequestBody $!{entity} $!{table.entityPath}) {
+		return R.status($!{table.entityPath}Service.saveOrUpdate($!{table.entityPath}));
+	}
+
+	#if($!{superEntityClass})
+
+	/**
+	* 删除 $!{table.comment}
+	*/
+	@PostMapping("/remove")
+    @ApiOperationSupport(order = 7)
+	@ApiOperation(value = "逻辑删除", notes = "传入ids")
+	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+		return R.status($!{table.entityPath}Service.deleteLogic(Func.toIntList(ids)));
+	}
+
+	#else
+
+	/**
+	* 删除 $!{table.comment}
+	*/
+	@PostMapping("/remove")
+    @ApiOperationSupport(order = 7)
+	@ApiOperation(value = "删除", notes = "传入ids")
+	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+		return R.status($!{table.entityPath}Service.removeByIds(Func.toIntList(ids)));
+	}
+
+	#end
+
+}
diff --git a/blade-ops/blade-develop/src/main/resources/templates/wrapper.java.vm b/blade-ops/blade-develop/src/main/resources/templates/wrapper.java.vm
new file mode 100644
index 00000000..64a8b015
--- /dev/null
+++ b/blade-ops/blade-develop/src/main/resources/templates/wrapper.java.vm
@@ -0,0 +1,45 @@
+/**
+ * Copyright (c) 2018-2028, Chill Zhuang 庄骞 (smallchill@163.com).
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#set($wrapperPackage=$package.Entity.replace("entity","wrapper"))
+package $!{wrapperPackage};
+
+import lombok.AllArgsConstructor;
+import org.springblade.core.mp.support.BaseEntityWrapper;
+import org.springblade.core.tool.utils.BeanUtil;
+import $!{package.Entity}.$!{entity};
+#set($voPackage=$package.Entity.replace("entity","vo"))
+import $!{voPackage}.$!{entity}VO;
+
+/**
+ * $!{table.comment}包装类,返回视图层所需的字段
+ *
+ * @author $!{author}
+ * @since $!{date}
+ */
+public class $!{entity}Wrapper extends BaseEntityWrapper<$!{entity}, $!{entity}VO>  {
+
+    public static $!{entity}Wrapper build() {
+        return new $!{entity}Wrapper();
+    }
+
+	@Override
+	public $!{entity}VO entityVO($!{entity} $!{table.entityPath}) {
+		$!{entity}VO $!{table.entityPath}VO = BeanUtil.copy($!{table.entityPath}, $!{entity}VO.class);
+
+		return $!{table.entityPath}VO;
+	}
+
+}
diff --git a/blade-ops/blade-develop/src/test/resources/templates/controller.java.vm b/blade-ops/blade-develop/src/test/resources/templates/controller.java.vm
new file mode 100644
index 00000000..95ba8684
--- /dev/null
+++ b/blade-ops/blade-develop/src/test/resources/templates/controller.java.vm
@@ -0,0 +1,154 @@
+/**
+ * Copyright (c) 2018-2028, Chill Zhuang 庄骞 (smallchill@163.com).
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package $!{package.Controller};
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiOperationSupport;
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import javax.validation.Valid;
+
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
+import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.Func;
+import org.springframework.web.bind.annotation.*;
+#if($!{superEntityClass})
+import org.springframework.web.bind.annotation.RequestParam;
+#end
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import $!{package.Entity}.$!{entity};
+#set($voPackage=$package.Entity.replace("entity","vo"))
+import $!{voPackage}.$!{entity}VO;
+#set($wrapperPackage=$package.Entity.replace("entity","wrapper"))
+import $!{wrapperPackage}.$!{entity}Wrapper;
+import $!{package.Service}.$!{table.serviceName};
+#if($!{superControllerClassPackage})
+import $!{superControllerClassPackage};
+#end
+#if(!$!{superEntityClass})
+#end
+import java.util.List;
+
+/**
+ * $!{table.comment} 控制器
+ *
+ * @author $!{author}
+ * @since $!{date}
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("#if($!{package.ModuleName})/$!{package.ModuleName}#end/$!{cfg.entityKey}")
+@Api(value = "$!{table.comment}", tags = "$!{table.comment}接口")
+#if($!{superControllerClass})
+public class $!{table.controllerName} extends $!{superControllerClass} {
+#else
+public class $!{table.controllerName} {
+#end
+
+	private $!{table.serviceName} $!{table.entityPath}Service;
+
+	/**
+	* 详情
+	*/
+	@GetMapping("/detail")
+    @ApiOperationSupport(order = 1)
+	@ApiOperation(value = "详情", notes = "传入$!{table.entityPath}")
+	public R<$!{entity}VO> detail($!{entity} $!{table.entityPath}) {
+		$!{entity} detail = $!{table.entityPath}Service.getOne(Condition.getQueryWrapper($!{table.entityPath}));
+		return R.data($!{entity}Wrapper.build().entityVO(detail));
+	}
+
+	/**
+	* 分页 $!{table.comment}
+	*/
+	@GetMapping("/list")
+    @ApiOperationSupport(order = 2)
+	@ApiOperation(value = "分页", notes = "传入$!{table.entityPath}")
+	public R<IPage<$!{entity}VO>> list($!{entity} $!{table.entityPath}, Query query) {
+		IPage<$!{entity}> pages = $!{table.entityPath}Service.page(Condition.getPage(query), Condition.getQueryWrapper($!{table.entityPath}));
+		return R.data($!{entity}Wrapper.build().pageVO(pages));
+	}
+
+	/**
+	* 自定义分页 $!{table.comment}
+	*/
+	@GetMapping("/page")
+    @ApiOperationSupport(order = 3)
+	@ApiOperation(value = "分页", notes = "传入$!{table.entityPath}")
+	public R<IPage<$!{entity}VO>> page($!{entity}VO $!{table.entityPath}, Query query) {
+		IPage<$!{entity}VO> pages = $!{table.entityPath}Service.select$!{entity}Page(Condition.getPage(query), $!{table.entityPath});
+		return R.data(pages);
+	}
+
+	/**
+	* 新增 $!{table.comment}
+	*/
+	@PostMapping("/save")
+    @ApiOperationSupport(order = 4)
+	@ApiOperation(value = "新增", notes = "传入$!{table.entityPath}")
+	public R save(@Valid @RequestBody $!{entity} $!{table.entityPath}) {
+		return R.status($!{table.entityPath}Service.save($!{table.entityPath}));
+	}
+
+	/**
+	* 修改 $!{table.comment}
+	*/
+	@PostMapping("/update")
+    @ApiOperationSupport(order = 5)
+	@ApiOperation(value = "修改", notes = "传入$!{table.entityPath}")
+	public R update(@Valid @RequestBody $!{entity} $!{table.entityPath}) {
+		return R.status($!{table.entityPath}Service.updateById($!{table.entityPath}));
+	}
+
+	/**
+	* 新增或修改 $!{table.comment}
+	*/
+	@PostMapping("/submit")
+    @ApiOperationSupport(order = 6)
+	@ApiOperation(value = "新增或修改", notes = "传入$!{table.entityPath}")
+	public R submit(@Valid @RequestBody $!{entity} $!{table.entityPath}) {
+		return R.status($!{table.entityPath}Service.saveOrUpdate($!{table.entityPath}));
+	}
+
+	#if($!{superEntityClass})
+
+	/**
+	* 删除 $!{table.comment}
+	*/
+	@PostMapping("/remove")
+    @ApiOperationSupport(order = 7)
+	@ApiOperation(value = "逻辑删除", notes = "传入ids")
+	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+		return R.status($!{table.entityPath}Service.deleteLogic(Func.toIntList(ids)));
+	}
+
+	#else
+
+	/**
+	* 删除 $!{table.comment}
+	*/
+	@PostMapping("/remove")
+    @ApiOperationSupport(order = 7)
+	@ApiOperation(value = "删除", notes = "传入ids")
+	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+		return R.status($!{table.entityPath}Service.removeByIds(Func.toIntList(ids)));
+	}
+
+	#end
+
+}
diff --git a/blade-ops/blade-develop/src/test/resources/templates/wrapper.java.vm b/blade-ops/blade-develop/src/test/resources/templates/wrapper.java.vm
new file mode 100644
index 00000000..64a8b015
--- /dev/null
+++ b/blade-ops/blade-develop/src/test/resources/templates/wrapper.java.vm
@@ -0,0 +1,45 @@
+/**
+ * Copyright (c) 2018-2028, Chill Zhuang 庄骞 (smallchill@163.com).
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#set($wrapperPackage=$package.Entity.replace("entity","wrapper"))
+package $!{wrapperPackage};
+
+import lombok.AllArgsConstructor;
+import org.springblade.core.mp.support.BaseEntityWrapper;
+import org.springblade.core.tool.utils.BeanUtil;
+import $!{package.Entity}.$!{entity};
+#set($voPackage=$package.Entity.replace("entity","vo"))
+import $!{voPackage}.$!{entity}VO;
+
+/**
+ * $!{table.comment}包装类,返回视图层所需的字段
+ *
+ * @author $!{author}
+ * @since $!{date}
+ */
+public class $!{entity}Wrapper extends BaseEntityWrapper<$!{entity}, $!{entity}VO>  {
+
+    public static $!{entity}Wrapper build() {
+        return new $!{entity}Wrapper();
+    }
+
+	@Override
+	public $!{entity}VO entityVO($!{entity} $!{table.entityPath}) {
+		$!{entity}VO $!{table.entityPath}VO = BeanUtil.copy($!{table.entityPath}, $!{entity}VO.class);
+
+		return $!{table.entityPath}VO;
+	}
+
+}
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/controller/NoticeController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/controller/NoticeController.java
index d126e83f..a4c8d645 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/controller/NoticeController.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/controller/NoticeController.java
@@ -58,7 +58,7 @@ public class NoticeController extends BladeController implements CacheNames {
 	@ApiOperation(value = "详情", notes = "传入notice")
 	public R<NoticeVO> detail(Notice notice) {
 		Notice detail = noticeService.getOne(Condition.getQueryWrapper(notice));
-		return R.data(NoticeWrapper.init().entityVO(detail));
+		return R.data(NoticeWrapper.build().entityVO(detail));
 	}
 
 	/**
@@ -73,7 +73,7 @@ public class NoticeController extends BladeController implements CacheNames {
 	@ApiOperation(value = "分页", notes = "传入notice")
 	public R<IPage<NoticeVO>> list(@ApiIgnore @RequestParam Map<String, Object> notice, Query query) {
 		IPage<Notice> pages = noticeService.page(Condition.getPage(query), Condition.getQueryWrapper(notice, Notice.class));
-		return R.data(NoticeWrapper.init().pageVO(pages));
+		return R.data(NoticeWrapper.build().pageVO(pages));
 	}
 
 	/**
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/wrapper/NoticeWrapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/wrapper/NoticeWrapper.java
index a155604e..70fe7f7c 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/wrapper/NoticeWrapper.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/wrapper/NoticeWrapper.java
@@ -36,7 +36,7 @@ public class NoticeWrapper extends BaseEntityWrapper<Notice, NoticeVO> {
 		dictClient = SpringUtil.getBean(IDictClient.class);
 	}
 
-	public static NoticeWrapper init() {
+	public static NoticeWrapper build() {
 		return new NoticeWrapper();
 	}
 
diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/controller/DeptController.java b/blade-service/blade-system/src/main/java/org/springblade/system/controller/DeptController.java
index 6b0f3a74..6df84364 100644
--- a/blade-service/blade-system/src/main/java/org/springblade/system/controller/DeptController.java
+++ b/blade-service/blade-system/src/main/java/org/springblade/system/controller/DeptController.java
@@ -57,7 +57,7 @@ public class DeptController extends BladeController {
 	@ApiOperation(value = "详情", notes = "传入dept")
 	public R<DeptVO> detail(Dept dept) {
 		Dept detail = deptService.getOne(Condition.getQueryWrapper(dept));
-		return R.data(DeptWrapper.init().entityVO(detail));
+		return R.data(DeptWrapper.build().entityVO(detail));
 	}
 
 	/**
@@ -73,7 +73,7 @@ public class DeptController extends BladeController {
 	public R<List<INode>> list(@ApiIgnore @RequestParam Map<String, Object> dept, BladeUser bladeUser) {
 		QueryWrapper<Dept> queryWrapper = Condition.getQueryWrapper(dept, Dept.class);
 		List<Dept> list = deptService.list((!bladeUser.getTenantCode().equals(BladeConstant.ADMIN_TENANT_CODE)) ? queryWrapper.lambda().eq(Dept::getTenantCode, bladeUser.getTenantCode()) : queryWrapper);
-		return R.data(DeptWrapper.init().listNodeVO(list));
+		return R.data(DeptWrapper.build().listNodeVO(list));
 	}
 
 	/**
diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/controller/DictController.java b/blade-service/blade-system/src/main/java/org/springblade/system/controller/DictController.java
index c65bb057..88115d2c 100644
--- a/blade-service/blade-system/src/main/java/org/springblade/system/controller/DictController.java
+++ b/blade-service/blade-system/src/main/java/org/springblade/system/controller/DictController.java
@@ -58,7 +58,7 @@ public class DictController extends BladeController {
 	@ApiOperation(value = "详情", notes = "传入dict")
 	public R<DictVO> detail(Dict dict) {
 		Dict detail = dictService.getOne(Condition.getQueryWrapper(dict));
-		return R.data(DictWrapper.init().entityVO(detail));
+		return R.data(DictWrapper.build().entityVO(detail));
 	}
 
 	/**
@@ -74,7 +74,7 @@ public class DictController extends BladeController {
 	public R<List<INode>> list(@ApiIgnore @RequestParam Map<String, Object> dict) {
 		@SuppressWarnings("unchecked")
 		List<Dict> list = dictService.list(Condition.getQueryWrapper(dict, Dict.class).lambda().orderByAsc(Dict::getSort));
-		return R.data(DictWrapper.init().listNodeVO(list));
+		return R.data(DictWrapper.build().listNodeVO(list));
 	}
 
 	/**
diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/controller/MenuController.java b/blade-service/blade-system/src/main/java/org/springblade/system/controller/MenuController.java
index e135f76f..7bd9b5bf 100644
--- a/blade-service/blade-system/src/main/java/org/springblade/system/controller/MenuController.java
+++ b/blade-service/blade-system/src/main/java/org/springblade/system/controller/MenuController.java
@@ -58,7 +58,7 @@ public class MenuController extends BladeController {
 	@ApiOperation(value = "详情", notes = "传入menu")
 	public R<MenuVO> detail(Menu menu) {
 		Menu detail = menuService.getOne(Condition.getQueryWrapper(menu));
-		return R.data(MenuWrapper.init().entityVO(detail));
+		return R.data(MenuWrapper.build().entityVO(detail));
 	}
 
 	/**
@@ -75,7 +75,7 @@ public class MenuController extends BladeController {
 	public R<List<MenuVO>> list(@ApiIgnore @RequestParam Map<String, Object> menu) {
 		@SuppressWarnings("unchecked")
 		List<Menu> list = menuService.list(Condition.getQueryWrapper(menu, Menu.class).lambda().orderByAsc(Menu::getSort));
-		return R.data(MenuWrapper.init().listNodeVO(list));
+		return R.data(MenuWrapper.build().listNodeVO(list));
 	}
 
 	/**
diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/controller/RoleController.java b/blade-service/blade-system/src/main/java/org/springblade/system/controller/RoleController.java
index 053473db..202d0f7d 100644
--- a/blade-service/blade-system/src/main/java/org/springblade/system/controller/RoleController.java
+++ b/blade-service/blade-system/src/main/java/org/springblade/system/controller/RoleController.java
@@ -57,7 +57,7 @@ public class RoleController extends BladeController {
 	@ApiOperation(value = "详情", notes = "传入role")
 	public R<RoleVO> detail(Role role) {
 		Role detail = roleService.getOne(Condition.getQueryWrapper(role));
-		return R.data(RoleWrapper.init().entityVO(detail));
+		return R.data(RoleWrapper.build().entityVO(detail));
 	}
 
 	/**
@@ -73,7 +73,7 @@ public class RoleController extends BladeController {
 	public R<List<INode>> list(@ApiIgnore @RequestParam Map<String, Object> role, BladeUser bladeUser) {
 		QueryWrapper<Role> queryWrapper = Condition.getQueryWrapper(role, Role.class);
 		List<Role> list = roleService.list((!bladeUser.getTenantCode().equals(BladeConstant.ADMIN_TENANT_CODE)) ? queryWrapper.lambda().eq(Role::getTenantCode, bladeUser.getTenantCode()) : queryWrapper);
-		return R.data(RoleWrapper.init().listNodeVO(list));
+		return R.data(RoleWrapper.build().listNodeVO(list));
 	}
 
 	/**
diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/wrapper/DeptWrapper.java b/blade-service/blade-system/src/main/java/org/springblade/system/wrapper/DeptWrapper.java
index 79203def..a393f43f 100644
--- a/blade-service/blade-system/src/main/java/org/springblade/system/wrapper/DeptWrapper.java
+++ b/blade-service/blade-system/src/main/java/org/springblade/system/wrapper/DeptWrapper.java
@@ -42,7 +42,7 @@ public class DeptWrapper extends BaseEntityWrapper<Dept, DeptVO> {
 		deptService = SpringUtil.getBean(IDeptService.class);
 	}
 
-	public static DeptWrapper init() {
+	public static DeptWrapper build() {
 		return new DeptWrapper();
 	}
 
diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/wrapper/DictWrapper.java b/blade-service/blade-system/src/main/java/org/springblade/system/wrapper/DictWrapper.java
index fb749661..39a20c3b 100644
--- a/blade-service/blade-system/src/main/java/org/springblade/system/wrapper/DictWrapper.java
+++ b/blade-service/blade-system/src/main/java/org/springblade/system/wrapper/DictWrapper.java
@@ -42,7 +42,7 @@ public class DictWrapper extends BaseEntityWrapper<Dict, DictVO> {
 		dictService = SpringUtil.getBean(IDictService.class);
 	}
 
-	public static DictWrapper init() {
+	public static DictWrapper build() {
 		return new DictWrapper();
 	}
 
diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/wrapper/MenuWrapper.java b/blade-service/blade-system/src/main/java/org/springblade/system/wrapper/MenuWrapper.java
index ddfa8f7e..1e4737c6 100644
--- a/blade-service/blade-system/src/main/java/org/springblade/system/wrapper/MenuWrapper.java
+++ b/blade-service/blade-system/src/main/java/org/springblade/system/wrapper/MenuWrapper.java
@@ -46,7 +46,7 @@ public class MenuWrapper extends BaseEntityWrapper<Menu, MenuVO> {
 		dictClient = SpringUtil.getBean(IDictClient.class);
 	}
 
-	public static MenuWrapper init() {
+	public static MenuWrapper build() {
 		return new MenuWrapper();
 	}
 
diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/wrapper/RoleWrapper.java b/blade-service/blade-system/src/main/java/org/springblade/system/wrapper/RoleWrapper.java
index 3ef7f18f..b7bdeb93 100644
--- a/blade-service/blade-system/src/main/java/org/springblade/system/wrapper/RoleWrapper.java
+++ b/blade-service/blade-system/src/main/java/org/springblade/system/wrapper/RoleWrapper.java
@@ -42,7 +42,7 @@ public class RoleWrapper extends BaseEntityWrapper<Role, RoleVO> {
 		roleService = SpringUtil.getBean(IRoleService.class);
 	}
 
-	public static RoleWrapper init() {
+	public static RoleWrapper build() {
 		return new RoleWrapper();
 	}
 
diff --git a/blade-service/blade-user/src/main/java/org/springblade/system/user/controller/UserController.java b/blade-service/blade-user/src/main/java/org/springblade/system/user/controller/UserController.java
index 4a2c0541..c572194c 100644
--- a/blade-service/blade-user/src/main/java/org/springblade/system/user/controller/UserController.java
+++ b/blade-service/blade-user/src/main/java/org/springblade/system/user/controller/UserController.java
@@ -56,7 +56,7 @@ public class UserController {
 	@GetMapping("/detail")
 	public R<UserVO> detail(User user) {
 		User detail = userService.getOne(Condition.getQueryWrapper(user));
-		return R.data(UserWrapper.init().entityVO(detail));
+		return R.data(UserWrapper.build().entityVO(detail));
 	}
 
 	/**
@@ -72,7 +72,7 @@ public class UserController {
 	public R<IPage<UserVO>> list(@ApiIgnore @RequestParam Map<String, Object> user, Query query, BladeUser bladeUser) {
 		QueryWrapper<User> queryWrapper = Condition.getQueryWrapper(user, User.class);
 		IPage<User> pages = userService.page(Condition.getPage(query), (!bladeUser.getTenantCode().equals(BladeConstant.ADMIN_TENANT_CODE)) ? queryWrapper.lambda().eq(User::getTenantCode, bladeUser.getTenantCode()) : queryWrapper);
-		return R.data(UserWrapper.init().pageVO(pages));
+		return R.data(UserWrapper.build().pageVO(pages));
 	}
 
 	/**
diff --git a/blade-service/blade-user/src/main/java/org/springblade/system/user/wrapper/UserWrapper.java b/blade-service/blade-user/src/main/java/org/springblade/system/user/wrapper/UserWrapper.java
index 050b8a60..c1495e83 100644
--- a/blade-service/blade-user/src/main/java/org/springblade/system/user/wrapper/UserWrapper.java
+++ b/blade-service/blade-user/src/main/java/org/springblade/system/user/wrapper/UserWrapper.java
@@ -43,7 +43,7 @@ public class UserWrapper extends BaseEntityWrapper<User, UserVO> {
 		dictClient = SpringUtil.getBean(IDictClient.class);
 	}
 
-	public static UserWrapper init() {
+	public static UserWrapper build() {
 		return new UserWrapper();
 	}