From 8f29519b9c9290ee0d06dcfb790a339ed3661381 Mon Sep 17 00:00:00 2001
From: egan <egzosn@gmail.com>
Date: Sat, 29 Sep 2018 17:52:06 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=94=AF=E4=BB=98=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E6=B3=9B=E5=9E=8B=EF=BC=8C=E4=BD=BF=E5=BE=97=E6=94=AF?=
 =?UTF-8?q?=E4=BB=98=E6=89=A9=E5=B1=95=E6=9B=B4=E6=96=B9=E4=BE=BF=EF=BC=8C?=
 =?UTF-8?q?=E5=85=B7=E4=BD=93=E6=94=AF=E4=BB=98=E6=9C=8D=E5=8A=A1=E4=BD=BF?=
 =?UTF-8?q?=E7=94=A8=E5=85=B7=E4=BD=93=E6=94=AF=E4=BB=98=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pay-java-common/pom.xml                              |  2 +-
 .../com/egzosn/pay/common/api/BasePayService.java    | 12 ++++++------
 .../java/com/egzosn/pay/common/api/PayService.java   |  6 +++---
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/pay-java-common/pom.xml b/pay-java-common/pom.xml
index a863818..e94df45 100644
--- a/pay-java-common/pom.xml
+++ b/pay-java-common/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>pay-java-parent</artifactId>
         <groupId>com.egzosn</groupId>
-        <version>2.10.3-SNAPSHOT</version>
+        <version>2.11.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>jar</packaging>
diff --git a/pay-java-common/src/main/java/com/egzosn/pay/common/api/BasePayService.java b/pay-java-common/src/main/java/com/egzosn/pay/common/api/BasePayService.java
index dea0d77..3052e07 100644
--- a/pay-java-common/src/main/java/com/egzosn/pay/common/api/BasePayService.java
+++ b/pay-java-common/src/main/java/com/egzosn/pay/common/api/BasePayService.java
@@ -21,9 +21,9 @@ import java.util.*;
  *      date 2017/3/5 20:36
  *   </pre>
  */
-public abstract class BasePayService implements PayService {
+public abstract class BasePayService<PC extends PayConfigStorage> implements PayService<PC>  {
 
-    protected PayConfigStorage payConfigStorage;
+    protected PC payConfigStorage;
 
     protected HttpRequestTemplate requestTemplate;
     protected int retrySleepMillis = 1000;
@@ -35,13 +35,13 @@ public abstract class BasePayService implements PayService {
      * @param payConfigStorage 支付配置
      */
     @Override
-    public BasePayService setPayConfigStorage(PayConfigStorage payConfigStorage) {
+    public BasePayService setPayConfigStorage(PC payConfigStorage) {
         this.payConfigStorage = payConfigStorage;
         return this;
     }
 
     @Override
-    public PayConfigStorage getPayConfigStorage() {
+    public PC getPayConfigStorage() {
         return payConfigStorage;
     }
     @Override
@@ -61,11 +61,11 @@ public abstract class BasePayService implements PayService {
     }
 
 
-    public BasePayService(PayConfigStorage payConfigStorage) {
+    public BasePayService(PC payConfigStorage) {
         this(payConfigStorage, null);
     }
 
-    public BasePayService(PayConfigStorage payConfigStorage, HttpConfigStorage configStorage) {
+    public BasePayService(PC payConfigStorage, HttpConfigStorage configStorage) {
         setPayConfigStorage(payConfigStorage);
         setRequestTemplateConfigStorage(configStorage);
     }
diff --git a/pay-java-common/src/main/java/com/egzosn/pay/common/api/PayService.java b/pay-java-common/src/main/java/com/egzosn/pay/common/api/PayService.java
index 9d8c804..e877fec 100644
--- a/pay-java-common/src/main/java/com/egzosn/pay/common/api/PayService.java
+++ b/pay-java-common/src/main/java/com/egzosn/pay/common/api/PayService.java
@@ -20,7 +20,7 @@ import java.util.Map;
  * date 2016-5-18 14:09:01
  *</pre>
  */
-public interface PayService {
+public interface PayService<PC extends PayConfigStorage> {
 
 
 
@@ -29,14 +29,14 @@ public interface PayService {
      * @param payConfigStorage 支付配置
      * @return 支付服务
      */
-    PayService setPayConfigStorage(PayConfigStorage payConfigStorage);
+    PayService setPayConfigStorage(PC payConfigStorage);
 
     /**
      * 获取支付配置
      *
      * @return 支付配置
      */
-    PayConfigStorage getPayConfigStorage();
+    PC getPayConfigStorage();
     /**
      * 获取http请求工具
      *