diff --git a/pay-java-ali/src/main/java/com/egzosn/pay/ali/api/AliPayConfigStorage.java b/pay-java-ali/src/main/java/com/egzosn/pay/ali/api/AliPayConfigStorage.java index 7198174..afa187b 100644 --- a/pay-java-ali/src/main/java/com/egzosn/pay/ali/api/AliPayConfigStorage.java +++ b/pay-java-ali/src/main/java/com/egzosn/pay/ali/api/AliPayConfigStorage.java @@ -33,10 +33,6 @@ public class AliPayConfigStorage extends BasePayConfigStorage { this.aliPublicKey = aliPublicKey; } - @Override - public String getSecretKey() { - return aliPublicKey; - } public void setAppId(String appId) { 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 23bbd9a..6b456b6 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 @@ -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); } 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 498e94b..db69a38 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 @@ -10,7 +10,6 @@ import com.egzosn.pay.common.api.BasePayConfigStorage; public class FuiouPayConfigStorage extends BasePayConfigStorage { public String mchntCd;//商户代码 - public String mchntKey;//商户密钥 /** * 应用id @@ -54,13 +53,4 @@ public class FuiouPayConfigStorage extends BasePayConfigStorage { return null; } - @Override - public String getSecretKey() { - return super.getKeyPrivate(); - } - - public void setSecretKey(String mchntKey){ - this.mchntKey = mchntKey; - setKeyPrivate(mchntKey); - } } diff --git a/pay-java-wx-youdian/src/main/java/com/egzosn/pay/wx/youdian/api/WxYouDianPayConfigStorage.java b/pay-java-wx-youdian/src/main/java/com/egzosn/pay/wx/youdian/api/WxYouDianPayConfigStorage.java index a5bd59c..e42d1cb 100644 --- a/pay-java-wx-youdian/src/main/java/com/egzosn/pay/wx/youdian/api/WxYouDianPayConfigStorage.java +++ b/pay-java-wx-youdian/src/main/java/com/egzosn/pay/wx/youdian/api/WxYouDianPayConfigStorage.java @@ -11,20 +11,13 @@ import com.egzosn.pay.common.api.BasePayConfigStorage; */ public class WxYouDianPayConfigStorage extends BasePayConfigStorage { - public volatile String secretKey; + //账号 public volatile String seller; - public void setSecretKey(String secretKey) { - this.secretKey = secretKey; - } - @Override - public String getSecretKey() { - return secretKey; - } @Override diff --git a/pay-java-wx/src/main/java/com/egzosn/pay/wx/api/WxPayConfigStorage.java b/pay-java-wx/src/main/java/com/egzosn/pay/wx/api/WxPayConfigStorage.java index 1eaf01a..bac1615 100644 --- a/pay-java-wx/src/main/java/com/egzosn/pay/wx/api/WxPayConfigStorage.java +++ b/pay-java-wx/src/main/java/com/egzosn/pay/wx/api/WxPayConfigStorage.java @@ -20,10 +20,7 @@ public class WxPayConfigStorage extends BasePayConfigStorage { public String mchId; - @Override - public String getSecretKey() { - return appSecret; - } + public void setAppSecret(String appSecret) { this.appSecret = appSecret;