2019/1/2 同步master线上backup

4d864df8 · 303514581@qq.com · 2cd1062a · 4d864df8 · 4d864df8
Commit 4d864df8 authored Jan 02, 2019 by 303514581@qq.com
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 4 deletions

src/main/java/com/zhiwei/messageflow/config/ESConfig.java
+2 -2

src/main/resources/es.properties
+4 -2

No files found.
--- a/src/main/java/com/zhiwei/messageflow/config/ESConfig.java
+++ b/src/main/java/com/zhiwei/messageflow/config/ESConfig.java
@@ -29,8 +29,8 @@ public class ESConfig {
 	public static String weiboMarkType;
 	
 	/** Es IP **/
-	public static final String ESIP = "1.119.44.201";
-//	public static final String ESIP = "202.107.192.94";
+//	public static final String ESIP = "1.119.44.201";
+	public static final String ESIP = "202.107.192.94";
 	/** Es PORT **/
 	public static final int ESPORT = 9200;
 	/** Es 9300PORT **/

--- a/src/main/resources/es.properties
+++ b/src/main/resources/es.properties
 #es.ip=192.168.1.75
-es.ip=1.119.44.201
+#es.ip=1.119.44.201
+es.ip=202.107.192.94
 #es.ip=192.168.0.234
 #es.ip=115.231.214.234
 #es.ip=192.168.0.11
 es.esPort=9300

-es.clusterName=Media-University
+#es.clusterName=Media-University
+es.clusterName=my-test-es
 #es.clusterName=elasticsearch
 #es.clusterName=MyEsCluster