2018/8/1 消息流8092稳定版

pom.xml

@@ -126,7 +126,7 @@
 			<groupId>com.zhiwei.middleware</groupId>
 			<artifactId>automaticmark-client</artifactId>
 			<version>1.0-SNAPSHOT</version>
-		</dependency>
+		</dependency> 
 
 	</dependencies>
 

src/main/java/com/zhiwei/messageflow/config/MiddlewareConfig.java

 package com.zhiwei.messageflow.config;
 
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.PropertySource;
-import org.springframework.stereotype.Component;
+import java.io.InputStream;
+import java.util.Properties;
 
 import lombok.Data;
 import lombok.ToString;
@@ -16,12 +14,20 @@ import lombok.ToString;
  */
 @Data
 @ToString
-@Component
-@Configuration
-@ConfigurationProperties(prefix = "middleware")
-@PropertySource(value = "classpath:middleware.properties")
 public class MiddlewareConfig {
-	
+	static {
+		Properties conf = null;
+		try {
+			InputStream is = Thread.currentThread().getContextClassLoader()
+					.getResourceAsStream("middleware.properties");
+			conf = new Properties();
+			conf.load(is);
+			is.close();
+			zookeeperIp = conf.getProperty("middleware.zookeeperIp");
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+	}
 	public static String zookeeperIp;
 	
 }

src/main/java/com/zhiwei/messageflow/config/MongoConfig.java

@@ -17,25 +17,25 @@ import lombok.ToString;
 @PropertySource(value = "classpath:mongo.properties")
 public class MongoConfig {
 
-	private String LocalIP;
-	private int Localport;
-	private String LocalDBName;
-
-	private String ServerIP;
-	private int Serverport;
-	private String ServerDBName;
-	private String ServerUsername;
-	private String ServerPassword;
-	private String authenticationDatabase;
-
-	private String EventDBName;
-	private String WechatDBName;
-	private String TestDBName;
-
-	private String weibotagDBName;
-	private String mediatagDBName;
-	private String TagIP;
-	private int Tagport;
+//	private String LocalIP;
+//	private int Localport;
+//	private String LocalDBName;
+//
+//	private String ServerIP;
+//	private int Serverport;
+//	private String ServerDBName;
+//	private String ServerUsername;
+//	private String ServerPassword;
+//	private String authenticationDatabase;
+//
+//	private String EventDBName;
+//	private String WechatDBName;
+//	private String TestDBName;
+//
+//	private String weibotagDBName;
+//	private String mediatagDBName;
+//	private String TagIP;
+//	private int Tagport;
 
 	private int connectionsPerHost;
 	private int threadsAllowedToBlockForConnectionMultiplier;

src/main/java/com/zhiwei/messageflow/es/service/impl/AutoMarkServiceImpl.java

@@ -17,9 +17,9 @@ import com.zhiwei.middleware.automaticmark.Service.AutomaticMarkClient;
 @Component
 public class AutoMarkServiceImpl implements AutoMarkService {
 
-	private static AutomaticMarkClient client = AutomaticMarkClient.getClient("zookeeper://192.168.0.234:2181");
-	// private static AutomaticMarkClient client =
-	// AutomaticMarkClient.getClient("zookeeper://192.168.0.203:2181");
+	 private static AutomaticMarkClient client = AutomaticMarkClient.getClient(MiddlewareConfig.zookeeperIp);
+	 
+//	 private static AutomaticMarkClient client = AutomaticMarkClient.getClient("zookeeper://192.168.0.234:2181");
 
 	@Override
 	public void autoMarkMessages(List<JSONObject> messages, Project project) {

src/main/java/com/zhiwei/messageflow/es/service/impl/EarlyWarningServiceImpl.java

@@ -36,15 +36,15 @@ public class EarlyWarningServiceImpl implements EarlyWarningService {
 			 */
 			long createAt = trackRule.getCreateAt();
 			long addDay = 0;
-			if (trackRule.getEarlyWarningTime().equals("一天")) {
-				addDay = 24 * 60 * 60 * 1000L;
-			} else if (trackRule.getEarlyWarningTime().equals("二天")) {
-				addDay = 2 * 24 * 60 * 60 * 1000L;
-			} else if (trackRule.getEarlyWarningTime().equals("三天")) {
-				addDay = 3 * 24 * 60 * 60 * 1000L;
-			}
-
-			long confirm = createAt + addDay;
+//			if (trackRule.getEarlyWarningTime().equals("一天")) {
+//				addDay = 24 * 60 * 60 * 1000L;
+//			} else if (trackRule.getEarlyWarningTime().equals("二天")) {
+//				addDay = 2 * 24 * 60 * 60 * 1000L;
+//			} else if (trackRule.getEarlyWarningTime().equals("三天")) {
+//				addDay = 3 * 24 * 60 * 60 * 1000L;
+//			}
+
+			long confirm = System.currentTimeMillis()+1L;//createAt + addDay;
 			if (confirm <= System.currentTimeMillis()) {
 				// 过期
 				trackRule.setWarn(true);
@@ -113,17 +113,17 @@ public class EarlyWarningServiceImpl implements EarlyWarningService {
 			 */
 			long createAt = trackRule.getCreateAt();
 			long addDay = 0;
-			if (trackRule.getEarlyWarningTime().equals("一天")) {
-				addDay = 24 * 60 * 60 * 1000L;
-			} else if (trackRule.getEarlyWarningTime().equals("二天")) {
-				addDay = 2 * 24 * 60 * 60 * 1000L;
-			} else if (trackRule.getEarlyWarningTime().equals("三天")) {
-				addDay = 3 * 24 * 60 * 60 * 1000L;
-			} else if (trackRule.getEarlyWarningTime().equals("一月")) {
-				addDay = 30 * 24 * 60 * 60 * 1000L;
-			}
-
-			long confirm = createAt + addDay;
+//			if (trackRule.getEarlyWarningTime().equals("一天")) {
+//				addDay = 24 * 60 * 60 * 1000L;
+//			} else if (trackRule.getEarlyWarningTime().equals("二天")) {
+//				addDay = 2 * 24 * 60 * 60 * 1000L;
+//			} else if (trackRule.getEarlyWarningTime().equals("三天")) {
+//				addDay = 3 * 24 * 60 * 60 * 1000L;
+//			} else if (trackRule.getEarlyWarningTime().equals("一月")) {
+//				addDay = 30 * 24 * 60 * 60 * 1000L;
+//			}
+
+			long confirm = System.currentTimeMillis()+1L;//createAt + addDay;
 			if (confirm <= System.currentTimeMillis()) {
 				// 过期
 				trackRule.setWarn(true);

src/main/java/com/zhiwei/messageflow/util/ESQueryUtil.java

@@ -383,7 +383,8 @@ public class ESQueryUtil {
 							fields.add("title");
 						}
 					}
-					if ((matchFields.equals("全文") || matchFields.equals("标题+全文") || matchFields.equals(""))&&!ptList.contains("video")) {
+					if (matchFields.equals("全文") || matchFields.equals("标题+全文") || matchFields.equals("")) {
+//						if ((matchFields.equals("全文") || matchFields.equals("标题+全文") || matchFields.equals(""))&&!ptList.contains("video")) {
 						if (!fields.contains("content")) {
 							fields.add("content");
 						}

src/main/resources/application.properties

-##\u009C\u008D\u008A端uri
+##\uFFFD\u009C\u008D\uFFFD\u008A\uFFFD\u7AEFuri
 #spring.data.mongodb.uri=115.236.59.91:27017
 
 #\u5185\u7F6Etomcat\u7AEF\u53E3\u53F7
-server.port=8091
+server.port=8092
 
-#\u009C\u008D\u008A端\u0095\u008D\u0093
+#\uFFFD\u009C\u008D\uFFFD\u008A\uFFFD\u7AEF\uFFFD\u0095\uFFFD\uFFFD\u008D\uFFFD\uFFFD\u0093
 spring.data.mongodb.primary.database=qbjcPhoenix
-#\u009C\u008D\u008Aip
+#\uFFFD\u009C\u008D\uFFFD\u008A\uFFFDip
 spring.data.mongodb.primary.host=192.168.0.101
-#\u009C\u008D\u008Aport
-spring.data.mongodb.primary.port=27017
+#\uFFFD\u009C\u008D\uFFFD\u008A\uFFFDport
+spring.data.mongodb.primary.port=30000
 
 spring.data.mongodb.primary.username=stno
 
@@ -17,12 +17,12 @@ spring.data.mongodb.primary.password=stno1q2w3e4r
 
 spring.data.mongodb.primary.authenticationDatabase=admin
 
-#\u009C\u008D\u008A端\u0095\u008D\u0093
+#\uFFFD\u009C\u008D\uFFFD\u008A\uFFFD\u7AEF\uFFFD\u0095\uFFFD\uFFFD\u008D\uFFFD\uFFFD\u0093
 spring.data.mongodb.secondary.database=eventMuseum
-#\u009C\u008D\u008Aip
+#\uFFFD\u009C\u008D\uFFFD\u008A\uFFFDip
 spring.data.mongodb.secondary.host=192.168.0.101
-#\u009C\u008D\u008Aport
-spring.data.mongodb.secondary.port=27017
+#\uFFFD\u009C\u008D\uFFFD\u008A\uFFFDport
+spring.data.mongodb.secondary.port=30000
 
 spring.data.mongodb.secondary.username=stno
 
@@ -30,12 +30,12 @@ spring.data.mongodb.secondary.password=stno1q2w3e4r
 
 spring.data.mongodb.secondary.authenticationDatabase=admin
 
-#\u009C\u008D\u008A端\u0095\u008D\u0093
+#\uFFFD\u009C\u008D\uFFFD\u008A\uFFFD\u7AEF\uFFFD\u0095\uFFFD\uFFFD\u008D\uFFFD\uFFFD\u0093
 spring.data.mongodb.thirdary.database=WechatPublic
-#\u009C\u008D\u008Aip
+#\uFFFD\u009C\u008D\uFFFD\u008A\uFFFDip
 spring.data.mongodb.thirdary.host=192.168.0.101
-#\u009C\u008D\u008Aport
-spring.data.mongodb.thirdary.port=27017
+#\uFFFD\u009C\u008D\uFFFD\u008A\uFFFDport
+spring.data.mongodb.thirdary.port=30000
 
 spring.data.mongodb.thirdary.username=stno
 
@@ -64,21 +64,21 @@ spring.data.mongodb.thirdary.authenticationDatabase=admin
 #spring.data.mongodb.option.heartbeat-frequency=10000
 #spring.data.mongodb.option.local-threshold=15
 
-##\u009C\u009Cip
+##\uFFFD\u009C\uFFFD\uFFFD\u009C\uFFFDip
 #spring.data.mongodb.host=192.168.0.241
-##\u009C\u009Cport
+##\uFFFD\u009C\uFFFD\uFFFD\u009C\uFFFDport
 #spring.data.mongodb.port=27017
-##\u009C\u009C\u0095\u008D\u0093
+##\uFFFD\u009C\uFFFD\uFFFD\u009C\uFFFD\uFFFD\u0095\uFFFD\uFFFD\u008D\uFFFD\uFFFD\u0093
 #spring.data.mongodb.database=qbjcPhoenix
 
-#\u0085\u0096\u0095\u008D\u0093
+#\uFFFD\u0085\uFFFD\uFFFD\u0096\uFFFD\u0095\uFFFD\uFFFD\u008D\uFFFD\uFFFD\u0093
 #spring.data.mongodb.database=eventMuseum
 #spring.data.mongodb.database=WechatPublic
  
-#tag\u0094uri
+#tag\uFFFD\u0094\uFFFDuri
 #spring.data.mongodb.uri=1.119.44.206:30000
 #spring.data.mongodb.uri=192.168.0.245:27017
-#tag\u0095\u008D\u0093
+#tag\uFFFD\u0095\uFFFD\uFFFD\u008D\uFFFD\uFFFD\u0093
 #spring.data.mongodb.database=Testqbjc
 #spring.data.mongodb.database=weibotag
 

src/main/resources/application.properties.local1

@@ -16,9 +16,9 @@ spring.data.mongodb.primary.port=27017
 #服务端数据库
 spring.data.mongodb.secondary.database=eventMuseum
 #服务ip
-spring.data.mongodb.secondary.host=115.236.59.91
+spring.data.mongodb.secondary.host=202.107.192.94
 #服务port
-spring.data.mongodb.secondary.port=27017
+spring.data.mongodb.secondary.port=30000
 
 spring.data.mongodb.secondary.username=stno
 
@@ -29,9 +29,9 @@ spring.data.mongodb.secondary.authenticationDatabase=admin
 #服务端数据库
 spring.data.mongodb.thirdary.database=WechatPublic
 #服务ip
-spring.data.mongodb.thirdary.host=115.236.59.91
+spring.data.mongodb.thirdary.host=202.107.192.94
 #服务port
-spring.data.mongodb.thirdary.port=27017
+spring.data.mongodb.thirdary.port=30000
 
 spring.data.mongodb.thirdary.username=stno
 

src/main/resources/application.properties.local2

@@ -3,9 +3,9 @@
 #服务端数据库
 spring.data.mongodb.primary.database=qbjcPhoenix
 #服务ip
-spring.data.mongodb.primary.host=115.236.59.91
+spring.data.mongodb.primary.host=202.107.192.94
 #服务port
-spring.data.mongodb.primary.port=27017
+spring.data.mongodb.primary.port=30000
 
 spring.data.mongodb.primary.username=stno
 
@@ -16,9 +16,9 @@ spring.data.mongodb.primary.authenticationDatabase=admin
 #服务端数据库
 spring.data.mongodb.secondary.database=eventMuseum
 #服务ip
-spring.data.mongodb.secondary.host=115.236.59.91
+spring.data.mongodb.secondary.host=202.107.192.94
 #服务port
-spring.data.mongodb.secondary.port=27017
+spring.data.mongodb.secondary.port=30000
 
 spring.data.mongodb.secondary.username=stno
 
@@ -29,9 +29,9 @@ spring.data.mongodb.secondary.authenticationDatabase=admin
 #服务端数据库
 spring.data.mongodb.thirdary.database=WechatPublic
 #服务ip
-spring.data.mongodb.thirdary.host=115.236.59.91
+spring.data.mongodb.thirdary.host=202.107.192.94
 #服务port
-spring.data.mongodb.thirdary.port=27017
+spring.data.mongodb.thirdary.port=30000
 
 spring.data.mongodb.thirdary.username=stno
 

src/main/resources/middleware.properties

-middleware.zookeeperIp=zookeeper://192.168.0.234:2181
+#middleware.zookeeperIp=zookeeper://192.168.0.234:2181
\ No newline at end of file
+middleware.zookeeperIp=zookeeper://192.168.0.203:2181
\ No newline at end of file

src/main/resources/mongo.properties

@@ -3,29 +3,29 @@
 #mongo.Localport = 27017
 
 #mongo.LocalIP = 115.236.59.91
-mongo.LocalIP = 192.168.0.101
-mongo.LocalDBName = qbjcPhoenix
-mongo.Localport = 27017
-
-mongo.ServerIP = 192.168.0.101
-#mongo.ServerIP = 115.236.59.91
-mongo.ServerDBName = qbjcPhoenix
-mongo.Serverport = 27017
-
-mongo.ServerUsername = stno
-mongo.ServerPassword = stno1q2w3e4r
-mongo.authenticationDatabase=admin
-
-mongo.EventDBName = eventMuseum
-mongo.WechatDBName = WechatPublic
-mongo.TestDBName = Testqbjc
-
-mongo.weibotagDBName = weibotag
-mongo.mediatagDBName = mediatag
-#mongo.TagIP = 1.119.44.206
-mongo.TagIP = 192.168.0.245
-#mongo.Tagport = 30000
-mongo.Tagport = 27017
+#mongo.LocalIP = 192.168.0.101
+#mongo.LocalDBName = qbjcPhoenix
+#mongo.Localport = 27017
+#
+#mongo.ServerIP = 192.168.0.101
+##mongo.ServerIP = 115.236.59.91
+#mongo.ServerDBName = qbjcPhoenix
+#mongo.Serverport = 27017
+#
+#mongo.ServerUsername = stno
+#mongo.ServerPassword = stno1q2w3e4r
+#mongo.authenticationDatabase=admin
+#
+#mongo.EventDBName = eventMuseum
+#mongo.WechatDBName = WechatPublic
+#mongo.TestDBName = Testqbjc
+#
+#mongo.weibotagDBName = weibotag
+#mongo.mediatagDBName = mediatag
+##mongo.TagIP = 1.119.44.206
+#mongo.TagIP = 192.168.0.245
+##mongo.Tagport = 30000
+#mongo.Tagport = 27017
 
 mongo.connectionsPerHost=200
 mongo.threadsAllowedToBlockForConnectionMultiplier=10

src/main/resources/redis.properties.6380

@@ -13,7 +13,7 @@ redis.port=6380
 
 redis.keyMaxSize=5000
 
-redis.selectDB=13
+redis.selectDB=12
 #redis.selectDB=2
 redis.user_keyMaxSize=1000
 redis.cacheSize=1000