From 021033a705ef8c02c419748f702d9cf7287f5eda Mon Sep 17 00:00:00 2001 From: zzs Date: Tue, 14 Mar 2017 14:49:13 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E7=8E=AF=E5=A2=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/in/egan/pay/demo/dao/ApyAccountRepository.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pay-java-demo/src/main/java/in/egan/pay/demo/dao/ApyAccountRepository.java b/pay-java-demo/src/main/java/in/egan/pay/demo/dao/ApyAccountRepository.java index efdef0c..85032c6 100644 --- a/pay-java-demo/src/main/java/in/egan/pay/demo/dao/ApyAccountRepository.java +++ b/pay-java-demo/src/main/java/in/egan/pay/demo/dao/ApyAccountRepository.java @@ -42,6 +42,8 @@ public class ApyAccountRepository { apyAccount1.setSignType(SignUtils.RSA.name()); apyAccount1.setPayType(PayType.aliPay); apyAccount1.setMsgType(MsgType.text); + //设置测试环境 + apyAccount1.setTest(true); apyAccounts.put(apyAccount1.getPayId(), apyAccount1); ApyAccount apyAccount2 = new ApyAccount(); From 91b1074fba404ef56e7a7ab5ba59411362b0d4ba Mon Sep 17 00:00:00 2001 From: Actinia-517 <412605202@qq.com> Date: Tue, 25 Apr 2017 21:40:47 +0800 Subject: [PATCH 2/4] =?UTF-8?q?#=E6=96=B0=E5=A2=9E#=20=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E9=80=80=E6=AC=BE=E6=8E=A5=E5=8F=A3=20=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E7=AD=89=E6=B3=A8=E9=87=8A=20#=E4=BF=AE?= =?UTF-8?q?=E6=94=B9#=20=E6=9B=B4=E6=96=B0=E6=96=B0=E7=9A=84=E6=94=AF?= =?UTF-8?q?=E4=BB=98=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/in/egan/pay/demo/entity/PayType.java | 27 ++ .../in/egan/pay/demo/service/PayResponse.java | 7 + .../pay/fuiou/api/FuiouPayConfigStorage.java | 34 +- .../egan/pay/fuiou/api/FuiouPayService.java | 333 ++++++++++++------ .../in/egan/pay/fuiou/bean/FuiouCurType.java | 17 +- .../pay/fuiou/bean/FuiouTransactionType.java | 13 +- .../utils/SimplePostRequestExecutor.java | 76 ---- 7 files changed, 304 insertions(+), 203 deletions(-) delete mode 100644 pay-java-fuiou/src/main/java/in/egan/pay/fuiou/utils/SimplePostRequestExecutor.java diff --git a/pay-java-demo/src/main/java/in/egan/pay/demo/entity/PayType.java b/pay-java-demo/src/main/java/in/egan/pay/demo/entity/PayType.java index d896d46..2c8095d 100644 --- a/pay-java-demo/src/main/java/in/egan/pay/demo/entity/PayType.java +++ b/pay-java-demo/src/main/java/in/egan/pay/demo/entity/PayType.java @@ -112,6 +112,33 @@ public enum PayType implements BasePayType { return YoudianTransactionType.valueOf(transactionType); } + },fuiou{ + + @Override + public PayService getPayService(ApyAccount apyAccount) { + AliPayConfigStorage aliPayConfigStorage = new AliPayConfigStorage(); + aliPayConfigStorage.setPid(apyAccount.getPartner()); + aliPayConfigStorage.setAppId(apyAccount.getAppid()); + aliPayConfigStorage.setAliPublicKey(apyAccount.getPublicKey()); + aliPayConfigStorage.setKeyPrivate(apyAccount.getPrivateKey()); + aliPayConfigStorage.setNotifyUrl(apyAccount.getNotifyUrl()); + aliPayConfigStorage.setReturnUrl(apyAccount.getReturnUrl()); + aliPayConfigStorage.setSignType(apyAccount.getSignType()); + aliPayConfigStorage.setSeller(apyAccount.getSeller()); + aliPayConfigStorage.setPayType(apyAccount.getPayType().toString()); + aliPayConfigStorage.setMsgType(apyAccount.getMsgType()); + aliPayConfigStorage.setInputCharset(apyAccount.getInputCharset()); + aliPayConfigStorage.setTest(apyAccount.isTest()); + return new AliPayService(aliPayConfigStorage); + } + + @Override + public TransactionType getTransactionType(String transactionType) { + // in.egan.pay.ali.before.bean.AliTransactionType 17年更新的版本,旧版本请自行切换 + return AliTransactionType.valueOf(transactionType); + } + + }; public abstract PayService getPayService(ApyAccount apyAccount); diff --git a/pay-java-demo/src/main/java/in/egan/pay/demo/service/PayResponse.java b/pay-java-demo/src/main/java/in/egan/pay/demo/service/PayResponse.java index 5fee84e..a11bdc8 100644 --- a/pay-java-demo/src/main/java/in/egan/pay/demo/service/PayResponse.java +++ b/pay-java-demo/src/main/java/in/egan/pay/demo/service/PayResponse.java @@ -6,6 +6,7 @@ import in.egan.pay.ali.bean.AliTransactionType; import in.egan.pay.demo.entity.ApyAccount; import in.egan.pay.demo.entity.PayType; import in.egan.pay.demo.service.handler.AliPayMessageHandler; +import in.egan.pay.demo.service.handler.FuiouPayMessageHandler; import in.egan.pay.demo.service.handler.WxPayMessageHandler; import in.egan.pay.demo.service.handler.YouDianPayMessageHandler; import in.egan.pay.demo.service.interceptor.AliPayMessageInterceptor; @@ -81,6 +82,12 @@ public class PayResponse { .payType(PayType.youdianPay.name()) .handler(autowire(new YouDianPayMessageHandler(payId))) .end() + .rule() + .async(false) + .msgType(MsgType.xml.name()) + .payType(PayType.fuiou.name()) + .handler(autowire(new FuiouPayMessageHandler(payId))) + .end() ; } diff --git a/pay-java-fuiou/src/main/java/in/egan/pay/fuiou/api/FuiouPayConfigStorage.java b/pay-java-fuiou/src/main/java/in/egan/pay/fuiou/api/FuiouPayConfigStorage.java index 94f0b06..d2c7426 100644 --- a/pay-java-fuiou/src/main/java/in/egan/pay/fuiou/api/FuiouPayConfigStorage.java +++ b/pay-java-fuiou/src/main/java/in/egan/pay/fuiou/api/FuiouPayConfigStorage.java @@ -2,7 +2,7 @@ package in.egan.pay.fuiou.api;/** * Created by Fuzx on 2017/1/16 0016. */ -import in.egan.pay.common.before.api.BasePayConfigStorage; +import in.egan.pay.common.api.BasePayConfigStorage; /** * @author Fuzx @@ -13,19 +13,41 @@ public class FuiouPayConfigStorage extends BasePayConfigStorage { public String mchntCd;//商户代码 public String mchntKey;//商户密钥 - + /** + * 应用id + * @return 空 + */ @Override public String getAppid() { return null; } + /** + * 合作商唯一标识 + * + * @see #getPid() 代替者 + */ @Override - public String getPartner() { + public String getPartner () { return mchntCd; } - public void setPartner(String partner) { - this.mchntCd = partner; + /** + * 合作商唯一标识 + * + * @see #getPartner() 代替者 + */ + @Override + public String getPid () { + return mchntCd; + } + + public String getMchntCd () { + return mchntCd; + } + + public void setMchntCd (String mchntCd) { + this.mchntCd = mchntCd; } @Override @@ -35,7 +57,7 @@ public class FuiouPayConfigStorage extends BasePayConfigStorage { @Override public String getSecretKey() { - return mchntKey; + return super.getKeyPrivate(); } public void setSecretKey(String mchntKey){ diff --git a/pay-java-fuiou/src/main/java/in/egan/pay/fuiou/api/FuiouPayService.java b/pay-java-fuiou/src/main/java/in/egan/pay/fuiou/api/FuiouPayService.java index 293402a..3e766b1 100644 --- a/pay-java-fuiou/src/main/java/in/egan/pay/fuiou/api/FuiouPayService.java +++ b/pay-java-fuiou/src/main/java/in/egan/pay/fuiou/api/FuiouPayService.java @@ -2,23 +2,26 @@ package in.egan.pay.fuiou.api;/** * Created by Fuzx on 2017/1/16 0016. */ -import in.egan.pay.common.before.api.BasePayService; -import in.egan.pay.common.before.api.PayConfigStorage; -import in.egan.pay.common.before.api.RequestExecutor; +import com.alibaba.fastjson.JSONObject; +import in.egan.pay.common.api.BasePayService; +import in.egan.pay.common.api.Callback; +import in.egan.pay.common.api.PayConfigStorage; import in.egan.pay.common.bean.MethodType; import in.egan.pay.common.bean.PayOrder; import in.egan.pay.common.bean.PayOutMessage; -import in.egan.pay.common.before.bean.result.PayError; +import in.egan.pay.common.bean.TransactionType; import in.egan.pay.common.exception.PayErrorException; +import in.egan.pay.common.http.HttpConfigStorage; import in.egan.pay.common.util.sign.SignUtils; import in.egan.pay.common.util.str.StringUtils; -import in.egan.pay.fuiou.utils.SimplePostRequestExecutor; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.http.message.BasicNameValuePair; import java.awt.image.BufferedImage; import java.io.InputStream; +import java.math.BigDecimal; +import java.text.DateFormat; +import java.text.SimpleDateFormat; import java.util.*; /** @@ -26,34 +29,39 @@ import java.util.*; * @create 2017 2017/1/16 0016 */ public class FuiouPayService extends BasePayService { - + //日志 protected final Log log = LogFactory.getLog(FuiouPayService.class); + //正式域名 + public final static String URL_FuiouBaseDomain = "https://pay.fuiou.com/"; + //测试域名 +// public final static String URL_FuiouBaseDomain = "http://www-1.fuiou.com:8888/wg1_run/"; + //B2C/B2B支付 + public final static String URL_FuiouSmpGate = URL_FuiouBaseDomain + "smpGate.do"; + //B2C/B2B支付(跨境支付) + public final static String URL_FuiouNewSmpGate = URL_FuiouBaseDomain + "newSmpGate.do"; + //订单退款 + public final static String URL_FuiouSmpRefundGate = URL_FuiouBaseDomain + "newSmpRefundGate.do"; + //3.2 支付结果查询 + public final static String URL_FuiouSmpQueryGate = URL_FuiouBaseDomain + "smpQueryGate.do"; + //3.3 支付结果查询(直接返回) + public final static String URL_FuiouSmpAQueryGate = URL_FuiouBaseDomain + "smpAQueryGate.do"; + //3.4订单退款 + public final static String URL_NewSmpRefundGate = URL_FuiouBaseDomain + "newSmpRefundGate.do"; - public final static String fuiouBaseDomain = "https://pay.fuiou.com/";//正式域名 -// public final static String fuiouBaseDomain = "http://www-1.fuiou.com:8888/wg1_run/";//测试域名 - - public final static String fuiouSmpGate = fuiouBaseDomain + "smpGate.do";//B2C/B2B支付 - - public final static String fuiouNewSmpGate = fuiouBaseDomain + "newSmpGate.do";//B2C/B2B支付(跨境支付) - public final static String fuiouSmpRefundGate = fuiouBaseDomain + "newSmpRefundGate.do";//订单退款 - - public final static String fuiouSmpQueryGate = fuiouBaseDomain + "smpQueryGate.do";//3.2 支付结果查询 - public final static String fuiouSmpAQueryGate = fuiouBaseDomain + "smpAQueryGate.do";//3.3 支付结果查询(直接返回) - - public FuiouPayService(PayConfigStorage payConfigStorage) { - setPayConfigStorage(payConfigStorage); + /** + * 构造函数，初始化时候使用 + * @param payConfigStorage + * @param configStorage + */ + public FuiouPayService (PayConfigStorage payConfigStorage, HttpConfigStorage configStorage) { + super(payConfigStorage, configStorage); } - @Override - public String getHttpsVerifyUrl() { - return null; - } - /** * 回调校验 * @param params 回调回来的参数集 - * @return + * @return 返回检验结果 0000 成功 其他失败 */ @Override public boolean verify(Map params) { @@ -62,7 +70,8 @@ public class FuiouPayService extends BasePayService { return false; } try { - return getSignVerify(params, params.get("md5")) && "0000".equals(verifyUrl(params.get("order_id")));//返回参数校验 和 重新请求订单检查数据是否合法 + //返回参数校验 和 重新请求订单检查数据是否合法 + return (signVerify(params, params.get("md5")) && verifySource(params.get("order_id"))); } catch (PayErrorException e) { e.printStackTrace(); } @@ -70,13 +79,14 @@ public class FuiouPayService extends BasePayService { } /** - * 校验回调参数是否合法 + * 回调签名校验 + * * @param params 参数集 - * @param returnSign - * @return + * @param responseSign 响应的签名串 + * @return 校验结果 */ @Override - public boolean getSignVerify(Map params, String returnSign) { + public boolean signVerify (Map params, String responseSign ) { LinkedHashSet keySet = new LinkedHashSet<>(); keySet.add("mchnt_cd");//商户代码 keySet.add("order_id");//商户订单号 @@ -97,63 +107,29 @@ public class FuiouPayService extends BasePayService { } String sign = createSign(verifyMD5Str.deleteCharAt(verifyMD5Str.length() -1).toString(),payConfigStorage.getInputCharset()); // System.out.println("加密串"+verifyMD5Str+",,返回参数生成MD5="+sign+",,返回MD5摘要值"+returnSign); - if(returnSign.equals(sign)){ - return true; - } - return false; + return responseSign.equals(sign); } /** - * 发起请求校验订单是否支付成功 - * @param order_id - * @return - * @throws PayErrorException + * 校验回调数据来源是否合法 + * + * @param order_id 业务id, 数据的真实性. + * @return 返回校验结果 */ @Override - public String verifyUrl(String order_id) throws PayErrorException { -// LinkedHashMap param = new LinkedHashMap(); -// param.put("mchnt_cd",payConfigStorage.getPartner()); -// param.put("order_id",order_id); -// param.put("md5",createSign(SignUtils.parameters2MD5Str(param,"|"),payConfigStorage.getInputCharset())); - List pairList = new ArrayList(); - pairList.add(new BasicNameValuePair("mchnt_cd",payConfigStorage.getPartner())); - pairList.add(new BasicNameValuePair("order_id",order_id)); - pairList.add(new BasicNameValuePair("md5",createSign(SignUtils.parameters2MD5Str(pairList,"|"),payConfigStorage.getInputCharset()))); - return execute(new SimplePostRequestExecutor(), fuiouSmpAQueryGate,pairList); -// JSONObject jsonObject = XML.toJSONObject(responseContent); - -// return getFormString(param,MethodType.POST,fuiouSmpAQueryGate); - } - - @Override - public T execute(RequestExecutor executor, String uri, E data) throws PayErrorException { - int retryTimes = 0; - do { - try { - return executeInternal(executor, uri, data); - } catch (PayErrorException e) { - PayError error = (PayError) e.getPayError(); - if ("404".equals(error.getErrorCode()) ) { - int sleepMillis = retrySleepMillis * (1 << retryTimes); - try { - log.debug(String.format("富友支付系统错误，错误信息:<%s>,(%s)ms 后重试(第%s次)",e.getMessage(),sleepMillis, retryTimes + 1)); - Thread.sleep(sleepMillis); - } catch (InterruptedException e1) { - throw new RuntimeException(e1); - } - } else { - throw e; - } - } - } while (++retryTimes < maxRetryTimes); - - throw new RuntimeException("富友支付服务端异常，超出重试次数"); + public boolean verifySource (String order_id) { + LinkedHashMap params = new LinkedHashMap<>(); + params.put("mchnt_cd",payConfigStorage.getPid()); + params.put("order_id",order_id); + params.put("md5",createSign(SignUtils.parameters2MD5Str(params,"|"),payConfigStorage.getInputCharset())); + JSONObject resultJson = getHttpRequestTemplate().postForObject(URL_FuiouSmpAQueryGate,params,JSONObject.class); + return resultJson.getString("order_pay_code").equals("0000"); } /** - * 对支付请求参数进行加密,排序 + * 将支付请求参数加密成md5 * @param order 支付订单 - * @return + * @return 返回支付请求参数集合 */ @Override public Map orderInfo(PayOrder order) { @@ -163,6 +139,11 @@ public class FuiouPayService extends BasePayService { return parameters; } + /** + * 按序添加请求参数 + * @param order 支付订单 + * @return 返回支付请求参数集合 + */ private LinkedHashMap getOrderInfo(PayOrder order) { LinkedHashMap parameters = new LinkedHashMap(); parameters.put("mchnt_cd", payConfigStorage.getPartner());//商户代码 @@ -183,9 +164,9 @@ public class FuiouPayService extends BasePayService { /** * 对内容进行加密 - * @param content 需要签名的内容 + * @param content 需要加密的内容 * @param characterEncoding 字符编码 - * @return + * @return 加密后的字符串 */ @Override public String createSign(String content, String characterEncoding) { @@ -193,45 +174,57 @@ public class FuiouPayService extends BasePayService { } /** - * 将参数拼凑成String + * 将请求参数或者请求流转化为 Map * @param parameterMap 请求参数 * @param is 请求流 - * @return + * @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; i < values.length; i++) { - valueStr = (i == values.length - 1) ? valueStr + values[i] - : valueStr + values[i] + ","; - } - //乱码解决，这段代码在出现乱码时使用。如果mysign和sign不相等也可以使用这段代码转化 - //valueStr = new String(valueStr.getBytes("ISO-8859-1"), "gbk"); - params.put(name, valueStr); - } - return params; + return null; } + /** + * 获取输出消息，用户返回给支付端 + * @param code 返回代码 + * @param message 返回信息 + * @return 消息实体 + */ + @Override public PayOutMessage getPayOutMessage(String code, String message) { return PayOutMessage.TEXT().content(code.toLowerCase()).build(); } + /** + * 发送支付请求（form表单） + * @param orderInfo 发起支付的订单信息 + * @param method 请求方式 "post" "get", + * @return form表单提交的html字符串 + */ + @Override public String buildRequest(Map orderInfo, MethodType method) { - return getFormString(orderInfo, method,fuiouSmpGate); + return getFormString(orderInfo, method,URL_FuiouSmpGate ); } /** - * 根据参数行程form表单 + * 获取输出二维码，用户返回给支付端, + * + * @param order 发起支付的订单信息 + * @return 空 + */ + @Override + public BufferedImage genQrPay (PayOrder order) { + return null; + } + + /** + * 根据参数形成form表单 * @param param 参数 * @param method 请求方式 get_post - * @param url - * @return + * @param url 支付请求url地址 + * @return form表单html代码 */ private String getFormString(Map param, MethodType method,String url) { StringBuffer formHtml = new StringBuffer(); @@ -261,41 +254,157 @@ public class FuiouPayService extends BasePayService { } /** - * 生成二维码支付 - * 暂未实现或无此功能 - * - * @param orderInfo 发起支付的订单信息 - * @return + * 交易查询接口 + * @param tradeNo 支付平台订单号 + * @param outTradeNo 商户单号 + * @return 空 */ - @Override - public BufferedImage genQrPay(Map orderInfo) { - throw new UnsupportedOperationException(); - } - @Override public Map query(String tradeNo, String outTradeNo) { return null; } + /** + * 交易查询接口 + * + * @param tradeNo 支付平台订单号 + * @param outTradeNo 商户单号 + * @param callback 处理器 + * @return 空 + */ + @Override + public T query (String tradeNo, String outTradeNo, Callback callback) { + return null; + } + + /** + * 交易关闭接口 + * @param tradeNo 支付平台订单号 + * @param outTradeNo 商户单号 + * @return 空 + */ @Override public Map close(String tradeNo, String outTradeNo) { return null; } + /** + * 交易关闭接口 + * + * @param tradeNo 支付平台订单号 + * @param outTradeNo 商户单号 + * @param callback 处理器 + * @return 空 + */ @Override - public Map refund(String tradeNo, String outTradeNo) { + public T close (String tradeNo, String outTradeNo, Callback callback) { return null; } + /** + * 申请退款接口 + * + * @param tradeNo 支付平台订单号 + * @param outTradeNo 商户单号 + * @param refundAmount 退款金额 + * @param totalAmount 总金额 + * @return 退款返回结果集 + */ + @Override + public Map refund (String tradeNo, String outTradeNo, BigDecimal refundAmount, BigDecimal totalAmount) { + Map params = new HashMap<>(); + params.put("mchnt_cd",payConfigStorage.getSecretKey());//商户代码 + DateFormat df = new SimpleDateFormat("yyyy-MM-dd"); + df.setTimeZone(TimeZone.getTimeZone("GMT+8")); + params.put("origin_order_date",df.format(new Date()));//原交易日期 + params.put("origin_order_id",tradeNo);//原订单号 + params.put("refund_amt",refundAmount);//退款金额 + params.put("rem","");//备注 + params.put("md5",createSign(SignUtils.parameters2MD5Str(params,"|"),payConfigStorage.getInputCharset())); + JSONObject resultJson = getHttpRequestTemplate().postForObject(URL_FuiouSmpRefundGate,params,JSONObject.class); + //5341标识退款成功 + return resultJson; + + } + + /** + * 申请退款接口 + * + * @param tradeNo 支付平台订单号 + * @param outTradeNo 商户单号 + * @param refundAmount 退款金额 + * @param totalAmount 总金额 + * @param callback 处理器 + * @return 空 + */ + @Override + public T refund (String tradeNo, String outTradeNo, BigDecimal refundAmount, BigDecimal totalAmount, Callback callback) { + return null; + } + + /** + * 查询退款 + * @param tradeNo 支付平台订单号 + * @param outTradeNo 商户单号 + * @return 空 + * + */ + @Override public Map refundquery(String tradeNo, String outTradeNo) { return null; } + /** + * 查询退款 + * + * @param tradeNo 支付平台订单号 + * @param outTradeNo 商户单号 + * @param callback 处理器 + * @return　空 + */ + @Override + public T refundquery (String tradeNo, String outTradeNo, Callback callback) { + return null; + } + + /** + * 下载对账单 + * @param billDate 账单时间：日账单格式为yyyy-MM-dd，月账单格式为yyyy-MM。 + * @param billType 账单类型，商户通过接口或商户经开放平台授权后其所属服务商通过接口可以获取以下账单类型：trade、signcustomer；trade指商户基于支付宝交易收单的业务账单；signcustomer是指基于商户支付宝余额收入及支出等资金变动的帐务账单； + * @return 空 + */ @Override public Object downloadbill(Date billDate, String billType) { return null; } + /** + * 下载对账单 + * + * @param billDate 账单时间：具体请查看对应支付平台 + * @param billType 账单类型，具体请查看对应支付平台 + * @param callback 处理器 + * @return 空 + */ + @Override + public T downloadbill (Date billDate, String billType, Callback callback) { + return null; + } + + /** + * 通用查询接口 + * + * @param tradeNoOrBillDate 支付平台订单号或者账单日期， 具体请 类型为{@link String }或者 {@link Date }，类型须强制限制，类型不对应则抛出异常{@link PayErrorException} + * @param outTradeNoBillType 商户单号或者 账单类型 + * @param transactionType 交易类型 + * @param callback 处理器 + * @return 空 + */ + @Override + public T secondaryInterface (Object tradeNoOrBillDate, String outTradeNoBillType, TransactionType transactionType, Callback callback) { + return null; + } + } diff --git a/pay-java-fuiou/src/main/java/in/egan/pay/fuiou/bean/FuiouCurType.java b/pay-java-fuiou/src/main/java/in/egan/pay/fuiou/bean/FuiouCurType.java index f16dc63..be34d10 100644 --- a/pay-java-fuiou/src/main/java/in/egan/pay/fuiou/bean/FuiouCurType.java +++ b/pay-java-fuiou/src/main/java/in/egan/pay/fuiou/bean/FuiouCurType.java @@ -5,6 +5,7 @@ package in.egan.pay.fuiou.bean;/** import in.egan.pay.common.bean.CurType; /** + * 货币类型 * @author Fuzx * @create 2017 2017/1/24 0024 */ @@ -20,13 +21,25 @@ public enum FuiouCurType implements CurType { JPY("日元"), SGD("新加坡元"), AUD("澳大利亚元"); - + /** + * 币种名称 + */ private String name; + //索引 private int index; - private FuiouCurType(String name) { + /** + * 构造函数 + * @param name + */ + FuiouCurType(String name) { this.name = name; } + + /** + * 获取币种名称 + * @return 币种名称 + */ @Override public String getCurType(){ return this.name(); diff --git a/pay-java-fuiou/src/main/java/in/egan/pay/fuiou/bean/FuiouTransactionType.java b/pay-java-fuiou/src/main/java/in/egan/pay/fuiou/bean/FuiouTransactionType.java index 105cfcf..ae87dfc 100644 --- a/pay-java-fuiou/src/main/java/in/egan/pay/fuiou/bean/FuiouTransactionType.java +++ b/pay-java-fuiou/src/main/java/in/egan/pay/fuiou/bean/FuiouTransactionType.java @@ -3,19 +3,18 @@ package in.egan.pay.fuiou.bean; import in.egan.pay.common.bean.TransactionType; /** - * 微信交易类型 - * @author egan - * @email egzosn@gmail.com - * @date 2016/10/19 22:58 + * 支付类型 + * @author Fuzx + * @create 2017 2017/1/24 0024 */ public enum FuiouTransactionType implements TransactionType { - B2B(""), - B2C("") + B2B("B2B"), + B2C("B2C") ; private String method; - private FuiouTransactionType(String method) { + FuiouTransactionType(String method) { this.method = method; } diff --git a/pay-java-fuiou/src/main/java/in/egan/pay/fuiou/utils/SimplePostRequestExecutor.java b/pay-java-fuiou/src/main/java/in/egan/pay/fuiou/utils/SimplePostRequestExecutor.java deleted file mode 100644 index 9ef6720..0000000 --- a/pay-java-fuiou/src/main/java/in/egan/pay/fuiou/utils/SimplePostRequestExecutor.java +++ /dev/null @@ -1,76 +0,0 @@ -package in.egan.pay.fuiou.utils; - -import com.alibaba.fastjson.JSONObject; -import in.egan.pay.common.before.api.RequestExecutor; -import in.egan.pay.common.before.bean.result.PayError; -import in.egan.pay.common.exception.PayErrorException; -import in.egan.pay.common.util.XML; -import in.egan.pay.common.before.util.http.Utf8ResponseHandler; -import org.apache.http.Consts; -import org.apache.http.HttpHost; -import org.apache.http.client.ClientProtocolException; -import org.apache.http.client.config.RequestConfig; -import org.apache.http.client.entity.UrlEncodedFormEntity; -import org.apache.http.client.methods.CloseableHttpResponse; -import org.apache.http.client.methods.HttpPost; -import org.apache.http.entity.StringEntity; -import org.apache.http.impl.client.CloseableHttpClient; -import org.apache.http.message.BasicNameValuePair; - -import java.io.IOException; -import java.util.List; -import java.util.Map; - -/** - * @author egan - * @email egzosn@gmail.com - * @date 2016-5-18 14:09:01 - */ -public class SimplePostRequestExecutor implements RequestExecutor { - - @Override - public String execute(CloseableHttpClient httpclient, HttpHost httpProxy, String uri, Object postEntity) throws PayErrorException, ClientProtocolException, IOException { - HttpPost httpPost = new HttpPost(uri); -// httpPost.setHeader("Content-Type","application/x-www-from-urlencoded"); - if (httpProxy != null) { - RequestConfig config = RequestConfig.custom().setProxy(httpProxy).build(); - httpPost.setConfig(config); - } - if (postEntity instanceof Map) { - StringBuilder builder = new StringBuilder(); - Map pe = (Map) postEntity; - for (Object key : pe.keySet()) { - builder.append(key).append("=").append(pe.get(key)).append("&"); - } - if (builder.length() > 1) { - builder.deleteCharAt(builder.length() - 1); - } - StringEntity entity = new StringEntity(builder.toString(), Consts.UTF_8); -// entity.setContentType("application/x-www-from-urlencoded"); - httpPost.setEntity(entity); - } else if (postEntity instanceof String) { - - StringEntity entity = new StringEntity((String) postEntity, Consts.UTF_8); - httpPost.setEntity(entity); - }else if(postEntity instanceof List){ - //表单方式 - httpPost.setEntity(new UrlEncodedFormEntity((List)postEntity, Consts.UTF_8)); - } - - try (CloseableHttpResponse response = httpclient.execute(httpPost)) { - String responseContent = Utf8ResponseHandler.INSTANCE.handleResponse(response); -// System.out.println("直接返回的查询结果-->"+responseContent); -// responseContent = responseContent.replace("","").replace("","").replace("","").replace("",""); - JSONObject jsonObject = XML.toJSONObject(responseContent);//包含md5 - JSONObject plain = XML.toJSONObject(""+jsonObject.getString("plain")+"");//"plain" -> "5002验证签名失败" - - if("0000".equals(plain.getString("order_pay_code"))){ - return "0000"; - }else{ - throw new PayErrorException(new PayError(404,plain.getString("order_pay_error"),responseContent)); - } - }finally { - httpPost.releaseConnection(); - } - } -} \ No newline at end of file From 5f4b6d9249c20003ff49c5a64c13aadc9ff08d03 Mon Sep 17 00:00:00 2001 From: "egzosn@gmail.com" <930928lI1> Date: Fri, 5 May 2017 17:28:42 +0800 Subject: [PATCH 3/4] Merge branch 'develop-Actinia' of https://git.oschina.net/egzosn/pay-java-parent into develop # Conflicts: # pay-java-demo/src/main/java/com/egzosn/pay/demo/entity/PayType.java # pay-java-demo/src/main/java/com/egzosn/pay/demo/service/PayResponse.java # pay-java-fuiou/src/main/java/com/egzosn/pay/fuiou/api/FuiouPayConfigStorage.java # pay-java-fuiou/src/main/java/com/egzosn/pay/fuiou/api/FuiouPayService.java # pay-java-fuiou/src/main/java/com/egzosn/pay/fuiou/utils/SimplePostRequestExecutor.java --- .../pay/demo/controller/PayController.java | 2 +- .../com/egzosn/pay/demo/entity/PayType.java | 30 +++++++++---------- .../egzosn/pay/demo/service/PayResponse.java | 1 + .../egzosn/pay/fuiou/api/FuiouPayService.java | 8 +++++ pom.xml | 4 +-- 5 files changed, 27 insertions(+), 18 deletions(-) diff --git a/pay-java-demo/src/main/java/com/egzosn/pay/demo/controller/PayController.java b/pay-java-demo/src/main/java/com/egzosn/pay/demo/controller/PayController.java index d9abb3f..d53562c 100644 --- a/pay-java-demo/src/main/java/com/egzosn/pay/demo/controller/PayController.java +++ b/pay-java-demo/src/main/java/com/egzosn/pay/demo/controller/PayController.java @@ -96,7 +96,7 @@ public class PayController { PayResponse payResponse = service.getPayResponse(payId); ByteArrayOutputStream baos = new ByteArrayOutputStream(); - ImageIO.write(payResponse.getService().genQrPay(new PayOrder("订单title", "摘要", null == price ? new BigDecimal(0.01) : price, "9d1c43152c304ed2b9d2db320ef0a742", PayType.valueOf(payResponse.getStorage().getPayType()).getTransactionType(transactionType))), "JPEG", baos); + ImageIO.write(payResponse.getService().genQrPay(new PayOrder("订单title", "摘要", null == price ? new BigDecimal(0.01) : price, UUID.randomUUID().toString().replace("-", ""), PayType.valueOf(payResponse.getStorage().getPayType()).getTransactionType(transactionType))), "JPEG", baos); return baos.toByteArray(); } diff --git a/pay-java-demo/src/main/java/com/egzosn/pay/demo/entity/PayType.java b/pay-java-demo/src/main/java/com/egzosn/pay/demo/entity/PayType.java index a157bef..3e1eec1 100644 --- a/pay-java-demo/src/main/java/com/egzosn/pay/demo/entity/PayType.java +++ b/pay-java-demo/src/main/java/com/egzosn/pay/demo/entity/PayType.java @@ -6,6 +6,10 @@ import com.egzosn.pay.ali.bean.AliTransactionType; import com.egzosn.pay.common.api.PayService; import com.egzosn.pay.common.bean.BasePayType; import com.egzosn.pay.common.bean.TransactionType; +import com.egzosn.pay.demo.service.handler.FuiouPayMessageHandler; +import com.egzosn.pay.fuiou.api.FuiouPayConfigStorage; +import com.egzosn.pay.fuiou.api.FuiouPayService; +import com.egzosn.pay.fuiou.bean.FuiouTransactionType; import com.egzosn.pay.wx.api.WxPayConfigStorage; import com.egzosn.pay.wx.api.WxPayService; import com.egzosn.pay.wx.bean.WxTransactionType; @@ -118,26 +122,22 @@ public enum PayType implements BasePayType { @Override public PayService getPayService(ApyAccount apyAccount) { - AliPayConfigStorage aliPayConfigStorage = new AliPayConfigStorage(); - aliPayConfigStorage.setPid(apyAccount.getPartner()); - aliPayConfigStorage.setAppId(apyAccount.getAppid()); - aliPayConfigStorage.setAliPublicKey(apyAccount.getPublicKey()); - aliPayConfigStorage.setKeyPrivate(apyAccount.getPrivateKey()); - aliPayConfigStorage.setNotifyUrl(apyAccount.getNotifyUrl()); - aliPayConfigStorage.setReturnUrl(apyAccount.getReturnUrl()); - aliPayConfigStorage.setSignType(apyAccount.getSignType()); - aliPayConfigStorage.setSeller(apyAccount.getSeller()); - aliPayConfigStorage.setPayType(apyAccount.getPayType().toString()); - aliPayConfigStorage.setMsgType(apyAccount.getMsgType()); - aliPayConfigStorage.setInputCharset(apyAccount.getInputCharset()); - aliPayConfigStorage.setTest(apyAccount.isTest()); - return new AliPayService(aliPayConfigStorage); + FuiouPayConfigStorage fuiouPayConfigStorage = new FuiouPayConfigStorage(); + fuiouPayConfigStorage.setKeyPrivate(apyAccount.getPrivateKey()); + fuiouPayConfigStorage.setNotifyUrl(apyAccount.getNotifyUrl()); + fuiouPayConfigStorage.setReturnUrl(apyAccount.getReturnUrl()); + fuiouPayConfigStorage.setSignType(apyAccount.getSignType()); + fuiouPayConfigStorage.setPayType(apyAccount.getPayType().toString()); + fuiouPayConfigStorage.setMsgType(apyAccount.getMsgType()); + fuiouPayConfigStorage.setInputCharset(apyAccount.getInputCharset()); + fuiouPayConfigStorage.setTest(apyAccount.isTest()); + return new FuiouPayService(fuiouPayConfigStorage); } @Override public TransactionType getTransactionType(String transactionType) { // in.egan.pay.ali.before.bean.AliTransactionType 17年更新的版本,旧版本请自行切换 - return AliTransactionType.valueOf(transactionType); + return FuiouTransactionType.valueOf(transactionType); } diff --git a/pay-java-demo/src/main/java/com/egzosn/pay/demo/service/PayResponse.java b/pay-java-demo/src/main/java/com/egzosn/pay/demo/service/PayResponse.java index 451ca04..752a617 100644 --- a/pay-java-demo/src/main/java/com/egzosn/pay/demo/service/PayResponse.java +++ b/pay-java-demo/src/main/java/com/egzosn/pay/demo/service/PayResponse.java @@ -3,6 +3,7 @@ package com.egzosn.pay.demo.service; import com.egzosn.pay.ali.bean.AliTransactionType; +import com.egzosn.pay.common.http.HttpConfigStorage; import com.egzosn.pay.demo.entity.ApyAccount; import com.egzosn.pay.demo.entity.PayType; import com.egzosn.pay.demo.service.handler.AliPayMessageHandler; diff --git a/pay-java-fuiou/src/main/java/com/egzosn/pay/fuiou/api/FuiouPayService.java b/pay-java-fuiou/src/main/java/com/egzosn/pay/fuiou/api/FuiouPayService.java index 73a48ac..5375962 100644 --- a/pay-java-fuiou/src/main/java/com/egzosn/pay/fuiou/api/FuiouPayService.java +++ b/pay-java-fuiou/src/main/java/com/egzosn/pay/fuiou/api/FuiouPayService.java @@ -58,6 +58,14 @@ public class FuiouPayService extends BasePayService { super(payConfigStorage, configStorage); } + /** + * 构造函数，初始化时候使用 + * @param payConfigStorage + */ + public FuiouPayService (PayConfigStorage payConfigStorage) { + super(payConfigStorage, null); + } + /** * 回调校验 diff --git a/pom.xml b/pom.xml index 0cc5830..4264294 100644 --- a/pom.xml +++ b/pom.xml @@ -114,7 +114,7 @@ 1.7 - + From 5d6e58aac8ffdffcea28a26f6f862391ade7aff5 Mon Sep 17 00:00:00 2001 From: egzosn Date: Fri, 5 May 2017 19:21:35 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E8=A1=A5=E5=85=A8=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/egzosn/pay/demo/entity/PayType.java | 10 +++++++--- .../egzosn/pay/demo/service/PayResponse.java | 8 ++++---- .../interceptor/AliPayMessageInterceptor.java | 4 ++-- .../pay/fuiou/api/FuiouPayConfigStorage.java | 9 ++++----- .../egzosn/pay/fuiou/api/FuiouPayService.java | 20 +++++++++---------- .../egzosn/pay/fuiou/bean/FuiouCurType.java | 6 ++---- .../pay/fuiou/bean/FuiouTransactionType.java | 4 ++-- pom.xml | 2 +- 8 files changed, 31 insertions(+), 32 deletions(-) diff --git a/pay-java-demo/src/main/java/com/egzosn/pay/demo/entity/PayType.java b/pay-java-demo/src/main/java/com/egzosn/pay/demo/entity/PayType.java index 3e1eec1..23bbd9a 100644 --- a/pay-java-demo/src/main/java/com/egzosn/pay/demo/entity/PayType.java +++ b/pay-java-demo/src/main/java/com/egzosn/pay/demo/entity/PayType.java @@ -10,6 +10,8 @@ import com.egzosn.pay.demo.service.handler.FuiouPayMessageHandler; import com.egzosn.pay.fuiou.api.FuiouPayConfigStorage; import com.egzosn.pay.fuiou.api.FuiouPayService; import com.egzosn.pay.fuiou.bean.FuiouTransactionType; +import com.egzosn.pay.fuiou.api.FuiouPayConfigStorage; +import com.egzosn.pay.fuiou.api.FuiouPayService; import com.egzosn.pay.wx.api.WxPayConfigStorage; import com.egzosn.pay.wx.api.WxPayService; import com.egzosn.pay.wx.bean.WxTransactionType; @@ -18,18 +20,20 @@ import com.egzosn.pay.wx.youdian.api.WxYouDianPayService; import com.egzosn.pay.wx.youdian.bean.YoudianTransactionType; + /** * 支付类型 + * * @author egan - * @email egzosn@gmail.com - * @date 2016/11/20 0:30 + * email egzosn@gmail.com + * date 2016/11/20 0:30 */ public enum PayType implements BasePayType { aliPay{ /** - * @see com.egzosn.pay.ali.before.api.AliPayService 17年更新的版本,旧版本请自行切换 + * @see com.egzosn.pay.ali.api.AliPayService 17年更新的版本,旧版本请自行切换 * @param apyAccount * @return */ diff --git a/pay-java-demo/src/main/java/com/egzosn/pay/demo/service/PayResponse.java b/pay-java-demo/src/main/java/com/egzosn/pay/demo/service/PayResponse.java index 752a617..d1dd637 100644 --- a/pay-java-demo/src/main/java/com/egzosn/pay/demo/service/PayResponse.java +++ b/pay-java-demo/src/main/java/com/egzosn/pay/demo/service/PayResponse.java @@ -1,9 +1,10 @@ - - package com.egzosn.pay.demo.service; -import com.egzosn.pay.ali.bean.AliTransactionType; +import com.egzosn.pay.common.api.PayMessageRouter; import com.egzosn.pay.common.http.HttpConfigStorage; +import com.egzosn.pay.demo.service.handler.FuiouPayMessageHandler; +import com.egzosn.pay.demo.service.handler.YouDianPayMessageHandler; +import com.egzosn.pay.demo.service.interceptor.AliPayMessageInterceptor; import com.egzosn.pay.demo.entity.ApyAccount; import com.egzosn.pay.demo.entity.PayType; import com.egzosn.pay.demo.service.handler.AliPayMessageHandler; @@ -13,7 +14,6 @@ import com.egzosn.pay.demo.service.handler.YouDianPayMessageHandler; import com.egzosn.pay.demo.service.interceptor.AliPayMessageInterceptor; import com.egzosn.pay.common.api.PayConfigStorage; import com.egzosn.pay.common.api.PayMessageHandler; -import com.egzosn.pay.common.api.PayMessageRouter; import com.egzosn.pay.common.api.PayService; import com.egzosn.pay.common.bean.MsgType; import org.springframework.beans.factory.config.AutowireCapableBeanFactory; diff --git a/pay-java-demo/src/main/java/com/egzosn/pay/demo/service/interceptor/AliPayMessageInterceptor.java b/pay-java-demo/src/main/java/com/egzosn/pay/demo/service/interceptor/AliPayMessageInterceptor.java index b5258d1..7f27f51 100644 --- a/pay-java-demo/src/main/java/com/egzosn/pay/demo/service/interceptor/AliPayMessageInterceptor.java +++ b/pay-java-demo/src/main/java/com/egzosn/pay/demo/service/interceptor/AliPayMessageInterceptor.java @@ -12,8 +12,8 @@ import java.util.Map; /** * 支付宝回调信息拦截器 * @author: egan - * @email egzosn@gmail.com - * @date 2017/1/18 19:28 + * email egzosn@gmail.com + * date 2017/1/18 19:28 */ public class AliPayMessageInterceptor implements PayMessageInterceptor { diff --git a/pay-java-fuiou/src/main/java/com/egzosn/pay/fuiou/api/FuiouPayConfigStorage.java b/pay-java-fuiou/src/main/java/com/egzosn/pay/fuiou/api/FuiouPayConfigStorage.java index 4f9c416..c09f560 100644 --- a/pay-java-fuiou/src/main/java/com/egzosn/pay/fuiou/api/FuiouPayConfigStorage.java +++ b/pay-java-fuiou/src/main/java/com/egzosn/pay/fuiou/api/FuiouPayConfigStorage.java @@ -1,12 +1,11 @@ -package com.egzosn.pay.fuiou.api;/** - * Created by Fuzx on 2017/1/16 0016. - */ - +package com.egzosn.pay.fuiou.api; import com.egzosn.pay.common.api.BasePayConfigStorage; /** * @author Fuzx - * @create 2017 2017/1/16 0016 + * 
+ * create 2017 2017/1/16 0016
+ *
*/ public class FuiouPayConfigStorage extends BasePayConfigStorage { diff --git a/pay-java-fuiou/src/main/java/com/egzosn/pay/fuiou/api/FuiouPayService.java b/pay-java-fuiou/src/main/java/com/egzosn/pay/fuiou/api/FuiouPayService.java index 5375962..6403930 100644 --- a/pay-java-fuiou/src/main/java/com/egzosn/pay/fuiou/api/FuiouPayService.java +++ b/pay-java-fuiou/src/main/java/com/egzosn/pay/fuiou/api/FuiouPayService.java @@ -1,8 +1,4 @@ -package com.egzosn.pay.fuiou.api;/** - * Created by Fuzx on 2017/1/16 0016. - */ - - +package com.egzosn.pay.fuiou.api; import com.alibaba.fastjson.JSONObject; import com.egzosn.pay.common.api.BasePayService; import com.egzosn.pay.common.api.Callback; @@ -27,7 +23,9 @@ import java.util.*; /** * @author Fuzx - * @create 2017 2017/1/16 0016 + * 
+ * create 2017 2017/1/16 0016
+ *
*/ public class FuiouPayService extends BasePayService { //日志 @@ -51,19 +49,18 @@ public class FuiouPayService extends BasePayService { /** * 构造函数，初始化时候使用 - * @param payConfigStorage - * @param configStorage + * @param payConfigStorage 支付账户配置信息 + * @param configStorage 网络代理配置 */ public FuiouPayService (PayConfigStorage payConfigStorage, HttpConfigStorage configStorage) { super(payConfigStorage, configStorage); } - /** * 构造函数，初始化时候使用 - * @param payConfigStorage + * @param payConfigStorage 支付账户配置信息 */ public FuiouPayService (PayConfigStorage payConfigStorage) { - super(payConfigStorage, null); + super(payConfigStorage); } @@ -401,6 +398,7 @@ public class FuiouPayService extends BasePayService { return null; } + /** * 通用查询接口 * diff --git a/pay-java-fuiou/src/main/java/com/egzosn/pay/fuiou/bean/FuiouCurType.java b/pay-java-fuiou/src/main/java/com/egzosn/pay/fuiou/bean/FuiouCurType.java index 231aa8c..bd5da4a 100644 --- a/pay-java-fuiou/src/main/java/com/egzosn/pay/fuiou/bean/FuiouCurType.java +++ b/pay-java-fuiou/src/main/java/com/egzosn/pay/fuiou/bean/FuiouCurType.java @@ -1,13 +1,11 @@ -package com.egzosn.pay.fuiou.bean;/** - * Created by Fuzx on 2017/1/24 0024. - */ +package com.egzosn.pay.fuiou.bean; import com.egzosn.pay.common.bean.CurType; /** * 货币类型 * @author Fuzx - * @create 2017 2017/1/24 0024 + * create 2017 2017/1/24 0024 */ public enum FuiouCurType implements CurType { diff --git a/pay-java-fuiou/src/main/java/com/egzosn/pay/fuiou/bean/FuiouTransactionType.java b/pay-java-fuiou/src/main/java/com/egzosn/pay/fuiou/bean/FuiouTransactionType.java index d124bf1..273b383 100644 --- a/pay-java-fuiou/src/main/java/com/egzosn/pay/fuiou/bean/FuiouTransactionType.java +++ b/pay-java-fuiou/src/main/java/com/egzosn/pay/fuiou/bean/FuiouTransactionType.java @@ -5,7 +5,7 @@ import com.egzosn.pay.common.bean.TransactionType; /** * 支付类型 * @author Fuzx - * @create 2017 2017/1/24 0024 + * create 2017 2017/1/24 0024 */ public enum FuiouTransactionType implements TransactionType { B2B("B2B"), @@ -25,7 +25,7 @@ public enum FuiouTransactionType implements TransactionType { /** * 获取接口名称 - * @return + * @return 接口名称 */ @Override public String getMethod() { diff --git a/pom.xml b/pom.xml index 4264294..bfccbdc 100644 --- a/pom.xml +++ b/pom.xml @@ -51,9 +51,9 @@ pay-java-common pay-java-ali pay-java-wx - pay-java-demo pay-java-wx-youdian pay-java-fuiou + pay-java-demo