From a081443c91078b98878c1a6df3876f8ceb522bbe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9A=AE=E5=85=89=EF=BC=9A=E5=9F=8E=E4=B8=AD=E5=9F=8E?= <806783409@qq.com> Date: Thu, 11 Jul 2019 23:36:30 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=86elasticsearch?= =?UTF-8?q?=E5=85=A8=E5=B1=80=E6=90=9C=E7=B4=A2=E5=92=8C=E6=96=87=E7=AB=A0?= =?UTF-8?q?=E5=86=85=E6=90=9C=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../manage/entity/WikiPageContent.java | 26 + .../manage/mapper/WikiPageContentMapper.java | 7 +- .../manage}/param/SearchByEsParam.java | 22 +- .../repository/manage}/vo/SpaceNewsVo.java | 2 +- .../mapper/manage/WikiPageContentMapper.xml | 23 + .../web/manage/DocSystemController.java | 2 +- .../sql/zyplayer_doc_manage.1.0.3.sql | 10 + zyplayer-doc-ui/wiki-ui/src/App.vue | 8 +- .../wiki-ui/src/common/config/apilist.js | 1 + .../wiki-ui/src/common/lib/common/common.js | 20 + zyplayer-doc-ui/wiki-ui/src/routes.js | 2 + .../wiki-ui/src/views/page/Search.vue | 122 +++ .../wiki-ui/src/views/user/Login.vue | 4 +- .../wiki/controller/WikiPageController.java | 88 +- .../wiki/controller/param/SpaceNewsParam.java | 40 - .../src/main/resources/doc-wiki-index.js | 10 +- .../src/main/resources/doc-wiki-manifest.js | 4 +- .../src/main/resources/doc-wiki-old.html | 841 ++++++++++++++++++ .../src/main/resources/doc-wiki-v2.html | 17 - .../src/main/resources/doc-wiki-vendor.js | 12 +- .../src/main/resources/doc-wiki.html | 2 +- 21 files changed, 1132 insertions(+), 131 deletions(-) rename {zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller => zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage}/param/SearchByEsParam.java (63%) rename {zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller => zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage}/vo/SpaceNewsVo.java (97%) create mode 100644 zyplayer-doc-ui/wiki-ui/src/views/page/Search.vue delete mode 100644 zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/param/SpaceNewsParam.java create mode 100644 zyplayer-doc-wiki/src/main/resources/doc-wiki-old.html delete mode 100644 zyplayer-doc-wiki/src/main/resources/doc-wiki-v2.html diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/WikiPageContent.java b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/WikiPageContent.java index d728b40a..2a4f62b0 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/WikiPageContent.java +++ b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/WikiPageContent.java @@ -69,6 +69,16 @@ public class WikiPageContent implements Serializable { */ private String preview; + /** + * 空间ID + */ + private Long spaceId; + + /** + * 名字 + */ + private String name; + public Long getId() { return id; } @@ -155,4 +165,20 @@ public class WikiPageContent implements Serializable { public void setPreview(String preview) { this.preview = preview; } + + public Long getSpaceId() { + return spaceId; + } + + public void setSpaceId(Long spaceId) { + this.spaceId = spaceId; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } } diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/mapper/WikiPageContentMapper.java b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/mapper/WikiPageContentMapper.java index e730520f..0b13dda2 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/mapper/WikiPageContentMapper.java +++ b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/mapper/WikiPageContentMapper.java @@ -2,6 +2,10 @@ package com.zyplayer.doc.data.repository.manage.mapper; import com.zyplayer.doc.data.repository.manage.entity.WikiPageContent; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.zyplayer.doc.data.repository.manage.param.SearchByEsParam; +import com.zyplayer.doc.data.repository.manage.vo.SpaceNewsVo; + +import java.util.List; /** *
@@ -12,5 +16,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
* @since 2019-02-24
*/
public interface WikiPageContentMapper extends BaseMapper
{{item.zanNum}}
+ {{item.viewNum}}
+ {{item.updateTime||item.createTime}}
+ 系统登录
-