diff --git a/pom.xml b/pom.xml index c4f75909..d38418a3 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.zyplayer zyplayer-doc - 1.0.2 + 1.0.3 pom zyplayer-doc diff --git a/zyplayer-doc-core/pom.xml b/zyplayer-doc-core/pom.xml index bdf36086..20790850 100644 --- a/zyplayer-doc-core/pom.xml +++ b/zyplayer-doc-core/pom.xml @@ -3,10 +3,10 @@ xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 4.0.0 - + com.zyplayer zyplayer-doc-core - 1.0.2 + 1.0.3 zyplayer-doc-core http://maven.apache.org diff --git a/zyplayer-doc-data/pom.xml b/zyplayer-doc-data/pom.xml index c5d984a7..f945df05 100644 --- a/zyplayer-doc-data/pom.xml +++ b/zyplayer-doc-data/pom.xml @@ -6,7 +6,7 @@ com.zyplayer zyplayer-doc-data - 1.0.2 + 1.0.3 org.springframework.boot @@ -23,7 +23,7 @@ 2.0 6.1.0 1.1.9 - 1.0.2 + 1.0.3 7.2.0 diff --git a/zyplayer-doc-db/pom.xml b/zyplayer-doc-db/pom.xml index f87f9ab4..46023cc4 100644 --- a/zyplayer-doc-db/pom.xml +++ b/zyplayer-doc-db/pom.xml @@ -5,7 +5,7 @@ com.zyplayer zyplayer-doc-db - 1.0.2 + 1.0.3 jar zyplayer-doc-db 数据库文档工具 @@ -92,7 +92,7 @@ UTF-8 UTF-8 1.8 - 1.0.2 + 1.0.3 true 7.2.0 diff --git a/zyplayer-doc-dubbo/pom.xml b/zyplayer-doc-dubbo/pom.xml index e6b37cc1..4cc8c2ce 100644 --- a/zyplayer-doc-dubbo/pom.xml +++ b/zyplayer-doc-dubbo/pom.xml @@ -5,7 +5,7 @@ 4.0.0 com.zyplayer zyplayer-doc-dubbo - 1.0.2 + 1.0.3 jar zyplayer-doc-dubbo @@ -37,7 +37,7 @@ true 7.2.0 ${project.build.outputDirectory}/META-INF/resources/webjars/${project.artifactId}/${project.version} - 1.0.2 + 1.0.3 diff --git a/zyplayer-doc-es/pom.xml b/zyplayer-doc-es/pom.xml index cbff3458..4c10aa39 100644 --- a/zyplayer-doc-es/pom.xml +++ b/zyplayer-doc-es/pom.xml @@ -5,7 +5,7 @@ com.zyplayer zyplayer-doc-es - 1.0.2 + 1.0.3 jar zyplayer-doc-es wiki文档工具 @@ -32,7 +32,7 @@ UTF-8 UTF-8 1.8 - 1.0.2 + 1.0.3 true 7.2.0 diff --git a/zyplayer-doc-grpc/pom.xml b/zyplayer-doc-grpc/pom.xml index 06d245c8..013e932d 100644 --- a/zyplayer-doc-grpc/pom.xml +++ b/zyplayer-doc-grpc/pom.xml @@ -6,7 +6,7 @@ com.zyplayer zyplayer-doc-grpc - 1.0.2 + 1.0.3 org.springframework.boot @@ -53,7 +53,7 @@ com.zyplayer zyplayer-doc-core - 1.0.2 + 1.0.3 diff --git a/zyplayer-doc-manage/pom.xml b/zyplayer-doc-manage/pom.xml index de92d8cf..bec98e80 100644 --- a/zyplayer-doc-manage/pom.xml +++ b/zyplayer-doc-manage/pom.xml @@ -4,7 +4,7 @@ com.zyplayer zyplayer-doc-manage - 1.0.2 + 1.0.3 war zyplayer-doc-manage @@ -22,13 +22,12 @@ 1.8 3.0.6 1.2.53 - 1.0.2 2.0 6.1.0 1.1.9 1.9.4 2.9.2 - 1.0.2 + 1.0.3 7.2.0 diff --git a/zyplayer-doc-manage/src/main/resources/sql/zyplayer_doc_manage.1.0.3.sql b/zyplayer-doc-manage/src/main/resources/sql/zyplayer_doc_manage.1.0.3.sql index 0a6e7d3d..6a9395ec 100644 --- a/zyplayer-doc-manage/src/main/resources/sql/zyplayer_doc_manage.1.0.3.sql +++ b/zyplayer-doc-manage/src/main/resources/sql/zyplayer_doc_manage.1.0.3.sql @@ -5,7 +5,8 @@ -- 2、建议数据库版本：5.7.25 -- --- 从1.0.2版本升级： +-- ------------------------从1.0.2版本升级：------------------------ + CREATE TABLE `db_datasource` ( `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键自增ID', `name` varchar(50) DEFAULT NULL COMMENT '数据源名称', @@ -26,10 +27,6 @@ VALUES ( 'DB_DATASOURCE_MANAGE', '数据源管理权', 0, 1, '2019-06-29 13:01:2 INSERT INTO `auth_info`(`auth_name`, `auth_desc`, `can_edit`, `create_uid`, `creation_time`, `auth_type`) VALUES ( 'ES_DATASOURCE_MANAGE', 'ES数据源管理权', 0, 1, '2019-07-27 00:39:20', 1); -insert into user_auth(`user_id`, `auth_id`, `create_uid`, `del_flag`, `creation_time`) -select a.id, b.id, a.id, 0, now() from user_info a,auth_info b -where a.user_no='zyplayer' and b.auth_name='DB_DATASOURCE_MANAGE'; - ALTER TABLE `wiki_page_content` MODIFY COLUMN `preview` varchar(16000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '预览内容'; -- alter table `db_datasource` add `name` varchar(50) DEFAULT NULL COMMENT '数据源名称'; @@ -48,8 +45,356 @@ CREATE TABLE `es_datasource` ( - -- ------------------------全新的库：------------------------ +/* + 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: 16/08/2019 18:26:05 +*/ + +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 '创建时间', + `auth_type` tinyint(4) NOT NULL DEFAULT 0 COMMENT '权限类型 0=隐藏权限 1=可使用', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB AUTO_INCREMENT = 14 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '权限信息表' ROW_FORMAT = Compact; + +-- ---------------------------- +-- Records of auth_info +-- ---------------------------- +INSERT INTO `auth_info` VALUES (3, 'AUTH_ASSIGN', '权限分配权', 0, 1, '2018-12-01 11:40:42', 1); +INSERT INTO `auth_info` VALUES (4, 'USER_MANAGE', '用户管理权', 0, 1, '2018-12-01 11:40:42', 1); +INSERT INTO `auth_info` VALUES (5, 'WIKI_EDIT_PAGE_', '编辑wiki文档', 0, 1, '2019-06-04 13:01:20', 0); +INSERT INTO `auth_info` VALUES (6, 'WIKI_VIEW_PAGE_', '查看wiki文档', 0, 1, '2019-06-04 13:01:20', 0); +INSERT INTO `auth_info` VALUES (7, 'WIKI_COMMENT_PAGE_', '评论wiki文档', 0, 1, '2019-06-04 13:01:20', 0); +INSERT INTO `auth_info` VALUES (8, 'WIKI_DELETE_PAGE_', '删除wiki文档', 0, 1, '2019-06-04 13:01:20', 0); +INSERT INTO `auth_info` VALUES (9, 'WIKI_PAGE_FILE_UPLOAD_', '上传wiki文档附件', 0, 1, '2019-06-04 13:01:20', 0); +INSERT INTO `auth_info` VALUES (10, 'WIKI_PAGE_FILE_DELETE_', '删除wiki文档附件', 0, 1, '2019-06-04 13:01:20', 0); +INSERT INTO `auth_info` VALUES (11, 'WIKI_PAGE_AUTH_MANAGE_', 'wiki权限管理', 0, 1, '2019-06-04 13:01:20', 0); +INSERT INTO `auth_info` VALUES (12, 'DB_DATASOURCE_MANAGE', '数据源管理权', 0, 1, '2019-06-29 13:01:20', 1); +INSERT INTO `auth_info` VALUES (13, 'ES_DATASOURCE_MANAGE', 'ES数据源管理权', 0, 1, '2019-07-27 00:39:20', 1); + +-- ---------------------------- +-- Table structure for db_datasource +-- ---------------------------- +DROP TABLE IF EXISTS `db_datasource`; +CREATE TABLE `db_datasource` ( + `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键自增ID', + `driver_class_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '数据源驱动类', + `source_url` varchar(512) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '数据源地址', + `source_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '数据源用户名', + `source_password` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT 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 '创建时间', + `yn` tinyint(4) NULL DEFAULT NULL COMMENT '是否有效 0=无效 1=有效', + `name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '数据源名称', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB AUTO_INCREMENT = 2 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic; + +-- ---------------------------- +-- Records of db_datasource +-- ---------------------------- + +-- ---------------------------- +-- Table structure for es_datasource +-- ---------------------------- +DROP TABLE IF EXISTS `es_datasource`; +CREATE TABLE `es_datasource` ( + `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键自增ID', + `name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '数据源名称', + `host_port` varchar(512) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '地址和端口', + `scheme` varchar(512) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT 'scheme，http或其他', + `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 = 2 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic; + +-- ---------------------------- +-- Records of es_datasource +-- ---------------------------- + +-- ---------------------------- +-- 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 = 48 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 (31, 3, 1, 1, NULL, 0, '2019-06-21 15:19:51', NULL, NULL); +INSERT INTO `user_auth` VALUES (32, 3, 2, 1, NULL, 0, '2019-06-21 15:19:51', NULL, NULL); +INSERT INTO `user_auth` VALUES (33, 3, 3, 1, NULL, 0, '2019-06-21 15:19:51', NULL, NULL); +INSERT INTO `user_auth` VALUES (34, 3, 4, 1, NULL, 0, '2019-06-21 15:19:51', NULL, NULL); +INSERT INTO `user_auth` VALUES (44, 1, 3, 1, NULL, 0, '2019-08-12 13:10:11', NULL, NULL); +INSERT INTO `user_auth` VALUES (45, 1, 4, 1, NULL, 0, '2019-08-12 13:10:11', NULL, NULL); +INSERT INTO `user_auth` VALUES (46, 1, 12, 1, NULL, 0, '2019-08-12 13:10:11', NULL, NULL); +INSERT INTO `user_auth` VALUES (47, 1, 13, 1, NULL, 0, '2019-08-12 13:10:11', NULL, NULL); + +-- ---------------------------- +-- 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=已删除 2=已停用', + `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 '更新时间', + `phone` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '手机号', + `sex` tinyint(4) NOT NULL DEFAULT 0 COMMENT '性别 0=女 1=男', + PRIMARY KEY (`id`) USING BTREE, + UNIQUE INDEX `idx_userNo`(`user_no`) USING BTREE COMMENT '登录用户名' +) ENGINE = InnoDB AUTO_INCREMENT = 4 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', NULL, 0); +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', NULL, 0); +INSERT INTO `user_info` VALUES (3, 'admin', 'bcb41ccdc4363c6848a1d760f26c28a0', 'admin', NULL, NULL, 0, '2019-06-21 15:19:40', 1, NULL, NULL, 0); + +-- ---------------------------- +-- 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-07-16 21:00:00', 0, 42, 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, 122, 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, 29, 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(16000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL 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-07-12 18:11:44', '一入开源深似海源码地址：https://gitee.com/zyplayer/zyplayer-doc体验地址：http://doc.zyplayer.com/zyplayer-doc-manage/static/manage/home.html 账号：zyplayer 密码：123456更多实用功能请提交评论或加群交流！谢谢！QQ群：466363173tips：想要编辑本文请修改表：wiki_page的edit_type字段值为0才行哦~有什么问题可以来评论本文章哦！当然，如果你是部署在你们自己本地的我肯定看不到此文章的评论可以到本工具官网下评论此文章，我会随时去查看的！唯一官网地址：http://doc.zyplayer.com欢迎提交各种变态无理的要求~'); +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模块

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

