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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
egan
2019-08-04 19:40:27 +08:00
parent c8004a4238 f3310aab91
commit 3679043cfd
4 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pay-java-common/src/main/java/com/egzosn/pay/common/api/PayMessageRouter.java
View File

@@ -129,7 +129,7 @@ public class PayMessageRouter {
public PayOutMessage route(Map<String, Object> payMessage, PayConfigStorage storage) {
PayMessage message = payService.createMessage(payMessage);
message.setPayType(storage.getPayType());
if (null == storage.getMsgType()){
if (null != storage.getMsgType()){
message.setMsgType(storage.getMsgType().name());
}
return route(message);

2
pay-java-common/src/main/java/com/egzosn/pay/common/http/HttpRequestTemplate.java
View File

@@ -343,7 +343,7 @@ public class HttpRequestTemplate {
}
ClientHttpRequest<T> httpRequest = new ClientHttpRequest(uri ,method, request, null == configStorage ? null : configStorage.getCharset());
//判断是否有代理设置
if (null == httpProxy){
if (null != httpProxy){
httpRequest.setProxy(httpProxy);
}
httpRequest.setResponseType(responseType);