tianboguang пре 2 година
родитељ
комит
61da8e862e

+ 13 - 5
src/main/java/com/fdkankan/tracking/controller/TrackingController.java

@@ -1,6 +1,7 @@
 package com.fdkankan.tracking.controller;
 
 import com.alibaba.fastjson.JSONObject;
+import com.fdkankan.tracking.entit.TrackingBody;
 import com.fdkankan.tracking.entit.TrackingEntity;
 import com.fdkankan.tracking.service.TrackingService;
 import com.fdkankan.tracking.utils.IpUtils;
@@ -27,11 +28,18 @@ public class TrackingController {
 
     @RequestMapping("save")
     public void saveLog(@RequestBody TrackingEntity entity, HttpServletRequest request){
-        entity.setUserAgent(request.getHeader("user-agent"));
-        entity.setUserIP(IpUtils.getIPAddress(request));
-        entity.setRequestTime(new Date());
-        if(!ObjectUtils.isEmpty(entity.getUserIP())){
-            entity.setUserIpAdress(IpUtils.getUserAddress(entity.getUserIP()));
+        TrackingBody trackingBody = entity.getTrackingBody();
+        if(ObjectUtils.isEmpty(trackingBody)){
+            return;
+        }
+        trackingBody.setUserAgent(request.getHeader("user-agent"));
+        trackingBody.setUserIP(IpUtils.getIPAddress(request));
+        trackingBody.setRequestTime(new Date());
+        if(ObjectUtils.isEmpty(trackingBody.getSource())){
+            trackingBody.setSource("FRONT");
+        }
+        if(!ObjectUtils.isEmpty(trackingBody.getUserIP())){
+            trackingBody.setUserIpAdress(IpUtils.getUserAddress(trackingBody.getUserIP()));
         }
         log.info("收到打点请求:{}", JSONObject.toJSONString(entity));
         trackingService.save(entity);

+ 5 - 14
src/main/java/com/fdkankan/tracking/entit/TrackingBody.java

@@ -6,12 +6,11 @@ public class TrackingBody {
 
     private String appId;
     private String module;
-    private String requestType;
     private String userId;
     private Date requestTime;
     private String url;
     private Object requestData;
-    private String trackingType;
+    private String source;
     private String referrer;
     private String eventType;
     private String eventName;
@@ -42,14 +41,6 @@ public class TrackingBody {
         this.module = module;
     }
 
-    public String getRequestType() {
-        return requestType;
-    }
-
-    public void setRequestType(String requestType) {
-        this.requestType = requestType;
-    }
-
     public String getUserId() {
         return userId;
     }
@@ -82,12 +73,12 @@ public class TrackingBody {
         this.requestData = requestData;
     }
 
-    public String getTrackingType() {
-        return trackingType;
+    public String getSource() {
+        return source;
     }
 
-    public void setTrackingType(String trackingType) {
-        this.trackingType = trackingType;
+    public void setSource(String source) {
+        this.source = source;
     }
 
     public String getReferrer() {