加粗

字体大小

宋体宋体宋体宋体宋体 

斜体斜体斜体

下划线下划线下划线

删除线删除线删除线

字体颜色

背景颜色

链接：百度一下

  1. 有序列表
  2. xxx
  3. xxx

文字居中

文字靠右

xxxxx

表情：\"[坏笑]\"

表格：

 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_history +-- ---------------------------- +DROP TABLE IF EXISTS `wiki_page_history`; +CREATE TABLE `wiki_page_history` ( + `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 '创建时间', + `del_flag` tinyint(4) NOT NULL DEFAULT 0 COMMENT '删除标记 0=正常 1=已删除', + PRIMARY KEY (`id`) USING BTREE, + INDEX `idx_page_id`(`page_id`) USING BTREE COMMENT '页面ID索引' +) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic; + +-- ---------------------------- +-- 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 +-- ---------------------------- +INSERT INTO `wiki_page_zan` VALUES (1, 1, NULL, 1, '暮光：城中城', '2019-03-09 22:19:44', 0); +INSERT INTO `wiki_page_zan` VALUES (2, 3, NULL, 1, '暮光：城中城', '2019-04-02 15:09:01', 0); +INSERT INTO `wiki_page_zan` VALUES (3, 2, NULL, 1, '暮光：城中城', '2019-06-05 12:50:59', 0); +INSERT INTO `wiki_page_zan` VALUES (4, 5, NULL, 1, '暮光：城中城', '2019-06-12 12:18:27', 1); + +-- ---------------------------- +-- 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 = 55 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-other/pom.xml b/zyplayer-doc-other/pom.xml index fab36c87..b48b27b9 100644 --- a/zyplayer-doc-other/pom.xml +++ b/zyplayer-doc-other/pom.xml @@ -5,7 +5,7 @@ zyplayer-doc com.zyplayer - 1.0.2 + 1.0.3 4.0.0 diff --git a/zyplayer-doc-other/zyplayer-doc-test/pom.xml b/zyplayer-doc-other/zyplayer-doc-test/pom.xml index 064cee47..a6a60516 100644 --- a/zyplayer-doc-other/zyplayer-doc-test/pom.xml +++ b/zyplayer-doc-other/zyplayer-doc-test/pom.xml @@ -13,14 +13,14 @@ com.zyplayer zyplayer-doc-test - 1.0.2 + 1.0.3 jar UTF-8 UTF-8 1.8 - 1.0.2 + 1.0.3 7.2.0 diff --git a/zyplayer-doc-swagger/pom.xml b/zyplayer-doc-swagger/pom.xml index 4c01cb47..53a4a00f 100644 --- a/zyplayer-doc-swagger/pom.xml +++ b/zyplayer-doc-swagger/pom.xml @@ -6,7 +6,7 @@ com.zyplayer zyplayer-doc-swagger - 1.0.2 + 1.0.3 jar zyplayer-doc-swagger zyplayer-doc-swagger是swagger-ui的一个前端实现，使用简单、解析速度快、走心的设计，支持多项目同时展示，多种文档目录的展示方案，多种自定义配置，满足各种使用习惯 @@ -37,7 +37,7 @@ true 7.2.0 ${project.build.outputDirectory}/META-INF/resources/webjars/${project.artifactId}/${project.version} - 1.0.2 + 1.0.3 diff --git a/zyplayer-doc-swagger/src/main/java/com/zyplayer/doc/swagger/controller/MgDocumentController.java b/zyplayer-doc-swagger/src/main/java/com/zyplayer/doc/swagger/controller/MgDocumentController.java index 4fa33a6e..5ba91207 100644 --- a/zyplayer-doc-swagger/src/main/java/com/zyplayer/doc/swagger/controller/MgDocumentController.java +++ b/zyplayer-doc-swagger/src/main/java/com/zyplayer/doc/swagger/controller/MgDocumentController.java @@ -300,7 +300,7 @@ public class MgDocumentController { @PostMapping(value = "/addSwaggerResources") public ResponseJson addSwaggerResources(HttpServletRequest request, String swaggerJson, String resourcesUrl, String rewriteDomainUrl, String oldUrl, Integer openVisit) { // 通过json文档内容来添加 - ResponseJson responseJson = this.addSwaggerJsonApiDocs(request, swaggerJson, resourcesUrl); + ResponseJson responseJson = this.addSwaggerJsonApiDocs(request, swaggerJson, resourcesUrl, rewriteDomainUrl, openVisit); if (responseJson != null) { return responseJson; } @@ -363,7 +363,7 @@ public class MgDocumentController { * @param swaggerJson swagger的文档内容 * @return 添加结果 */ - public ResponseJson addSwaggerJsonApiDocs(HttpServletRequest request, String swaggerJson, String resourcesUrl) { + public ResponseJson addSwaggerJsonApiDocs(HttpServletRequest request, String swaggerJson, String resourcesUrl, String rewriteDomainUrl, Integer openVisit) { if (StringUtils.isNotBlank(swaggerJson)) { Integer nextId = 0; String customUrl = resourcesUrl; @@ -375,7 +375,7 @@ public class MgDocumentController { customUrl = customUrl.substring(0, customUrl.lastIndexOf("/")); customUrl = customUrl + Consts.PROXY_API_DOCS + "?id=" + nextId; } - boolean addResult = this.addSwaggerLocationList(swaggerJson, null, customUrl, customUrl, 0); + boolean addResult = this.addSwaggerLocationList(swaggerJson, rewriteDomainUrl, customUrl, customUrl, openVisit); if (addResult) { storageService.put(StorageKeys.PROXY_API_DOCS + nextId, swaggerJson); return DocResponseJson.ok(); diff --git a/zyplayer-doc-swagger/src/main/java/com/zyplayer/doc/swagger/controller/ZyplayerSwaggerController.java b/zyplayer-doc-swagger/src/main/java/com/zyplayer/doc/swagger/controller/ZyplayerSwaggerController.java index 111e0103..aa9ae78c 100644 --- a/zyplayer-doc-swagger/src/main/java/com/zyplayer/doc/swagger/controller/ZyplayerSwaggerController.java +++ b/zyplayer-doc-swagger/src/main/java/com/zyplayer/doc/swagger/controller/ZyplayerSwaggerController.java @@ -2,10 +2,12 @@ package com.zyplayer.doc.swagger.controller; import com.alibaba.fastjson.JSON; import com.zyplayer.doc.core.annotation.AuthMan; +import com.zyplayer.doc.swagger.controller.vo.LocationListVo; import com.zyplayer.doc.swagger.controller.vo.SwaggerResourcesInfoVo; import com.zyplayer.doc.swagger.framework.constant.Consts; import com.zyplayer.doc.swagger.framework.constant.StorageKeys; import com.zyplayer.doc.swagger.framework.service.MgStorageService; +import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; @@ -17,9 +19,7 @@ import springfox.documentation.swagger.web.SecurityConfiguration; import springfox.documentation.swagger.web.SwaggerResource; import springfox.documentation.swagger.web.UiConfiguration; -import java.util.Collections; -import java.util.LinkedList; -import java.util.List; +import java.util.*; /** * 承接了所有的ApiResourceController的接口 @@ -41,7 +41,7 @@ public class ZyplayerSwaggerController { if (resourcesInfoVoList == null || resourcesInfoVoList.isEmpty()) { return Collections.emptyList(); } - List resourceList = new LinkedList<>(); + Set resourceList = new HashSet<>(); resourcesInfoVoList.forEach(resource -> { resource.getResourceList().forEach(val -> { String location = val.getLocation(); @@ -49,7 +49,21 @@ public class ZyplayerSwaggerController { }); resourceList.addAll(resource.getResourceList()); }); - return resourceList; + List locationList = new LinkedList<>(); + String swaggerLocationListStr = storageService.get(StorageKeys.SWAGGER_LOCATION_LIST); + if (StringUtils.isNotBlank(swaggerLocationListStr)) { + locationList = JSON.parseArray(swaggerLocationListStr, LocationListVo.class); + } + for (LocationListVo listVo : locationList) { + if (listVo.getLocation().contains(Consts.PROXY_API_DOCS)) { + SwaggerResource resource = new SwaggerResource(); + resource.setLocation(listVo.getLocation()); + resource.setName(listVo.getName()); + resource.setSwaggerVersion("2.0"); + resourceList.add(resource); + } + } + return new LinkedList<>(resourceList); } @ResponseBody diff --git a/zyplayer-doc-swagger/src/main/resources/open-doc.html b/zyplayer-doc-swagger/src/main/resources/open-doc.html index ac6ca611..9f89843d 100644 --- a/zyplayer-doc-swagger/src/main/resources/open-doc.html +++ b/zyplayer-doc-swagger/src/main/resources/open-doc.html @@ -58,9 +58,9 @@ 支持多项目同时展示，多种文档目录的展示方案，多种自定义配置，满足各种使用习惯。 本项目是完全从头写的，所以有任何属性未解析到、UI上有何建议都能及时处理得到。 使用中您有任何的意见和建议都可到源码地址处反馈哦！
- 源码地址：zyplayer-doc-swagger（还有其他很多功能哦）， - 前端框架：zui（很不错）， - 我的网站：空间轴、自由发挥（都已很久未维护） + 源码地址：zyplayer-doc-swagger， + 前端框架：zui， + 我的网站：空间轴、自由发挥 diff --git a/zyplayer-doc-swagger/src/main/resources/webjars/zpages/docUrlDetailConfig.html b/zyplayer-doc-swagger/src/main/resources/webjars/zpages/docUrlDetailConfig.html index 8f8e88fd..d321d8a2 100644 --- a/zyplayer-doc-swagger/src/main/resources/webjars/zpages/docUrlDetailConfig.html +++ b/zyplayer-doc-swagger/src/main/resources/webjars/zpages/docUrlDetailConfig.html @@ -127,8 +127,18 @@ app.oldLocation = item.location; app.addNewDocumentInput = item.location; app.rewriteDomainUrl = item.rewriteDomainUrl; + app.addNewSwaggerJson = ""; app.openVisit = (item.openVisit == 1); - $('#addNewDocumentModal').modal({moveable: true}); + if (item.location.indexOf('proxy-api-docs') > 0) { + var docId = item.location.substring(item.location.indexOf("?id=") + 4); + // 获取文档内容 + ajaxTemp(urlBase + "swagger-mg-ui/document/proxy-api-docs", "get", "text", {id: docId}, function (json) { + app.addNewSwaggerJson = json; + $('#addNewDocumentModal').modal({moveable: true}); + }); + } else { + $('#addNewDocumentModal').modal({moveable: true}); + } }, addNewDocument: function(){ app.openVisit = false; diff --git a/zyplayer-doc-wiki/pom.xml b/zyplayer-doc-wiki/pom.xml index 7cd251e8..bee69d72 100644 --- a/zyplayer-doc-wiki/pom.xml +++ b/zyplayer-doc-wiki/pom.xml @@ -5,7 +5,7 @@ com.zyplayer zyplayer-doc-wiki - 1.0.2 + 1.0.3 jar zyplayer-doc-wiki wiki文档工具 @@ -32,7 +32,7 @@ UTF-8 UTF-8 1.8 - 1.0.2 + 1.0.3 true 7.2.0