Merge branch 'master' of http://git.picaiba.com/kszny/ym-pass

 Conflicts:

	ym-admin/src/main/java/com/cnbm/admin/config/SecurityConfig.java

	ym-gateway/src/main/resources/application.yml

	ym-generator/src/main/java/com/cnbm/generator/build/CodeGenerator.java

ym-generator/src/main/resources/templates/controller.java.vm

@@ -68,26 +68,26 @@ public class ${table.controllerName} {
     @ApiOperation("保存")
     @LogOperation("保存")
     @PreAuthorize("@ex.hasAuthority('${package.ModuleName}:${table.entityPath}:save')")
-    public Result save(@RequestBody ${entity}DTO dto){
+    public Result<Long> save(@RequestBody ${entity}DTO dto){
         //效验数据
         ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
 
         ${table.entityPath}Service.save(dto);
 
-        return new Result();
+        return new Result<Long>().ok(dto.getId());
     }
 
     @PutMapping
     @ApiOperation("修改")
     @LogOperation("修改")
     @PreAuthorize("@ex.hasAuthority('${package.ModuleName}:${table.entityPath}:update')")
-    public Result update(@RequestBody ${entity}DTO dto){
+    public Result<Long> update(@RequestBody ${entity}DTO dto){
         //效验数据
         ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
 
         ${table.entityPath}Service.update(dto);
 
-        return new Result();
+        return new Result<Long>().ok(dto.getId());
     }
 
     @DeleteMapping

ym-generator/src/main/resources/templates/mapper.xml.vm

@@ -1,39 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="${package.Mapper}.${table.mapperName}">
-
-#if(${enableCache})
-    <!-- 开启二级缓存 -->
-    <cache type="${cacheClassName}"/>
-
-#end
-#if(${baseResultMap})
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="${package.Entity}.${entity}">
-#foreach($field in ${table.fields})
-#if(${field.keyFlag})##生成主键排在第一位
-        <id column="${field.name}" property="${field.propertyName}" />
-#end
-#end
-#foreach($field in ${table.commonFields})##生成公共字段
-        <result column="${field.name}" property="${field.propertyName}" />
-#end
-#foreach($field in ${table.fields})
-#if(!${field.keyFlag})##生成普通字段
-        <result column="${field.name}" property="${field.propertyName}" />
-#end
-#end
+    <resultMap type="${package.Entity}.${table.entityName}" id="${table.entityName}Map">
+        #foreach($field in ${table.fields})
+            <id column="${field.name}" property="${field.propertyName}" />
+        #end
     </resultMap>
 
-#end
-#if(${baseColumnList})
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-#foreach($field in ${table.commonFields})
-        ${field.columnName},
-#end
-        ${table.fieldNames}
-    </sql>
-
-#end
 </mapper>