🎉 2.0.0.RC4

blade-auth/pom.xml

@@ -8,7 +8,7 @@
     <parent>
         <artifactId>BladeX</artifactId>
         <groupId>org.springblade</groupId>
-        <version>2.0.0.RC3</version>
+        <version>2.0.0.RC4</version>
     </parent>
 
     <artifactId>blade-auth</artifactId>

blade-common/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>BladeX</artifactId>
         <groupId>org.springblade</groupId>
-        <version>2.0.0.RC3</version>
+        <version>2.0.0.RC4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

blade-gateway/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>BladeX</artifactId>
         <groupId>org.springblade</groupId>
-        <version>2.0.0.RC3</version>
+        <version>2.0.0.RC4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

blade-ops/blade-admin/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>blade-ops</artifactId>
         <groupId>org.springblade</groupId>
-        <version>2.0.0.RC3</version>
+        <version>2.0.0.RC4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

blade-ops/blade-develop/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.springblade</groupId>
         <artifactId>blade-ops</artifactId>
-        <version>2.0.0.RC3</version>
+        <version>2.0.0.RC4</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

blade-ops/blade-develop/src/main/java/org/springblade/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;
 			}
 		});

blade-ops/blade-develop/src/main/resources/templates/controller.java.vm

@@ -53,7 +53,7 @@ import java.util.List;
  */
 @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} {

blade-ops/blade-develop/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
   })

blade-ops/blade-develop/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 {

blade-ops/blade-develop/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),
   });

blade-ops/blade-develop/src/test/resources/templates/controller.java.vm

@@ -53,7 +53,7 @@ import java.util.List;
  */
 @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} {

blade-ops/blade-develop/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
   })

blade-ops/blade-develop/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 {

blade-ops/blade-develop/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),
   });

blade-ops/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>BladeX</artifactId>
         <groupId>org.springblade</groupId>
-        <version>2.0.0.RC3</version>
+        <version>2.0.0.RC4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

blade-service-api/blade-desk-api/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>blade-service-api</artifactId>
         <groupId>org.springblade</groupId>
-        <version>2.0.0.RC3</version>
+        <version>2.0.0.RC4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

blade-service-api/blade-dict-api/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>blade-service-api</artifactId>
         <groupId>org.springblade</groupId>
-        <version>2.0.0.RC3</version>
+        <version>2.0.0.RC4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

blade-service-api/blade-system-api/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>blade-service-api</artifactId>
         <groupId>org.springblade</groupId>
-        <version>2.0.0.RC3</version>
+        <version>2.0.0.RC4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

blade-service-api/blade-user-api/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>blade-service-api</artifactId>
         <groupId>org.springblade</groupId>
-        <version>2.0.0.RC3</version>
+        <version>2.0.0.RC4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

blade-service-api/pom.xml

@@ -5,13 +5,13 @@
     <parent>
         <artifactId>BladeX</artifactId>
         <groupId>org.springblade</groupId>
-        <version>2.0.0.RC3</version>
+        <version>2.0.0.RC4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>blade-service-api</artifactId>
     <name>${project.artifactId}</name>
-    <version>2.0.0.RC3</version>
+    <version>2.0.0.RC4</version>
     <packaging>pom</packaging>
     <description>BladeX 微服务API集合</description>
 

blade-service/blade-desk/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.springblade</groupId>
         <artifactId>blade-service</artifactId>
-        <version>2.0.0.RC3</version>
+        <version>2.0.0.RC4</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

blade-service/blade-log/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>blade-service</artifactId>
         <groupId>org.springblade</groupId>
-        <version>2.0.0.RC3</version>
+        <version>2.0.0.RC4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

blade-service/blade-system/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>blade-service</artifactId>
         <groupId>org.springblade</groupId>
-        <version>2.0.0.RC3</version>
+        <version>2.0.0.RC4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

blade-service/blade-user/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>blade-service</artifactId>
         <groupId>org.springblade</groupId>
-        <version>2.0.0.RC3</version>
+        <version>2.0.0.RC4</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

blade-service/blade-user/src/main/java/org/springblade/system/user/controller/UserController.java

@@ -91,6 +91,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));
+	}
+
 	/**
 	 * 删除
 	 */

blade-service/blade-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java

@@ -23,12 +23,13 @@ import org.springblade.common.constant.CommonConstant;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.core.tool.utils.DigestUtil;
 import org.springblade.core.tool.utils.Func;
-import org.springblade.system.user.mapper.UserMapper;
 import org.springblade.system.user.entity.User;
 import org.springblade.system.user.entity.UserInfo;
+import org.springblade.system.user.mapper.UserMapper;
 import org.springblade.system.user.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)));
 	}
 

blade-service/pom.xml

@@ -6,14 +6,14 @@
 
     <artifactId>blade-service</artifactId>
     <name>${project.artifactId}</name>
-    <version>2.0.0.RC3</version>
+    <version>2.0.0.RC4</version>
     <packaging>pom</packaging>
     <description>BladeX 微服务集合</description>
 
     <parent>
         <groupId>org.springblade</groupId>
         <artifactId>BladeX</artifactId>
-        <version>2.0.0.RC3</version>
+        <version>2.0.0.RC4</version>
     </parent>
 
     <modules>

pom.xml

@@ -5,12 +5,12 @@
 
     <groupId>org.springblade</groupId>
     <artifactId>BladeX</artifactId>
-    <version>2.0.0.RC3</version>
+    <version>2.0.0.RC4</version>
     <packaging>pom</packaging>
 
     <properties>
-        <bladex.tool.version>2.0.0.RC3</bladex.tool.version>
-        <bladex.project.version>2.0.0.RC3</bladex.project.version>
+        <bladex.tool.version>2.0.0.RC4</bladex.tool.version>
+        <bladex.project.version>2.0.0.RC4</bladex.project.version>
 
         <java.version>1.8</java.version>
         <swagger.version>2.9.2</swagger.version>

script/docker/.env

@@ -1,2 +1,2 @@
 REGISTER=192.168.186.129/blade
-TAG=2.0.0.RC3
+TAG=2.0.0.RC4