From d4c1e83b1d0d303beed7dff1427acca62f9f6df4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=90=8C=E8=90=8C=E5=93=92SAKURA=E9=85=B1?= Date: Thu, 29 Nov 2018 21:28:37 +0800 Subject: [PATCH] :recycle: Refactoring code:Rename menu keepalive to keepAlive --- doc/db/pigxx.sql | 6 +++--- .../java/com/pig4cloud/pigx/admin/api/dto/MenuTree.java | 4 ++-- .../java/com/pig4cloud/pigx/admin/api/entity/SysMenu.java | 4 ++-- .../main/java/com/pig4cloud/pigx/admin/api/vo/MenuVO.java | 2 +- .../main/java/com/pig4cloud/pigx/admin/api/vo/TreeUtil.java | 2 +- pigx-visual/pigx-activiti/src/main/resources/bootstrap.yml | 1 - 6 files changed, 9 insertions(+), 10 deletions(-) diff --git a/doc/db/pigxx.sql b/doc/db/pigxx.sql index 45a225cbf..4fc6dda49 100644 --- a/doc/db/pigxx.sql +++ b/doc/db/pigxx.sql @@ -175,11 +175,11 @@ CREATE TABLE `sys_menu` ( `icon` varchar(32) DEFAULT NULL COMMENT '图标', `component` varchar(64) DEFAULT NULL COMMENT 'VUE页面', `sort` int(11) DEFAULT '1' COMMENT '排序值', - `keepalive` char(1) DEFAULT '0' COMMENT '0-开启，1- 关闭', - `type` char(1) DEFAULT NULL COMMENT '菜单类型 （0菜单 1按钮）', + `keep_alive` char(1) DEFAULT '0' COMMENT '路由缓冲(0-开启，1- 关闭)', + `type` char(1) DEFAULT NULL COMMENT '菜单类型 （0-菜单 1-按钮）', `create_time` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', `update_time` timestamp NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', - `del_flag` char(1) DEFAULT '0' COMMENT '0--正常 1--删除', + `del_flag` char(1) DEFAULT '0' COMMENT '逻辑删除标记(0--正常 1--删除)', `tenant_id` int(11) DEFAULT NULL, PRIMARY KEY (`menu_id`) USING BTREE ) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='菜单权限表'; diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/dto/MenuTree.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/dto/MenuTree.java index 9653175fd..87904b866 100644 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/dto/MenuTree.java +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/dto/MenuTree.java @@ -37,7 +37,7 @@ public class MenuTree extends TreeNode { private String component; private String authority; private String redirect; - private String keepalive; + private String keepAlive; private String code; private String type; private String label; @@ -70,6 +70,6 @@ public class MenuTree extends TreeNode { this.type = menuVo.getType(); this.label = menuVo.getName(); this.sort = menuVo.getSort(); - this.keepalive = menuVo.getKeepalive(); + this.keepAlive = menuVo.getKeepAlive(); } } diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysMenu.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysMenu.java index 0d8aa073b..ae9757d4f 100644 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysMenu.java +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysMenu.java @@ -84,9 +84,9 @@ public class SysMenu extends Model { @NotNull(message = "菜单类型不能为空") private String type; /** - * 是否缓冲 + * 路由缓冲 */ - private String keepalive; + private String keepAlive; /** * 创建时间 */ diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/vo/MenuVO.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/vo/MenuVO.java index d233514d2..3c7da89fd 100644 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/vo/MenuVO.java +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/vo/MenuVO.java @@ -76,7 +76,7 @@ public class MenuVO implements Serializable { /** * 是否缓冲 */ - private String keepalive; + private String keepAlive; /** * 创建时间 */ diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/vo/TreeUtil.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/vo/TreeUtil.java index 33021c29d..885a6cfaa 100644 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/vo/TreeUtil.java +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/vo/TreeUtil.java @@ -114,7 +114,7 @@ public class TreeUtil { node.setLabel(menu.getName()); node.setComponent(menu.getComponent()); node.setIcon(menu.getIcon()); - node.setKeepalive(menu.getKeepalive()); + node.setKeepAlive(menu.getKeepAlive()); trees.add(node); } return TreeUtil.bulid(trees, root); diff --git a/pigx-visual/pigx-activiti/src/main/resources/bootstrap.yml b/pigx-visual/pigx-activiti/src/main/resources/bootstrap.yml index 9f3cf45c9..881d420d0 100644 --- a/pigx-visual/pigx-activiti/src/main/resources/bootstrap.yml +++ b/pigx-visual/pigx-activiti/src/main/resources/bootstrap.yml @@ -1,4 +1,3 @@ -server.session server: port: 5005