From bf2bf47f53960d2b3e58d8b3a3482a913c2fcce0 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: Tue, 16 Jul 2019 22:33:42 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96es=EF=BC=8C=E5=8E=BB=E6=8E=89?= =?UTF-8?q?=E8=AF=84=E8=AE=BA=E6=9D=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../{service => entity}/EsWikiPage.java | 2 +- .../service/EsWikiPageService.java | 5 +++-- .../service/elasticsearch/support/Document.java | 5 ----- ...archConfig.java => ElasticSearchConfig.java} | 2 +- .../support/EsAbstractService.java | 10 +++++----- zyplayer-doc-ui/wiki-ui/src/views/page/Show.vue | 4 ++-- .../controller/WikiPageCommentController.java | 17 ++++++++--------- .../doc/wiki/controller/WikiPageController.java | 2 +- .../src/main/resources/doc-wiki-index.js | 4 ++-- .../src/main/resources/doc-wiki-manifest.js | 4 ++-- .../src/main/resources/doc-wiki.html | 2 +- 11 files changed, 26 insertions(+), 31 deletions(-) rename zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/elasticsearch/{service => entity}/EsWikiPage.java (98%) rename zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/elasticsearch/support/{ElaticSearchConfig.java => ElasticSearchConfig.java} (97%) diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/elasticsearch/service/EsWikiPage.java b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/elasticsearch/entity/EsWikiPage.java similarity index 98% rename from zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/elasticsearch/service/EsWikiPage.java rename to zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/elasticsearch/entity/EsWikiPage.java index 0e475514..06a1ebb1 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/elasticsearch/service/EsWikiPage.java +++ b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/elasticsearch/entity/EsWikiPage.java @@ -1,4 +1,4 @@ -package com.zyplayer.doc.data.service.elasticsearch.service; +package com.zyplayer.doc.data.service.elasticsearch.entity; import com.zyplayer.doc.data.service.elasticsearch.support.Document; diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/elasticsearch/service/EsWikiPageService.java b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/elasticsearch/service/EsWikiPageService.java index 9bc37cec..47f161d1 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/elasticsearch/service/EsWikiPageService.java +++ b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/elasticsearch/service/EsWikiPageService.java @@ -1,6 +1,7 @@ package com.zyplayer.doc.data.service.elasticsearch.service; -import com.zyplayer.doc.data.service.elasticsearch.support.ElaticSearchConfig; +import com.zyplayer.doc.data.service.elasticsearch.entity.EsWikiPage; +import com.zyplayer.doc.data.service.elasticsearch.support.ElasticSearchConfig; import com.zyplayer.doc.data.service.elasticsearch.support.EsAbstractService; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.stereotype.Service; @@ -11,7 +12,7 @@ import org.springframework.stereotype.Service; * @since 2019-07-07 */ @Service -@ConditionalOnBean(ElaticSearchConfig.class) +@ConditionalOnBean(ElasticSearchConfig.class) public class EsWikiPageService extends EsAbstractService { @Override diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/elasticsearch/support/Document.java b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/elasticsearch/support/Document.java index 1e2e2e2d..6cb837e7 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/elasticsearch/support/Document.java +++ b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/elasticsearch/support/Document.java @@ -1,8 +1,3 @@ -// -// Source code recreated from a .class file by IntelliJ IDEA -// (powered by Fernflower decompiler) -// - package com.zyplayer.doc.data.service.elasticsearch.support; import java.lang.annotation.*; diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/elasticsearch/support/ElaticSearchConfig.java b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/elasticsearch/support/ElasticSearchConfig.java similarity index 97% rename from zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/elasticsearch/support/ElaticSearchConfig.java rename to zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/elasticsearch/support/ElasticSearchConfig.java index d47434a0..fbc8ccc2 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/elasticsearch/support/ElaticSearchConfig.java +++ b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/elasticsearch/support/ElasticSearchConfig.java @@ -20,7 +20,7 @@ import java.net.UnknownHostException; */ @Configuration @ConditionalOnProperty(prefix = "zyplayer.doc.manage.elasticsearch", name = "open", havingValue = "true") -public class ElaticSearchConfig { +public class ElasticSearchConfig { @Value(value = "${zyplayer.doc.manage.elasticsearch.host:''}") private String host; diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/elasticsearch/support/EsAbstractService.java b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/elasticsearch/support/EsAbstractService.java index 77091fbe..7ab3f900 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/elasticsearch/support/EsAbstractService.java +++ b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/elasticsearch/support/EsAbstractService.java @@ -38,7 +38,7 @@ public abstract class EsAbstractService { private static final Logger logger = LoggerFactory.getLogger(EsAbstractService.class); @Resource - private TransportClient esClient; + private TransportClient transportClient; @Resource private Mapper mapper; @@ -58,7 +58,7 @@ public abstract class EsAbstractService { public boolean create(T table) { String pk = getPrimaryKey(table); - IndexResponse indexResponse = this.esClient + IndexResponse indexResponse = this.transportClient .prepareIndex(this.getIndexName(), this.getIndexType()) .setId(pk) .setSource(JSONObject.toJSONString(table), XContentType.JSON) @@ -69,7 +69,7 @@ public abstract class EsAbstractService { public boolean update(T table) { String pk = getPrimaryKey(table); - UpdateResponse updateResponse = this.esClient + UpdateResponse updateResponse = this.transportClient .prepareUpdate(this.getIndexName(), this.getIndexType(), pk) .setDoc(JSONObject.toJSONString(table), XContentType.JSON) .get(); @@ -79,7 +79,7 @@ public abstract class EsAbstractService { public void delete(T table) { String pk = getPrimaryKey(table); - DeleteResponse response = this.esClient + DeleteResponse response = this.transportClient .prepareDelete(this.getIndexName(), this.getIndexType(), pk) .execute() .actionGet(); @@ -150,7 +150,7 @@ public abstract class EsAbstractService { highlightBuilder.preTags(""); highlightBuilder.postTags(""); highlightBuilder.field("*"); - SearchRequestBuilder requestBuilder = esClient.prepareSearch(this.getIndexName()).setTypes(this.getIndexType()) + SearchRequestBuilder requestBuilder = transportClient.prepareSearch(this.getIndexName()).setTypes(this.getIndexType()) .setQuery(queryBuilders) .highlighter(highlightBuilder) .setFrom(startIndex).setSize(pageSize).setExplain(true); 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 c0c8b362..7ccab925 100644 --- a/zyplayer-doc-ui/wiki-ui/src/views/page/Show.vue +++ b/zyplayer-doc-ui/wiki-ui/src/views/page/Show.vue @@ -110,8 +110,8 @@