lywsvip/pay-java-parent
1
0
Fork 0
mirror of https://gitee.com/egzosn/pay-java-parent.git synced 2026-05-22 18:11:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

优化，清理无效

Browse Source
This commit is contained in:
egzosn
2018-01-26 19:42:56 +08:00
parent 7b87767a90
commit b6c714f33e
4 changed files with 19 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
pay-java-ali/src/main/java/com/egzosn/pay/ali/api/AliPayService.java
View File

@@ -121,7 +121,6 @@ public class AliPayService extends BasePayService {
@Override
public boolean verifySource(String id) {
// return "true".equals(requestTemplate.getForObject( getHttpsVerifyUrl() + "partner=" + payConfigStorage.getPid() + "&notify_id=" + id, String.class));
return true;
}

34
pay-java-ali/src/main/java/com/egzosn/pay/ali/before/api/AliPayService.java
View File

@@ -227,41 +227,7 @@ public class AliPayService extends BasePayService {
}
/**
* 将请求参数或者请求流转化为 Map
*
* @param parameterMap 请求参数
* @param is 请求流
* @return 获得回调的请求参数
*/
@Override
public Map<String, Object> getParameter2Map(Map<String, String[]> parameterMap, InputStream is) {
Map<String, Object> params = new TreeMap<String,Object>();
for (Iterator iter = parameterMap.keySet().iterator(); iter.hasNext();) {
String name = (String) iter.next();
String[] values = parameterMap.get(name);
String valueStr = "";
for (int i = 0,len = values.length; i < len; i++) {
valueStr += (i == len - 1) ? values[i]
: values[i] + ",";
}
//乱码解决，这段代码在出现乱码时使用。如果mysign和sign不相等也可以使用这段代码转化
//valueStr = new String(valueStr.getBytes("ISO-8859-1"), "gbk");
if (!valueStr.matches("\\w+")){
try {
if(valueStr.equals(new String(valueStr.getBytes("iso8859-1"), "iso8859-1"))){
valueStr=new String(valueStr.getBytes("iso8859-1"), payConfigStorage.getInputCharset());
}
} catch (UnsupportedEncodingException e) {
e.printStackTrace();
}
}
params.put(name, valueStr);
}
return params;
}
/**
* 获取输出消息，用户返回给支付端
*

18
pay-java-union/src/main/java/com/egzosn/pay/union/api/UnionPayService.java
View File

@@ -69,21 +69,31 @@ public class UnionPayService extends BasePayService {
super(payConfigStorage, configStorage);
}
/**
* 根据是否为沙箱环境进行获取请求地址
*
* @return 请求地址
*/
public String getReqUrl() {
return (payConfigStorage.isTest() ? TEST_BASE_DOMAIN : RELEASE_BASE_DOMAIN) ;
}
public String getFrontTransUrl () {
return String.format(FRONT_TRANS_URL,payConfigStorage.isTest() ? TEST_BASE_DOMAIN : RELEASE_BASE_DOMAIN);
return String.format(FRONT_TRANS_URL, getReqUrl());
}
public String getBackTransUrl () {
return String.format(BACK_TRANS_URL, payConfigStorage.isTest() ? TEST_BASE_DOMAIN : RELEASE_BASE_DOMAIN);
return String.format(BACK_TRANS_URL, getReqUrl());
}
public String getSingleQueryUrl () {
return String.format(SINGLE_QUERY_URL, payConfigStorage.isTest() ? TEST_BASE_DOMAIN : RELEASE_BASE_DOMAIN);
return String.format(SINGLE_QUERY_URL,getReqUrl());
}
public String getFileTransUrl () {
return String.format(FILE_TRANS_URL, payConfigStorage.isTest() ? TEST_BASE_DOMAIN : RELEASE_BASE_DOMAIN);
return String.format(FILE_TRANS_URL, getReqUrl());
}

10
pay-java-wx/src/main/java/com/egzosn/pay/wx/api/WxPayService.java
View File

@@ -68,7 +68,7 @@ public class WxPayService extends BasePayService {
* @param transactionType 交易类型
* @return 请求url
*/
private String getUrl(TransactionType transactionType) {
private String getReqUrl(TransactionType transactionType) {
return URI + transactionType.getMethod();
}
@@ -196,7 +196,7 @@ public class WxPayService extends BasePayService {
String requestXML = XML.getMap2Xml(parameters);
LOG.debug("requestXML：" + requestXML);
//调起支付的参数列表
JSONObject result = requestTemplate.postForObject(getUrl(order.getTransactionType()), requestXML, JSONObject.class);
JSONObject result = requestTemplate.postForObject(getReqUrl(order.getTransactionType()), requestXML, JSONObject.class);
if (!"SUCCESS".equals(result.get("return_code"))) {
throw new PayErrorException(new WxPayError(result.getString("return_code"), result.getString("return_msg"), result.toJSONString()));
@@ -511,7 +511,7 @@ public class WxPayService extends BasePayService {
//设置签名
setSign(parameters);
return callback.perform(requestTemplate.postForObject(getUrl(WxTransactionType.REFUND), XML.getMap2Xml(parameters), JSONObject.class));
return callback.perform(requestTemplate.postForObject(getReqUrl(WxTransactionType.REFUND), XML.getMap2Xml(parameters), JSONObject.class));
}
/**
@@ -586,7 +586,7 @@ public class WxPayService extends BasePayService {
//设置签名
setSign(parameters);
return callback.perform(requestTemplate.postForObject(getUrl(WxTransactionType.DOWNLOADBILL), XML.getMap2Xml(parameters), JSONObject.class));
return callback.perform(requestTemplate.postForObject(getReqUrl(WxTransactionType.DOWNLOADBILL), XML.getMap2Xml(parameters), JSONObject.class));
}
/**
@@ -625,7 +625,7 @@ public class WxPayService extends BasePayService {
}
//设置签名
setSign(parameters);
return callback.perform(requestTemplate.postForObject(getUrl(transactionType), XML.getMap2Xml(parameters) , JSONObject.class));
return callback.perform(requestTemplate.postForObject(getReqUrl(transactionType), XML.getMap2Xml(parameters) , JSONObject.class));
}