From d77695b82541eab738f6dd329e6d77eba0ac1729 Mon Sep 17 00:00:00 2001
From: b2baccline <23131013+b2baccline@users.noreply.github.com>
Date: Thu, 20 Feb 2020 17:29:15 +0800
Subject: [PATCH] =?UTF-8?q?:lock:=20=E6=9D=83=E9=99=90=E7=B3=BB=E7=BB=9F?=
 =?UTF-8?q?=EF=BC=8C=E6=B7=BB=E5=8A=A0read=E6=9D=83=E9=99=90=EF=BC=8C?=
 =?UTF-8?q?=E7=94=A8=E4=BA=8E=E6=8E=A7=E5=88=B6=E6=9F=A5=E8=AF=A2=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/BaseConfigController.java      |  2 +
 .../controller/AdminAccessLogController.java  |  5 ++-
 .../AdminOperationLogController.java          |  9 +++-
 .../controller/ApiAccessLogController.java    |  3 ++
 .../controller/SysPermissionController.java   | 21 ++++-----
 .../sys/controller/SysRoleController.java     |  2 +
 .../sys/controller/SysUserController.java     |  2 +
 .../resources/template/Controller.java.vm     |  2 +
 .../main/resources/template/permission.sql.vm | 11 +++--
 doc/2ballcat.sql                              | 44 ++++++++++++-------
 10 files changed, 70 insertions(+), 31 deletions(-)

