Merge remote-tracking branch 'origin/lucky_dev' into leng_dev_wx

pigx-common/pigx-common-swagger/src/main/java/com/pig4cloud/pigx/common/swagger/config/SwaggerAutoConfiguration.java

@@ -43,6 +43,8 @@ import java.util.List;
 /**
  * @author lengleng
  * swagger配置
+ * 禁用方法1：使用注解@Profile({"dev","test"}) 表示在开发或测试环境开启，而在生产关闭。（推荐使用）
+ * 禁用方法2：使用注解@ConditionalOnProperty(name = "swagger.enable", havingValue = "true") 然后在测试配置或者开发配置中添加swagger.enable=true即可开启，生产环境不填则默认关闭Swagger.
  */
 @Configuration
 @EnableSwagger2

pigx-visual/pigx-codegen/src/main/resources/template/Controller.java.vm

@@ -52,6 +52,7 @@ public class ${className}Controller {
      */
     @ApiOperation(value = "分页查询", notes = "分页查询")
     @GetMapping("/page" )
+    @PreAuthorize("@pms.hasPermission('${moduleName}_${pathName}_get')" )
     public R get${className}Page(Page page, ${className} ${classname}) {
         return R.ok(${classname}Service.page(page, Wrappers.query(${classname})));
     }
@@ -64,6 +65,7 @@ public class ${className}Controller {
      */
     @ApiOperation(value = "通过id查询", notes = "通过id查询")
     @GetMapping("/{${pk.lowerAttrName}}" )
+    @PreAuthorize("@pms.hasPermission('${moduleName}_${pathName}_get')" )
     public R getById(@PathVariable("${pk.lowerAttrName}" ) ${pk.attrType} ${pk.lowerAttrName}) {
         return R.ok(${classname}Service.getById(${pk.lowerAttrName}));
     }

pigx-visual/pigx-codegen/src/main/resources/template/menu.sql.vm

@@ -14,3 +14,5 @@ insert into `sys_menu` ( `parent_id`, `permission`, `type`, `path`, `icon`,  `de
     SELECT @parentId, '${moduleName}_${pathName}_edit', '1', null, '1',  '0', '2018-05-15 21:35:18', '1', '2018-07-29 13:38:59', '${comments}修改', 1;
 insert into `sys_menu` ( `parent_id`, `permission`, `type`, `path`, `icon`, `del_flag`, `create_time`, `sort`, `update_time`, `name`, `tenant_id`)
     SELECT @parentId, '${moduleName}_${pathName}_del', '1', null, '1',  '0', '2018-05-15 21:35:18', '2', '2018-07-29 13:38:59', '${comments}删除', 1;
+insert into `sys_menu` ( `parent_id`, `permission`, `type`, `path`, `icon`, `del_flag`, `create_time`, `sort`, `update_time`, `name`, `tenant_id`)
+    SELECT @parentId, '${moduleName}_${pathName}_get', '1', null, '1',  '0', '2018-05-15 21:35:18', '2', '2018-07-29 13:38:59', '${comments}获取', 1;