Test /users & /messages APIs

Author: Javen

src/cn/jpush/api/JPushClient.java

@@ -66,12 +66,12 @@ public ReceivedsResult getReportReceiveds(String msgIds) {
 	    return _reportClient.getReceiveds(msgIds);
 	}
 
-    public UsersResult getReportUsersCount(TimeUnit timeUnit, String start, int step) {
-        return _reportClient.getUsersCount(timeUnit, start, step);
+    public UsersResult getReportUsers(TimeUnit timeUnit, String start, int duration) {
+        return _reportClient.getUsers(timeUnit, start, duration);
     }
 
-    public MessagesResult getReportMessagesCount(String msgIds) {
-        return _reportClient.getMessagesCount(msgIds);
+    public MessagesResult getReportMessages(String msgIds) {
+        return _reportClient.getMessages(msgIds);
     }
 
 

src/cn/jpush/api/common/NativeHttpClient.java

@@ -39,7 +39,12 @@ public ResponseWrapper sendPost(String url, String content, String authCode) {
 	}
 
     public ResponseWrapper sendRequest(String url, String content, String method, String authCode) {
-        LOG.debug("Send request to - " + url + ", with content - " + content);
+        String requestLog = "Send request to - " + url;
+        if (null != content) {
+            requestLog += ", with content - " + content;
+        }
+        LOG.debug(requestLog);
+        
 		HttpURLConnection conn = null;
 		OutputStream out = null;
 		StringBuffer sb = new StringBuffer();

src/cn/jpush/api/examples/ReportsExample.java

@@ -13,19 +13,19 @@ public class ReportsExample {
     protected static final Logger LOG = LoggerFactory.getLogger(ReportsExample.class);
 
     // demo App defined in resources/jpush-api.conf 
-	private static final String appKey ="dd1066407b044738b6479275";
+	private static final String appKey = "dd1066407b044738b6479275";
 	private static final String masterSecret = "2b38ce69b1de2a7fa95706ea";
 
 	public static void main(String[] args) {
-//		testGetReport();
+		testGetReport();
 		testGetMessages();
-//		testGetUsers();
+		testGetUsers();
 	}
 
 
 	public static void testGetReport() {
         JPushClient jpushClient = new JPushClient(masterSecret, appKey);
-		ReceivedsResult receivedsResult = jpushClient.getReportReceiveds("1708010723,1774452771");
+		ReceivedsResult receivedsResult = jpushClient.getReportReceiveds("1942377665");
 		if (receivedsResult.isResultOK()) {
 		    LOG.info("Receiveds - " + receivedsResult);
 		} else {
@@ -44,7 +44,7 @@ public static void testGetReport() {
 
     public static void testGetUsers() {
         JPushClient jpushClient = new JPushClient(masterSecret, appKey);
-        UsersResult result = jpushClient.getReportUsersCount(TimeUnit.DAY, "20140606", 2);
+        UsersResult result = jpushClient.getReportUsers(TimeUnit.DAY, "2014-06-10", 3);
 
         if (result.isResultOK()) {
             LOG.info("Users Count - " + result);
@@ -64,10 +64,10 @@ public static void testGetUsers() {
 
     public static void testGetMessages() {
         JPushClient jpushClient = new JPushClient(masterSecret, appKey);
-        MessagesResult result = jpushClient.getReportMessagesCount("1933834921");
+        MessagesResult result = jpushClient.getReportMessages("269978303");
 
         if (result.isResultOK()) {
-            LOG.info("Users Count - " + result);
+            LOG.info("Messages Count - " + result);
         } else {
             if (result.getErrorCode() > 0) {
                 // 业务异常

src/cn/jpush/api/report/ReceivedsResult.java

@@ -22,10 +22,6 @@ public static class Received {
 	    @Expose public int ios_apns_sent;
 	}
 
-	public List<Received> getReceivedList() {
-	    return this.received_list;
-	}
-	
 	public static ReceivedsResult fromResponse(ResponseWrapper responseWrapper) {
         ReceivedsResult receivedsResult = new ReceivedsResult();
         if (responseWrapper.isServerResponse()) {

src/cn/jpush/api/report/ReportClient.java

@@ -1,5 +1,6 @@
 package cn.jpush.api.report;
 
+import java.net.URLEncoder;
 import java.util.regex.Pattern;
 
 import cn.jpush.api.common.NativeHttpClient;
@@ -9,10 +10,10 @@
 import cn.jpush.api.utils.StringUtils;
 
 public class ReportClient {    
-    private static final String REPORT_HOST_NAME = "http://183.232.25.237:9900";   //"https://report.jpush.cn";
-    private static final String REPORT_RECEIVE_PATH = "/v2/received";
-    private static final String REPORT_USER_PATH = "/v3/user";
-    private static final String REPORT_MESSAGE_PATH = "/v3/message";
+    private static final String REPORT_HOST_NAME = "https://report.jpush.cn";
+    private static final String REPORT_RECEIVE_PATH = "/v3/received";
+    private static final String REPORT_USER_PATH = "/v3/users";
+    private static final String REPORT_MESSAGE_PATH = "/v3/messages";
 
     private NativeHttpClient _httpClient = new NativeHttpClient();;
 
@@ -40,7 +41,7 @@ public ReceivedsResult getReceiveds(String msgIds) {
         return ReceivedsResult.fromResponse(response);
 	}
 
-    public MessagesResult getMessagesCount(String msgIds) {
+    public MessagesResult getMessages(String msgIds) {
         checkMsgids(msgIds);
         String authCode = ServiceHelper.getAuthorizationBase64(_appKey, _masterSecret);
 
@@ -50,12 +51,18 @@ public MessagesResult getMessagesCount(String msgIds) {
         return MessagesResult.fromResponse(response);
     }
 
-    public UsersResult getUsersCount(TimeUnit timeUnit, String start, int step) {
+    public UsersResult getUsers(TimeUnit timeUnit, String start, int duration) {
         String authCode = ServiceHelper.getAuthorizationBase64(_appKey, _masterSecret);
 
+        String startEncoded = null;
+        try {
+            startEncoded = URLEncoder.encode(start, "utf-8");
+        } catch (Exception e) {
+        }
+        
         String url = REPORT_HOST_NAME + REPORT_USER_PATH
                 + "?time_unit=" + timeUnit.toString()
-                + "&start=" + start + "&step=" + step;
+                + "&start=" + startEncoded + "&duration=" + duration;
         ResponseWrapper response = _httpClient.sendGet(url, null, authCode);
 
         return UsersResult.fromResponse(response);

src/cn/jpush/api/report/UsersResult.java

@@ -14,7 +14,7 @@ public class UsersResult extends BaseResult {
 
     @Expose public TimeUnit time_unit;
     @Expose public String start;
-    @Expose public int step;
+    @Expose public int duration;
     @Expose public List<User> items = new ArrayList<User>();
 
 
@@ -32,6 +32,7 @@ public static class Android {
 
 	public static class Ios {
 	    @SerializedName("new") @Expose public long add;
+	    @Expose public int online;
         @Expose public int active;
     }