lsm/weixin-java-tools
1
0
Fork 0
mirror of https://gitee.com/binary/weixin-java-tools.git synced 2025-09-20 18:48:13 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/wechat-group/weixin-java-tools into develop

Browse Source
This commit is contained in:
ben
2016-10-10 11:00:30 +08:00
parent 25064c5ff8 3d9bc6be0f
commit ab9cc45168
63 changed files with 1522 additions and 976 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
weixin-java-common/pom.xml
View File

@@ -6,7 +6,7 @@
<parent>
<groupId>com.github.binarywang</groupId>
<artifactId>weixin-java-parent</artifactId>
<version>2.1.2</version>
<version>2.3.0-SNAPSHOT</version>
</parent>
<artifactId>weixin-java-common</artifactId>

2
weixin-java-common/src/main/java/me/chanjar/weixin/common/api/WxConsts.java
View File

@@ -93,6 +93,8 @@ public class WxConsts {
public static final String EVT_KF_CREATE_SESSION = "kf_create_session"; // 客服接入会话
public static final String EVT_KF_CLOSE_SESSION = "kf_close_session"; // 客服关闭会话
public static final String EVT_KF_SWITCH_SESSION = "kf_switch_session"; // 客服转接会话
public static final String EVT_POI_CHECK_NOTIFY = "poi_check_notify"; //门店审核事件推送
///////////////////////
// 上传多媒体文件的类型
///////////////////////

5
weixin-java-common/src/main/java/me/chanjar/weixin/common/exception/WxErrorException.java
View File

@@ -13,6 +13,11 @@ public class WxErrorException extends Exception {
this.error = error;
}
public WxErrorException(WxError error, Throwable cause) {
super(error.toString(), cause);
this.error = error;
}
public WxError getError() {
return this.error;
}

1
weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/ApacheHttpClientBuilder.java
View File

@@ -5,6 +5,7 @@ import org.apache.http.impl.client.CloseableHttpClient;
/**
* httpclient build interface
* @author kakotor
*/
public interface ApacheHttpClientBuilder {

8
weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/DefaultApacheHttpClientBuilder.java
View File

@@ -1,6 +1,8 @@
package me.chanjar.weixin.common.util.http;
import me.chanjar.weixin.common.util.StringUtils;
import java.io.IOException;
import java.util.concurrent.TimeUnit;
import org.apache.http.annotation.NotThreadSafe;
import org.apache.http.auth.AuthScope;
import org.apache.http.auth.UsernamePasswordCredentials;
@@ -21,11 +23,11 @@ import org.apache.http.impl.client.HttpClients;
import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
import org.apache.http.protocol.HttpContext;
import java.io.IOException;
import java.util.concurrent.TimeUnit;
import me.chanjar.weixin.common.util.StringUtils;
/**
* httpclient 连接管理器
* @author kakotor
*/
@NotThreadSafe
public class DefaultApacheHttpClientBuilder implements ApacheHttpClientBuilder {