userIdsList = Arrays.stream(userIds.split(",")).map(Long::valueOf).collect(Collectors.toList());
diff --git a/zyplayer-doc-manage/src/main/resources/sql/zyplayer_doc_manage.1.0.2.sql b/zyplayer-doc-manage/src/main/resources/sql/zyplayer_doc_manage.1.0.2.sql
index bea8eff4..a6409c42 100644
--- a/zyplayer-doc-manage/src/main/resources/sql/zyplayer_doc_manage.1.0.2.sql
+++ b/zyplayer-doc-manage/src/main/resources/sql/zyplayer_doc_manage.1.0.2.sql
@@ -19,6 +19,297 @@ ALTER TABLE `wiki_page` ADD COLUMN `seq_no` int NOT NULL DEFAULT 0 COMMENT '顺
UPDATE wiki_page SET seq_no=id WHERE del_flag=0;
ALTER TABLE `wiki_page_content` ADD COLUMN `preview` varchar(1024) NULL COMMENT '预览内容';
+ALTER TABLE `wiki_page_file` ADD COLUMN `download_num` int NOT NULL DEFAULT 0 COMMENT '下载次数';
--- 全新的库：
+
+
+
+
+
+-- ------------------------全新的库：------------------------
+
+/*
+ Navicat Premium Data Transfer
+
+ Source Server : 127.0.0.1
+ Source Server Type : MySQL
+ Source Server Version : 50724
+ Source Host : 127.0.0.1:3306
+ Source Schema : zyplayer_doc_manage
+
+ Target Server Type : MySQL
+ Target Server Version : 50724
+ File Encoding : 65001
+
+ Date: 18/06/2019 20:29:06
+*/
+
+SET NAMES utf8mb4;
+SET FOREIGN_KEY_CHECKS = 0;
+
+-- ----------------------------
+-- Table structure for auth_info
+-- ----------------------------
+DROP TABLE IF EXISTS `auth_info`;
+CREATE TABLE `auth_info` (
+ `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键自增ID',
+ `auth_name` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '权限名',
+ `auth_desc` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '权限说明',
+ `can_edit` tinyint(4) NULL DEFAULT 1 COMMENT '是否可编辑 0=否 1=是',
+ `create_uid` bigint(20) NULL DEFAULT NULL COMMENT '创建人用户ID',
+ `creation_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
+ PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 12 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '权限信息表' ROW_FORMAT = Compact;
+
+-- ----------------------------
+-- Records of auth_info
+-- ----------------------------
+INSERT INTO `auth_info` VALUES (1, 'DOC_ALL', '文档查看权', 0, 1, '2018-12-01 11:40:42');
+INSERT INTO `auth_info` VALUES (2, 'AUTH_MANAGE', '权限管理权', 0, 1, '2018-12-01 11:40:42');
+INSERT INTO `auth_info` VALUES (3, 'AUTH_ASSIGN', '权限分配权', 0, 1, '2018-12-01 11:40:42');
+INSERT INTO `auth_info` VALUES (4, 'USER_MANAGE', '用户管理权', 0, 1, '2018-12-01 11:40:42');
+INSERT INTO `auth_info` VALUES (5, 'WIKI_EDIT_PAGE_', '编辑wiki文档', 0, 1, '2019-06-04 13:01:20');
+INSERT INTO `auth_info` VALUES (6, 'WIKI_VIEW_PAGE_', '查看wiki文档', 0, 1, '2019-06-04 13:01:20');
+INSERT INTO `auth_info` VALUES (7, 'WIKI_COMMENT_PAGE_', '评论wiki文档', 0, 1, '2019-06-04 13:01:20');
+INSERT INTO `auth_info` VALUES (8, 'WIKI_DELETE_PAGE_', '删除wiki文档', 0, 1, '2019-06-04 13:01:20');
+INSERT INTO `auth_info` VALUES (9, 'WIKI_PAGE_FILE_UPLOAD_', '上传wiki文档附件', 0, 1, '2019-06-04 13:01:20');
+INSERT INTO `auth_info` VALUES (10, 'WIKI_PAGE_FILE_DELETE_', '删除wiki文档附件', 0, 1, '2019-06-04 13:01:20');
+INSERT INTO `auth_info` VALUES (11, 'WIKI_PAGE_AUTH_MANAGE_', 'wiki权限管理', 0, 1, '2019-06-04 13:01:20');
+
+-- ----------------------------
+-- Table structure for user_auth
+-- ----------------------------
+DROP TABLE IF EXISTS `user_auth`;
+CREATE TABLE `user_auth` (
+ `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键自增ID',
+ `user_id` bigint(20) NULL DEFAULT NULL COMMENT '用户ID',
+ `auth_id` bigint(20) NULL DEFAULT NULL COMMENT '权限ID',
+ `create_uid` bigint(20) NULL DEFAULT NULL COMMENT '创建用户ID',
+ `update_uid` bigint(20) NULL DEFAULT NULL COMMENT '更新用户ID',
+ `del_flag` tinyint(4) NULL DEFAULT 0 COMMENT '是否删除 0=未删除 1=已删除',
+ `creation_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
+ `update_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间',
+ `auth_custom_suffix` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '自定义权限结尾',
+ PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 31 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '用户权限表' ROW_FORMAT = Compact;
+
+-- ----------------------------
+-- Records of user_auth
+-- ----------------------------
+INSERT INTO `user_auth` VALUES (9, 2, 1, 1, NULL, 0, '2018-12-15 22:19:59', NULL, NULL);
+INSERT INTO `user_auth` VALUES (10, 2, 2, 1, NULL, 0, '2018-12-15 22:19:59', NULL, NULL);
+INSERT INTO `user_auth` VALUES (11, 2, 3, 1, NULL, 0, '2018-12-15 22:19:59', NULL, NULL);
+INSERT INTO `user_auth` VALUES (12, 2, 4, 1, NULL, 0, '2018-12-15 22:19:59', NULL, NULL);
+INSERT INTO `user_auth` VALUES (13, 3, 1, 1, NULL, 0, '2018-12-15 22:19:59', NULL, NULL);
+INSERT INTO `user_auth` VALUES (14, 3, 2, 1, NULL, 0, '2018-12-15 22:19:59', NULL, NULL);
+INSERT INTO `user_auth` VALUES (15, 3, 3, 1, NULL, 0, '2018-12-15 22:19:59', NULL, NULL);
+INSERT INTO `user_auth` VALUES (16, 3, 4, 1, NULL, 0, '2018-12-15 22:19:59', NULL, NULL);
+INSERT INTO `user_auth` VALUES (24, 1, 1, 1, NULL, 0, '2018-12-16 21:41:01', NULL, NULL);
+INSERT INTO `user_auth` VALUES (25, 1, 2, 1, NULL, 0, '2018-12-16 21:41:01', NULL, NULL);
+INSERT INTO `user_auth` VALUES (26, 1, 3, 1, NULL, 0, '2018-12-16 21:41:01', NULL, NULL);
+INSERT INTO `user_auth` VALUES (27, 1, 4, 1, NULL, 0, '2018-12-16 21:41:01', NULL, NULL);
+INSERT INTO `user_auth` VALUES (28, 1, 5, 1, NULL, 0, '2019-06-12 12:19:47', NULL, '7');
+INSERT INTO `user_auth` VALUES (29, 1, 7, 1, NULL, 0, '2019-06-12 12:19:47', NULL, '7');
+INSERT INTO `user_auth` VALUES (30, 1, 9, 1, NULL, 0, '2019-06-12 12:19:47', NULL, '7');
+
+-- ----------------------------
+-- Table structure for user_info
+-- ----------------------------
+DROP TABLE IF EXISTS `user_info`;
+CREATE TABLE `user_info` (
+ `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键自增ID',
+ `user_no` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '用户编号，用于登录等',
+ `password` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '密码',
+ `user_name` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '用户名',
+ `email` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '邮箱',
+ `avatar` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '头像',
+ `del_flag` tinyint(4) NULL DEFAULT 0 COMMENT '是否删除 0=未删除 1=已删除',
+ `creation_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
+ `create_uid` bigint(20) NULL DEFAULT NULL COMMENT '创建人用户ID',
+ `update_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间',
+ PRIMARY KEY (`id`) USING BTREE,
+ UNIQUE INDEX `idx_userNo`(`user_no`) USING BTREE COMMENT '登录用户名'
+) ENGINE = InnoDB AUTO_INCREMENT = 3 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '用户信息表' ROW_FORMAT = Compact;
+
+-- ----------------------------
+-- Records of user_info
+-- ----------------------------
+INSERT INTO `user_info` VALUES (1, 'zyplayer', 'e10adc3949ba59abbe56e057f20f883e', '暮光：城中城', '806783409@qq.com', NULL, 0, '2018-12-01 11:37:39', NULL, '2018-12-15 20:32:08');
+INSERT INTO `user_info` VALUES (2, '1', 'e10adc3949ba59abbe56e057f20f883e', '1111', NULL, NULL, 0, '2018-12-15 20:16:10', 1, '2018-12-15 20:19:50');
+
+-- ----------------------------
+-- Table structure for wiki_page
+-- ----------------------------
+DROP TABLE IF EXISTS `wiki_page`;
+CREATE TABLE `wiki_page` (
+ `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键自增ID',
+ `space_id` bigint(20) NULL DEFAULT NULL COMMENT '空间ID',
+ `name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '名字',
+ `parent_id` bigint(20) NOT NULL DEFAULT 0 COMMENT '父ID',
+ `node_type` tinyint(4) NULL DEFAULT 0 COMMENT '节点类型 0=有子节点 1=终节点',
+ `zan_num` int(11) NOT NULL DEFAULT 0 COMMENT '赞的数量',
+ `edit_type` tinyint(4) NOT NULL DEFAULT 0 COMMENT '编辑类型 0=可编辑 1=不允许编辑',
+ `create_user_id` bigint(20) NULL DEFAULT NULL COMMENT '创建人ID',
+ `create_user_name` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建人名字',
+ `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
+ `update_user_id` bigint(20) NULL DEFAULT NULL COMMENT '修改人ID',
+ `update_user_name` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '修改人名字',
+ `update_time` datetime(0) NULL DEFAULT NULL COMMENT '修改时间',
+ `del_flag` tinyint(4) NOT NULL DEFAULT 0 COMMENT '0=有效 1=删除',
+ `view_num` int(11) NOT NULL DEFAULT 0 COMMENT '阅读数',
+ `seq_no` int(11) NOT NULL DEFAULT 0 COMMENT '顺序',
+ PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 15 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Records of wiki_page
+-- ----------------------------
+INSERT INTO `wiki_page` VALUES (1, 1, '关于zyplayer-doc工具', 0, 0, 0, 0, 1, '暮光：城中城', '2019-03-09 14:01:41', 1, '暮光：城中城', '2019-06-14 16:51:44', 0, 25, 1);
+INSERT INTO `wiki_page` VALUES (2, 1, '开发规划', 0, 0, 0, 0, 1, '暮光：城中城', '2019-03-09 14:14:02', 1, '暮光：城中城', '2019-06-14 13:30:22', 0, 30, 4);
+INSERT INTO `wiki_page` VALUES (3, 1, '升级日志', 0, 0, 0, 0, 1, '暮光：城中城', '2019-03-09 14:16:20', 1, '暮光：城中城', '2019-06-14 16:49:30', 0, 21, 5);
+INSERT INTO `wiki_page` VALUES (4, 1, '贡献人员列表', 0, 0, 0, 0, 1, '暮光：城中城', '2019-03-09 15:16:15', 1, '暮光：城中城', '2019-06-14 13:20:43', 0, 13, 7);
+INSERT INTO `wiki_page` VALUES (5, 1, 'zyplayer-doc-swagger', 0, 0, 1, 0, 1, '暮光：城中城', '2019-03-09 15:33:14', NULL, NULL, NULL, 0, 20, 9);
+INSERT INTO `wiki_page` VALUES (6, 1, '如何使用', 5, 0, 0, 0, 1, '暮光：城中城', '2019-03-09 15:33:33', 1, '暮光：城中城', '2019-03-09 15:33:46', 0, 3, 14);
+INSERT INTO `wiki_page` VALUES (7, 2, '所有格式测试', 0, 0, 0, 0, 1, '暮光：城中城', '2019-03-12 12:21:26', NULL, NULL, NULL, 0, 13, 13);
+
+-- ----------------------------
+-- Table structure for wiki_page_comment
+-- ----------------------------
+DROP TABLE IF EXISTS `wiki_page_comment`;
+CREATE TABLE `wiki_page_comment` (
+ `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键自增ID',
+ `page_id` bigint(20) NULL DEFAULT NULL COMMENT '页面ID',
+ `parent_id` bigint(20) NULL DEFAULT NULL COMMENT '父评论ID',
+ `content` varchar(512) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '评论内容',
+ `zan_num` int(11) NOT NULL DEFAULT 0 COMMENT '赞的数量',
+ `create_user_id` bigint(20) NULL DEFAULT NULL COMMENT '创建人ID',
+ `create_user_name` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建人名字',
+ `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
+ `del_flag` tinyint(4) NULL DEFAULT 0 COMMENT '0=有效 1=删除',
+ PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 7 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Records of wiki_page_comment
+-- ----------------------------
+
+-- ----------------------------
+-- Table structure for wiki_page_content
+-- ----------------------------
+DROP TABLE IF EXISTS `wiki_page_content`;
+CREATE TABLE `wiki_page_content` (
+ `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键自增ID',
+ `page_id` bigint(20) NULL DEFAULT NULL COMMENT '页面ID',
+ `content` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '内容',
+ `create_user_id` bigint(20) NULL DEFAULT NULL COMMENT '创建人ID',
+ `create_user_name` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建人名字',
+ `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
+ `update_user_id` bigint(20) NULL DEFAULT NULL COMMENT '修改人ID',
+ `update_user_name` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '修改人名字',
+ `update_time` datetime(0) NULL DEFAULT NULL COMMENT '修改时间',
+ `preview` varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '0' COMMENT '预览内容',
+ PRIMARY KEY (`id`) USING BTREE,
+ UNIQUE INDEX `uk_page_id`(`page_id`) USING BTREE COMMENT '页面ID'
+) ENGINE = InnoDB AUTO_INCREMENT = 15 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Records of wiki_page_content
+-- ----------------------------
+INSERT INTO `wiki_page_content` VALUES (1, 1, '一入开源深似海
源码地址：https://gitee.com/zyplayer/zyplayer-doc体验地址：http://doc.zyplayer.com/zyplayer-doc-manage/static/manage/home.html 账号：zyplayer 密码：123456
更多实用功能请提交评论或加群交流！谢谢！
QQ群：466363173
tips：想要编辑本文请修改表：wiki_page的edit_type字段值为0才行哦~
有什么问题可以来评论本文章哦！当然，如果你是部署在你们自己本地的我肯定看不到此文章的评论
可以到本工具官网下评论此文章，我会随时去查看的！
唯一官网地址：http://doc.zyplayer.com
欢迎提交各种变态无理的要求~
', 1, '暮光：城中城', '2019-03-09 14:01:41', 1, '暮光：城中城', '2019-06-14 16:51:44', '一入开源深似海源码地址：https://gitee.com/zyplayer/zyplayer-doc体验地址：http://doc.zyplayer.com/zyplayer-doc-manage/static/manage/home.html 账号：zyplayer 密码：123456更多实用功能请提交评论或加群交流！谢谢！QQ群：466363173tips：想要编辑本文请修改表：w...');
+INSERT INTO `wiki_page_content` VALUES (2, 2, 'zyplayer-doc-manage：
1、首页做大的调整优化，希望使用element重构一下
2、人员导入方案，权限优化，人员管理细化
zyplayer-doc-wiki：
1、支持页面权限控制，包括查看、编辑、删除、评论的权限
2、支持把一个空间里的文档一键同步到git的wiki上，统一管理文档
3、支持微信文章拉取保存
4、支持历史记录查看
5、支持提供多种编辑器选择，更大的选择空间
6、支持全局搜索、文章内搜索等，当前只支持标题搜索，尴尬
7、支持开放一个空间里的文档无需登录即可访问
8、url动态变动，这样就可以复制指定文章的地址了
9、参考https://www.kancloud.cn，取其精华
欢迎加入开发！
如果您觉得哪里不好用也可以拉取源码下来改了后提交PR
源码地址：https://gitee.com/zyplayer/zyplayer-doc
更多实用功能请提交评论或加群交流！谢谢！
QQ群：466363173
', 1, '暮光：城中城', '2019-03-09 14:14:02', 1, '暮光：城中城', '2019-06-14 13:30:22', 'zyplayer-doc-manage：1、首页做大的调整优化，希望使用element重构一下2、人员导入方案，权限优化，人员管理细化 zyplayer-doc-wiki：1、支持页面权限控制，包括查看、编辑、删除、评论的权限2、支持把一个空间里的文档一键同步到git的wiki上，统一管理文档3、支持微信文章拉取保存4、支持历史记录查看5、支持提供多种编辑器选择，更大的选择空间6、支持全...');
+INSERT INTO `wiki_page_content` VALUES (3, 3, 'V1.0.1 2019-03-09
1、增加zyplayer-doc-wiki模块
- 支持空间隔离
- 支持附件上传
- 拖动可以改变wiki顺序
- 基本的文档创建、编辑、评论、删除、搜索等功能
2、dubbo文档支持使用元数据生成参数和返回值，dubbo2.7.0新特性
3、框架进行了大的拆分，表修改较多
4、增加升级通知
5、细节优化
V1.0.0 2019-02-15
第一个版本发布
1、zyplayer-doc-swagger，swagger接口文档展示方案，在之前的项目中有许多改进，坚持文档生成和展示分离，有较多需要服务端支持的功能，不对各项目做过多的入侵即可使用，可动态对文档进行开放访问
2、zyplayer-doc-dubbo，支持对dubbo服务的自动扫描，直观展示所有的服务，文档的展示、文档编辑和在线接口调试，不需要对已有的服务做任何改动，支持zookeeper、nacos注册中心的服务扫描
3、zyplayer-doc-db，数据库文档工具，具有数据库表、字段文档的查看/修改，文档导出等功能，支持mysql和sqlserver数据库
4、zyplayer-doc-manage，管理以上几个服务，spring boot项目，spring security做权限管理，可直接运行
', 1, '暮光：城中城', '2019-03-09 14:16:20', 1, '暮光：城中城', '2019-06-14 16:49:30', 'V1.0.1 2019-03-091、增加zyplayer-doc-wiki模块支持空间隔离支持附件上传拖动可以改变wiki顺序基本的文档创建、编辑、评论、删除、搜索等功能2、dubbo文档支持使用元数据生成参数和返回值，dubbo2.7.0新特性3、框架进行了大的拆分，表修改较多4、增加升级通知5、细节优化V1.0.0 2019-02-15第一个版本发布1、zyplayer-doc-swagge...');
+INSERT INTO `wiki_page_content` VALUES (4, 4, '开发人员列表：
暮光：城中城
', 1, '暮光：城中城', '2019-03-09 15:16:15', 1, '暮光：城中城', '2019-06-14 13:20:43', '开发人员列表：暮光：城中城');
+INSERT INTO `wiki_page_content` VALUES (5, 5, 'zyplayer-doc-swagger 使用文档目录
', 1, '暮光：城中城', '2019-03-09 15:33:14', NULL, NULL, NULL, NULL);
+INSERT INTO `wiki_page_content` VALUES (6, 6, '最不喜欢写文档了。。。
', 1, '暮光：城中城', '2019-03-09 15:33:33', 1, '暮光：城中城', '2019-03-09 15:33:46', NULL);
+INSERT INTO `wiki_page_content` VALUES (7, 7, 'H2
加粗
字体大小
宋体宋体宋体宋体宋体
斜体斜体斜体
下划线下划线下划线
删除线删除线删除线
字体颜色
背景颜色
链接：百度一下
- 有序列表
- xxx
- xxx
文字居中
文字靠右
xxxxx
表情：![\"[坏笑]\"](\"http://img.t.sinajs.cn/t4/appstyle/expression/ext/normal/50/pcmoren_huaixiao_org.png\")
表格：
| ID | 名字 | 邮箱 | 说明 | 时间 |
|---|
| xx | xx | xx | xx | xx |
| | | | | |
代码：
public static void main(String[] args) {
System.out.println(\"hello world\");
}
', 1, '暮光：城中城', '2019-03-12 12:21:26', NULL, NULL, NULL, NULL);
+
+-- ----------------------------
+-- Table structure for wiki_page_file
+-- ----------------------------
+DROP TABLE IF EXISTS `wiki_page_file`;
+CREATE TABLE `wiki_page_file` (
+ `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键自增ID',
+ `page_id` bigint(20) NULL DEFAULT NULL COMMENT '页面ID',
+ `file_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '文件名',
+ `file_url` varchar(256) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '文件URL',
+ `uuid` varchar(40) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '文件UUID',
+ `create_user_id` bigint(20) NULL DEFAULT NULL COMMENT '创建人ID',
+ `create_user_name` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建人名字',
+ `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
+ `update_user_id` bigint(20) NULL DEFAULT NULL COMMENT '修改人ID',
+ `update_user_name` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '修改人名字',
+ `update_time` datetime(0) NULL DEFAULT NULL COMMENT '修改时间',
+ `del_flag` tinyint(4) NULL DEFAULT 0 COMMENT '0=有效 1=删除',
+ `download_num` int(11) NOT NULL DEFAULT 0 COMMENT '下载次数',
+ PRIMARY KEY (`id`) USING BTREE,
+ UNIQUE INDEX `uk_uuid`(`uuid`) USING BTREE COMMENT '文件ID'
+) ENGINE = InnoDB AUTO_INCREMENT = 15 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Records of wiki_page_file
+-- ----------------------------
+
+-- ----------------------------
+-- Table structure for wiki_page_zan
+-- ----------------------------
+DROP TABLE IF EXISTS `wiki_page_zan`;
+CREATE TABLE `wiki_page_zan` (
+ `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键自增ID',
+ `page_id` bigint(20) NULL DEFAULT NULL COMMENT '页面ID',
+ `comment_id` bigint(20) NULL DEFAULT NULL COMMENT '评论ID',
+ `create_user_id` bigint(20) NULL DEFAULT NULL COMMENT '创建人ID',
+ `create_user_name` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建人名字',
+ `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
+ `yn` tinyint(4) NULL DEFAULT NULL COMMENT '是否有效 0=无效 1=有效',
+ PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 5 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Records of wiki_page_zan
+-- ----------------------------
+
+-- ----------------------------
+-- Table structure for wiki_space
+-- ----------------------------
+DROP TABLE IF EXISTS `wiki_space`;
+CREATE TABLE `wiki_space` (
+ `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键自增ID',
+ `name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '空间名',
+ `type` tinyint(4) NULL DEFAULT 1 COMMENT '空间类型 1=公司 2=个人 3=私人',
+ `space_explain` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '描述',
+ `edit_type` tinyint(4) NOT NULL DEFAULT 0 COMMENT '编辑类型 0=可编辑 1=不允许编辑',
+ `tree_lazy_load` tinyint(4) NOT NULL DEFAULT 0 COMMENT '目录延迟加载 0=否 1=是',
+ `open_doc` tinyint(4) NOT NULL DEFAULT 0 COMMENT '是否是开放文档 0=否 1=是',
+ `uuid` varchar(40) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '唯一UUID',
+ `create_user_id` bigint(20) NULL DEFAULT NULL COMMENT '创建人ID',
+ `create_user_name` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建人名字',
+ `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
+ `del_flag` tinyint(4) NOT NULL DEFAULT 0 COMMENT '删除标记 0=正常 1=已删除',
+ PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 4 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Records of wiki_space
+-- ----------------------------
+INSERT INTO `wiki_space` VALUES (1, 'zyplayer-doc交流专用', 1, '', 0, 0, 1, '23f3f59a60824d21af9f7c3bbc9bc3cb', 1, '暮光：城中城', '2019-03-09 13:59:14', 0);
+INSERT INTO `wiki_space` VALUES (2, '体验专用空间', 2, '', 0, 0, 0, '91995a9a67bf45db9b5e58266517393e', 1, '暮光：城中城', '2019-03-09 14:24:30', 0);
+
+-- ----------------------------
+-- Table structure for zyplayer_storage
+-- ----------------------------
+DROP TABLE IF EXISTS `zyplayer_storage`;
+CREATE TABLE `zyplayer_storage` (
+ `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '主键自增ID',
+ `doc_key` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '参数名字',
+ `doc_value` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '参数值',
+ `creation_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
+ `update_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间',
+ PRIMARY KEY (`id`) USING BTREE,
+ UNIQUE INDEX `key`(`doc_key`) USING BTREE COMMENT 'key唯一索引'
+) ENGINE = InnoDB AUTO_INCREMENT = 6 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '存储网页上相关的数据' ROW_FORMAT = Compact;
+
+-- ----------------------------
+-- Records of zyplayer_storage
+-- ----------------------------
+SET FOREIGN_KEY_CHECKS = 1;
diff --git a/zyplayer-doc-manage/src/main/webapp/static/lib/mg/js/common.js b/zyplayer-doc-manage/src/main/webapp/static/lib/mg/js/common.js
index 1b6baa05..af17aa32 100644
--- a/zyplayer-doc-manage/src/main/webapp/static/lib/mg/js/common.js
+++ b/zyplayer-doc-manage/src/main/webapp/static/lib/mg/js/common.js
@@ -38,8 +38,8 @@ function validateResult(result) {
if (result.errCode == 200) {
return true;
} else if (result.errCode == 400) {
- var href = encodeURI(window.location.href);
- window.location = "static/manage/login.html?returnUrl=" + href;
+ var href = encodeURIComponent(window.location.href);
+ window.location = ctx + "static/manage/login.html?redirect=" + href;
} else {
alert(result.errMsg);
}
@@ -226,8 +226,8 @@ function ajaxTemp(url, dataSentType, dataReceiveType, paramsStr, successFunction
contentType : "application/x-www-form-urlencoded; charset=UTF-8",
success : function(msg) {
if (msg.errCode == 400) {
- var href = encodeURI(window.location.href);
- window.location = "static/manage/login.html?returnUrl=" + href;
+ var href = encodeURIComponent(window.location.href);
+ window.location = ctx + "static/manage/login.html?redirect=" + href;
} else {
if (typeof successFunction == "function") {
successFunction(msg, id);
@@ -346,7 +346,7 @@ var common = {
},
getParam: function(name){
var url = location.search;// 获取url中"?"符后的字串
- url = decodeURIComponent(url);
+ // url = decodeURIComponent(url);
if (url.indexOf("?") != -1) {
var str = url.substr(1);
strs = str.split("&");
diff --git a/zyplayer-doc-manage/src/main/webapp/static/manage/login.html b/zyplayer-doc-manage/src/main/webapp/static/manage/login.html
index c9f58ac3..a05afe5e 100644
--- a/zyplayer-doc-manage/src/main/webapp/static/manage/login.html
+++ b/zyplayer-doc-manage/src/main/webapp/static/manage/login.html
@@ -74,16 +74,20 @@
app.passwordError = "密码不能为空";
return;
}
- var returnUrl = common.getParam("returnUrl");
- if (!!returnUrl) {
- returnUrl = decodeURI(returnUrl);
+ // 获取url中"?"符后的字串
+ var href = location.href;
+ var url = href.substring(href.indexOf("?"), href.length);
+ var redirect = "";
+ if (url.indexOf("redirect=") > 0) {
+ redirect = url.substring(url.indexOf("redirect=") + 9, url.length);
+ redirect = decodeURIComponent(redirect);
} else {
- returnUrl = ctx + "static/manage/home.html";
+ redirect = ctx + "static/manage/home.html";
}
post(ctx + "login", param, function (result) {
console.log(result);
if (result.errCode == 200) {
- location.href = returnUrl;
+ location.href = redirect;
} else {
app.passwordError = "登录失败，" + result.errMsg;
}
diff --git a/zyplayer-doc-swagger/src/main/resources/export/js/common.js b/zyplayer-doc-swagger/src/main/resources/export/js/common.js
index 4804caa4..1778343a 100644
--- a/zyplayer-doc-swagger/src/main/resources/export/js/common.js
+++ b/zyplayer-doc-swagger/src/main/resources/export/js/common.js
@@ -30,8 +30,8 @@ function validateResult(result) {
if (result.errCode == 200) {
return true;
} else if (result.errCode == 400) {
- var href = encodeURI(window.location.href);
- window.location = "static/manage/login.html?returnUrl=" + href;
+ var href = encodeURIComponent(window.location.href);
+ window.location = "static/manage/login.html?redirect=" + href;
} else {
Toast.error(result.errMsg);
}
@@ -196,8 +196,8 @@ function ajaxTemp(url, dataSentType, dataReceiveType, paramsStr, successFunction
contentType : "application/x-www-form-urlencoded; charset=UTF-8",
success : function(msg) {
if (msg.errCode == 400) {
- var href = encodeURI(window.location.href);
- window.location = "static/manage/login.html?returnUrl=" + href;
+ var href = encodeURIComponent(window.location.href);
+ window.location = "static/manage/login.html?redirect=" + href;
} else {
if (typeof successFunction == "function") {
successFunction(msg, id);
diff --git a/zyplayer-doc-swagger/src/main/resources/webjars/mg-ui/js/common.js b/zyplayer-doc-swagger/src/main/resources/webjars/mg-ui/js/common.js
index d39b9f46..ae0cf8b2 100644
--- a/zyplayer-doc-swagger/src/main/resources/webjars/mg-ui/js/common.js
+++ b/zyplayer-doc-swagger/src/main/resources/webjars/mg-ui/js/common.js
@@ -30,8 +30,8 @@ function validateResult(result) {
if (result.errCode == 200) {
return true;
} else if (result.errCode == 400) {
- var href = encodeURI(window.location.href);
- window.location = "static/manage/login.html?returnUrl=" + href;
+ var href = encodeURIComponent(window.location.href);
+ window.location = "static/manage/login.html?redirect=" + href;
} else {
Toast.error(result.errMsg);
}
@@ -196,8 +196,8 @@ function ajaxTemp(url, dataSentType, dataReceiveType, paramsStr, successFunction
contentType : "application/x-www-form-urlencoded; charset=UTF-8",
success : function(msg) {
if (msg.errCode == 400) {
- var href = encodeURI(window.location.href);
- window.location = "static/manage/login.html?returnUrl=" + href;
+ var href = encodeURIComponent(window.location.href);
+ window.location = "static/manage/login.html?redirect=" + href;
} else {
if (typeof successFunction == "function") {
successFunction(msg, id);
diff --git a/zyplayer-doc-swagger/src/main/resources/webjars/open-doc/js/common.js b/zyplayer-doc-swagger/src/main/resources/webjars/open-doc/js/common.js
index cf995f27..487cbdf1 100644
--- a/zyplayer-doc-swagger/src/main/resources/webjars/open-doc/js/common.js
+++ b/zyplayer-doc-swagger/src/main/resources/webjars/open-doc/js/common.js
@@ -30,8 +30,8 @@ function validateResult(result) {
if (result.errCode == 200) {
return true;
} else if (result.errCode == 400) {
- var href = encodeURI(window.location.href);
- window.location = "static/manage/login.html?returnUrl=" + href;
+ var href = encodeURIComponent(window.location.href);
+ window.location = "static/manage/login.html?redirect=" + href;
} else {
Toast.error(result.errMsg);
}
@@ -196,8 +196,8 @@ function ajaxTemp(url, dataSentType, dataReceiveType, paramsStr, successFunction
contentType : "application/x-www-form-urlencoded; charset=UTF-8",
success : function(msg) {
if (msg.errCode == 400) {
- var href = encodeURI(window.location.href);
- window.location = "static/manage/login.html?returnUrl=" + href;
+ var href = encodeURIComponent(window.location.href);
+ window.location = "static/manage/login.html?redirect=" + href;
} else {
if (typeof successFunction == "function") {
successFunction(msg, id);
diff --git a/zyplayer-doc-ui/wiki-ui/src/App.vue b/zyplayer-doc-ui/wiki-ui/src/App.vue
index b3acc97e..150b9b9e 100644
--- a/zyplayer-doc-ui/wiki-ui/src/App.vue
+++ b/zyplayer-doc-ui/wiki-ui/src/App.vue
@@ -418,6 +418,15 @@
init() {
},
+ switchSpacePage(spaceId) {
+ spaceId = parseInt(spaceId);
+ if (app.choiceSpace == spaceId) {
+ return;
+ }
+ app.choiceSpace = spaceId;
+ app.nowClickPath.spaceId = spaceId;
+ this.doGetPageList(null);
+ },
}
}
diff --git a/zyplayer-doc-ui/wiki-ui/src/common/config/apimix.js b/zyplayer-doc-ui/wiki-ui/src/common/config/apimix.js
index 3ec4706c..d8b4ce2d 100644
--- a/zyplayer-doc-ui/wiki-ui/src/common/config/apimix.js
+++ b/zyplayer-doc-ui/wiki-ui/src/common/config/apimix.js
@@ -4,9 +4,12 @@ var href = window.location.href;
var _fn = {
href: href,
- // 这里设置接口域名
- HOST: 'http://local.zyplayer.com:8083/zyplayer-doc-manage',
- HOST1: 'http://local.zyplayer.com:8083/zyplayer-doc-manage',
+ // 本地启动时使用本地接口调试
+ // HOST: 'http://local.zyplayer.com:8083/zyplayer-doc-manage',
+ // HOST1: 'http://local.zyplayer.com:8083/zyplayer-doc-manage',
+ // 也可以直接使用线上的服务调试
+ HOST: 'http://doc.zyplayer.com/zyplayer-doc-manage',
+ HOST1: 'http://doc.zyplayer.com/zyplayer-doc-manage',
// 打包时使用下面这两行，文件就放在根目录下，所以当前路劲就好
// HOST: './',
// HOST1: './',
diff --git a/zyplayer-doc-ui/wiki-ui/src/common/lib/common/common.js b/zyplayer-doc-ui/wiki-ui/src/common/lib/common/common.js
index 6eeeeb7a..bb8428b0 100644
--- a/zyplayer-doc-ui/wiki-ui/src/common/lib/common/common.js
+++ b/zyplayer-doc-ui/wiki-ui/src/common/lib/common/common.js
@@ -23,8 +23,8 @@ export default {
global.vue.$message('请求错误：' + res.message);
} else if (res.data.errCode == 400) {
global.vue.$message('请先登录');
- var href = encodeURI(window.location.href);
- window.location = apimix.apilist1.HOST + "/static/manage/login.html?returnUrl=" + href;
+ var href = encodeURIComponent(window.location.href);
+ window.location = apimix.apilist1.HOST + "/static/manage/login.html?redirect=" + href;
} else if (res.data.errCode == 402) {
global.vue.$router.push("/common/noAuth");
} else if (res.data.errCode !== 200) {
diff --git a/zyplayer-doc-ui/wiki-ui/src/views/page/Show.vue b/zyplayer-doc-ui/wiki-ui/src/views/page/Show.vue
index 920ff604..8a161ff1 100644
--- a/zyplayer-doc-ui/wiki-ui/src/views/page/Show.vue
+++ b/zyplayer-doc-ui/wiki-ui/src/views/page/Show.vue
@@ -30,8 +30,9 @@
-
-
+
+
+
删除
@@ -172,6 +173,10 @@
if (!!this.parentPath.pageId) {
// 延迟设置展开的目录，edit比app先初始化
setTimeout(function () {
+ if (!!app.parentPath.spaceId) {
+ // 调用父方法切换选择的空间
+ global.vue.$app.switchSpacePage(app.parentPath.spaceId);
+ }
global.vue.$app.changeWikiPageExpandedKeys(app.parentPath.pageId);
}, 500);
}
@@ -267,6 +272,7 @@
app.pageContent = json.data.pageContent || {};
app.pageFileList = json.data.fileList || [];
app.uploadFormData = {pageId: app.wikiPage.id};
+ app.parentPath.spaceId = wikiPage.spaceId;
// 修改最后点击的项，保证刷新后点击编辑能展示编辑的项
// if (!app.lastClickNode.id) {
// app.lastClickNode = {id: wikiPage.id, nodePath: wikiPage.name};
diff --git a/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiCommonController.java b/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiCommonController.java
index 2ecc1fe8..4f718a0a 100644
--- a/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiCommonController.java
+++ b/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiCommonController.java
@@ -13,6 +13,7 @@ import com.zyplayer.doc.data.repository.manage.entity.UserInfo;
import com.zyplayer.doc.data.repository.manage.entity.WikiPage;
import com.zyplayer.doc.data.repository.manage.entity.WikiPageFile;
import com.zyplayer.doc.data.repository.manage.entity.WikiSpace;
+import com.zyplayer.doc.data.repository.manage.mapper.WikiPageFileMapper;
import com.zyplayer.doc.data.service.manage.UserInfoService;
import com.zyplayer.doc.data.service.manage.WikiPageFileService;
import com.zyplayer.doc.data.service.manage.WikiPageService;
@@ -59,6 +60,8 @@ public class WikiCommonController {
WikiSpaceService wikiSpaceService;
@Resource
UserInfoService userInfoService;
+ @Resource
+ WikiPageFileMapper wikiPageFileMapper;
@PostMapping("/user/base")
public ResponseJson