2.8.9

liyiorg · May 9, 2017 · 97b95a0 · 97b95a0
1 parent 89648c7
commit 97b95a0
Show file tree

Hide file tree

Showing 35 changed files with 1,275 additions and 16 deletions.
diff --git a/README.md b/README.md
@@ -24,7 +24,7 @@ weixin-popular 已支持的微信平台
 <dependency>
   <groupId>com.github.liyiorg</groupId>
   <artifactId>weixin-popular</artifactId>
-  <version>2.8.8</version>
+  <version>2.8.9</version>
 </dependency>
 ```
 * [升级注意事项](https://github.com/liyiorg/weixin-popular/wiki/jar_update)
@@ -50,6 +50,7 @@ weixin-popular 已支持的微信平台
 * [ShakearoundAPI](https://github.com/liyiorg/weixin-popular/wiki/ShakearoundAPI) 微信摇一摇周边 @Moyq5 (贡献)
 * [DatacubeAPI](https://github.com/liyiorg/weixin-popular/wiki/DataCubeAPI) 数据统计 @Moyq5 (贡献)
 * [CustomserviceAPI](https://github.com/liyiorg/weixin-popular/wiki/CustomserviceAPI) 客服功能  @ConciseA (贡献)
+* [WxaAPI](https://github.com/liyiorg/weixin-popular/wiki/WxaAPI) 微信小程序第三方平台
 
 ### 待开发API
 * [BizwifiAPI](https://github.com/liyiorg/weixin-popular/wiki/BizwifiAPI) 微信连Wi-Fi

diff --git a/changelog.txt b/changelog.txt
@@ -2,6 +2,13 @@ WEIXIN-POPULAR CHANGELOG
 ===========================
 https://github.com/liyiorg/weixin-popular
 
+Changes in version 2.8.9 (2017-05-08)
+-------------------------------------
+* 添加微信小程序第三方平台接口WxaAPI
+* 添加微信小程序数据统计接口
+* #75 补充服务商支付方式返回缺失字段
+* 添加菜单接口小程序类型字段
+
 Changes in version 2.8.8 (2017-04-07)
 -------------------------------------
 * 修复问题 #72 （小程序二维码接口返回数据格式错误）

diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 
 	<groupId>com.github.liyiorg</groupId>
 	<artifactId>weixin-popular</artifactId>
-	<version>2.8.8</version>
+	<version>2.8.9</version>
 
 	<name>weixin-popular</name>
     <description>The weixin-popular is a JAVA SDK for weixin. Weixin web url is https://mp.weixin.qq.com.</description>

diff --git a/src/main/java/weixin/popular/api/API.java b/src/main/java/weixin/popular/api/API.java
@@ -6,7 +6,7 @@
  * 
  * 2.8.6
  * 
- * @author SLYH
+ * @author LiYi
  *
  */
 public class API {

diff --git a/src/main/java/weixin/popular/api/DataCubeAPI.java b/src/main/java/weixin/popular/api/DataCubeAPI.java
@@ -20,6 +20,11 @@
 import weixin.popular.bean.datacube.upstreammsg.UpstreammsgResult;
 import weixin.popular.bean.datacube.user.UsercumulateResult;
 import weixin.popular.bean.datacube.user.UsersummaryResult;
+import weixin.popular.bean.datacube.wxapp.RetaininfoResult;
+import weixin.popular.bean.datacube.wxapp.SummarytrendResult;
+import weixin.popular.bean.datacube.wxapp.VisitdistributionResult;
+import weixin.popular.bean.datacube.wxapp.VisitpageResult;
+import weixin.popular.bean.datacube.wxapp.VisittrendResult;
 import weixin.popular.client.LocalHttpClient;
 import weixin.popular.util.JsonUtil;
 
@@ -459,4 +464,184 @@ public static InterfacesummaryResult getinterfacesummaryhour(String access_token
 				.build();
 		return LocalHttpClient.executeJsonResult(httpUriRequest,InterfacesummaryResult.class);
 	}
+
+	//-------------------------- 小程序
+
+	/**
+	 * 概况趋势	(小程序)
+	 * @param access_token access_token
+	 * @param begin_date begin_date
+	 * @param end_date end_date
+	 * @return result
+	 * @since 2.8.9
+	 */
+	public static SummarytrendResult getweanalysisappiddailysummarytrend(String access_token, String begin_date,String end_date) {
+		String requestJson = String.format("{\"begin_date\":\"%s\",\"end_date\":\"%s\"}", begin_date,end_date);
+		HttpUriRequest httpUriRequest = RequestBuilder.post()
+				.setHeader(jsonHeader)
+				.setUri(BASE_URI+"/datacube/getweanalysisappiddailysummarytrend")
+				.addParameter(PARAM_ACCESS_TOKEN, API.accessToken(access_token))
+				.setEntity(new StringEntity(requestJson,Charset.forName("utf-8")))
+				.build();
+		return LocalHttpClient.executeJsonResult(httpUriRequest,SummarytrendResult.class);
+	}
+
+	/**
+	 * 访问趋势 (小程序)<br>
+	 * 日趋势
+	 * @param access_token access_token
+	 * @param begin_date begin_date
+	 * @param end_date end_date
+	 * @return result
+	 * @since 2.8.9
+	 */
+	public static VisittrendResult getweanalysisappiddailyvisittrend(String access_token, String begin_date,String end_date) {
+		String requestJson = String.format("{\"begin_date\":\"%s\",\"end_date\":\"%s\"}", begin_date,end_date);
+		HttpUriRequest httpUriRequest = RequestBuilder.post()
+				.setHeader(jsonHeader)
+				.setUri(BASE_URI+"/datacube/getweanalysisappiddailyvisittrend")
+				.addParameter(PARAM_ACCESS_TOKEN, API.accessToken(access_token))
+				.setEntity(new StringEntity(requestJson,Charset.forName("utf-8")))
+				.build();
+		return LocalHttpClient.executeJsonResult(httpUriRequest,VisittrendResult.class);
+	}
+
+	/**
+	 * 访问趋势 (小程序)<br>
+	 * 周趋势
+	 * @param access_token access_token
+	 * @param begin_date begin_date
+	 * @param end_date end_date
+	 * @return result
+	 * @since 2.8.9
+	 */
+	public static VisittrendResult getweanalysisappidweeklyvisittrend(String access_token, String begin_date,String end_date) {
+		String requestJson = String.format("{\"begin_date\":\"%s\",\"end_date\":\"%s\"}", begin_date,end_date);
+		HttpUriRequest httpUriRequest = RequestBuilder.post()
+				.setHeader(jsonHeader)
+				.setUri(BASE_URI+"/datacube/getweanalysisappidweeklyvisittrend")
+				.addParameter(PARAM_ACCESS_TOKEN, API.accessToken(access_token))
+				.setEntity(new StringEntity(requestJson,Charset.forName("utf-8")))
+				.build();
+		return LocalHttpClient.executeJsonResult(httpUriRequest,VisittrendResult.class);
+	}
+
+	/**
+	 * 访问趋势 (小程序)<br>
+	 * 月趋势
+	 * @param access_token access_token
+	 * @param begin_date begin_date
+	 * @param end_date end_date
+	 * @return result
+	 * @since 2.8.9
+	 */
+	public static VisittrendResult getweanalysisappidmonthlyvisittrend(String access_token, String begin_date,String end_date) {
+		String requestJson = String.format("{\"begin_date\":\"%s\",\"end_date\":\"%s\"}", begin_date,end_date);
+		HttpUriRequest httpUriRequest = RequestBuilder.post()
+				.setHeader(jsonHeader)
+				.setUri(BASE_URI+"/datacube/getweanalysisappidmonthlyvisittrend")
+				.addParameter(PARAM_ACCESS_TOKEN, API.accessToken(access_token))
+				.setEntity(new StringEntity(requestJson,Charset.forName("utf-8")))
+				.build();
+		return LocalHttpClient.executeJsonResult(httpUriRequest,VisittrendResult.class);
+	}
+
+	/**
+	 * 访问分布 (小程序)<br>
+	 * @param access_token access_token
+	 * @param begin_date begin_date
+	 * @param end_date end_date
+	 * @return result
+	 * @since 2.8.9
+	 */
+	public static VisitdistributionResult getweanalysisappidvisitdistribution(String access_token, String begin_date,String end_date) {
+		String requestJson = String.format("{\"begin_date\":\"%s\",\"end_date\":\"%s\"}", begin_date,end_date);
+		HttpUriRequest httpUriRequest = RequestBuilder.post()
+				.setHeader(jsonHeader)
+				.setUri(BASE_URI+"/datacube/getweanalysisappidvisitdistribution")
+				.addParameter(PARAM_ACCESS_TOKEN, API.accessToken(access_token))
+				.setEntity(new StringEntity(requestJson,Charset.forName("utf-8")))
+				.build();
+		return LocalHttpClient.executeJsonResult(httpUriRequest,VisitdistributionResult.class);
+	}
+
+	/**
+	 * 访问留存 (小程序)<br>
+	 * 日留存
+	 * @param access_token access_token
+	 * @param begin_date begin_date
+	 * @param end_date end_date
+	 * @return result
+	 * @since 2.8.9
+	 */
+	public static RetaininfoResult getweanalysisappiddailyretaininfo(String access_token, String begin_date,String end_date) {
+		String requestJson = String.format("{\"begin_date\":\"%s\",\"end_date\":\"%s\"}", begin_date,end_date);
+		HttpUriRequest httpUriRequest = RequestBuilder.post()
+				.setHeader(jsonHeader)
+				.setUri(BASE_URI+"/datacube/getweanalysisappiddailyretaininfo")
+				.addParameter(PARAM_ACCESS_TOKEN, API.accessToken(access_token))
+				.setEntity(new StringEntity(requestJson,Charset.forName("utf-8")))
+				.build();
+		return LocalHttpClient.executeJsonResult(httpUriRequest,RetaininfoResult.class);
+	}
+
+	/**
+	 * 访问留存 (小程序)<br>
+	 * 周留存
+	 * @param access_token access_token
+	 * @param begin_date begin_date
+	 * @param end_date end_date
+	 * @return result
+	 * @since 2.8.9
+	 */
+	public static RetaininfoResult getweanalysisappidweeklyretaininfo(String access_token, String begin_date,String end_date) {
+		String requestJson = String.format("{\"begin_date\":\"%s\",\"end_date\":\"%s\"}", begin_date,end_date);
+		HttpUriRequest httpUriRequest = RequestBuilder.post()
+				.setHeader(jsonHeader)
+				.setUri(BASE_URI+"/datacube/getweanalysisappidweeklyretaininfo")
+				.addParameter(PARAM_ACCESS_TOKEN, API.accessToken(access_token))
+				.setEntity(new StringEntity(requestJson,Charset.forName("utf-8")))
+				.build();
+		return LocalHttpClient.executeJsonResult(httpUriRequest,RetaininfoResult.class);
+	}
+
+	/**
+	 * 访问留存 (小程序)<br>
+	 * 月留存
+	 * @param access_token access_token
+	 * @param begin_date begin_date
+	 * @param end_date end_date
+	 * @return result
+	 * @since 2.8.9
+	 */
+	public static RetaininfoResult getweanalysisappidmonthlyretaininfo(String access_token, String begin_date,String end_date) {
+		String requestJson = String.format("{\"begin_date\":\"%s\",\"end_date\":\"%s\"}", begin_date,end_date);
+		HttpUriRequest httpUriRequest = RequestBuilder.post()
+				.setHeader(jsonHeader)
+				.setUri(BASE_URI+"/datacube/getweanalysisappidmonthlyretaininfo")
+				.addParameter(PARAM_ACCESS_TOKEN, API.accessToken(access_token))
+				.setEntity(new StringEntity(requestJson,Charset.forName("utf-8")))
+				.build();
+		return LocalHttpClient.executeJsonResult(httpUriRequest,RetaininfoResult.class);
+	}
+
+	/**
+	 * 访问页面 (小程序)
+	 * @param access_token access_token
+	 * @param begin_date begin_date
+	 * @param end_date end_date
+	 * @return result
+	 * @since 2.8.9
+	 */
+	public static VisitpageResult getweanalysisappidvisitpage(String access_token, String begin_date,String end_date) {
+		String requestJson = String.format("{\"begin_date\":\"%s\",\"end_date\":\"%s\"}", begin_date,end_date);
+		HttpUriRequest httpUriRequest = RequestBuilder.post()
+				.setHeader(jsonHeader)
+				.setUri(BASE_URI+"/datacube/getweanalysisappidvisitpage")
+				.addParameter(PARAM_ACCESS_TOKEN, API.accessToken(access_token))
+				.setEntity(new StringEntity(requestJson,Charset.forName("utf-8")))
+				.build();
+		return LocalHttpClient.executeJsonResult(httpUriRequest,VisitpageResult.class);
+	}
+
 }
diff --git a/src/main/java/weixin/popular/api/PayAPI.java b/src/main/java/weixin/popular/api/PayAPI.java
@@ -20,7 +20,7 @@
 
 /**
  * 老版本支付，新版本使用PayMchAPI。
- * @author SLYH
+ * @author LiYi
  */
 public class PayAPI extends BaseAPI{
 

diff --git a/src/main/java/weixin/popular/api/SnsAPI.java b/src/main/java/weixin/popular/api/SnsAPI.java
@@ -238,5 +238,27 @@ public static Jscode2sessionResult jscode2session(String appid,String secret,Str
 			.build();
 		return LocalHttpClient.executeJsonResult(httpUriRequest,Jscode2sessionResult.class);
 	}
+
+	/**
+	 *  code 换取 session_key（微信小程序   第三方平台）
+	 * @since 2.8.9
+	 * @param appid appid
+	 * @param js_code js_code
+	 * @param component_appid component_appid
+	 * @param component_access_token component_access_token
+	 * @return result
+	 */
+	public static Jscode2sessionResult componentJscode2session(String appid,String js_code,String component_appid,String component_access_token){
+		HttpUriRequest httpUriRequest = RequestBuilder.get()
+			.setUri(BASE_URI + "/sns/component/jscode2session")
+			.addParameter("appid",appid)
+			.addParameter("js_code",js_code)
+			.addParameter("grant_type","authorization_code")
+			.addParameter("component_appid",component_appid)
+			.addParameter("component_access_token",API.componentAccessToken(component_access_token))
+			.build();
+		return LocalHttpClient.executeJsonResult(httpUriRequest,Jscode2sessionResult.class);
+	}
+
 
 }
diff --git a/src/main/java/weixin/popular/api/UserAPI.java b/src/main/java/weixin/popular/api/UserAPI.java
@@ -23,7 +23,7 @@
 
 /**
  * User API
- * @author Administrator
+ * @author LiYi
  *
  */
 public class UserAPI extends BaseAPI{
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,7 +6,7 @@ @@
      *
      * 2.8.6
      *
-     * @author SLYH
+     * @author LiYi
      *
      */
     public class API {
@@ Expand Down @@