推送的邮件修改

.gitignore

@@ -6,3 +6,4 @@
 .svn
 .settings/
 target/
+/Jenkinsfile/
\ No newline at end of file

src/main/java/com/zhiwei/finance/ESUtil.java

@@ -101,7 +101,7 @@ public class ESUtil {
 		// path = doc.getString("url");
 		// }
 		// }
-//		sources = new ReadExcel().getExcel(path);
+		// sources = new ReadExcel().getExcel(path);
 		Calendar cal = Calendar.getInstance();
 		cal.add(Calendar.HOUR_OF_DAY, -1);
 		List<NewsResult> list = new ESUtil().pushByKey(cal.getTime(), new Date(), sources, "wechat");
@@ -153,15 +153,15 @@ public class ESUtil {
 				// 搜索数据
 				SearchRequestBuilder srb = esClient.prepareSearch(Config.getVal("indexName." + type));
 				BoolQueryBuilder bb = new BoolQueryBuilder();
-				if (type.equals("weibo")) {
-					QueryBuilder matchQuery = QueryBuilders.termQuery("messages", key);
-					bb.should(matchQuery);
-					srb.setQuery(bb);
-				} else {
+				// if (type.equals("weibo")) {
+				// QueryBuilder matchQuery = QueryBuilders.termQuery("messages", key);
+				// bb.should(matchQuery);
+				// srb.setQuery(bb);
+				// } else {
 				QueryBuilder matchQuery = QueryBuilders.termQuery("content", key);
 				bb.should(matchQuery);
 				srb.setQuery(bb);
-				}
+				// }
 				srb.setPostFilter(QueryBuilders.rangeQuery("time")
 						.gte(sdf.format(startTime.getTime()) + "T" + (startHour > 10 ? startHour : "0" + startHour)
 								+ ":00:00.000Z")
@@ -179,21 +179,21 @@ public class ESUtil {
 					if (!url.contains("http")) {
 						url = String.valueOf(map.get("id"));
 					}
-					if (type.equals("weibo")) {
-						n.setUrl(url);
-						if (map.get("roottext") == null) {
-							n.setTitle(String.valueOf(map.get("text")));
-						} else {
-							n.setTitle(String.valueOf(map.get("roottext")));
-						}
-						try {
-							n.setTime(map.get("time") + "");
-						} catch (Exception e) {
-							n.setTime("");
-						}
-						n.setSource(String.valueOf(map.get("username")));
-						result.add(n);
-					} else {
+					// if (type.equals("weibo")) {
+					// n.setUrl(url);
+					// if (map.get("roottext") == null) {
+					// n.setTitle(String.valueOf(map.get("text")));
+					// } else {
+					// n.setTitle(String.valueOf(map.get("roottext")));
+					// }
+					// try {
+					// n.setTime(map.get("time") + "");
+					// } catch (Exception e) {
+					// n.setTime("");
+					// }
+					// n.setSource(String.valueOf(map.get("username")));
+					// result.add(n);
+					// } else {
 					n.setUrl(url);
 					n.setTitle(String.valueOf(map.get("title")));
 					try {
@@ -204,14 +204,12 @@ public class ESUtil {
 					}
 					n.setSource(String.valueOf(map.get("source")));
 					result.add(n);
-					}
+					// }
 				}
 			}
 			log.info("金融结束");
 		} catch (Exception e) {
 			log.error("es检索出错，错误信息【{}】", e);
-		} finally {
-			esClient.close();
 		}
 		for (NewsResult news : result) {
 			for (String source : sources) {