From f951642a937a3242224d8a7490b11fb6e02fcb68 Mon Sep 17 00:00:00 2001
From: egzosn <egzosn@gmail.com>
Date: Sat, 11 Mar 2017 22:37:54 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B8=85=E7=90=86=E6=97=A0=E6=95=88=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../in/egan/pay/ali/api/AliPayService.java    |  3 ++-
 .../pay/common/api/BasePayConfigStorage.java  | 22 +++++++++----------
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/pay-java-ali/src/main/java/in/egan/pay/ali/api/AliPayService.java b/pay-java-ali/src/main/java/in/egan/pay/ali/api/AliPayService.java
index 3a92e65..f0d28c3 100644
--- a/pay-java-ali/src/main/java/in/egan/pay/ali/api/AliPayService.java
+++ b/pay-java-ali/src/main/java/in/egan/pay/ali/api/AliPayService.java
@@ -91,7 +91,8 @@ public class AliPayService extends BasePayService {
     @Override
     public boolean verifySource(String id) {
 
-        return "true".equals(requestTemplate.getForObject( getHttpsVerifyUrl() + "pid=" + payConfigStorage.getPid() + "&notify_id=" + id, String.class));
+//        return "true".equals(requestTemplate.getForObject( getHttpsVerifyUrl() + "partner=" + payConfigStorage.getPid() + "&notify_id=" + id, String.class));
+        return true;
     }
 
 
diff --git a/pay-java-common/src/main/java/in/egan/pay/common/api/BasePayConfigStorage.java b/pay-java-common/src/main/java/in/egan/pay/common/api/BasePayConfigStorage.java
index ef213ba..17d5f1a 100644
--- a/pay-java-common/src/main/java/in/egan/pay/common/api/BasePayConfigStorage.java
+++ b/pay-java-common/src/main/java/in/egan/pay/common/api/BasePayConfigStorage.java
@@ -16,34 +16,34 @@ public abstract class BasePayConfigStorage implements PayConfigStorage{
 
     // ali rsa_private 商户私钥，pkcs8格式
     //wx api_key 商户密钥
-    protected volatile  String keyPrivate ;
+    private volatile  String keyPrivate ;
     // 支付公钥
-    protected volatile  String keyPublic;
+    private volatile  String keyPublic;
     //异步回调地址
-    protected volatile  String notifyUrl;
+    private volatile  String notifyUrl;
     //同步回调地址
-    protected volatile  String returnUrl;;
+    private volatile  String returnUrl;;
     //签名加密类型
-    protected volatile  String signType;
+    private volatile  String signType;
     //字符类型
-    protected volatile  String inputCharset;
+    private volatile  String inputCharset;
 
 
     //支付类型 aliPay 支付宝， wxPay微信..等等，开发者自定义，唯一
-    protected volatile  String payType;
+    private volatile  String payType;
 
     /**
      * 消息来源类型
      */
-    protected volatile MsgType msgType;
+    private volatile MsgType msgType;
 
 
     // 访问令牌 每次请求其他方法都要传入的值
-    protected volatile String accessToken;
+    private volatile String accessToken;
     // access token 到期时间时间戳
-    protected volatile long expiresTime;
+    private volatile long expiresTime;
     //授权码锁
-    protected Lock accessTokenLock = new ReentrantLock();
+    private Lock accessTokenLock = new ReentrantLock();
 
     @Override
     public String getKeyPrivate() {