diff --git a/bookMarkService/common/src/main/java/com/fanxb/bookmark/common/exception/EsException.java b/bookMarkService/common/src/main/java/com/fanxb/bookmark/common/exception/EsException.java
new file mode 100644
index 0000000..3154fe4
--- /dev/null
+++ b/bookMarkService/common/src/main/java/com/fanxb/bookmark/common/exception/EsException.java
@@ -0,0 +1,18 @@
+package com.fanxb.bookmark.common.exception;
+
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * 类功能简述：
+ * 类功能详述：
+ *
+ * @author fanxb
+ * @date 2019/7/26 11:31
+ */
+@Slf4j
+public class EsException extends CustomException {
+
+    public EsException(Exception e) {
+        super("当前服务不可用，请稍后重试", 0, e);
+    }
+}
diff --git a/bookMarkService/common/src/main/java/com/fanxb/bookmark/common/exception/ExceptionHandle.java b/bookMarkService/common/src/main/java/com/fanxb/bookmark/common/exception/ExceptionHandle.java
index 976c63f..e2d3c14 100644
--- a/bookMarkService/common/src/main/java/com/fanxb/bookmark/common/exception/ExceptionHandle.java
+++ b/bookMarkService/common/src/main/java/com/fanxb/bookmark/common/exception/ExceptionHandle.java
@@ -20,12 +20,13 @@ public class ExceptionHandle {
 
     @ExceptionHandler(Exception.class)
     public Result handleException(Exception e) {
-        logger.error("捕获到错误:", e);
         CustomException ce;
         if (e instanceof CustomException) {
+            logger.error("捕获到自定义错误:{}", e.getMessage(), e);
             ce = (CustomException) e;
         } else {
-            ce = new CustomException(e);
+            logger.error("捕获到意外错误:{}", e.getMessage(), e);
+            ce = new CustomException("服务器异常");
         }
         return new Result(ce.getCode(), ce.getMessage(), null);
     }
diff --git a/bookMarkService/common/src/main/java/com/fanxb/bookmark/common/util/EsUtil.java b/bookMarkService/common/src/main/java/com/fanxb/bookmark/common/util/EsUtil.java
index 451dd05..b0cb28d 100644
--- a/bookMarkService/common/src/main/java/com/fanxb/bookmark/common/util/EsUtil.java
+++ b/bookMarkService/common/src/main/java/com/fanxb/bookmark/common/util/EsUtil.java
@@ -4,8 +4,10 @@ import com.alibaba.fastjson.JSON;
 import com.fanxb.bookmark.common.constant.EsConstant;
 import com.fanxb.bookmark.common.entity.EsEntity;
 import com.fanxb.bookmark.common.exception.CustomException;
+import com.fanxb.bookmark.common.exception.EsException;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.http.HttpHost;
+import org.elasticsearch.action.admin.indices.delete.DeleteIndexRequest;
 import org.elasticsearch.action.bulk.BulkRequest;
 import org.elasticsearch.action.delete.DeleteRequest;
 import org.elasticsearch.action.index.IndexRequest;
@@ -19,6 +21,8 @@ import org.elasticsearch.client.indices.CreateIndexResponse;
 import org.elasticsearch.client.indices.GetIndexRequest;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.xcontent.XContentType;
+import org.elasticsearch.index.query.QueryBuilder;
+import org.elasticsearch.index.reindex.DeleteByQueryRequest;
 import org.elasticsearch.search.SearchHit;
 import org.elasticsearch.search.builder.SearchSourceBuilder;
 import org.springframework.beans.factory.annotation.Value;
@@ -54,6 +58,9 @@ public class EsUtil {
     @PostConstruct
     public void init() {
         try {
+            if (client != null) {
+                client.close();
+            }
             client = new RestHighLevelClient(RestClient.builder(new HttpHost(host, port, scheme)));
             if (this.indexExist(EsConstant.BOOKMARK_INDEX)) {
                 return;
@@ -66,8 +73,7 @@ public class EsUtil {
                 throw new CustomException("初始化失败");
             }
         } catch (Exception e) {
-            log.error("初始化es失败", e);
-            System.exit(0);
+            log.error("注意初始化es失败", e);
         }
 
     }
@@ -103,7 +109,7 @@ public class EsUtil {
         try {
             client.index(request, RequestOptions.DEFAULT);
         } catch (Exception e) {
-            throw new CustomException(e);
+            throw new EsException(e);
         }
     }
 
@@ -122,7 +128,7 @@ public class EsUtil {
         try {
             client.bulk(request, RequestOptions.DEFAULT);
         } catch (Exception e) {
-            throw new CustomException(e);
+            throw new EsException(e);
         }
     }
 
@@ -140,7 +146,7 @@ public class EsUtil {
         try {
             client.bulk(request, RequestOptions.DEFAULT);
         } catch (Exception e) {
-            throw new CustomException(e);
+            throw new EsException(e);
         }
     }
 
@@ -166,7 +172,44 @@ public class EsUtil {
             }
             return res;
         } catch (Exception e) {
-            throw new CustomException(e);
+            throw new EsException(e);
+        }
+    }
+
+    /**
+     * Description: 删除index
+     *
+     * @param index index
+     * @return void
+     * @author fanxb
+     * @date 2019/7/26 11:30
+     */
+    public void deleteIndex(String index) {
+        try {
+            client.indices().delete(new DeleteIndexRequest(index), RequestOptions.DEFAULT);
+        } catch (Exception e) {
+            throw new EsException(e);
+        }
+    }
+
+    /**
+     * Description: delete by query
+     *
+     * @param index   index
+     * @param builder builder
+     * @author fanxb
+     * @date 2019/7/26 15:16
+     */
+    public void deleteByQuery(String index, QueryBuilder builder) {
+        DeleteByQueryRequest request = new DeleteByQueryRequest(index);
+        request.setQuery(builder);
+        //设置批量操作数量,最大为10000
+        request.setBatchSize(10000);
+        request.setConflicts("proceed");
+        try {
+            client.deleteByQuery(request, RequestOptions.DEFAULT);
+        } catch (Exception e) {
+            throw new EsException(e);
         }
     }