mirror of
https://gitee.com/egzosn/pay-java-parent.git
synced 2026-06-06 16:40:18 +08:00
Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
cnzzs
@@ -36,7 +36,7 @@ public class ApyAccountRepository {
|
||||
apyAccount1.setPrivateKey("MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAKroe/8h5vC4L6T+B2WdXiVwGsMvUKgb2XsKix6VY3m2wcf6tyzpNRDCNykbIwGtaeo7FshN+qZxdXHLiIam9goYncBit/8ojfLGy2gLxO/PXfzGxYGs0KsDZ+ryVPPmE34ZZ8jiJpR0ygzCFl8pN3QJPJRGTJn5+FTT9EF/9zyZAgMBAAECgYAktngcYC35u7cQXDk+jMVyiVhWYU2ULxdSpPspgLGzrZyG1saOcTIi/XVX8Spd6+B6nmLQeF/FbU3rOeuD8U2clzul2Z2YMbJ0FYay9oVZFfp5gTEFpFRTVfzqUaZQBIjJe/xHL9kQVqc5xHlE/LVA27/Kx3dbC35Y7B4EVBDYAQJBAOhsX8ZreWLKPhXiXHTyLmNKhOHJc+0tFH7Ktise/0rNspojU7o9prOatKpNylp9v6kux7migcMRdVUWWiVe+4ECQQC8PqsuEz7B0yqirQchRg1DbHjh64bw9Kj82EN1/NzOUd53tP9tg+SO97EzsibK1F7tOcuwqsa7n2aY48mQ+y0ZAkBndA2xcRcnvOOjtAz5VO8G7R12rse181HjGfG6AeMadbKg30aeaGCyIxN1loiSfNR5xsPJwibGIBg81mUrqzqBAkB+K6rkaPXJR9XtzvdWb/N3235yPkDlw7Z4MiOVM3RzvR/VMDV7m8lXoeDde2zQyeMOMYy6ztwA6WgE1bhGOnQRAkEAouUBv1sVdSBlsexX15qphOmAevzYrpufKgJIRLFWQxroXMS7FTesj+f+FmGrpPCxIde1dqJ8lqYLTyJmbzMPYw==\n");
|
||||
apyAccount1.setNotifyUrl("http://pay.egan.in/payBack1.json");
|
||||
// 无需同步回调可不填
|
||||
// apyAccount1.setReturnUrl("");
|
||||
apyAccount1.setReturnUrl("http://pay.egan.in/payBack1.json");
|
||||
apyAccount1.setInputCharset("UTF-8");
|
||||
apyAccount1.setSeller("2088102169916436");
|
||||
apyAccount1.setSignType(SignUtils.RSA.name());
|
||||
|
||||
@@ -26,9 +26,9 @@ public class ApyAccount {
|
||||
// 应用id
|
||||
// @Column(name = "appid")
|
||||
private String appid;
|
||||
// 支付公钥，sign_type只有单一key时public_key与private_key相等，比如sign_type=MD5的情况
|
||||
// 支付平台公钥(签名校验使用)，sign_type只有单一key时public_key与private_key相等，比如sign_type=MD5的情况
|
||||
private String publicKey;
|
||||
// 支付私钥
|
||||
// 应用私钥(生成签名)
|
||||
// @Column(name = "private_key")
|
||||
private String privateKey;
|
||||
// 异步回调地址
|
||||
|
||||
@@ -69,7 +69,6 @@ public enum PayType implements BasePayType {
|
||||
public PayService getPayService(ApyAccount apyAccount) {
|
||||
WxPayConfigStorage wxPayConfigStorage = new WxPayConfigStorage();
|
||||
wxPayConfigStorage.setMchId(apyAccount.getPartner());
|
||||
wxPayConfigStorage.setAppSecret(apyAccount.getPublicKey());
|
||||
wxPayConfigStorage.setKeyPublic(apyAccount.getPublicKey());
|
||||
wxPayConfigStorage.setAppid(apyAccount.getAppid());
|
||||
wxPayConfigStorage.setKeyPrivate(apyAccount.getPrivateKey());
|
||||
@@ -127,6 +126,7 @@ public enum PayType implements BasePayType {
|
||||
@Override
|
||||
public PayService getPayService(ApyAccount apyAccount) {
|
||||
FuiouPayConfigStorage fuiouPayConfigStorage = new FuiouPayConfigStorage();
|
||||
fuiouPayConfigStorage.setKeyPublic(apyAccount.getPublicKey());
|
||||
fuiouPayConfigStorage.setKeyPrivate(apyAccount.getPrivateKey());
|
||||
fuiouPayConfigStorage.setNotifyUrl(apyAccount.getNotifyUrl());
|
||||
fuiouPayConfigStorage.setReturnUrl(apyAccount.getReturnUrl());
|
||||
@@ -140,7 +140,6 @@ public enum PayType implements BasePayType {
|
||||
|
||||
@Override
|
||||
public TransactionType getTransactionType(String transactionType) {
|
||||
// in.egan.pay.ali.before.bean.AliTransactionType 17年更新的版本,旧版本请自行切换
|
||||
return FuiouTransactionType.valueOf(transactionType);
|
||||
}
|
||||
|
||||
|
||||
@@ -7,8 +7,8 @@ CREATE TABLE `pay_account` (
|
||||
`pay_id` INT(11) NOT NULL AUTO_INCREMENT COMMENT '支付账号id',
|
||||
`partner` VARCHAR(32) DEFAULT NULL COMMENT '支付合作id,商户id，差不多是支付平台的账号或id',
|
||||
`appid` VARCHAR(32) DEFAULT NULL COMMENT '应用id',
|
||||
`public_key` VARCHAR(1204) DEFAULT NULL COMMENT '支付公钥，sign_type只有单一key时public_key与private_key相等，比如sign_type=MD5的情况',
|
||||
`private_key` VARCHAR(2048) DEFAULT NULL COMMENT '支付私钥',
|
||||
`public_key` VARCHAR(1204) DEFAULT NULL COMMENT '支付平台公钥(签名校验使用)，sign_type只有单一key时public_key与private_key相等，比如sign_type=MD5(友店支付除外)的情况',
|
||||
`private_key` VARCHAR(2048) DEFAULT NULL COMMENT '应用私钥(生成签名)',
|
||||
`notify_url` VARCHAR(1024) DEFAULT NULL COMMENT '异步回调地址',
|
||||
`return_url` VARCHAR(1024) DEFAULT NULL COMMENT '同步回调地址',
|
||||
`seller` VARCHAR(256) DEFAULT NULL COMMENT '收款账号, 针对支付宝',
|
||||
@@ -22,11 +22,3 @@ CREATE TABLE `pay_account` (
|
||||
PRIMARY KEY (`pay_id`)
|
||||
) ENGINE=INNODB DEFAULT CHARSET=utf8;
|
||||
|
||||
/*Data for the table `apy_account` */
|
||||
|
||||
insert into `apy_account`(`pay_id`,`partner`,`appid`,`public_key`,`private_key`,`notify_url`,`return_url`,`seller`,`sign_type`,`input_charset`,`pay_type`,`msg_type`,`create_by`,`create_time`) values
|
||||
(1,'12******01','wxa**********ba9e9','48gf0iwuhr***********r9weh9eiut9','48gf0iwuhr***********r9weh9eiut9','http://pay.egzosn.com/payBack2.json','同步回调地址','','MD5','utf-8','wxPay','xml','egan','2017-01-20 17:07:48'),
|
||||
(2,'20889119449*****','','MIGfMA0GCSqGSIb3DQEB*********gmLCUYuLkxpLQIDAQAB','IqZg51Vx8BvyypnIfKgw=*********MIICdwIBADANBgkqhkiG9w0BAQE','http://pay.egzosn.com/payBack3.json','同步回调地址','egzosn@gmail.com','RSA','utf-8','aliPay','text','egan','2017-01-20 17:11:46'),
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -17,9 +17,9 @@
|
||||
<br>
|
||||
应用id<input type="text" name="appid">
|
||||
<br>
|
||||
支付公钥<input type="text" name="publicKey"><b>如签名类型为MD5时，当前的值与支付私钥想等</b>
|
||||
支付平台公钥(签名校验使用)<input type="text" name="publicKey"><b>支付公钥，sign_type只有单一key时public_key与private_key相等，比如sign_type=MD5(友店支付除外)的情况</b>
|
||||
<br>
|
||||
支付私钥<input type="text" name="privateKey">
|
||||
应用私钥(生成签名使用)<input type="text" name="privateKey">
|
||||
<br>
|
||||
异步回调地址<input type="text" name="notifyUrl"><b>友店支付用不到此参数，在友店管理端进行配置</b>
|
||||
<br>
|
||||
@@ -30,6 +30,7 @@
|
||||
签名类型<select name="signType">
|
||||
<option>MD5</option>
|
||||
<option>RSA</option>
|
||||
<option>RSA2</option>
|
||||
</select>
|
||||
<br>
|
||||
编码类型(建议UTF-8)<input type="text" name="inputCharset" value="UTF-8">
|
||||
@@ -38,6 +39,7 @@
|
||||
<option value="aliPay">aliPay</option>
|
||||
<option value="wxPay">wxPay</option>
|
||||
<option value="youdianPay">youdianPay</option>
|
||||
<option value="youdianPay">fuiou</option>
|
||||
</select><b>此处为开发者自定义，详情请查看 com.egzosn.pay.demo.entity.PayType</b>
|
||||
<br>
|
||||
消息类型 <select name="msgType">
|
||||
@@ -58,9 +60,10 @@
|
||||
<br/>
|
||||
<div>各个支付对应的<b>交易类型</b>可自行查看对应的官方文档，本项目已实现几种交易类型,对应各个支付类型的<code>com.egzosn.pay.common.bean.TransactionType</code>具体实现</div>
|
||||
<div>旧版支付宝(<code>com.egzosn.pay.ali.before.bean.AliTransactionType</code>)： 即时付款=DIRECT ， 移动支付=APP ， 手机网站支付=WAP</div>
|
||||
<div>新版支付宝(<code>com.egzosn.pay.ali.bean.AliTransactionType</code>)： app支付=APP ， 手机网站支付=WAP , 扫码付=SWEEPPAY, 条码付=BAR_CODE, 声波付=WAVE_CODE </div>
|
||||
<div>新版支付宝(<code>com.egzosn.pay.ali.bean.AliTransactionType</code>)： 即时付款=DIRECT ， app支付=APP ， 手机网站支付=WAP , 扫码付=SWEEPPAY, 条码付=BAR_CODE, 声波付=WAVE_CODE </div>
|
||||
<div>微信(<code>com.egzosn.pay.wx.bean.WxTransactionType</code>)： 公众号支付=JSAPI ， 移动支付=APP ， 扫码付=NATIVE</div>
|
||||
<div>友店微信(<code>com.egzosn.pay.wx.youdian.bean.YoudianTransactionType</code>)： 扫码付=NATIVE</div>
|
||||
<div>富友(<code>com.egzosn.pay.fuiou.bean.FuiouTransactionType</code>)： B2B，B2C</div>
|
||||
|
||||
<br>
|
||||
<br>
|
||||
|
||||
Reference in New Issue
Block a user