MODIFY

src/main/java/com/bayread/sensors/service/APIService.java

@@ -15,8 +15,6 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import javax.annotation.PostConstruct;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
-import java.util.Arrays;
-import java.util.Map;
 
 @Slf4j
 @Controller
@@ -57,17 +55,32 @@ public class APIService {
 
     @ResponseBody
     @RequestMapping(value = "web")
-    public String reportLog(HttpServletRequest request) {
+    public String dy(HttpServletRequest request) {
         String dataList = new InputStreamToString(request).get();
 
         if(StringUtils.isNotEmpty(dataList)){
             TRACKING_EVENT.info(dataList);
-            TRACKING_EVENT.info(dataList);
+            workerCollector.put(dataList);
+        }
+
+        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
     @RequestMapping(value = "ping")
     public String test() {

src/main/java/com/bayread/sensors/task/LogsHandleWorker.java

@@ -10,6 +10,7 @@ import org.springframework.kafka.core.KafkaTemplate;
 import sun.misc.BASE64Decoder;
 
 import java.io.IOException;
+import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 import java.nio.charset.StandardCharsets;
 import java.util.List;
@@ -31,7 +32,9 @@ public class LogsHandleWorker implements MultipleWorkerEvent<String> {
 
         list.forEach(log ->{
             try {
-                if(log.startsWith("data_list=")){
+                if(log.startsWith("data_jweb=")){
+                    jsweb(log);
+                }else if(log.startsWith("data_list=")){
                     web(log);
                 }else{
                     app(log);
@@ -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){
         kafka.send(TOPIC, log);
     }