diff --git a/ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/config/controller/BaseConfigController.java b/ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/config/controller/BaseConfigController.java
index f4803ffe..8304145e 100644
--- a/ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/config/controller/BaseConfigController.java
+++ b/ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/config/controller/BaseConfigController.java
@@ -36,6 +36,7 @@ public class BaseConfigController {
      */
     @ApiOperation(value = "分页查询", notes = "分页查询")
     @GetMapping("/page")
+    @PreAuthorize("@per.hasPermission('config_baseconfig_read')")
     public R<IPage<BaseConfig>> getSysConfigPage(
             Page<BaseConfig> page, BaseConfig baseConfig) {
         return R.ok(baseConfigService.page(page, Wrappers.query(baseConfig)));
@@ -49,6 +50,7 @@ public class BaseConfigController {
      */
     @ApiOperation(value = "通过id查询", notes = "通过id查询")
     @GetMapping("/{id}")
+    @PreAuthorize("@per.hasPermission('config_baseconfig_read')")
     public R<BaseConfig> getById(@PathVariable("id") Integer id) {
         return R.ok(baseConfigService.getById(id));
     }
diff --git a/ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/log/controller/AdminAccessLogController.java b/ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/log/controller/AdminAccessLogController.java
index 7b41e25c..e0aca773 100644
--- a/ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/log/controller/AdminAccessLogController.java
+++ b/ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/log/controller/AdminAccessLogController.java
@@ -9,6 +9,7 @@ import com.hccake.ballcat.common.core.result.R;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -36,6 +37,7 @@ public class AdminAccessLogController {
      */
     @ApiOperation(value = "分页查询", notes = "分页查询")
     @GetMapping("/page" )
+    @PreAuthorize("@per.hasPermission('log_adminaccesslog_read')")
     public R<IPage<AdminAccessLog>> getAccessLogApiPage(
             Page<AdminAccessLog> page, AdminAccessLog adminAccessLog) {
         return R.ok(adminAccessLogService.page(page, Wrappers.query(adminAccessLog)));
@@ -48,7 +50,8 @@ public class AdminAccessLogController {
      * @return R
      */
     @ApiOperation(value = "通过id查询后台访问日志", notes = "通过id查询后台访问日志")
-    @GetMapping("/{id}" )
+    @GetMapping("/{id}")
+    @PreAuthorize("@per.hasPermission('log_adminaccesslog_read')")
     public R<AdminAccessLog> getById(@PathVariable("id" ) Long id) {
         return R.ok(adminAccessLogService.getById(id));
     }
diff --git a/ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/log/controller/AdminOperationLogController.java b/ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/log/controller/AdminOperationLogController.java
index 1c668917..f1855729 100644
--- a/ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/log/controller/AdminOperationLogController.java
+++ b/ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/log/controller/AdminOperationLogController.java
@@ -8,9 +8,12 @@ import com.hccake.ballcat.admin.modules.log.service.OperationLogAdminService;
 import com.hccake.ballcat.common.core.result.R;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import lombok.AllArgsConstructor;
 import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 
 /**
@@ -35,6 +38,7 @@ public class AdminOperationLogController {
      */
     @ApiOperation(value = "分页查询", notes = "分页查询")
     @GetMapping("/page")
+    @PreAuthorize("@per.hasPermission('log_adminoperationlog_read')")
     public R<IPage<AdminOperationLog>> getOperationLogAdminPage(
             Page<AdminOperationLog> page, AdminOperationLog adminOperationLog) {
         return R.ok(operationLogAdminService.page(page, Wrappers.query(adminOperationLog)));
@@ -49,6 +53,7 @@ public class AdminOperationLogController {
      */
     @ApiOperation(value = "通过id查询", notes = "通过id查询")
     @GetMapping("/{id}")
+    @PreAuthorize("@per.hasPermission('log_adminoperationlog_read')")
     public R<AdminOperationLog> getById(@PathVariable("id") Long id) {
         return R.ok(operationLogAdminService.getById(id));
     }
diff --git a/ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/log/controller/ApiAccessLogController.java b/ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/log/controller/ApiAccessLogController.java
index 6fbc039e..0c20a186 100644
--- a/ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/log/controller/ApiAccessLogController.java
+++ b/ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/log/controller/ApiAccessLogController.java
@@ -9,6 +9,7 @@ import com.hccake.ballcat.common.core.result.R;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -37,6 +38,7 @@ public class ApiAccessLogController {
      */
     @ApiOperation(value = "分页查询", notes = "分页查询")
     @GetMapping("/page")
+    @PreAuthorize("@per.hasPermission('log_apiaccesslog_read')")
     public R<IPage<ApiAccessLog>> getAccessLogApiPage(
             Page<ApiAccessLog> page, ApiAccessLog apiAccessLog) {
         return R.ok(apiAccessLogService.page(page, Wrappers.query(apiAccessLog)));
@@ -51,6 +53,7 @@ public class ApiAccessLogController {
      */
     @ApiOperation(value = "通过id查询", notes = "通过id查询")
     @GetMapping("/{id}")
+    @PreAuthorize("@per.hasPermission('log_apiaccesslog_read')")
     public R<ApiAccessLog> getById(@PathVariable("id") Long id) {
         return R.ok(apiAccessLogService.getById(id));
     }
diff --git a/ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/sys/controller/SysPermissionController.java b/ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/sys/controller/SysPermissionController.java
index f35e9547..7d0d571d 100644
--- a/ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/sys/controller/SysPermissionController.java
+++ b/ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/sys/controller/SysPermissionController.java
@@ -27,8 +27,8 @@ import java.util.stream.Collectors;
  * @date 2019/09/17
  */
 @RestController
-@RequestMapping("/syspermission")
-@Api(value = "syspermission", tags = "权限管理模块")
+@RequestMapping("/syspermission" )
+@Api(value = "syspermission", tags = "权限管理模块" )
 @RequiredArgsConstructor
 public class SysPermissionController {
     private final SysPermissionService sysPermissionService;
@@ -38,7 +38,7 @@ public class SysPermissionController {
      *
      * @return 当前用户的路由
      */
-    @ApiOperation(value = "动态路由", notes = "动态路由")
+    @ApiOperation(value = "动态路由", notes = "动态路由" )
     @GetMapping("/router")
     public R<List<Router>> getUserPermission() {
 
@@ -69,7 +69,8 @@ public class SysPermissionController {
      *
      * @return
      */
-    @GetMapping(value = "/list")
+    @GetMapping(value = "/list" )
+    @PreAuthorize("@per.hasPermission('sys_syspermission_read')")
     public R<List<SysPermission>> getTree() {
         List<SysPermission> list = sysPermissionService
                 .list(Wrappers.<SysPermission>lambdaQuery()
@@ -84,29 +85,29 @@ public class SysPermissionController {
      * @param id 权限ID
      * @return 权限详细信息
      */
-    @GetMapping("/{id}")
+    @GetMapping("/{id}" )
+    @PreAuthorize("@per.hasPermission('sys_syspermission_read')")
     public R getById(@PathVariable Integer id) {
         return R.ok(sysPermissionService.getById(id));
     }
 
 
-    @ApiOperation(value = "新增权限", notes = "新增权限")
+    @ApiOperation(value = "新增权限", notes = "新增权限" )
     @OperationLogging("新增权限" )
     @PostMapping
-    @PreAuthorize("@per.hasPermission('sys_syspermission_add')" )
+    @PreAuthorize("@per.hasPermission('sys_syspermission_add')")
     public R save(@Valid @RequestBody SysPermission sysMenu) {
         return R.ok(sysPermissionService.save(sysMenu));
     }
 
 
-
     /**
      * 更新权限
      *
      * @param sysPermission
      * @return R
      */
-    @ApiOperation(value = "修改权限", notes = "修改权限")
+    @ApiOperation(value = "修改权限", notes = "修改权限" )
     @OperationLogging("修改权限" )
     @PutMapping
     @PreAuthorize("@per.hasPermission('sys_syspermission_edit')" )
@@ -115,7 +116,7 @@ public class SysPermissionController {
     }
 
 
-    @ApiOperation(value = "通过id删除权限", notes = "通过id删除权限")
+    @ApiOperation(value = "通过id删除权限", notes = "通过id删除权限" )
     @OperationLogging("通过id删除权限" )
     @DeleteMapping("/{id}" )
     @PreAuthorize("@per.hasPermission('sys_syspermission_del')" )
diff --git a/ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/sys/controller/SysRoleController.java b/ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/sys/controller/SysRoleController.java
index ce0dab5e..f4297911 100644
--- a/ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/sys/controller/SysRoleController.java
+++ b/ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/sys/controller/SysRoleController.java
@@ -39,6 +39,7 @@ public class SysRoleController {
      * @return 分页对象
      */
     @GetMapping("/page")
+    @PreAuthorize("@per.hasPermission('sys_sysrole_read')")
     public R getRolePage(Page page) {
         return R.ok(sysRoleService.page(page, Wrappers.emptyWrapper()));
     }
@@ -50,6 +51,7 @@ public class SysRoleController {
      * @return 角色信息
      */
     @GetMapping("/{id}")
+    @PreAuthorize("@per.hasPermission('sys_sysrole_read')")
     public R getById(@PathVariable Integer id) {
         return R.ok(sysRoleService.getById(id));
     }
diff --git a/ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/sys/controller/SysUserController.java b/ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/sys/controller/SysUserController.java
index 95d029bb..0d0487b5 100644
--- a/ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/sys/controller/SysUserController.java
+++ b/ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/sys/controller/SysUserController.java
@@ -51,6 +51,7 @@ public class SysUserController {
      * @return 用户集合
      */
     @GetMapping("/page")
+    @PreAuthorize("@per.hasPermission('sys_sysuser_read')")
     public R<IPage<SysUser>> getUserPage(
             Page<SysUser> page, SysUserQO qo) {
         return R.ok(sysUserService.getUserPage(page, qo));
@@ -110,6 +111,7 @@ public class SysUserController {
      * @param userId userId
      */
     @GetMapping("/scope/{userId}")
+    @PreAuthorize("@per.hasPermission('sys_sysuser_grant')")
     public R<SysUserScope> getUserRoleIds(@PathVariable Integer userId) {
 
         List<SysRole> roleList = sysUserRoleService.getRoles(userId);
diff --git a/ballcat-codegen/src/main/resources/template/Controller.java.vm b/ballcat-codegen/src/main/resources/template/Controller.java.vm
index d1fed7ea..2978b948 100644
--- a/ballcat-codegen/src/main/resources/template/Controller.java.vm
+++ b/ballcat-codegen/src/main/resources/template/Controller.java.vm
@@ -37,6 +37,7 @@ public class ${className}Controller {
      */
     @ApiOperation(value = "分页查询", notes = "分页查询")
     @GetMapping("/page" )
+    @PreAuthorize("@per.hasPermission('${moduleName}_${pathName}_read')" )
     public R<IPage<${className}>> get${className}Page(
             Page<${className}> page, ${className} ${classname}) {
         return R.ok(${classname}Service.page(page, Wrappers.query(${classname})));
@@ -50,6 +51,7 @@ public class ${className}Controller {
      */
     @ApiOperation(value = "通过id查询", notes = "通过id查询")
     @GetMapping("/{${pk.lowerAttrName}}" )
+    @PreAuthorize("@per.hasPermission('${moduleName}_${pathName}_read')" )
     public R<${className}> getById(@PathVariable("${pk.lowerAttrName}" ) ${pk.attrType} ${pk.lowerAttrName}) {
         return R.ok(${classname}Service.getById(${pk.lowerAttrName}));
     }
diff --git a/ballcat-codegen/src/main/resources/template/permission.sql.vm b/ballcat-codegen/src/main/resources/template/permission.sql.vm
index 7acdc535..9e9cd979 100644
--- a/ballcat-codegen/src/main/resources/template/permission.sql.vm
+++ b/ballcat-codegen/src/main/resources/template/permission.sql.vm
@@ -17,15 +17,20 @@ VALUES
 -- 菜单对应按钮SQL
 INSERT INTO `sys_permission` ( `id`, `parent_id`,`title`, `code`, `sort`, `type`, `del_flag`, `create_time`, `update_time` )
 VALUES
-( @menuId + 1, @menuId, '${comments}新增', '${moduleName}_${pathName}_add',  0, 2, 0, '2019-10-13 22:00:24', NULL );
+( @menuId + 1, @menuId, '${comments}查询', '${moduleName}_${pathName}_read',  0, 2, 0, '2019-10-13 22:00:24', NULL );
+
 
 INSERT INTO `sys_permission` ( `id`, `parent_id`,`title`, `code`, `sort`, `type`, `del_flag`, `create_time`, `update_time` )
 VALUES
-( @menuId + 2, @menuId, '${comments}修改', '${moduleName}_${pathName}_edit', 1, 2, 0, '2019-10-13 22:00:24', NULL );
+( @menuId + 2, @menuId, '${comments}新增', '${moduleName}_${pathName}_add',  1, 2, 0, '2019-10-13 22:00:24', NULL );
 
 INSERT INTO `sys_permission` ( `id`, `parent_id`,`title`, `code`, `sort`, `type`, `del_flag`, `create_time`, `update_time` )
 VALUES
-( @menuId + 3, @menuId, '${comments}删除', '${moduleName}_${pathName}_del', 2, 2, 0, '2019-10-13 22:00:24', NULL );
+( @menuId + 3, @menuId, '${comments}修改', '${moduleName}_${pathName}_edit', 2, 2, 0, '2019-10-13 22:00:24', NULL );
+
+INSERT INTO `sys_permission` ( `id`, `parent_id`,`title`, `code`, `sort`, `type`, `del_flag`, `create_time`, `update_time` )
+VALUES
+( @menuId + 4, @menuId, '${comments}删除', '${moduleName}_${pathName}_del', 3, 2, 0, '2019-10-13 22:00:24', NULL );
 
 ## -----------------基础生成部分end-------------
 
diff --git a/doc/2ballcat.sql b/doc/2ballcat.sql
index fa605a39..1faca69d 100644
--- a/doc/2ballcat.sql
+++ b/doc/2ballcat.sql
@@ -158,28 +158,35 @@ INSERT INTO `sys_permission` VALUES (10034, '账户绑定', NULL, '/account/sett
 INSERT INTO `sys_permission` VALUES (10035, '新消息通知', NULL, '/account/settings/notification', 'NotificationSettings', 'account/settings/Notification', NULL, NULL, 10030, NULL, 1, 0, 0, 1, 0, NULL, NULL);
 INSERT INTO `sys_permission` VALUES (100000, '系统管理', NULL, '', 'sys', 'layouts/RouteView', '/sys/sysuser', NULL, 0, 'setting', 9, 0, 0, 0, 0, NULL, NULL);
 INSERT INTO `sys_permission` VALUES (100100, '系统用户', NULL, '/sys/sysuser', 'sysuser', 'sys/sysuser/SysUserPage', NULL, NULL, 100000, NULL, 1, 0, 0, 1, 0, NULL, NULL);
-INSERT INTO `sys_permission` VALUES (100101, '系统用户新增', 'sys_sysuser_add', NULL, NULL, NULL, NULL, NULL, 100100, NULL, 0, 0, 0, 2, 0, '2019-10-13 22:00:24', NULL);
-INSERT INTO `sys_permission` VALUES (100102, '系统用户修改', 'sys_sysuser_edit', NULL, NULL, NULL, NULL, NULL, 100100, NULL, 1, 0, 0, 2, 0, '2019-10-13 22:00:24', NULL);
-INSERT INTO `sys_permission` VALUES (100103, '系统用户删除', 'sys_sysuser_del', NULL, NULL, NULL, NULL, NULL, 100100, NULL, 2, 0, 0, 2, 0, '2019-10-13 22:00:24', NULL);
-INSERT INTO `sys_permission` VALUES (100104, '系统用户授权', 'sys_sysuser_grant', NULL, NULL, NULL, NULL, NULL, 100100, NULL, 3, 0, 0, 2, 0, '2019-10-13 22:00:24', NULL);
-INSERT INTO `sys_permission` VALUES (100105, '系统用户改密', 'sys_sysuser_pass', NULL, NULL, NULL, NULL, NULL, 100100, NULL, 4, 0, 0, 2, 0, '2019-10-13 22:00:24', NULL);
+INSERT INTO `sys_permission` VALUES (100101, '系统用户查询', 'sys_sysuser_read', NULL, NULL, NULL, NULL, NULL, 100100, NULL, 0, 0, 0, 2, 0, '2019-10-13 22:00:24', NULL);
+INSERT INTO `sys_permission` VALUES (100102, '系统用户新增', 'sys_sysuser_add', NULL, NULL, NULL, NULL, NULL, 100100, NULL, 1, 0, 0, 2, 0, '2019-10-13 22:00:24', NULL);
+INSERT INTO `sys_permission` VALUES (100103, '系统用户修改', 'sys_sysuser_edit', NULL, NULL, NULL, NULL, NULL, 100100, NULL, 2, 0, 0, 2, 0, '2019-10-13 22:00:24', NULL);
+INSERT INTO `sys_permission` VALUES (100104, '系统用户删除', 'sys_sysuser_del', NULL, NULL, NULL, NULL, NULL, 100100, NULL, 3, 0, 0, 2, 0, '2019-10-13 22:00:24', NULL);
+INSERT INTO `sys_permission` VALUES (100105, '系统用户授权', 'sys_sysuser_grant', NULL, NULL, NULL, NULL, NULL, 100100, NULL, 3, 0, 0, 2, 0, '2019-10-13 22:00:24', NULL);
+INSERT INTO `sys_permission` VALUES (100106, '系统用户改密', 'sys_sysuser_pass', NULL, NULL, NULL, NULL, NULL, 100100, NULL, 4, 0, 0, 2, 0, '2019-10-13 22:00:24', NULL);
 INSERT INTO `sys_permission` VALUES (100200, '角色管理', NULL, '/sys/role', 'role', 'sys/role/RolePage', NULL, NULL, 100000, NULL, 1, 0, 0, 1, 0, NULL, NULL);
-INSERT INTO `sys_permission` VALUES (100201, '系统角色新增', 'sys_sysrole_add', NULL, NULL, NULL, NULL, NULL, 100200, NULL, 0, 0, 0, 2, 0, '2019-10-13 22:00:24', NULL);
-INSERT INTO `sys_permission` VALUES (100202, '系统角色修改', 'sys_sysrole_edit', NULL, NULL, NULL, NULL, NULL, 100200, NULL, 1, 0, 0, 2, 0, '2019-10-13 22:00:24', NULL);
-INSERT INTO `sys_permission` VALUES (100203, '系统角色删除', 'sys_sysrole_del', NULL, NULL, NULL, NULL, NULL, 100200, NULL, 2, 0, 0, 2, 0, '2019-10-13 22:00:24', NULL);
-INSERT INTO `sys_permission` VALUES (100204, '系统角色授权', 'sys_sysrole_grant', NULL, NULL, NULL, NULL, NULL, 100200, NULL, 3, 0, 0, 2, 0, '2019-10-13 22:00:24', NULL);
+INSERT INTO `sys_permission` VALUES (100201, '系统角色查询', 'sys_sysrole_read', NULL, NULL, NULL, NULL, NULL, 100200, NULL, 0, 0, 0, 2, 0, '2019-10-13 22:00:24', NULL);
+INSERT INTO `sys_permission` VALUES (100202, '系统角色新增', 'sys_sysrole_add', NULL, NULL, NULL, NULL, NULL, 100200, NULL, 1, 0, 0, 2, 0, '2019-10-13 22:00:24', NULL);
+INSERT INTO `sys_permission` VALUES (100203, '系统角色修改', 'sys_sysrole_edit', NULL, NULL, NULL, NULL, NULL, 100200, NULL, 2, 0, 0, 2, 0, '2019-10-13 22:00:24', NULL);
+INSERT INTO `sys_permission` VALUES (100204, '系统角色删除', 'sys_sysrole_del', NULL, NULL, NULL, NULL, NULL, 100200, NULL, 3, 0, 0, 2, 0, '2019-10-13 22:00:24', NULL);
+INSERT INTO `sys_permission` VALUES (100205, '系统角色授权', 'sys_sysrole_grant', NULL, NULL, NULL, NULL, NULL, 100200, NULL, 3, 0, 0, 2, 0, '2019-10-13 22:00:24', NULL);
 INSERT INTO `sys_permission` VALUES (100300, '权限管理', NULL, '/sys/permission', 'permission', 'sys/permission/PermissionPage', NULL, NULL, 100000, NULL, 1, 0, 0, 1, 0, NULL, '2019-10-13 22:00:24');
-INSERT INTO `sys_permission` VALUES (100301, '权限新增', 'sys_syspermission_add', NULL, NULL, NULL, NULL, NULL, 100300, NULL, 0, 0, 0, 2, 0, '2019-10-13 22:00:24', NULL);
-INSERT INTO `sys_permission` VALUES (100302, '权限修改', 'sys_syspermission_edit', NULL, NULL, NULL, NULL, NULL, 100300, NULL, 1, 0, 0, 2, 0, '2019-10-13 22:00:24', NULL);
-INSERT INTO `sys_permission` VALUES (100303, '权限删除', 'sys_syspermission_del', NULL, NULL, NULL, NULL, NULL, 100300, NULL, 2, 0, 0, 2, 0, '2019-10-13 22:00:24', NULL);
+INSERT INTO `sys_permission` VALUES (100301, '权限查询', 'sys_syspermission_read', NULL, NULL, NULL, NULL, NULL, 100300, NULL, 0, 0, 0, 2, 0, '2019-10-13 22:00:24', NULL);
+INSERT INTO `sys_permission` VALUES (100302, '权限新增', 'sys_syspermission_add', NULL, NULL, NULL, NULL, NULL, 100300, NULL, 1, 0, 0, 2, 0, '2019-10-13 22:00:24', NULL);
+INSERT INTO `sys_permission` VALUES (100303, '权限修改', 'sys_syspermission_edit', NULL, NULL, NULL, NULL, NULL, 100300, NULL, 2, 0, 0, 2, 0, '2019-10-13 22:00:24', NULL);
+INSERT INTO `sys_permission` VALUES (100304, '权限删除', 'sys_syspermission_del', NULL, NULL, NULL, NULL, NULL, 100300, NULL, 3, 0, 0, 2, 0, '2019-10-13 22:00:24', NULL);
 INSERT INTO `sys_permission` VALUES (100400, '配置信息', NULL, '/config/baseconfig', 'baseconfig', 'config/baseconfig/BaseConfigPage', NULL, NULL, 100000, NULL, 4, 0, 0, 1, 0, NULL, '2019-10-15 14:13:49');
-INSERT INTO `sys_permission` VALUES (100401, '配置新增', 'config_baseconfig_add', NULL, NULL, NULL, NULL, NULL, 100400, NULL, 0, 0, 0, 2, 0, '2019-10-13 22:00:24', '2019-10-15 14:14:03');
-INSERT INTO `sys_permission` VALUES (100402, '配置修改', 'config_baseconfig_edit', NULL, NULL, NULL, NULL, NULL, 100400, NULL, 1, 0, 0, 2, 0, '2019-10-13 22:00:24', '2019-10-15 14:14:10');
-INSERT INTO `sys_permission` VALUES (100403, '配置删除', 'config_baseconfig_del', NULL, NULL, NULL, NULL, NULL, 100400, NULL, 2, 0, 0, 2, 0, '2019-10-13 22:00:24', '2019-10-15 14:14:29');
+INSERT INTO `sys_permission` VALUES (100401, '配置查询', 'config_baseconfig_read', NULL, NULL, NULL, NULL, NULL, 100400, NULL, 0, 0, 0, 2, 0, '2019-10-13 22:00:24', '2019-10-15 14:14:03');
+INSERT INTO `sys_permission` VALUES (100402, '配置新增', 'config_baseconfig_add', NULL, NULL, NULL, NULL, NULL, 100400, NULL, 1, 0, 0, 2, 0, '2019-10-13 22:00:24', '2019-10-15 14:14:03');
+INSERT INTO `sys_permission` VALUES (100403, '配置修改', 'config_baseconfig_edit', NULL, NULL, NULL, NULL, NULL, 100400, NULL, 2, 0, 0, 2, 0, '2019-10-13 22:00:24', '2019-10-15 14:14:10');
+INSERT INTO `sys_permission` VALUES (100404, '配置删除', 'config_baseconfig_del', NULL, NULL, NULL, NULL, NULL, 100400, NULL, 3, 0, 0, 2, 0, '2019-10-13 22:00:24', '2019-10-15 14:14:29');
 INSERT INTO `sys_permission` VALUES (110000, '日志管理', NULL, '', 'log', 'layouts/RouteView', '/log/adminoperationlog', NULL, 0, 'file-search', 9, 0, 0, 0, 0, NULL, '2019-10-16 18:30:07');
 INSERT INTO `sys_permission` VALUES (110100, '操作日志', NULL, '/log/adminoperationlog', 'adminOperationLog', 'log/adminoperationlog/AdminOperationLogPage', NULL, NULL, 110000, NULL, 1, 0, 0, 1, 0, NULL, '2019-10-13 22:00:24');
+INSERT INTO `sys_permission` VALUES (110101, '操作日志查询', 'log_adminoperationlog_read', NULL, NULL, NULL, NULL, NULL, 110100, NULL, 0, 0, 0, 2, 0, '2019-10-13 22:00:24', '2019-10-15 14:14:03');
 INSERT INTO `sys_permission` VALUES (110200, '访问日志(接口)', NULL, '/log/apiaccesslog', 'apiAccessLog', 'log/apiaccesslog/ApiAccessLogPage', NULL, NULL, 110000, NULL, 1, 0, 0, 1, 0, NULL, '2019-10-13 22:00:24');
+INSERT INTO `sys_permission` VALUES (110201, '访问日志(接口)查询', 'log_apiaccesslog_read', NULL, NULL, NULL, NULL, NULL, 110200, NULL, 0, 0, 0, 2, 0, '2019-10-13 22:00:24', '2019-10-15 14:14:03');
 INSERT INTO `sys_permission` VALUES (110300, '访问日志(后台)', NULL, '/log/adminaccesslog', 'adminAccessLog', 'log/adminaccesslog/AdminAccessLogPage', NULL, NULL, 110000, NULL, 1, 0, 0, 1, 0, NULL, '2019-10-13 22:00:24');
+INSERT INTO `sys_permission` VALUES (110301, '访问日志(后台)查询', 'log_adminaccesslog_read', NULL, NULL, NULL, NULL, NULL, 110300, NULL, 0, 0, 0, 2, 0, '2019-10-13 22:00:24', '2019-10-15 14:14:03');
 INSERT INTO `sys_permission` VALUES (990000, '开发平台', '', '', 'develop', 'layouts/RouteView', '', NULL, 0, 'desktop', 99, 0, 0, 0, 0, NULL, '2019-11-22 16:49:56');
 INSERT INTO `sys_permission` VALUES (990100, '接口文档', '', 'http://ballcat-admin:8080/swagger-ui.html', 'swagger', '', '', '_blank', 990000, 'file', 1, 0, 0, 1, 0, NULL, '2019-11-22 16:48:42');
 INSERT INTO `sys_permission` VALUES (990200, '文档增强', '', 'http://ballcat-admin:8080/doc.html', 'doc', '', '', '_blank', 990000, 'file-text', 2, 0, 0, 1, 0, NULL, '2019-11-22 16:48:50');
@@ -236,23 +243,30 @@ INSERT INTO `sys_role_permission` VALUES (1, 100102);
 INSERT INTO `sys_role_permission` VALUES (1, 100103);
 INSERT INTO `sys_role_permission` VALUES (1, 100104);
 INSERT INTO `sys_role_permission` VALUES (1, 100105);
+INSERT INTO `sys_role_permission` VALUES (1, 100106);
 INSERT INTO `sys_role_permission` VALUES (1, 100200);
 INSERT INTO `sys_role_permission` VALUES (1, 100201);
 INSERT INTO `sys_role_permission` VALUES (1, 100202);
 INSERT INTO `sys_role_permission` VALUES (1, 100203);
 INSERT INTO `sys_role_permission` VALUES (1, 100204);
+INSERT INTO `sys_role_permission` VALUES (1, 100205);
 INSERT INTO `sys_role_permission` VALUES (1, 100300);
 INSERT INTO `sys_role_permission` VALUES (1, 100301);
 INSERT INTO `sys_role_permission` VALUES (1, 100302);
 INSERT INTO `sys_role_permission` VALUES (1, 100303);
+INSERT INTO `sys_role_permission` VALUES (1, 100304);
 INSERT INTO `sys_role_permission` VALUES (1, 100400);
 INSERT INTO `sys_role_permission` VALUES (1, 100401);
 INSERT INTO `sys_role_permission` VALUES (1, 100402);
 INSERT INTO `sys_role_permission` VALUES (1, 100403);
+INSERT INTO `sys_role_permission` VALUES (1, 100404);
 INSERT INTO `sys_role_permission` VALUES (1, 110000);
 INSERT INTO `sys_role_permission` VALUES (1, 110100);
+INSERT INTO `sys_role_permission` VALUES (1, 110101);
 INSERT INTO `sys_role_permission` VALUES (1, 110200);
+INSERT INTO `sys_role_permission` VALUES (1, 110201);
 INSERT INTO `sys_role_permission` VALUES (1, 110300);
+INSERT INTO `sys_role_permission` VALUES (1, 110301);
 INSERT INTO `sys_role_permission` VALUES (1, 990000);
 INSERT INTO `sys_role_permission` VALUES (1, 990100);
 INSERT INTO `sys_role_permission` VALUES (1, 990200);