Merge branch 'master' of https://github.com/liyiorg/weixin-popular in…

…to liyiorg-master

src/main/java/weixin/popular/api/ClearQuotaAPI.java

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 package weixin.popular.api;
 
 import java.nio.charset.Charset;
@@ -38,3 +39,45 @@ public static BaseResult clear_quota(String access_token,String appid){
 	}
 
 }
+=======
+package weixin.popular.api;
+
+import java.nio.charset.Charset;
+
+import org.apache.http.client.methods.HttpUriRequest;
+import org.apache.http.client.methods.RequestBuilder;
+import org.apache.http.entity.StringEntity;
+
+import weixin.popular.bean.BaseResult;
+import weixin.popular.client.LocalHttpClient;
+
+/**
+ * 
+ * 接口调用频次清零API <br>
+ * 公众号调用接口并不是无限制的。为了防止公众号的程序错误而引发微信服务器负载异常，默认情况下，每个公众号调用接口都不能超过一定限制，当超过一定限制时，调用对应接口会收到如下错误返回码：
+ * {"errcode":45009,"errmsg":"api freq out of limit"}
+ * @author LiYi
+ * @since 2.7.1
+ */
+public class ClearQuotaAPI extends BaseAPI{
+
+	/**
+	 * 公众号调用或第三方平台帮公众号调用对公众号的所有api调用（包括第三方帮其调用）次数进行清零
+	 * @since 2.7.1
+	 * @param access_token access_token
+	 * @param appid appid
+	 * @return BaseResult
+	 */
+	public static BaseResult clear_quota(String access_token,String appid){
+		String json = String.format("{\"appid\":\"%s\"}", appid);
+		HttpUriRequest httpUriRequest = RequestBuilder.post()
+										.setHeader(jsonHeader)
+										.setUri(BASE_URI+"/cgi-bin/clear_quota")
+										.addParameter(getATPN(), access_token)
+										.setEntity(new StringEntity(json,Charset.forName("utf-8")))
+										.build();
+		return LocalHttpClient.executeJsonResult(httpUriRequest,BaseResult.class);
+	}
+
+}
+>>>>>>> 0727dc61a0ebb79e9b3391976937a54697002b5f

src/main/java/weixin/popular/api/DeviceAPI.java

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 package weixin.popular.api;
 
 /**
@@ -14,3 +15,21 @@ public class DeviceAPI extends BaseAPI{
 	 * 
 	 */
 }
+=======
+package weixin.popular.api;
+
+/**
+ * 设备功能
+ * @author nobody
+ *
+ */
+public class DeviceAPI extends BaseAPI{
+
+	/**
+	 * 这里一片空白，开源贡献动起手来！
+	 * 
+	 * 参考其它API的开发方式
+	 * 
+	 */
+}
+>>>>>>> 0727dc61a0ebb79e9b3391976937a54697002b5f

src/main/java/weixin/popular/bean/material/MaterialGetResult.java

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 package weixin.popular.bean.material;
 
 import java.util.List;
@@ -48,3 +49,55 @@ public void setNews_item(List<Article> news_item) {
 	}
 
 }
+=======
+package weixin.popular.bean.material;
+
+import java.util.List;
+
+import weixin.popular.bean.media.MediaGetResult;
+import weixin.popular.bean.message.Article;
+
+public class MaterialGetResult extends MediaGetResult {
+
+	private String title; // 如果返回的是视频消息素材
+
+	private String description; // 如果返回的是视频消息素材
+
+	private String down_url; // 如果返回的是视频消息素材
+
+	private List<Article> news_item; // 图文素材返回
+
+	public String getTitle() {
+		return title;
+	}
+
+	public void setTitle(String title) {
+		this.title = title;
+	}
+
+	public String getDescription() {
+		return description;
+	}
+
+	public void setDescription(String description) {
+		this.description = description;
+	}
+
+	public String getDown_url() {
+		return down_url;
+	}
+
+	public void setDown_url(String down_url) {
+		this.down_url = down_url;
+	}
+
+	public List<Article> getNews_item() {
+		return news_item;
+	}
+
+	public void setNews_item(List<Article> news_item) {
+		this.news_item = news_item;
+	}
+
+}
+>>>>>>> 0727dc61a0ebb79e9b3391976937a54697002b5f

src/main/java/weixin/popular/bean/media/MediaGetResult.java

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 package weixin.popular.bean.media;
 
 import weixin.popular.bean.BaseResult;
@@ -35,3 +36,42 @@ public void setBytes(byte[] bytes) {
 	}
 
 }
+=======
+package weixin.popular.bean.media;
+
+import weixin.popular.bean.BaseResult;
+
+public class MediaGetResult extends BaseResult{
+
+	private String filename;
+
+	private String contentType;
+
+	private byte[] bytes;
+
+	public String getFilename() {
+		return filename;
+	}
+
+	public void setFilename(String filename) {
+		this.filename = filename;
+	}
+
+	public String getContentType() {
+		return contentType;
+	}
+
+	public void setContentType(String contentType) {
+		this.contentType = contentType;
+	}
+
+	public byte[] getBytes() {
+		return bytes;
+	}
+
+	public void setBytes(byte[] bytes) {
+		this.bytes = bytes;
+	}
+
+}
+>>>>>>> 0727dc61a0ebb79e9b3391976937a54697002b5f

src/main/java/weixin/popular/bean/message/AroundBeacon.java

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 package weixin.popular.bean.message;
 
 import javax.xml.bind.annotation.XmlAccessType;
@@ -60,3 +61,67 @@ public void setDistance(String distance) {
 		this.distance = distance;
 	}
 }
+=======
+package weixin.popular.bean.message;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+
+/**
+ * 
+ * 摇一摇 周边事件数据
+ * 
+ * @author LiYi
+ *
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlRootElement(name="AroundBeacon")
+public class AroundBeacon {
+
+	@XmlElement(name="Uuid")
+	private String uuid;
+
+	@XmlElement(name="Major")
+	private String major;
+
+	@XmlElement(name="Minor")
+	private String minor;
+
+	@XmlElement(name="Distance")
+	private String distance;
+
+	public String getUuid() {
+		return uuid;
+	}
+
+	public void setUuid(String uuid) {
+		this.uuid = uuid;
+	}
+
+	public String getMajor() {
+		return major;
+	}
+
+	public void setMajor(String major) {
+		this.major = major;
+	}
+
+	public String getMinor() {
+		return minor;
+	}
+
+	public void setMinor(String minor) {
+		this.minor = minor;
+	}
+
+	public String getDistance() {
+		return distance;
+	}
+
+	public void setDistance(String distance) {
+		this.distance = distance;
+	}
+}
+>>>>>>> 0727dc61a0ebb79e9b3391976937a54697002b5f