From fc024145190906995604e0740c15b34d99f34840 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, 23 Jul 2019 21:41:20 +0800
Subject: [PATCH] =?UTF-8?q?es=E6=96=87=E6=A1=A3=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
zyplayer-doc-data/pom.xml | 25 ----
.../controller/EsMappingController.java | 23 +++-
.../src/main/resources/doc-es-index.js | 14 ++
.../src/main/resources/doc-es-manifest.js | 2 +
.../src/main/resources/doc-es-vendor.js | 21 +++
.../src/main/resources/doc-es.html | 14 ++
.../web/manage/DocSystemController.java | 6 +
.../sql/zyplayer_doc_manage.1.0.3.sql | 3 +
.../static/console/doc-console-index.js | 8 +-
.../static/console/doc-console-manifest.js | 4 +-
.../webapp/static/console/doc-console.html | 2 +-
.../console-ui/src/views/home/Home.vue | 4 +
zyplayer-doc-ui/es-ui/package-lock.json | 23 ++--
zyplayer-doc-ui/es-ui/src/App.vue | 123 ++++-------------
.../es-ui/src/common/config/apilist.js | 2 +
zyplayer-doc-ui/es-ui/src/doc-es.html | 2 +-
zyplayer-doc-ui/es-ui/src/index.html | 2 +-
zyplayer-doc-ui/es-ui/src/routes.js | 16 +--
.../src/views/{table => index}/RouterView.vue | 0
.../es-ui/src/views/index/Show.vue | 67 +++++++++
.../es-ui/src/views/table/Database.vue | 72 ----------
.../es-ui/src/views/table/Info.vue | 128 ------------------
22 files changed, 205 insertions(+), 356 deletions(-)
create mode 100644 zyplayer-doc-es/src/main/resources/doc-es-index.js
create mode 100644 zyplayer-doc-es/src/main/resources/doc-es-manifest.js
create mode 100644 zyplayer-doc-es/src/main/resources/doc-es-vendor.js
create mode 100644 zyplayer-doc-es/src/main/resources/doc-es.html
rename zyplayer-doc-ui/es-ui/src/views/{table => index}/RouterView.vue (100%)
create mode 100644 zyplayer-doc-ui/es-ui/src/views/index/Show.vue
delete mode 100644 zyplayer-doc-ui/es-ui/src/views/table/Database.vue
delete mode 100644 zyplayer-doc-ui/es-ui/src/views/table/Info.vue
diff --git a/zyplayer-doc-data/pom.xml b/zyplayer-doc-data/pom.xml
index d30bfc9d..c5d984a7 100644
--- a/zyplayer-doc-data/pom.xml
+++ b/zyplayer-doc-data/pom.xml
@@ -104,31 +104,6 @@
aspectjtools
-
- org.elasticsearch
- elasticsearch
- ${elasticsearch.version}
-
-
- org.elasticsearch.client
- elasticsearch-rest-client
- ${elasticsearch.version}
-
-
- org.elasticsearch.client
- transport
- ${elasticsearch.version}
-
-
- org.elasticsearch.plugin
- transport-netty4-client
- ${elasticsearch.version}
-
-
- org.elasticsearch.plugin
- reindex-client
- ${elasticsearch.version}
-
org.elasticsearch.client
elasticsearch-rest-high-level-client
diff --git a/zyplayer-doc-es/src/main/java/com/zyplayer/doc/elasticsearch/controller/EsMappingController.java b/zyplayer-doc-es/src/main/java/com/zyplayer/doc/elasticsearch/controller/EsMappingController.java
index 5e53e414..8a7b7554 100644
--- a/zyplayer-doc-es/src/main/java/com/zyplayer/doc/elasticsearch/controller/EsMappingController.java
+++ b/zyplayer-doc-es/src/main/java/com/zyplayer/doc/elasticsearch/controller/EsMappingController.java
@@ -3,6 +3,7 @@ package com.zyplayer.doc.elasticsearch.controller;
import com.zyplayer.doc.core.json.DocResponseJson;
import com.zyplayer.doc.core.json.ResponseJson;
import com.zyplayer.doc.data.service.elasticsearch.support.ElasticSearchUtil;
+import org.apache.commons.lang3.StringUtils;
import org.elasticsearch.client.RequestOptions;
import org.elasticsearch.client.RestHighLevelClient;
import org.elasticsearch.client.indices.GetMappingsRequest;
@@ -12,6 +13,7 @@ import org.elasticsearch.common.unit.TimeValue;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@@ -37,15 +39,22 @@ public class EsMappingController {
@Resource
ElasticSearchUtil elasticSearchUtil;
- @GetMapping("/mappings")
- public ResponseJson