Release 3.1.17

Author: 任庆友

SensorsAnalyticsSDK/pom.xml

@@ -15,7 +15,7 @@
     <groupId>com.sensorsdata.analytics.javasdk</groupId>
     <name>SensorsAnalyticsSDK</name>
     <artifactId>SensorsAnalyticsSDK</artifactId>
-    <version>3.1.16</version>
+    <version>3.1.17</version>
     <description>The official Java SDK of Sensors Analytics</description>
     <url>http://sensorsdata.cn</url>
 

SensorsAnalyticsSDK/src/main/java/com/sensorsdata/analytics/javasdk/HelloSensorsAnalytics.java

@@ -9,7 +9,7 @@ public class HelloSensorsAnalytics {
 
   public static void main(String[] args) throws Exception {
     // Sensors Analytics 采集事件的 URL
-    final String SA_SERVER_URL = "http://10.10.11.209:8006/sa?project=default&token=bbb";
+    final String SA_SERVER_URL = "http://sdk-test.datasink.sensorsdata.cn/sa?project=renqingyou&token=95c73ae661f85aa0";
 
     // DebugConsumer
     final SensorsAnalytics sa = new SensorsAnalytics(new SensorsAnalytics.DebugConsumer
@@ -40,6 +40,8 @@ public static void main(String[] args) throws Exception {
     properties.put("$os_version", "8.1");               // 操作系统的具体版本
     properties.put("$ip", "123.123.123.123");           // 请求中能够拿到用户的IP，则把这个传递给SA，SA会自动根据这个解析省份、城市
     properties.put("Channel", "baidu");                 // 用户是通过baidu这个渠道过来的
+    properties.put("$project","abc");
+    properties.put("$token","123");
     sa.track(cookieId, false, "ViewHomePage", properties); // 记录访问首页这个event
 
     // 1.2 搜索商品

SensorsAnalyticsSDK/src/main/java/com/sensorsdata/analytics/javasdk/SensorsAnalytics.java

@@ -1148,37 +1148,48 @@ UrlEncodedFormEntity getHttpEntry(final String data) throws IOException {
     final boolean compressData;
   }
 
-  private void addEvent(String distinctId, boolean isLoginId, String originDistinceId,
+  private void addEvent(String distinctId, boolean isLoginId, String originDistinctId,
       String actionType, String eventName, Map<String, Object> properties)
       throws InvalidArgumentException {
     assertKey("Distinct Id", distinctId);
     assertProperties(actionType, properties);
     if (actionType.equals("track")) {
       assertKeyWithRegex("Event Name", eventName);
     } else if (actionType.equals("track_signup")) {
-      assertKey("Original Distinct Id", originDistinceId);
+      assertKey("Original Distinct Id", originDistinctId);
     }
 
     // Event time
     long time = System.currentTimeMillis();
-    if (properties != null && properties.containsKey("$time")) {
-      Date eventTime = (Date) properties.get("$time");
-      properties.remove("$time");
+    Map<String, Object> newProperties = null;
+    if (properties != null) {
+      newProperties = new HashMap<String, Object>(properties);
+    }
+    if (newProperties != null && newProperties.containsKey("$time")) {
+      Date eventTime = (Date) newProperties.get("$time");
+      newProperties.remove("$time");
       time = eventTime.getTime();
     }
 
     String eventProject = null;
-    if (properties != null && properties.containsKey("$project")) {
-      eventProject = (String) properties.get("$project");
-      properties.remove("$project");
+    String eventToken = null;
+    if (newProperties != null) {
+      if (newProperties.containsKey("$project")) {
+        eventProject = (String) newProperties.get("$project");
+        newProperties.remove("$project");
+      }
+      if (newProperties.containsKey("$token")) {
+        eventToken = (String) newProperties.get("$token");
+        newProperties.remove("$token");
+      }
     }
 
     Map<String, Object> eventProperties = new HashMap<String, Object>();
     if (actionType.equals("track") || actionType.equals("track_signup")) {
       eventProperties.putAll(superProperties);
     }
-    if (properties != null) {
-      eventProperties.putAll(properties);
+    if (newProperties != null) {
+      eventProperties.putAll(newProperties);
     }
 
     if (isLoginId) {
@@ -1200,6 +1211,10 @@ private void addEvent(String distinctId, boolean isLoginId, String originDistinc
       event.put("project", eventProject);
     }
 
+    if (eventToken != null) {
+      event.put("token", eventToken);
+    }
+
     if (enableTimeFree) {
       event.put("time_free", true);
     }
@@ -1208,7 +1223,7 @@ private void addEvent(String distinctId, boolean isLoginId, String originDistinc
       event.put("event", eventName);
     } else if (actionType.equals("track_signup")) {
       event.put("event", eventName);
-      event.put("original_id", originDistinceId);
+      event.put("original_id", originDistinctId);
     }
 
     this.consumer.send(event);
@@ -1220,15 +1235,27 @@ private void addItem(String itemType, String itemId, String actionType,
     assertKey("Item Id", itemId);
     assertProperties(actionType, properties);
 
+    Map<String, Object> newProperties = null;
+    if (properties != null) {
+      newProperties = new HashMap<String, Object>(properties);
+    }
+
     String eventProject = null;
-    if (properties != null && properties.containsKey("$project")) {
-      eventProject = (String) properties.get("$project");
-      properties.remove("$project");
+    String eventToken = null;
+    if (newProperties != null) {
+      if (newProperties.containsKey("$project")) {
+        eventProject = (String) newProperties.get("$project");
+        newProperties.remove("$project");
+      }
+      if (newProperties.containsKey("$token")) {
+        eventToken = (String) newProperties.get("$token");
+        newProperties.remove("$token");
+      }
     }
 
     Map<String, Object> eventProperties = new HashMap<String, Object>();
-    if (properties != null) {
-      eventProperties.putAll(properties);
+    if (newProperties != null) {
+      eventProperties.putAll(newProperties);
     }
 
     Map<String, String> libProperties = getLibProperties();
@@ -1243,6 +1270,10 @@ private void addItem(String itemType, String itemId, String actionType,
       record.put("project", eventProject);
     }
 
+    if (eventToken != null) {
+      record.put("token", eventToken);
+    }
+
     record.put("item_type", itemType);
     record.put("item_id", itemId);
     this.consumer.send(record);
@@ -1371,7 +1402,7 @@ private static ObjectMapper getJsonObjectMapper() {
     return jsonObjectMapper;
   }
 
-  private static final String SDK_VERSION = "3.1.16";
+  private static final String SDK_VERSION = "3.1.17";
 
   private static final Pattern KEY_PATTERN = Pattern.compile(
       "^((?!^distinct_id$|^original_id$|^time$|^properties$|^id$|^first_id$|^second_id$|^users$|^events$|^event$|^user_id$|^date$|^datetime$)[a-zA-Z_$][a-zA-Z\\d_$]{0,99})$",