:zap: 增加saber代码生成

src/main/java/org/springblade/modules/develop/support/BladeGenerator.java

@@ -171,10 +171,10 @@ public class BladeGenerator {
 	private InjectionConfig getInjectionConfig() {
 		String servicePackage = serviceName.split("-").length > 1 ? serviceName.split("-")[1] : serviceName;
 		// 自定义配置
+		Map<String, Object> map = new HashMap<>(16);
 		InjectionConfig cfg = new InjectionConfig() {
 			@Override
 			public void initMap() {
-				Map<String, Object> map = new HashMap<>(16);
 				map.put("serviceName", serviceName);
 				map.put("servicePackage", servicePackage);
 				this.setMap(map);
@@ -184,6 +184,7 @@ public class BladeGenerator {
 		focList.add(new FileOutConfig("/templates/entityVO.java.vm") {
 			@Override
 			public String outputFile(TableInfo tableInfo) {
+				map.put("entityKey", StringUtil.humpToLine(tableInfo.getEntityName()));
 				return getOutputDir() + "/" + packageName.replace(".", "/") + "/" + "vo" + "/" + tableInfo.getEntityName() + "VO" + StringPool.DOT_JAVA;
 			}
 		});

src/main/java/org/springblade/modules/system/controller/UserController.java

@@ -92,6 +92,15 @@ public class UserController {
 		return R.status(userService.saveOrUpdate(user));
 	}
 
+	/**
+	 * 修改
+	 */
+	@PostMapping("/update")
+	@ApiOperation(value = "修改", notes = "传入User", position = 3)
+	public R update(@Valid @RequestBody User user) {
+		return R.status(userService.updateById(user));
+	}
+
 	/**
 	 * 删除
 	 */

src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java

@@ -29,6 +29,7 @@ import org.springblade.modules.system.mapper.UserMapper;
 import org.springblade.modules.system.service.IUserService;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -67,6 +68,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, User> implement
 	public boolean resetPassword(String userIds) {
 		User user = new User();
 		user.setPassword(DigestUtil.encrypt(CommonConstant.DEFAULT_PASSWORD));
+		user.setUpdateTime(LocalDateTime.now());
 		return this.update(user, Wrappers.<User>update().lambda().in(User::getId, Func.toIntList(userIds)));
 	}
 

src/main/resources/templates/controller.java.vm

@@ -52,7 +52,7 @@ import $!{superControllerClassPackage};
  */
 @RestController
 @AllArgsConstructor
-@RequestMapping("#if($!{package.ModuleName})/$!{package.ModuleName}#end/$!{table.entityPath}")
+@RequestMapping("#if($!{package.ModuleName})/$!{package.ModuleName}#end/$!{cfg.entityKey}")
 @Api(value = "$!{table.comment}", tags = "$!{table.comment}接口")
 #if($!{superControllerClass})
 public class $!{table.controllerName} extends $!{superControllerClass} {

src/main/resources/templates/saber/api.js.vm

@@ -2,7 +2,7 @@ import request from '@/router/axios';
 
 export const getList = (current, size, params) => {
   return request({
-    url: '/api/$!{cfg.serviceName}/$!{table.entityPath}/list',
+    url: '/api/$!{cfg.serviceName}/$!{cfg.entityKey}/list',
     method: 'get',
     params: {
       ...params,
@@ -14,7 +14,7 @@ export const getList = (current, size, params) => {
 
 export const getDetail = (id) => {
   return request({
-    url: '/api/$!{cfg.serviceName}/$!{table.entityPath}/detail',
+    url: '/api/$!{cfg.serviceName}/$!{cfg.entityKey}/detail',
     method: 'get',
     params: {
       id
@@ -24,7 +24,7 @@ export const getDetail = (id) => {
 
 export const remove = (ids) => {
   return request({
-    url: '/api/$!{cfg.serviceName}/$!{table.entityPath}/remove',
+    url: '/api/$!{cfg.serviceName}/$!{cfg.entityKey}/remove',
     method: 'post',
     params: {
       ids,
@@ -34,7 +34,7 @@ export const remove = (ids) => {
 
 export const add = (row) => {
   return request({
-    url: '/api/$!{cfg.serviceName}/$!{table.entityPath}/submit',
+    url: '/api/$!{cfg.serviceName}/$!{cfg.entityKey}/submit',
     method: 'post',
     data: row
   })
@@ -42,7 +42,7 @@ export const add = (row) => {
 
 export const update = (row) => {
   return request({
-    url: '/api/$!{cfg.serviceName}/$!{table.entityPath}/submit',
+    url: '/api/$!{cfg.serviceName}/$!{cfg.entityKey}/submit',
     method: 'post',
     data: row
   })

src/main/resources/templates/saber/crud.vue.vm

@@ -27,7 +27,7 @@
 </template>
 
 <script>
-  import {getList, getDetail, add, update, remove} from "@/api/$!{servicePackage}/$!{table.entityPath}";
+  import {getList, getDetail, add, update, remove} from "@/api/$!{cfg.servicePackage}/$!{cfg.entityKey}";
   import {mapGetters} from "vuex";
 
   export default {

src/main/resources/templates/sword/service.js.vm

@@ -4,22 +4,22 @@ import func from '../utils/Func';
 import request from '../utils/request';
 
 export async function list(params) {
-  return request(`/api/$!{cfg.serviceName}/$!{table.entityPath}/list?$!{params}`);
+  return request(`/api/$!{cfg.serviceName}/$!{cfg.entityKey}/list?$!{params}`);
 }
 
 export async function submit(params) {
-  return request('/api/$!{cfg.serviceName}/$!{table.entityPath}/submit', {
+  return request('/api/$!{cfg.serviceName}/$!{cfg.entityKey}/submit', {
     method: 'POST',
     body: params,
   });
 }
 
 export async function detail(params) {
-  return request(`/api/$!{cfg.serviceName}/$!{table.entityPath}/detail?$!{params}`);
+  return request(`/api/$!{cfg.serviceName}/$!{cfg.entityKey}/detail?$!{params}`);
 }
 
 export async function remove(params) {
-  return request('/api/$!{cfg.serviceName}/$!{table.entityPath}/remove', {
+  return request('/api/$!{cfg.serviceName}/$!{cfg.entityKey}/remove', {
     method: 'POST',
     body: func.toFormData(params),
   });

src/test/resources/templates/controller.java.vm

@@ -52,7 +52,7 @@ import $!{superControllerClassPackage};
  */
 @RestController
 @AllArgsConstructor
-@RequestMapping("#if($!{package.ModuleName})/$!{package.ModuleName}#end/$!{table.entityPath}")
+@RequestMapping("#if($!{package.ModuleName})/$!{package.ModuleName}#end/$!{cfg.entityKey}")
 @Api(value = "$!{table.comment}", tags = "$!{table.comment}接口")
 #if($!{superControllerClass})
 public class $!{table.controllerName} extends $!{superControllerClass} {

src/test/resources/templates/saber/api.js.vm

@@ -2,7 +2,7 @@ import request from '@/router/axios';
 
 export const getList = (current, size, params) => {
   return request({
-    url: '/api/$!{cfg.serviceName}/$!{table.entityPath}/list',
+    url: '/api/$!{cfg.serviceName}/$!{cfg.entityKey}/list',
     method: 'get',
     params: {
       ...params,
@@ -14,7 +14,7 @@ export const getList = (current, size, params) => {
 
 export const getDetail = (id) => {
   return request({
-    url: '/api/$!{cfg.serviceName}/$!{table.entityPath}/detail',
+    url: '/api/$!{cfg.serviceName}/$!{cfg.entityKey}/detail',
     method: 'get',
     params: {
       id
@@ -24,7 +24,7 @@ export const getDetail = (id) => {
 
 export const remove = (ids) => {
   return request({
-    url: '/api/$!{cfg.serviceName}/$!{table.entityPath}/remove',
+    url: '/api/$!{cfg.serviceName}/$!{cfg.entityKey}/remove',
     method: 'post',
     params: {
       ids,
@@ -34,7 +34,7 @@ export const remove = (ids) => {
 
 export const add = (row) => {
   return request({
-    url: '/api/$!{cfg.serviceName}/$!{table.entityPath}/submit',
+    url: '/api/$!{cfg.serviceName}/$!{cfg.entityKey}/submit',
     method: 'post',
     data: row
   })
@@ -42,7 +42,7 @@ export const add = (row) => {
 
 export const update = (row) => {
   return request({
-    url: '/api/$!{cfg.serviceName}/$!{table.entityPath}/submit',
+    url: '/api/$!{cfg.serviceName}/$!{cfg.entityKey}/submit',
     method: 'post',
     data: row
   })

src/test/resources/templates/saber/crud.vue.vm

@@ -27,7 +27,7 @@
 </template>
 
 <script>
-  import {getList, getDetail, add, update, remove} from "@/api/$!{servicePackage}/$!{table.entityPath}";
+  import {getList, getDetail, add, update, remove} from "@/api/$!{cfg.servicePackage}/$!{cfg.entityKey}";
   import {mapGetters} from "vuex";
 
   export default {

src/test/resources/templates/sword/service.js.vm

@@ -4,22 +4,22 @@ import func from '../utils/Func';
 import request from '../utils/request';
 
 export async function list(params) {
-  return request(`/api/$!{cfg.serviceName}/$!{table.entityPath}/list?$!{params}`);
+  return request(`/api/$!{cfg.serviceName}/$!{cfg.entityKey}/list?$!{params}`);
 }
 
 export async function submit(params) {
-  return request('/api/$!{cfg.serviceName}/$!{table.entityPath}/submit', {
+  return request('/api/$!{cfg.serviceName}/$!{cfg.entityKey}/submit', {
     method: 'POST',
     body: params,
   });
 }
 
 export async function detail(params) {
-  return request(`/api/$!{cfg.serviceName}/$!{table.entityPath}/detail?$!{params}`);
+  return request(`/api/$!{cfg.serviceName}/$!{cfg.entityKey}/detail?$!{params}`);
 }
 
 export async function remove(params) {
-  return request('/api/$!{cfg.serviceName}/$!{table.entityPath}/remove', {
+  return request('/api/$!{cfg.serviceName}/$!{cfg.entityKey}/remove', {
     method: 'POST',
     body: func.toFormData(params),
   });