niko/weixin4j
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #110 from fengyapengwyy/wyying

Browse Source 
Wyying
This commit is contained in:
jinyu 2017-01-19 13:33:05 +08:00 committed by GitHub
commit 291e19c17f
2 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
weixin4j-base/src/main/java/com/foxinmy/weixin4j/http/weixin/WeixinRequestExecutor.java
View File

@ -129,10 +129,11 @@ public class WeixinRequestExecutor {
if (logger.isEnabled(InternalLogLevel.DEBUG)) {
logger.debug("weixin request >> " + request.getMethod() + " "
+ request.getURI().toString());
printHttpRequest(request,InternalLogLevel.DEBUG);
}
HttpResponse httpResponse = httpClient.execute(request);
WeixinResponse response = new WeixinResponse(httpResponse);
handleResponse(response);
handleResponse(request,response);
return response;
} catch (HttpClientException e) {
throw new WeixinException(e);
@ -164,7 +165,7 @@ public class WeixinRequestExecutor {
* 微信请求响应
* @throws WeixinException
*/
protected void handleResponse(WeixinResponse response)
protected void handleResponse(HttpRequest request,WeixinResponse response)
throws WeixinException {
boolean hasStreamMimeType = hasStreamMimeType(response);
if (logger.isEnabled(InternalLogLevel.DEBUG)) {
@ -181,6 +182,7 @@ public class WeixinRequestExecutor {
ApiResult result = response.getAsResult();
if (!SUCCESS_CODE.contains(String.format(",%s,", result.getReturnCode()
.toLowerCase()))) {
printHttpRequest(request,InternalLogLevel.WARN);
throw new WeixinException(result.getReturnCode(),
result.getReturnMsg());
}
@ -190,6 +192,7 @@ public class WeixinRequestExecutor {
XmlResult.class, response);
if (!SUCCESS_CODE.contains(String.format(",%s,", xmlResult
.getResultCode().toLowerCase()))) {
printHttpRequest(request,InternalLogLevel.WARN);
throw new WeixinException(xmlResult.getErrCode(),
xmlResult.getErrCodeDes());
}
@ -199,6 +202,18 @@ public class WeixinRequestExecutor {
}
}
private void printHttpRequest(HttpRequest request,InternalLogLevel level){
if(request.getEntity() instanceof StringEntity){
if(level.equals(InternalLogLevel.DEBUG)) {
logger.debug("weixin request body >> " + ((StringEntity) request.getEntity()).getContentString());
}else if(level.equals(InternalLogLevel.INFO)){
logger.info("weixin request body >> " + ((StringEntity) request.getEntity()).getContentString());
}else if(level.equals(InternalLogLevel.WARN)){
logger.warn("weixin request body >> " + ((StringEntity) request.getEntity()).getContentString());
}
}
}
public HttpClient getExecuteClient() {
return httpClient;
}

8
weixin4j-base/src/main/java/com/foxinmy/weixin4j/model/card/MemCardCustomField.java
View File

@ -70,4 +70,12 @@ public class MemCardCustomField {
public void setUrl(String url) {
this.url = url;
}
public String getTips() {
return tips;
}
public void setTips(String tips) {
this.tips = tips;
}
}