1
0
mirror of synced 2025-12-23 18:48:00 +08:00

Merge remote-tracking branch 'wechat/develop' into develop

# Conflicts:
#	weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/AbstractRequestExecutor.java
#	weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/MediaDownloadRequestExecutor.java
#	weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/MediaUploadRequestExecutor.java
#	weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/SimpleGetRequestExecutor.java
#	weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/SimplePostRequestExecutor.java
#	weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/jodd/WxMpServiceImpl.java
#	weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/okhttp/WxMpServiceImpl.java
#	weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/MaterialDeleteRequestExecutor.java
#	weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/MaterialNewsInfoRequestExecutor.java
#	weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/MaterialUploadRequestExecutor.java
#	weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/MaterialVideoInfoRequestExecutor.java
#	weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/MediaImgUploadRequestExecutor.java
#	weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/QrCodeRequestExecutor.java
This commit is contained in:
ecoolper
2017-05-08 21:36:07 +08:00
19 changed files with 331 additions and 229 deletions

View File

@@ -6,7 +6,7 @@
<parent>
<groupId>com.github.binarywang</groupId>
<artifactId>weixin-java-parent</artifactId>
<version>2.7.0-SNAPSHOT</version>
<version>2.6.1.BETA</version>
</parent>
<artifactId>weixin-java-cp</artifactId>

View File

@@ -8,8 +8,8 @@ import me.chanjar.weixin.common.util.http.HttpType;
import me.chanjar.weixin.common.util.http.apache.ApacheHttpClientBuilder;
import me.chanjar.weixin.common.util.http.apache.DefaultApacheHttpClientBuilder;
import me.chanjar.weixin.cp.api.WxCpConfigStorage;
import me.chanjar.weixin.cp.api.impl.AbstractWxCpServiceImpl;
import me.chanjar.weixin.cp.api.impl.AbstractWxCpServiceImpl;
import org.apache.http.HttpHost;
import org.apache.http.client.config.RequestConfig;
import org.apache.http.client.methods.CloseableHttpResponse;

View File

@@ -0,0 +1,139 @@
package me.chanjar.weixin.cp.bean.article;
/**
* <pre>
* Created by BinaryWang on 2017/3/27.
* </pre>
* @author Binary Wang
*/
public class MpnewsArticle {
private String title;
private String thumbMediaId;
private String author;
private String contentSourceUrl;
private String content;
private String digest;
private String showCoverPic;
private MpnewsArticle(Builder builder) {
setTitle(builder.title);
setThumbMediaId(builder.thumbMediaId);
setAuthor(builder.author);
setContentSourceUrl(builder.contentSourceUrl);
setContent(builder.content);
setDigest(builder.digest);
setShowCoverPic(builder.showCoverPic);
}
public static Builder newBuilder() {
return new Builder();
}
public String getTitle() {
return title;
}
public void setTitle(String title) {
this.title = title;
}
public String getThumbMediaId() {
return thumbMediaId;
}
public void setThumbMediaId(String thumbMediaId) {
this.thumbMediaId = thumbMediaId;
}
public String getAuthor() {
return author;
}
public void setAuthor(String author) {
this.author = author;
}
public String getContentSourceUrl() {
return contentSourceUrl;
}
public void setContentSourceUrl(String contentSourceUrl) {
this.contentSourceUrl = contentSourceUrl;
}
public String getContent() {
return content;
}
public void setContent(String content) {
this.content = content;
}
public String getDigest() {
return digest;
}
public void setDigest(String digest) {
this.digest = digest;
}
public String getShowCoverPic() {
return showCoverPic;
}
public void setShowCoverPic(String showCoverPic) {
this.showCoverPic = showCoverPic;
}
public static final class Builder {
private String title;
private String thumbMediaId;
private String author;
private String contentSourceUrl;
private String content;
private String digest;
private String showCoverPic;
private Builder() {
}
public Builder title(String title) {
this.title = title;
return this;
}
public Builder thumbMediaId(String thumbMediaId) {
this.thumbMediaId = thumbMediaId;
return this;
}
public Builder author(String author) {
this.author = author;
return this;
}
public Builder contentSourceUrl(String contentSourceUrl) {
this.contentSourceUrl = contentSourceUrl;
return this;
}
public Builder content(String content) {
this.content = content;
return this;
}
public Builder digest(String digest) {
this.digest = digest;
return this;
}
public Builder showCoverPic(String showCoverPic) {
this.showCoverPic = showCoverPic;
return this;
}
public MpnewsArticle build() {
return new MpnewsArticle(this);
}
}
}

View File

@@ -0,0 +1,49 @@
package me.chanjar.weixin.cp.bean.article;
/**
* <pre>
* Created by BinaryWang on 2017/3/27.
* </pre>
*
* @author Binary Wang
*/
public class NewArticle {
private String title;
private String description;
private String url;
private String picUrl;
public String getTitle() {
return this.title;
}
public void setTitle(String title) {
this.title = title;
}
public String getDescription() {
return this.description;
}
public void setDescription(String description) {
this.description = description;
}
public String getUrl() {
return this.url;
}
public void setUrl(String url) {
this.url = url;
}
public String getPicUrl() {
return this.picUrl;
}
public void setPicUrl(String picUrl) {
this.picUrl = picUrl;
}
}