Commit e28317c5 authored by dingjy's avatar dingjy

MODIFY

parent dc58dcce
...@@ -15,8 +15,6 @@ import org.springframework.web.bind.annotation.ResponseBody; ...@@ -15,8 +15,6 @@ import org.springframework.web.bind.annotation.ResponseBody;
import javax.annotation.PostConstruct; import javax.annotation.PostConstruct;
import javax.annotation.Resource; import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import java.util.Arrays;
import java.util.Map;
@Slf4j @Slf4j
@Controller @Controller
...@@ -57,17 +55,32 @@ public class APIService { ...@@ -57,17 +55,32 @@ public class APIService {
@ResponseBody @ResponseBody
@RequestMapping(value = "web") @RequestMapping(value = "web")
public String reportLog(HttpServletRequest request) { public String dy(HttpServletRequest request) {
String dataList = new InputStreamToString(request).get(); String dataList = new InputStreamToString(request).get();
if(StringUtils.isNotEmpty(dataList)){ if(StringUtils.isNotEmpty(dataList)){
TRACKING_EVENT.info(dataList); TRACKING_EVENT.info(dataList);
TRACKING_EVENT.info(dataList); workerCollector.put(dataList);
} }
return OK_RESULT; return OK_RESULT;
} }
@ResponseBody
@RequestMapping(value = "sa.gif")
public String jsweb(HttpServletRequest request) {
String data = request.getParameter("data");
if(StringUtils.isNotEmpty(data)){
data = "data_jweb=".concat(data);
TRACKING_EVENT.info(data);
workerCollector.put(data);
}
return OK_RESULT;
}
@ResponseBody @ResponseBody
@RequestMapping(value = "ping") @RequestMapping(value = "ping")
public String test() { public String test() {
......
...@@ -10,6 +10,7 @@ import org.springframework.kafka.core.KafkaTemplate; ...@@ -10,6 +10,7 @@ import org.springframework.kafka.core.KafkaTemplate;
import sun.misc.BASE64Decoder; import sun.misc.BASE64Decoder;
import java.io.IOException; import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder; import java.net.URLDecoder;
import java.nio.charset.StandardCharsets; import java.nio.charset.StandardCharsets;
import java.util.List; import java.util.List;
...@@ -31,7 +32,9 @@ public class LogsHandleWorker implements MultipleWorkerEvent<String> { ...@@ -31,7 +32,9 @@ public class LogsHandleWorker implements MultipleWorkerEvent<String> {
list.forEach(log ->{ list.forEach(log ->{
try { try {
if(log.startsWith("data_list=")){ if(log.startsWith("data_jweb=")){
jsweb(log);
}else if(log.startsWith("data_list=")){
web(log); web(log);
}else{ }else{
app(log); app(log);
...@@ -66,6 +69,13 @@ public class LogsHandleWorker implements MultipleWorkerEvent<String> { ...@@ -66,6 +69,13 @@ public class LogsHandleWorker implements MultipleWorkerEvent<String> {
} }
} }
void jsweb(String logs) throws IOException{
String params = URLDecoder.decode(logs.substring(10),"UTF-8");
BASE64Decoder decoder = new BASE64Decoder();
byte[] dbyte = decoder.decodeBuffer(params);
send(new String(dbyte, StandardCharsets.UTF_8));
}
public void send(String log){ public void send(String log){
kafka.send(TOPIC, log); kafka.send(TOPIC, log);
} }
......
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