Merge remote-tracking branch 'origin/master'

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

@@ -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);

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

@@ -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);

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

@@ -525,6 +525,7 @@ public class WxPayService extends BasePayService<WxPayConfigStorage> {
         parameters.put("total_fee", Util.conversionCentAmount(refundOrder.getTotalAmount()));
         parameters.put("refund_fee", Util.conversionCentAmount(refundOrder.getRefundAmount()));
         parameters.put("op_user_id", payConfigStorage.getPid());
+        setParameters(parameters, "notify_url",  payConfigStorage.getNotifyUrl());
 
         //设置签名
         setSign(parameters);

pom.xml

@@ -61,7 +61,7 @@
         <pay.version>2.12.8-SNAPSHOT</pay.version>
         <httpmime.version>4.5.4</httpmime.version>
         <log4j.version>1.2.17</log4j.version>
-        <fastjson.version>1.2.41</fastjson.version>
+        <fastjson.version>1.2.58</fastjson.version>
         <zxing.version>3.3.1</zxing.version>
     </properties>