lywsvip/pay-java-parent
1
0
Fork 0
mirror of https://gitee.com/egzosn/pay-java-parent.git synced 2026-05-16 19:46:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

修复ClientHttpRequest的bug, 定义交易类型的“接口”方法

Browse Source
This commit is contained in:
zzs
2017-03-08 20:35:16 +08:00
parent e814cb60ea
commit e171f33ebd
3 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pay-java-common/src/main/java/in/egan/pay/common/api/PayConfigStorage.java
View File

@@ -19,12 +19,13 @@ import java.util.concurrent.locks.Lock;
String getAppid();
/**
* 合作商唯一标识
* @see #getPid() 代替者
*/
@Deprecated
String getPartner();
/**
* 合作商唯一标识
* @see #getPartner 代替者
* @see #getPartner() 代替者
*/
String getPid();

6
pay-java-common/src/main/java/in/egan/pay/common/bean/TransactionType.java
View File

@@ -12,5 +12,11 @@ public interface TransactionType {
* @return
*/
String getType();
/**
* 获取接口
* @return
*/
String getMethod();
}

19
pay-java-common/src/main/java/in/egan/pay/common/http/ClientHttpRequest.java
View File

@@ -196,10 +196,18 @@ public class ClientHttpRequest<T> extends HttpEntityEnclosingRequestBase impleme
throw new HttpResponseException(statusLine.getStatusCode(), responseType + " 无法进行类型转换");
}
}
String charset = "UTF-8";
if (null != value && 2 == charset.length()) {
charset = value[1].substring(value[1].indexOf("=") + 1);
}
String result = EntityUtils.toString(entity, charset);
if (responseType.isAssignableFrom(String.class)){
return (T)result;
}
String result = EntityUtils.toString(entity, value[1].substring( value[1].indexOf("=") + 1));
String frist = result.substring(0, 1);
if (ContentType.APPLICATION_JSON.getMimeType().equals( value[0]) || "{[".indexOf(frist) >= 0){
if ( ContentType.APPLICATION_JSON.getMimeType().equals( value[0]) || "{[".indexOf(frist) >= 0 ){
try {
return JSON.parseObject(result, responseType);
}catch (JSONException e){
@@ -207,14 +215,11 @@ public class ClientHttpRequest<T> extends HttpEntityEnclosingRequestBase impleme
}
}
if (ContentType.APPLICATION_XML.getMimeType().equals( value[0])){
if (ContentType.APPLICATION_XML.getMimeType().equals( value[0]) || "<".indexOf(frist) >= 0){
return XML.toJSONObject(result).toJavaObject(responseType);
}
if (!responseType.isAssignableFrom(String.class)){
throw new PayErrorException(new PayException("failure", "类型转化异常,contentType:" + entity.getContentType().getValue(), result));
}
return (T)result;
throw new PayErrorException(new PayException("failure", "类型转化异常,contentType:" + entity.getContentType().getValue(), result));
}
}