Skip to content

M
messageflow
Commit 6c48fdb5 by shentao
Options

2018/10/8 消息流适配新采集系统、新中间件、新日志输出、对消息做时间限制

parent 79608b31
Showing with 279 additions and 437 deletions
pom.xml
......@@ -10,57 +10,130 @@
<name>messageflow</name>
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.0.0.RELEASE</version>
<relativePath /> <!-- lookup parent from repository -->
</parent>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>1.8</java.version>
<log4j.version>2.11.0</log4j.version>
<es.version>5.2.2</es.version>
<springboot.version>2.0.4.RELEASE</springboot.version>
</properties>
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-mongodb</artifactId>
<version>${springboot.version}</version>
<exclusions>
<exclusion>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-logging</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-redis</artifactId>
<version>${springboot.version}</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
<version>${springboot.version}</version>
<exclusions><!-- 去掉默认配置 -->
<exclusion>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-logging</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<version>${springboot.version}</version>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-configuration-processor</artifactId>
<version>${springboot.version}</version>
<optional>true</optional>
</dependency>
<!-- es -->
<dependency>
<groupId>org.elasticsearch.client</groupId>
<artifactId>transport</artifactId>
<version>${es.version}</version>
</dependency>
<dependency>
<groupId>com.zhiwei</groupId>
<artifactId>es-client</artifactId>
<version>1.3</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
<exclusion>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
</exclusion>
<exclusion>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-core</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-core -->
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>${log4j.version}</version>
</dependency>
<!-- https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-api -->
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
<version>${log4j.version}</version>
</dependency>
<!-- https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-1.2-api -->
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<artifactId>log4j-1.2-api</artifactId>
<version>${log4j.version}</version>
</dependency>
<!-- https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-slf4j-impl -->
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
<version>${log4j.version}</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- jackson -->
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.9.6</version>
</dependency>
<!-- net.sf.json -->
......@@ -71,27 +144,18 @@
<classifier>jdk15</classifier>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-configuration-processor</artifactId>
<optional>true</optional>
</dependency>
<!-- Jedis -->
<dependency>
<groupId>redis.clients</groupId>
<artifactId>jedis</artifactId>
<version>2.9.0</version>
</dependency>
<!-- lombok -->
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.18.0</version>
</dependency>
<!-- POI -->
......@@ -125,7 +189,7 @@
<dependency>
<groupId>com.zhiwei.middleware</groupId>
<artifactId>automaticmark-client</artifactId>
<version>1.0-SNAPSHOT</version>
<version>1.0.1-SNAPSHOT</version>
</dependency>
</dependencies>
......
src/main/java/com/zhiwei/messageflow/DES4RedisStart.java
......@@ -2,22 +2,19 @@ package com.zhiwei.messageflow;
import java.util.List;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import com.zhiwei.messageflow.mongo.bean.DirectGroup;
import com.zhiwei.messageflow.mongo.bean.PlatformNew;
import com.zhiwei.messageflow.mongo.bean.Project;
import com.zhiwei.messageflow.mongo.dao.DirectGroupDao;
import com.zhiwei.messageflow.mongo.dao.PlatformDao;
import com.zhiwei.messageflow.mongo.dao.ProjectDao;
@Component
public class DES4RedisStart{
private final static Logger log = LoggerFactory.getLogger(DES4RedisStart.class);
private static final Logger log = LogManager.getLogger(DES4RedisStart.class);
@Autowired
private ProjectDao projectDao;
......@@ -55,7 +52,7 @@ public class DES4RedisStart{
// 获取线程失败
if (directES4RedisThread == null) {
log.warn("{}项目获取线程失败", threadName);
log.warn("{}项目获取线程失败",threadName);
continue;
}
......
src/main/java/com/zhiwei/messageflow/DirectES4RedisTask.java
......@@ -6,8 +6,8 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
......@@ -27,7 +27,7 @@ import com.zhiwei.messageflow.service.DisposeMessageService;
@Component
public class DirectES4RedisTask {
private final static Logger log = LoggerFactory.getLogger(DirectES4RedisTask.class);
private final static Logger log = LogManager.getLogger(DirectES4RedisTask.class);
@Autowired
private DirectGroupDao directGroupDao;
......
src/main/java/com/zhiwei/messageflow/DirectES4RedisThread.java
......@@ -5,8 +5,8 @@ import java.util.List;
import java.util.Timer;
import java.util.TimerTask;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import com.fasterxml.jackson.core.JsonParseException;
import com.fasterxml.jackson.databind.JsonMappingException;
......@@ -14,7 +14,7 @@ import com.zhiwei.messageflow.mongo.bean.DirectGroup;
import com.zhiwei.messageflow.mongo.bean.Project;
public class DirectES4RedisThread extends Thread {
private final static Logger log = LoggerFactory.getLogger(DirectES4RedisThread.class);
private final static Logger log = LogManager.getLogger(DirectES4RedisThread.class);
// 线程
private Thread t;
// 线程名
......@@ -24,8 +24,8 @@ public class DirectES4RedisThread extends Thread {
// 定向渠道组list
private List<DirectGroup> dgList;
// 单个平台单个关键词组每次查询数量
// private static final int count = 20;
private static final int count = 300;
private static final int count = 20;
// private static final int count = 300;
private DirectES4RedisTask directES4RedisTask;
......
src/main/java/com/zhiwei/messageflow/ES4RedisRunner.java
......@@ -4,8 +4,8 @@ import java.io.IOException;
import java.util.Timer;
import java.util.TimerTask;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.springframework.boot.ApplicationArguments;
import org.springframework.boot.ApplicationRunner;
import org.springframework.stereotype.Component;
......@@ -19,7 +19,7 @@ import com.zhiwei.messageflow.test.GetMessage;
@Component
public class ES4RedisRunner implements ApplicationRunner {
public final static Logger log = LoggerFactory.getLogger(ES4RedisRunner.class);
public final static Logger log = LogManager.getLogger(ES4RedisRunner.class);
@Override
public void run(ApplicationArguments args) throws Exception {
......
src/main/java/com/zhiwei/messageflow/ES4RedisStart.java
......@@ -4,8 +4,8 @@ import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
......@@ -19,7 +19,7 @@ import com.zhiwei.messageflow.mongo.dao.ProjectDao;
@Component
public class ES4RedisStart {
private final static Logger log = LoggerFactory.getLogger(ES4RedisStart.class);
private final static Logger log = LogManager.getLogger(ES4RedisStart.class);
@Autowired
private ProjectDao projectDao;
......
src/main/java/com/zhiwei/messageflow/ES4RedisTask.java
......@@ -6,8 +6,8 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
......@@ -36,7 +36,7 @@ import com.zhiwei.messageflow.service.DisposeMessageService;
@Component
public class ES4RedisTask {
private final static Logger log = LoggerFactory.getLogger(ES4RedisTask.class);
private final static Logger log = LogManager.getLogger(ES4RedisTask.class);
@Autowired
private AutoMarkService autoMarkService;
......
src/main/java/com/zhiwei/messageflow/ES4RedisThreadNew.java
......@@ -5,8 +5,8 @@ import java.util.List;
import java.util.Timer;
import java.util.TimerTask;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import com.fasterxml.jackson.core.JsonParseException;
import com.fasterxml.jackson.databind.JsonMappingException;
......@@ -15,7 +15,7 @@ import com.zhiwei.messageflow.mongo.bean.Project;
public class ES4RedisThreadNew extends Thread {
private final static Logger log = LoggerFactory.getLogger(ES4RedisThreadNew.class);
private final static Logger log = LogManager.getLogger(ES4RedisThreadNew.class);
// 线程
private Thread t;
......@@ -29,8 +29,8 @@ public class ES4RedisThreadNew extends Thread {
private ES4RedisTask es4RedisTask;
// 单个平台单个关键词组每次查询数量
private static final int count = 300;
// private static final int count = 10;
// private static final int count = 300;
private static final int count = 10;
// private static final int max_Thread_num = 40;
// private static int Thread_num = 0;
......
src/main/java/com/zhiwei/messageflow/MessageflowApplication.java
......@@ -2,8 +2,10 @@ package com.zhiwei.messageflow;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.autoconfigure.data.mongo.MongoDataAutoConfiguration;
import org.springframework.boot.autoconfigure.mongo.MongoAutoConfiguration;
@SpringBootApplication
@SpringBootApplication(exclude = {MongoAutoConfiguration.class,MongoDataAutoConfiguration.class})
public class MessageflowApplication {
public static void main(String[] args) {
......
src/main/java/com/zhiwei/messageflow/es/dao/impl/ESDaoImpl.java
......@@ -720,7 +720,7 @@ public class ESDaoImpl implements ESDao {
SearchResponse response = searchRequestBuilder.execute().actionGet();
SearchHits searchHits = response.getHits();
System.out.println(searchHits.totalHits);
// System.out.println(searchHits.totalHits());
return searchHits;
}
......
src/main/java/com/zhiwei/messageflow/es/service/impl/ES4BeanServiceImpl.java
......@@ -3,8 +3,8 @@ package com.zhiwei.messageflow.es.service.impl;
import java.util.List;
import org.elasticsearch.search.SearchHits;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
......@@ -23,7 +23,7 @@ import com.zhiwei.messageflow.mongo.bean.PlatformNew;
@Component
public class ES4BeanServiceImpl implements ES4BeanService {
public final static Logger log = LoggerFactory.getLogger(ES4BeanServiceImpl.class);
public final static Logger log = LogManager.getLogger(ES4BeanServiceImpl.class);
@Autowired
private ESDao esDao;
......
src/main/java/com/zhiwei/messageflow/es/service/impl/HighLightFillingServiceImpl.java
......@@ -9,8 +9,8 @@ import java.util.regex.Pattern;
import org.elasticsearch.common.text.Text;
import org.elasticsearch.search.SearchHit;
import org.elasticsearch.search.fetch.subphase.highlight.HighlightField;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
......@@ -31,7 +31,7 @@ import com.zhiwei.messageflow.util.TimeUtil;
@Component
public class HighLightFillingServiceImpl implements HighLightFillingService {
private final static Logger log = LoggerFactory.getLogger(HighLightFillingServiceImpl.class);
private final static Logger log = LogManager.getLogger(HighLightFillingServiceImpl.class);
@Autowired
private HuserInfoDao huserInfoDao;
......
src/main/java/com/zhiwei/messageflow/es/service/impl/NoiseProcessingServiceImpl.java
package com.zhiwei.messageflow.es.service.impl;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.Date;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.TimeZone;
import org.elasticsearch.search.SearchHit;
import org.elasticsearch.search.SearchHits;
......@@ -588,7 +594,7 @@ public class NoiseProcessingServiceImpl implements NoiseProcessingService {
List<JSONObject> jmessages = new ArrayList<>();
SearchHit[] sh = searchHits.getHits();
for (SearchHit searchHit : sh) {
// System.err.println(searchHit.getSourceAsString());
// System.err.println(searchHit.getSourceAsString());
Map<String, Object> map = searchHit.getSource();
if (map == null) {
continue;
......@@ -603,16 +609,16 @@ public class NoiseProcessingServiceImpl implements NoiseProcessingService {
: null;
if (type.equals("status") && null != rstime) {
// 微博
isnoise = weiboIsNoise(noiseRules,map,platform,project);
isnoise = weiboIsNoise(noiseRules, map, platform, project);
} else if (type.equals("zhihu")) {
// zhihu
isnoise = zhihuIsNoise(noiseRules,map,platform,project);
isnoise = zhihuIsNoise(noiseRules, map, platform, project);
} else if (type.equals("video")) {
// 视频
isnoise = videoIsNoise(noiseRules,map,platform,project);
isnoise = videoIsNoise(noiseRules, map, platform, project);
} else {
// 网媒
isnoise = mediaIsNoise(noiseRules,map,platform,project);
isnoise = mediaIsNoise(noiseRules, map, platform, project);
}
if (isnoise) {
......@@ -629,15 +635,55 @@ public class NoiseProcessingServiceImpl implements NoiseProcessingService {
return jmessages;
}
private boolean isTimeOver(String time) {
long current=System.currentTimeMillis();//当前时间毫秒数
long zero=current/(1000*3600*24)*(1000*3600*24)-TimeZone.getDefault().getRawOffset();//今天零点零分零秒的毫秒数
Date date = new Date();
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'");
// SimpleDateFormat dateFormat = new SimpleDateFormat("EEE MMM d HH:mm:ss 'CST'
// yyyy", Locale.ENGLISH);
SimpleDateFormat dateFormat2 = new SimpleDateFormat("yyyy-MM-dd HH:mm");
SimpleDateFormat dateFormat3 = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss");
try {
date = dateFormat.parse(time);
if ((date.getTime() + (8 * 3600 * 1000L)) < zero) {
System.err.println(date.getTime() + (8 * 3600 * 1000L)+"|"+zero);
return true;
}
} catch (ParseException e) {
try {
date = dateFormat2.parse(time);
if ((date.getTime()) < zero) {
return true;
}
} catch (ParseException e1) {
try {
date = dateFormat3.parse(time);
if ((date.getTime()) < zero) {
return true;
}
} catch (ParseException e2) {
return true;
}
}
}
return false;
}
private boolean weiboIsNoise(List<NoiseRule> noiseRules, Map<String, Object> map, PlatformNew platformNew,
String project) {
boolean isnoise = false;
String platform = platformNew.getPlatformName();
String time = map.get("time") != null ? map.get("time").toString() : null;
if (isTimeOver(time)) {
System.err.println("weibo:time:" + time + map.get("id").toString());
return isnoise;
}
String text = map.get("text") != null ? map.get("text").toString() : null;
String roottext = map.get("roottext") != null ? map.get("roottext").toString() : null;
String username = map.get("username") != null ? map.get("username").toString() : null;
boolean isnoise = false;
if (null == username) {
return isnoise;
}
......@@ -730,13 +776,18 @@ public class NoiseProcessingServiceImpl implements NoiseProcessingService {
private boolean zhihuIsNoise(List<NoiseRule> noiseRules, Map<String, Object> map, PlatformNew platformNew,
String project) {
String platform = platformNew.getPlatformName();
// 噪音判断参数
boolean isnoise = false;
String platform = platformNew.getPlatformName();
String time = map.get("created_at") != null ? map.get("created_at").toString() : null;
if (isTimeOver(time)) {
System.err.println("zhihu:time:" + time + map.get("id").toString());
return isnoise;
}
String text = map.get("question_title") != null ? map.get("question_title").toString() : null;
String roottext = map.get("answer_content") != null ? map.get("answer_content").toString() : null;
// 噪音判断参数
boolean isnoise = false;
if (noiseRules != null) {
for (NoiseRule n : noiseRules) {
/**
......@@ -857,13 +908,17 @@ public class NoiseProcessingServiceImpl implements NoiseProcessingService {
private boolean videoIsNoise(List<NoiseRule> noiseRules, Map<String, Object> map, PlatformNew platformNew,
String project) {
// 噪音判断参数
boolean isnoise = false;
String platform = platformNew.getPlatformName();
String time = map.get("time") != null ? map.get("time").toString() : null;
if (isTimeOver(time)) {
System.err.println("video:time:" + time + map.get("id").toString());
return isnoise;
}
String text = map.get("title") != null ? map.get("title").toString() : null;
String roottext = null;
// 噪音判断参数
boolean isnoise = false;
if (noiseRules != null) {
for (NoiseRule n : noiseRules) {
/**
......@@ -983,12 +1038,18 @@ public class NoiseProcessingServiceImpl implements NoiseProcessingService {
private boolean mediaIsNoise(List<NoiseRule> noiseRules, Map<String, Object> map, PlatformNew platformNew,
String project) {
String platform = platformNew.getPlatformName();
boolean isnoise = false;
String platform = platformNew.getPlatformName();
String time = map.get("time") != null ? map.get("time").toString() : null;
if (isTimeOver(time)) {
System.err.println("media:time:" + time + map.get("id").toString());
return isnoise;
}
String text = map.get("title") != null ? map.get("title").toString() : null;
String roottext = map.get("content") != null ? map.get("content").toString() : null;
String username = map.get("source") != null ? map.get("source").toString() : null;
boolean isnoise = false;
if (null == username) {
return isnoise;
}
......@@ -1115,16 +1176,16 @@ public class NoiseProcessingServiceImpl implements NoiseProcessingService {
List<JSONObject> jmessages = new ArrayList<>();
SearchHit[] sh = searchHits.getHits();
for (SearchHit searchHit : sh) {
// System.err.println(searchHit.getSourceAsString());
// System.err.println(searchHit.getSourceAsString());
Map<String, Object> map = searchHit.getSource();
if (map == null) {
continue;
}
//source为空判断
// source为空判断
String type = searchHit.getType();
if (!type.equals("status")) {
// 除微博
if(map.get("source") == null){
if (map.get("source") == null) {
continue;
}
}
......@@ -1138,5 +1199,4 @@ public class NoiseProcessingServiceImpl implements NoiseProcessingService {
return jmessages;
}
}
src/main/java/com/zhiwei/messageflow/es/service/impl/TrackHitAndWarnServiceImpl.java
......@@ -8,8 +8,8 @@ import java.util.Map;
import org.elasticsearch.search.SearchHit;
import org.elasticsearch.search.SearchHits;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
......@@ -27,7 +27,7 @@ import com.zhiwei.messageflow.util.TimeUtil;
@Component
public class TrackHitAndWarnServiceImpl implements TrackHitAndWarnService {
private final static Logger log = LoggerFactory.getLogger(TrackHitAndWarnServiceImpl.class);
private final static Logger log = LogManager.getLogger(TrackHitAndWarnServiceImpl.class);
@Autowired
private TrackESDao trackESDao;
......
src/main/java/com/zhiwei/messageflow/mongo/service/impl/WechatSendServiceImpl.java
......@@ -4,8 +4,8 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
......@@ -25,7 +25,7 @@ import net.sf.json.JSONObject;
@Component
public class WechatSendServiceImpl implements WechatSendService {
private final static Logger log = LoggerFactory.getLogger(WechatSendServiceImpl.class);
private final static Logger log = LogManager.getLogger(WechatSendServiceImpl.class);
@Autowired
private WechatCodeDao wechatCodeDao;
......
src/main/java/com/zhiwei/messageflow/redis/RedisPoolAndTools.java
......@@ -2,8 +2,8 @@ package com.zhiwei.messageflow.redis;
import java.util.Set;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Configuration;
......@@ -18,7 +18,7 @@ import redis.clients.jedis.exceptions.JedisConnectionException;
@Configuration
public class RedisPoolAndTools {
public final static Logger log = LoggerFactory.getLogger(RedisPoolAndTools.class);
public final static Logger log = LogManager.getLogger(RedisPoolAndTools.class);
@Autowired
private RedisConfig redisConfig;
......
src/main/java/com/zhiwei/messageflow/service/impl/DisposeMessageServiceImpl.java
......@@ -3,8 +3,8 @@ package com.zhiwei.messageflow.service.impl;
import java.util.ArrayList;
import java.util.List;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
......@@ -24,7 +24,7 @@ import com.zhiwei.messageflow.service.DisposeMessageService;
@Component
public class DisposeMessageServiceImpl implements DisposeMessageService {
public final static Logger log = LoggerFactory.getLogger(DisposeMessageServiceImpl.class);
public final static Logger log = LogManager.getLogger(DisposeMessageServiceImpl.class);
@Autowired
private ES4BeanService es4BeanDao;
......
src/main/java/com/zhiwei/messageflow/util/HttpRequest.java
......@@ -12,8 +12,8 @@ import javax.net.ssl.SSLContext;
import javax.net.ssl.SSLSocketFactory;
import javax.net.ssl.TrustManager;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import net.sf.json.JSONObject;
......@@ -24,7 +24,7 @@ import net.sf.json.JSONObject;
* @date 2013-08-08
*/
public class HttpRequest {
private static Logger log = LoggerFactory.getLogger(HttpRequest.class);
private static Logger log = LogManager.getLogger(HttpRequest.class);
/**
* 发起https请求并获取结果
......
src/main/java/com/zhiwei/messageflow/util/MatchingInfoUtil.java
......@@ -20,8 +20,8 @@ import org.elasticsearch.common.text.Text;
import org.elasticsearch.search.SearchHit;
import org.elasticsearch.search.SearchHits;
import org.elasticsearch.search.fetch.subphase.highlight.HighlightField;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import com.alibaba.fastjson.JSONObject;
import com.fasterxml.jackson.core.JsonProcessingException;
......
src/main/resources/application.properties
##\uFFFD\u009C\u008D\uFFFD\u008A\uFFFD\u7AEFuri
##\u670D\u52A1\u7AEFuri
#spring.data.mongodb.uri=115.236.59.91:27017
#\u5185\u7F6Etomcat\u7AEF\u53E3\u53F7
server.port=10001
#\uFFFD\u009C\u008D\uFFFD\u008A\uFFFD\u7AEF\uFFFD\u0095\uFFFD\uFFFD\u008D\uFFFD\uFFFD\u0093
#\u670D\u52A1\u7AEF\u6570\u636E\u5E93
spring.data.mongodb.primary.database=qbjcPhoenix
#\uFFFD\u009C\u008D\uFFFD\u008A\uFFFDip
spring.data.mongodb.primary.host=192.168.0.101
#\uFFFD\u009C\u008D\uFFFD\u008A\uFFFDport
spring.data.mongodb.primary.port=30000
#\u670D\u52A1ip
spring.data.mongodb.primary.host=127.0.0.1
#\u670D\u52A1port
spring.data.mongodb.primary.port=27017
spring.data.mongodb.primary.username=stno
#spring.data.mongodb.primary.username=stno
spring.data.mongodb.primary.password=stno1q2w3e4r
#spring.data.mongodb.primary.password=stno1q2w3e4r
spring.data.mongodb.primary.authenticationDatabase=admin
#spring.data.mongodb.primary.authenticationDatabase=admin
#\uFFFD\u009C\u008D\uFFFD\u008A\uFFFD\u7AEF\uFFFD\u0095\uFFFD\uFFFD\u008D\uFFFD\uFFFD\u0093
#\u670D\u52A1\u7AEF\u6570\u636E\u5E93
spring.data.mongodb.secondary.database=eventMuseum
#\uFFFD\u009C\u008D\uFFFD\u008A\uFFFDip
spring.data.mongodb.secondary.host=192.168.0.101
#\uFFFD\u009C\u008D\uFFFD\u008A\uFFFDport
#\u670D\u52A1ip
spring.data.mongodb.secondary.host=202.107.192.94
#\u670D\u52A1port
spring.data.mongodb.secondary.port=30000
spring.data.mongodb.secondary.username=stno
......@@ -30,11 +26,11 @@ spring.data.mongodb.secondary.password=stno1q2w3e4r
spring.data.mongodb.secondary.authenticationDatabase=admin
#\uFFFD\u009C\u008D\uFFFD\u008A\uFFFD\u7AEF\uFFFD\u0095\uFFFD\uFFFD\u008D\uFFFD\uFFFD\u0093
#\u670D\u52A1\u7AEF\u6570\u636E\u5E93
spring.data.mongodb.thirdary.database=WechatPublic
#\uFFFD\u009C\u008D\uFFFD\u008A\uFFFDip
spring.data.mongodb.thirdary.host=192.168.0.101
#\uFFFD\u009C\u008D\uFFFD\u008A\uFFFDport
#\u670D\u52A1ip
spring.data.mongodb.thirdary.host=202.107.192.94
#\u670D\u52A1port
spring.data.mongodb.thirdary.port=30000
spring.data.mongodb.thirdary.username=stno
......@@ -64,21 +60,21 @@ spring.data.mongodb.thirdary.authenticationDatabase=admin
#spring.data.mongodb.option.heartbeat-frequency=10000
#spring.data.mongodb.option.local-threshold=15
##\uFFFD\u009C\uFFFD\uFFFD\u009C\uFFFDip
##\u672C\u5730ip
#spring.data.mongodb.host=192.168.0.241
##\uFFFD\u009C\uFFFD\uFFFD\u009C\uFFFDport
##\u672C\u5730port
#spring.data.mongodb.port=27017
##\uFFFD\u009C\uFFFD\uFFFD\u009C\uFFFD\uFFFD\u0095\uFFFD\uFFFD\u008D\uFFFD\uFFFD\u0093
##\u672C\u5730\u6570\u636E\u5E93
#spring.data.mongodb.database=qbjcPhoenix
#\uFFFD\u0085\uFFFD\uFFFD\u0096\uFFFD\u0095\uFFFD\uFFFD\u008D\uFFFD\uFFFD\u0093
#\u5176\u4ED6\u6570\u636E\u5E93
#spring.data.mongodb.database=eventMuseum
#spring.data.mongodb.database=WechatPublic
#tag\uFFFD\u0094\uFFFDuri
#tag\u7528uri
#spring.data.mongodb.uri=1.119.44.206:30000
#spring.data.mongodb.uri=192.168.0.245:27017
#tag\uFFFD\u0095\uFFFD\uFFFD\u008D\uFFFD\uFFFD\u0093
#tag\u6570\u636E\u5E93
#spring.data.mongodb.database=Testqbjc
#spring.data.mongodb.database=weibotag
......
src/main/resources/application.properties.8091 deleted 100644 → 0
##服务端uri
#spring.data.mongodb.uri=115.236.59.91:27017
#内置tomcat端口号
server.port=8091
#服务端数据库
spring.data.mongodb.primary.database=qbjcPhoenix
#服务ip
spring.data.mongodb.primary.host=192.168.0.101
#服务port
spring.data.mongodb.primary.port=27017
spring.data.mongodb.primary.username=stno
spring.data.mongodb.primary.password=stno1q2w3e4r
spring.data.mongodb.primary.authenticationDatabase=admin
#服务端数据库
spring.data.mongodb.secondary.database=eventMuseum
#服务ip
spring.data.mongodb.secondary.host=192.168.0.101
#服务port
spring.data.mongodb.secondary.port=27017
spring.data.mongodb.secondary.username=stno
spring.data.mongodb.secondary.password=stno1q2w3e4r
spring.data.mongodb.secondary.authenticationDatabase=admin
#服务端数据库
spring.data.mongodb.thirdary.database=WechatPublic
#服务ip
spring.data.mongodb.thirdary.host=192.168.0.101
#服务port
spring.data.mongodb.thirdary.port=27017
spring.data.mongodb.thirdary.username=stno
spring.data.mongodb.thirdary.password=stno1q2w3e4r
spring.data.mongodb.thirdary.authenticationDatabase=admin
#spring.data.mongodb.option.min-connection-per-host=0
#spring.data.mongodb.option.max-connection-per-host=100
#spring.data.mongodb.option.threads-allowed-to-block-for-connection-multiplier=5
#spring.data.mongodb.option.server-selection-timeout=30000
#spring.data.mongodb.option.max-wait-time=120000
#spring.data.mongodb.option.max-connection-idle-time=0
#spring.data.mongodb.option.max-connection-life-time=0
#spring.data.mongodb.option.connect-timeout=10000
#spring.data.mongodb.option.socket-timeout=0
#
#spring.data.mongodb.option.socket-keep-alive=false
#spring.data.mongodb.option.ssl-enabled=false
#spring.data.mongodb.option.ssl-invalid-host-name-allowed=false
#spring.data.mongodb.option.always-use-m-beans=false
#
#spring.data.mongodb.option.heartbeat-socket-timeout=20000
#spring.data.mongodb.option.heartbeat-connect-timeout=20000
#spring.data.mongodb.option.min-heartbeat-frequency=500
#spring.data.mongodb.option.heartbeat-frequency=10000
#spring.data.mongodb.option.local-threshold=15
##本地ip
#spring.data.mongodb.host=192.168.0.241
##本地port
#spring.data.mongodb.port=27017
##本地数据库
#spring.data.mongodb.database=qbjcPhoenix
#其他数据库
#spring.data.mongodb.database=eventMuseum
#spring.data.mongodb.database=WechatPublic
#tag用uri
#spring.data.mongodb.uri=1.119.44.206:30000
#spring.data.mongodb.uri=192.168.0.245:27017
#tag数据库
#spring.data.mongodb.database=Testqbjc
#spring.data.mongodb.database=weibotag
#mongo.connectionsPerHost=200
#mongo.threadsAllowedToBlockForConnectionMultiplier=10
#
#mongo.connectTimeout=30000
#
#mongo.maxWaitTime=50000
#mongo.autoConnectRetry=true
#mongo.socketKeepAlive=true
#
#mongo.socketTimeout=120000
#mongo.slaveOk=true
\ No newline at end of file
src/main/resources/application.properties.8092 deleted 100644 → 0
##服务端uri
#spring.data.mongodb.uri=115.236.59.91:27017
#内置tomcat端口号
server.port=8092
#服务端数据库
spring.data.mongodb.primary.database=qbjcPhoenix
#服务ip
spring.data.mongodb.primary.host=192.168.0.101
#服务port
spring.data.mongodb.primary.port=27017
spring.data.mongodb.primary.username=stno
spring.data.mongodb.primary.password=stno1q2w3e4r
spring.data.mongodb.primary.authenticationDatabase=admin
#服务端数据库
spring.data.mongodb.secondary.database=eventMuseum
#服务ip
spring.data.mongodb.secondary.host=192.168.0.101
#服务port
spring.data.mongodb.secondary.port=27017
spring.data.mongodb.secondary.username=stno
spring.data.mongodb.secondary.password=stno1q2w3e4r
spring.data.mongodb.secondary.authenticationDatabase=admin
#服务端数据库
spring.data.mongodb.thirdary.database=WechatPublic
#服务ip
spring.data.mongodb.thirdary.host=192.168.0.101
#服务port
spring.data.mongodb.thirdary.port=27017
spring.data.mongodb.thirdary.username=stno
spring.data.mongodb.thirdary.password=stno1q2w3e4r
spring.data.mongodb.thirdary.authenticationDatabase=admin
#spring.data.mongodb.option.min-connection-per-host=0
#spring.data.mongodb.option.max-connection-per-host=100
#spring.data.mongodb.option.threads-allowed-to-block-for-connection-multiplier=5
#spring.data.mongodb.option.server-selection-timeout=30000
#spring.data.mongodb.option.max-wait-time=120000
#spring.data.mongodb.option.max-connection-idle-time=0
#spring.data.mongodb.option.max-connection-life-time=0
#spring.data.mongodb.option.connect-timeout=10000
#spring.data.mongodb.option.socket-timeout=0
#
#spring.data.mongodb.option.socket-keep-alive=false
#spring.data.mongodb.option.ssl-enabled=false
#spring.data.mongodb.option.ssl-invalid-host-name-allowed=false
#spring.data.mongodb.option.always-use-m-beans=false
#
#spring.data.mongodb.option.heartbeat-socket-timeout=20000
#spring.data.mongodb.option.heartbeat-connect-timeout=20000
#spring.data.mongodb.option.min-heartbeat-frequency=500
#spring.data.mongodb.option.heartbeat-frequency=10000
#spring.data.mongodb.option.local-threshold=15
##本地ip
#spring.data.mongodb.host=192.168.0.241
##本地port
#spring.data.mongodb.port=27017
##本地数据库
#spring.data.mongodb.database=qbjcPhoenix
#其他数据库
#spring.data.mongodb.database=eventMuseum
#spring.data.mongodb.database=WechatPublic
#tag用uri
#spring.data.mongodb.uri=1.119.44.206:30000
#spring.data.mongodb.uri=192.168.0.245:27017
#tag数据库
#spring.data.mongodb.database=Testqbjc
#spring.data.mongodb.database=weibotag
#mongo.connectionsPerHost=200
#mongo.threadsAllowedToBlockForConnectionMultiplier=10
#
#mongo.connectTimeout=30000
#
#mongo.maxWaitTime=50000
#mongo.autoConnectRetry=true
#mongo.socketKeepAlive=true
#
#mongo.socketTimeout=120000
#mongo.slaveOk=true
\ No newline at end of file
src/main/resources/application.properties.new8091 deleted 100644 → 0
##�\u009C\u008D�\u008A�端uri
#spring.data.mongodb.uri=115.236.59.91:27017
#\u5185\u7F6Etomcat\u7AEF\u53E3\u53F7
server.port=8091
#�\u009C\u008D�\u008A�端�\u0095��\u008D��\u0093
spring.data.mongodb.primary.database=qbjcPhoenix
#�\u009C\u008D�\u008A�ip
spring.data.mongodb.primary.host=192.168.0.101
#�\u009C\u008D�\u008A�port
spring.data.mongodb.primary.port=30000
spring.data.mongodb.primary.username=stno
spring.data.mongodb.primary.password=stno1q2w3e4r
spring.data.mongodb.primary.authenticationDatabase=admin
#�\u009C\u008D�\u008A�端�\u0095��\u008D��\u0093
spring.data.mongodb.secondary.database=eventMuseum
#�\u009C\u008D�\u008A�ip
spring.data.mongodb.secondary.host=192.168.0.101
#�\u009C\u008D�\u008A�port
spring.data.mongodb.secondary.port=30000
spring.data.mongodb.secondary.username=stno
spring.data.mongodb.secondary.password=stno1q2w3e4r
spring.data.mongodb.secondary.authenticationDatabase=admin
#�\u009C\u008D�\u008A�端�\u0095��\u008D��\u0093
spring.data.mongodb.thirdary.database=WechatPublic
#�\u009C\u008D�\u008A�ip
spring.data.mongodb.thirdary.host=192.168.0.101
#�\u009C\u008D�\u008A�port
spring.data.mongodb.thirdary.port=30000
spring.data.mongodb.thirdary.username=stno
spring.data.mongodb.thirdary.password=stno1q2w3e4r
spring.data.mongodb.thirdary.authenticationDatabase=admin
#spring.data.mongodb.option.min-connection-per-host=0
#spring.data.mongodb.option.max-connection-per-host=100
#spring.data.mongodb.option.threads-allowed-to-block-for-connection-multiplier=5
#spring.data.mongodb.option.server-selection-timeout=30000
#spring.data.mongodb.option.max-wait-time=120000
#spring.data.mongodb.option.max-connection-idle-time=0
#spring.data.mongodb.option.max-connection-life-time=0
#spring.data.mongodb.option.connect-timeout=10000
#spring.data.mongodb.option.socket-timeout=0
#
#spring.data.mongodb.option.socket-keep-alive=false
#spring.data.mongodb.option.ssl-enabled=false
#spring.data.mongodb.option.ssl-invalid-host-name-allowed=false
#spring.data.mongodb.option.always-use-m-beans=false
#
#spring.data.mongodb.option.heartbeat-socket-timeout=20000
#spring.data.mongodb.option.heartbeat-connect-timeout=20000
#spring.data.mongodb.option.min-heartbeat-frequency=500
#spring.data.mongodb.option.heartbeat-frequency=10000
#spring.data.mongodb.option.local-threshold=15
##�\u009C��\u009C�ip
#spring.data.mongodb.host=192.168.0.241
##�\u009C��\u009C�port
#spring.data.mongodb.port=27017
##�\u009C��\u009C��\u0095��\u008D��\u0093
#spring.data.mongodb.database=qbjcPhoenix
#�\u0085��\u0096�\u0095��\u008D��\u0093
#spring.data.mongodb.database=eventMuseum
#spring.data.mongodb.database=WechatPublic
#tag�\u0094�uri
#spring.data.mongodb.uri=1.119.44.206:30000
#spring.data.mongodb.uri=192.168.0.245:27017
#tag�\u0095��\u008D��\u0093
#spring.data.mongodb.database=Testqbjc
#spring.data.mongodb.database=weibotag
#mongo.connectionsPerHost=200
#mongo.threadsAllowedToBlockForConnectionMultiplier=10
#
#mongo.connectTimeout=30000
#
#mongo.maxWaitTime=50000
#mongo.autoConnectRetry=true
#mongo.socketKeepAlive=true
#
#mongo.socketTimeout=120000
#mongo.slaveOk=true
\ No newline at end of file
src/main/resources/log4j2.xml 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<!-- log4j2 自身的日志级别 -->
<Configuration status="WARN">
<properties>
<property name="LOG_HOME">Log/</property>
<property name="LOG_FILE">messageflow</property>
</properties>
<Appenders>
<!-- 定义日志输出地 -->
<Console name="Console" target="SYSTEM_OUT">
<PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %logger{36} - %msg%n" />
</Console>
<RollingRandomAccessFile name="LogFile"
fileName="${LOG_HOME}/${LOG_FILE}.log"
filePattern="${LOG_HOME}/$${date:yyyy-MM}/${LOG_FILE}-%d{yyyy-MM-dd}-%i.log">
<PatternLayout
pattern="%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %logger{36} - %msg%n" />
<Policies>
<TimeBasedTriggeringPolicy interval="1" />
<SizeBasedTriggeringPolicy size="20 MB" />
</Policies>
<DefaultRolloverStrategy max="20" />
</RollingRandomAccessFile>
</Appenders>
<Loggers>
<Root level="all">
<AppenderRef ref="Console" level="info" />
<AppenderRef ref="LogFile" level="info" />
</Root>
</Loggers>
</Configuration>
\ No newline at end of file
src/main/resources/middleware.properties
#middleware.zookeeperIp=zookeeper://192.168.0.234:2181
middleware.zookeeperIp=zookeeper://192.168.0.203:2181;zookeeper://192.168.0.104:2181;zookeeper://192.168.0.105:2181;
\ No newline at end of file
middleware.zookeeperIp=zookeeper://192.168.0.234:2181
#middleware.zookeeperIp=zookeeper://192.168.0.203:2181;zookeeper://192.168.0.104:2181;zookeeper://192.168.0.105:2181;
\ No newline at end of file
src/main/resources/redis.properties
......@@ -3,15 +3,16 @@ redis.maxIdle=200
redis.maxWaitMillis=1000
redis.testOnBorrow=true
redis.testOnReturn=true
redis.ip = 192.168.0.202
#redis.ip = 192.168.0.202
#redis.ip = 202.107.192.94
#redis.ip=127.0.0.1
redis.port=6380
redis.ip=127.0.0.1
redis.port=6379
#redis.ip=192.168.1.74
#redis.port=6388
#redis.password=fjouero&^%^%^$*()*)))*^$$KDFJDKJF9ruorudlfdljfldjf
redis.keyMaxSize=5000
redis.DIRECTKEY=Direct:
redis.selectDB=12
#redis.selectDB=2
......
src/main/resources/redis.properties.6379 deleted 100644 → 0
redis.maxTotal=2048
redis.maxIdle=200
redis.maxWaitMillis=1000
redis.testOnBorrow=true
redis.testOnReturn=true
redis.ip = 192.168.0.202
#redis.ip = 202.107.192.94
#redis.ip=127.0.0.1
redis.port=6380
#redis.ip=192.168.1.74
#redis.port=6388
#redis.password=fjouero&^%^%^$*()*)))*^$$KDFJDKJF9ruorudlfdljfldjf
redis.keyMaxSize=5000
redis.DIRECTKEY=Direct:
redis.selectDB=13
#redis.selectDB=2
redis.user_keyMaxSize=1000
redis.cacheSize=1000
redis.intitCount=3000
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment