Przeglądaj źródła

:recycle: Refactoring code:Rename menu keepalive to keepAlive

萌萌哒SAKURA酱 6 lat temu
rodzic
commit
d4c1e83b1d

+ 3 - 3
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='菜单权限表';

+ 2 - 2
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();
 	}
 }

+ 2 - 2
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<SysMenu> {
 	@NotNull(message = "菜单类型不能为空")
 	private String type;
 	/**
-	 * 是否缓冲
+	 * 路由缓冲
 	 */
-	private String keepalive;
+	private String keepAlive;
 	/**
 	 * 创建时间
 	 */

+ 1 - 1
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;
 	/**
 	 * 创建时间
 	 */

+ 1 - 1
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);

+ 0 - 1
pigx-visual/pigx-activiti/src/main/resources/bootstrap.yml

@@ -1,4 +1,3 @@
-server.session
 server:
   port: 5005