From b6c714f33ef2c1b276aee43e462d571a6da5468f Mon Sep 17 00:00:00 2001 From: egzosn Date: Fri, 26 Jan 2018 19:42:56 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=8C=E6=B8=85=E7=90=86?= =?UTF-8?q?=E6=97=A0=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/egzosn/pay/ali/api/AliPayService.java | 1 - .../pay/ali/before/api/AliPayService.java | 34 ------------------- .../egzosn/pay/union/api/UnionPayService.java | 18 +++++++--- .../com/egzosn/pay/wx/api/WxPayService.java | 10 +++--- 4 files changed, 19 insertions(+), 44 deletions(-) diff --git a/pay-java-ali/src/main/java/com/egzosn/pay/ali/api/AliPayService.java b/pay-java-ali/src/main/java/com/egzosn/pay/ali/api/AliPayService.java index c0c6109..97ced68 100644 --- a/pay-java-ali/src/main/java/com/egzosn/pay/ali/api/AliPayService.java +++ b/pay-java-ali/src/main/java/com/egzosn/pay/ali/api/AliPayService.java @@ -121,7 +121,6 @@ public class AliPayService extends BasePayService { @Override public boolean verifySource(String id) { -// return "true".equals(requestTemplate.getForObject( getHttpsVerifyUrl() + "partner=" + payConfigStorage.getPid() + "¬ify_id=" + id, String.class)); return true; } diff --git a/pay-java-ali/src/main/java/com/egzosn/pay/ali/before/api/AliPayService.java b/pay-java-ali/src/main/java/com/egzosn/pay/ali/before/api/AliPayService.java index 64ea391..8175433 100644 --- a/pay-java-ali/src/main/java/com/egzosn/pay/ali/before/api/AliPayService.java +++ b/pay-java-ali/src/main/java/com/egzosn/pay/ali/before/api/AliPayService.java @@ -227,41 +227,7 @@ public class AliPayService extends BasePayService { } - /** - * 将请求参数或者请求流转化为 Map - * - * @param parameterMap 请求参数 - * @param is 请求流 - * @return 获得回调的请求参数 - */ - @Override - public Map getParameter2Map(Map parameterMap, InputStream is) { - Map params = new TreeMap(); - 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; - } /** * 获取输出消息，用户返回给支付端 * diff --git a/pay-java-union/src/main/java/com/egzosn/pay/union/api/UnionPayService.java b/pay-java-union/src/main/java/com/egzosn/pay/union/api/UnionPayService.java index b2b9831..19124d5 100644 --- a/pay-java-union/src/main/java/com/egzosn/pay/union/api/UnionPayService.java +++ b/pay-java-union/src/main/java/com/egzosn/pay/union/api/UnionPayService.java @@ -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()); } diff --git a/pay-java-wx/src/main/java/com/egzosn/pay/wx/api/WxPayService.java b/pay-java-wx/src/main/java/com/egzosn/pay/wx/api/WxPayService.java index b0f7ffa..0601d2e 100644 --- a/pay-java-wx/src/main/java/com/egzosn/pay/wx/api/WxPayService.java +++ b/pay-java-wx/src/main/java/com/egzosn/pay/wx/api/WxPayService.java @@ -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)); }