+ * 服务类 + *
+ * + * @author 暮光：城中城 + * @since 2020-09-05 + */ +public interface WikiPageHistoryService extends IService+ * 服务实现类 + *
+ * + * @author 暮光：城中城 + * @since 2020-09-05 + */ +@Service +public class WikiPageHistoryServiceImpl extends ServiceImpl一入开源深似海
源码地址：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：
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顺序
- 基本的文档创建、编辑、评论、删除、搜索等功能
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 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
- 无序列表
- 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\");
}
-
-
- {{wikiPage.name}}
-
-
-
- 创建：{{wikiPage.createUserName}} {{wikiPage.createTime}}
- 修改：{{wikiPage.updateUserName}} {{wikiPage.updateTime}}
-
-
- 上传附件
-
- 编辑
-
-
- 更多
-
-
- 删除
- 权限设置
- 查看开放文档
-
-
+
+
+
-
+
- {{wikiPage.name}}
+
-
-
-
-
- {{scope.row.fileName}}
-
-
-
-
- 删除
-
-
-
-
-
-
-
-
+
赞
踩
-
+
成为第一个赞同者
{{wikiPage.zanNum}}人赞了它
我赞了它
我和{{wikiPage.zanNum-1}}个其他人赞了它
-
+
{{wikiPage.viewNum}}次阅读
-
-
+
+
+
+
+
+
+
+
@@ -178,6 +232,12 @@
searchUserList: [],
pageAuthNewUser: "",
pageAuthUserLoading: false,
+ // 右侧标签页
+ actionTabVisible: false,
+ actionTabActiveName: 'comment',
+ pageHistoryDetail: '',
+ pageHistoryChoice: {},
+ pageHistoryList: [],
};
},
beforeRouteUpdate(to, from, next) {
@@ -210,6 +270,8 @@
this.editWikiAuth();
} else if (val == 'deletePage') {
this.deleteWikiPage();
+ } else if (val == 'showPageHistory') {
+ this.showPageHistory();
} else if (val == 'showOpenPage') {
if (this.spaceInfo.openDoc != 1) {
this.$message.warning("该空间未开放，无法查看开放文档地址");
@@ -288,11 +350,66 @@
});
}).catch(()=>{});
},
+ actionTabClick(tab) {
+ if (tab.name == 'comment') {
+ this.showCommentWiki();
+ } else if (tab.name == 'history') {
+ this.showPageHistory();
+ }
+ },
+ closeActionTab() {
+ this.actionTabVisible = false;
+ this.clearHistory();
+ },
+ showCommentWiki() {
+ this.actionTabVisible = true;
+ this.actionTabActiveName = 'comment';
+ this.scrollActionTabComment();
+ },
+ showPageHistory() {
+ this.actionTabVisible = true;
+ this.actionTabActiveName = 'history';
+ this.clearHistory();
+ },
+ getPageHistory(pageId) {
+ this.pageHistoryList = [];
+ let param = {pageId: pageId, pageNum: 1};
+ pageApi.pageHistoryList(param).then(json => {
+ let pageHistoryList = json.data || [];
+ pageHistoryList.forEach(item => item.loading = 0);
+ this.pageHistoryList = pageHistoryList;
+ });
+ },
+ historyClick(history) {
+ if (this.pageHistoryChoice.id == history.id && !!this.pageHistoryDetail) {
+ return;
+ }
+ this.pageHistoryChoice.loading = 0;
+ this.pageHistoryChoice = history;
+ // 缓存一下，但如果历史页面多了而且很大就占内存，也可以每次去拉取，先这样吧
+ if (history.content) {
+ history.loading = 2;
+ this.pageHistoryDetail = history.content || '内容为空';
+ } else {
+ history.loading = 1;
+ pageApi.pageHistoryDetail({id: history.id}).then(json => {
+ history.loading = 2;
+ this.pageHistoryDetail = json.data || '内容为空';
+ history.content = json.data || '内容为空';
+ });
+ }
+ },
+ clearHistory() {
+ this.pageHistoryChoice.loading = 0;
+ this.pageHistoryDetail = '';
+ this.pageHistoryChoice = {};
+ this.pageHistoryList.forEach(item => item.loading = 0);
+ },
loadPageDetail(pageId) {
- var param = {id: pageId};
- pageApi.pageDetail(param).then(json => {
+ this.clearHistory();
+ pageApi.pageDetail({id: pageId}).then(json => {
let result = json.data || {};
- var wikiPage = result.wikiPage || {};
+ let wikiPage = result.wikiPage || {};
wikiPage.selfZan = result.selfZan || 0;
this.wikiPage = wikiPage;
this.pageContent = result.pageContent || {};
@@ -320,25 +437,32 @@
this.$emit('changeExpandedKeys', pageId);
});
this.loadCommentList(pageId);
+ this.getPageHistory(pageId);
},
loadCommentList(pageId) {
- this.commentList = [];
this.cancelCommentUser();
- var param = {pageId: pageId};
- pageApi.pageCommentList(param).then(json => {
- var commentList = json.data || [];
- for (var i = 0; i < commentList.length; i++) {
+ pageApi.pageCommentList({pageId: pageId}).then(json => {
+ let commentList = json.data || [];
+ for (let i = 0; i < commentList.length; i++) {
commentList[i].color = this.getUserHeadBgColor(commentList[i].createUserId);
- var subCommentList = commentList[i].commentList || [];
- for (var j = 0; j < subCommentList.length; j++) {
- var subItem = subCommentList[j];
+ let subCommentList = commentList[i].commentList || [];
+ for (let j = 0; j < subCommentList.length; j++) {
+ let subItem = subCommentList[j];
subItem.color = this.getUserHeadBgColor(subItem.createUserId);
}
commentList[i].commentList = subCommentList;
+ commentList[i].visible = false;
}
this.commentList = commentList;
+ this.scrollActionTabComment();
});
},
+ scrollActionTabComment() {
+ setTimeout(() => {
+ let actionTabComment = this.$refs.actionTabComment;
+ actionTabComment.scrollTop = actionTabComment.scrollHeight;
+ }, 0);
+ },
zanPage(yn) {
var param = {yn: yn, pageId: this.wikiPage.id};
pageApi.updatePageZan(param).then(() => {
@@ -361,15 +485,9 @@
return this.selfUserId == row.createUserId || this.wikiPage.createUserId == this.selfUserId;
},
deleteComment(id) {
- this.$confirm('确定要除删此评论吗？', '提示', {
- confirmButtonText: '确定',
- cancelButtonText: '取消',
- type: 'warning'
- }).then(() => {
- pageApi.deletePageComment({id: id}).then(() => {
- this.$message.success("删除成功！");
- this.loadCommentList(this.parentPath.pageId);
- });
+ pageApi.deletePageComment({id: id}).then(() => {
+ // this.$message.success("删除成功！");
+ this.loadCommentList(this.parentPath.pageId);
});
},
cancelCommentUser() {
@@ -436,7 +554,7 @@
}
diff --git a/zyplayer-doc-wiki/pom.xml b/zyplayer-doc-wiki/pom.xml
index b7845b72..e971873c 100644
--- a/zyplayer-doc-wiki/pom.xml
+++ b/zyplayer-doc-wiki/pom.xml
@@ -58,6 +58,11 @@
zyplayer-doc-core
${zyplayer.doc.version}
+
+ org.eclipse.jgit
+ org.eclipse.jgit
+ 5.8.1.202007141445-r
+
diff --git a/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiPageAuthController.java b/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiPageAuthController.java
index 696898a7..383703b4 100644
--- a/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiPageAuthController.java
+++ b/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiPageAuthController.java
@@ -14,7 +14,7 @@ import com.zyplayer.doc.data.repository.support.consts.UserMsgType;
import com.zyplayer.doc.data.service.manage.*;
import com.zyplayer.doc.wiki.controller.vo.UserPageAuthVo;
import com.zyplayer.doc.wiki.framework.consts.WikiAuthType;
-import com.zyplayer.doc.wiki.service.WikiPageAuthService;
+import com.zyplayer.doc.wiki.service.common.WikiPageAuthService;
import org.apache.commons.collections.CollectionUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiPageCommentController.java b/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiPageCommentController.java
index 73e8cca5..8b54d3ac 100644
--- a/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiPageCommentController.java
+++ b/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiPageCommentController.java
@@ -68,15 +68,16 @@ public class WikiPageCommentController {
wrapper.eq("del_flag", 0);
wrapper.eq("page_id", pageComment.getPageId());
wrapper.eq(pageComment.getParentId() != null, "parent_id", pageComment.getParentId());
- List authList = wikiPageCommentService.list(wrapper);
- Map> listMap = authList.stream().filter(val -> val.getParentId() != null)
- .collect(Collectors.groupingBy(WikiPageComment::getParentId));
- List commentList = authList.stream().filter(val -> val.getParentId() == null)
- .map(val -> mapper.map(val, WikiPageCommentVo.class)).collect(Collectors.toList());
- for (WikiPageCommentVo commentVo : commentList) {
- commentVo.setCommentList(listMap.get(commentVo.getId()));
- }
- return DocResponseJson.ok(commentList);
+ List pageCommentList = wikiPageCommentService.list(wrapper);
+ // 取消二级评论，全展示在一级
+// Map> listMap = pageCommentList.stream().filter(val -> val.getParentId() != null)
+// .collect(Collectors.groupingBy(WikiPageComment::getParentId));
+// List commentList = pageCommentList.stream().filter(val -> val.getParentId() == null)
+// .map(val -> mapper.map(val, WikiPageCommentVo.class)).collect(Collectors.toList());
+// for (WikiPageCommentVo commentVo : commentList) {
+// commentVo.setCommentList(listMap.get(commentVo.getId()));
+// }
+ return DocResponseJson.ok(pageCommentList);
}
@PostMapping("/delete")
diff --git a/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiPageController.java b/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiPageController.java
index d4212e5b..4f9fe4af 100644
--- a/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiPageController.java
+++ b/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiPageController.java
@@ -25,7 +25,8 @@ import com.zyplayer.doc.data.utils.CacheUtil;
import com.zyplayer.doc.wiki.controller.vo.WikiPageContentVo;
import com.zyplayer.doc.wiki.controller.vo.WikiPageVo;
import com.zyplayer.doc.wiki.framework.consts.SpaceType;
-import com.zyplayer.doc.wiki.service.WikiPageAuthService;
+import com.zyplayer.doc.wiki.service.common.WikiPageAuthService;
+import com.zyplayer.doc.wiki.service.git.GitService;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.dozer.Mapper;
@@ -73,6 +74,8 @@ public class WikiPageController {
@Resource
UserMessageService userMessageService;
@Resource
+ GitService gitService;
+ @Resource
Mapper mapper;
@Autowired(required = false)
EsWikiPageService esWikiPageService;
@@ -278,6 +281,8 @@ public class WikiPageController {
} else {
logger.warn("未开启elasticsearch服务，建议开启");
}
+ // 提交历史版本记录
+ gitService.commitAndAddHistory(wikiPage.getId(), content);
return DocResponseJson.ok(wikiPage);
}
diff --git a/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiPageFileController.java b/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiPageFileController.java
index accaa3eb..57b89065 100644
--- a/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiPageFileController.java
+++ b/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiPageFileController.java
@@ -2,7 +2,6 @@ package com.zyplayer.doc.wiki.controller;
import cn.hutool.core.date.DateTime;
import cn.hutool.core.util.RandomUtil;
-import com.alibaba.fastjson.JSON;
import com.zyplayer.doc.core.annotation.AuthMan;
import com.zyplayer.doc.core.json.DocResponseJson;
import com.zyplayer.doc.core.json.ResponseJson;
@@ -18,7 +17,7 @@ import com.zyplayer.doc.data.service.manage.UserMessageService;
import com.zyplayer.doc.data.service.manage.WikiPageFileService;
import com.zyplayer.doc.data.service.manage.WikiPageService;
import com.zyplayer.doc.data.service.manage.WikiSpaceService;
-import com.zyplayer.doc.wiki.service.WikiPageAuthService;
+import com.zyplayer.doc.wiki.service.common.WikiPageAuthService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Value;
diff --git a/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiPageHistoryController.java b/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiPageHistoryController.java
new file mode 100644
index 00000000..28effad0
--- /dev/null
+++ b/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiPageHistoryController.java
@@ -0,0 +1,81 @@
+package com.zyplayer.doc.wiki.controller;
+
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.zyplayer.doc.core.annotation.AuthMan;
+import com.zyplayer.doc.core.json.DocResponseJson;
+import com.zyplayer.doc.core.json.ResponseJson;
+import com.zyplayer.doc.data.config.security.DocUserDetails;
+import com.zyplayer.doc.data.config.security.DocUserUtil;
+import com.zyplayer.doc.data.repository.manage.entity.*;
+import com.zyplayer.doc.data.repository.support.consts.UserMsgSysType;
+import com.zyplayer.doc.data.repository.support.consts.UserMsgType;
+import com.zyplayer.doc.data.service.manage.*;
+import com.zyplayer.doc.wiki.framework.consts.SpaceType;
+import com.zyplayer.doc.wiki.service.git.GitService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 文档控制器
+ *
+ * @author 暮光：城中城
+ * @since 2019年2月17日
+ */
+@AuthMan
+@RestController
+@RequestMapping("/zyplayer-doc-wiki/page/history")
+public class WikiPageHistoryController {
+ private static Logger logger = LoggerFactory.getLogger(WikiPageHistoryController.class);
+
+ @Resource
+ WikiPageHistoryService wikiPageHistoryService;
+ @Resource
+ WikiSpaceService wikiSpaceService;
+ @Resource
+ WikiPageService wikiPageService;
+ @Resource
+ GitService gitService;
+
+ @PostMapping("/list")
+ public ResponseJson> list(Long pageId, Integer pageNum) {
+ DocUserDetails currentUser = DocUserUtil.getCurrentUser();
+ WikiPage wikiPageSel = wikiPageService.getById(pageId);
+ WikiSpace wikiSpaceSel = wikiSpaceService.getById(wikiPageSel.getSpaceId());
+ // 私人空间
+ if (SpaceType.isOthersPrivate(wikiSpaceSel.getType(), currentUser.getUserId(), wikiSpaceSel.getCreateUserId())) {
+ return DocResponseJson.warn("您没有权限查看该空间的文章详情！");
+ }
+ UpdateWrapper wrapper = new UpdateWrapper<>();
+ wrapper.eq("page_id", pageId);
+ wrapper.eq("del_flag", 0);
+ IPage page = new Page<>(pageNum, 20, false);
+ wikiPageHistoryService.page(page, wrapper);
+ return DocResponseJson.ok(page);
+ }
+
+ @PostMapping("/detail")
+ public ResponseJson
+
+
+
+ {{scope.row.fileName}}
+
+
+
+
+ 删除
+
+
+
+
+
+
+
+
+ 赞
踩
-
+
成为第一个赞同者
{{wikiPage.zanNum}}人赞了它
我赞了它
我和{{wikiPage.zanNum-1}}个其他人赞了它
-
+
{{wikiPage.viewNum}}次阅读
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- 提交评论
- 取消回复
-
-
+
+
+
+
+
+
+
+ 暂无评论
+ {{comment.createUserName.substr(0,1)}}
+
+ {{comment.createUserName}}
+
+
+
+ 确定要除删此评论吗？
+
+ 取消
+ 确定
+
+
+ {{comment.content}}
+
+
+ 发送
+
+
+
+
+
+
+
+
+
+
+
+
+ 暂无修改历史记录
+ {{history.createUserName}}
+ {{history.createTime}}
+
{{comment.content}}-{{commentSub.content}}