From f9022814fda4cc7025c73d28bf1554c610b41a70 Mon Sep 17 00:00:00 2001 From: BinaryWang Date: Tue, 5 Jul 2016 10:55:47 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AE=80=E5=8C=96=E4=BC=98=E5=8C=96=E5=AE=A2?= =?UTF-8?q?=E6=9C=8D=E7=9B=B8=E5=85=B3=E6=8E=A5=E5=8F=A3=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../weixin/mp/api/WxMpBaseChildService.java | 15 --------------- .../me/chanjar/weixin/mp/api/WxMpKefuService.java | 2 +- .../me/chanjar/weixin/mp/api/WxMpServiceImpl.java | 7 ++----- .../weixin/mp/api/impl/WxMpKefuServiceImpl.java | 9 --------- .../me/chanjar/weixin/mp/api/ApiTestModule.java | 3 --- 5 files changed, 3 insertions(+), 33 deletions(-) delete mode 100644 weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpBaseChildService.java diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpBaseChildService.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpBaseChildService.java deleted file mode 100644 index 2176af57..00000000 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpBaseChildService.java +++ /dev/null @@ -1,15 +0,0 @@ -package me.chanjar.weixin.mp.api; - -/** - * - * @author Binary Wang - * - */ - -public interface WxMpBaseChildService { - /** - * 设置WxMpService对象 - * @return - */ - void setWxMpService(WxMpService wxMpService); -} diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpKefuService.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpKefuService.java index 8220a673..ec9b7af3 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpKefuService.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpKefuService.java @@ -15,7 +15,7 @@ import me.chanjar.weixin.mp.bean.customerservice.result.WxMpKfOnlineList; * @author Binary Wang * */ -public interface WxMpKefuService extends WxMpBaseChildService { +public interface WxMpKefuService { /** *
    * 获取客服基本信息
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpServiceImpl.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpServiceImpl.java
index 7273642d..2260f48d 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpServiceImpl.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpServiceImpl.java
@@ -23,6 +23,7 @@ import me.chanjar.weixin.common.util.http.*;
 import me.chanjar.weixin.common.util.json.GsonHelper;
 import me.chanjar.weixin.common.util.json.WxGsonBuilder;
 import me.chanjar.weixin.common.util.xml.XStreamInitializer;
+import me.chanjar.weixin.mp.api.impl.WxMpKefuServiceImpl;
 import me.chanjar.weixin.mp.bean.*;
 import me.chanjar.weixin.mp.bean.result.*;
 import me.chanjar.weixin.mp.util.http.*;
@@ -75,7 +76,7 @@ public class WxMpServiceImpl implements WxMpService {
 
   protected WxMpConfigStorage wxMpConfigStorage;
   
-  protected WxMpKefuService kefuService;
+  protected WxMpKefuService kefuService = new WxMpKefuServiceImpl(this);
 
   protected CloseableHttpClient httpClient;
 
@@ -1377,8 +1378,4 @@ public class WxMpServiceImpl implements WxMpService {
     return this.kefuService;
   }
   
-  public void setKefuService(WxMpKefuService kefuService) {
-    this.kefuService = kefuService;
-    this.kefuService.setWxMpService(this);
-  }
 }
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpKefuServiceImpl.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpKefuServiceImpl.java
index fc49e4ae..91afb731 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpKefuServiceImpl.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpKefuServiceImpl.java
@@ -20,19 +20,10 @@ import me.chanjar.weixin.mp.bean.customerservice.result.WxMpKfOnlineList;
 public class WxMpKefuServiceImpl implements WxMpKefuService {
   private WxMpService wxMpService;
 
-  public WxMpKefuServiceImpl(){
-    
-  }
-  
   public WxMpKefuServiceImpl(WxMpService wxMpService) {
     this.wxMpService = wxMpService;
   }
 
-  @Override
-  public void setWxMpService(WxMpService wxMpService) {
-    this.wxMpService = wxMpService;
-  }
-
   @Override
   public WxMpKfList kfList() throws WxErrorException {
     String url = "https://api.weixin.qq.com/cgi-bin/customservice/getkflist";
diff --git a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/ApiTestModule.java b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/ApiTestModule.java
index 7dc042f7..154b06b6 100644
--- a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/ApiTestModule.java
+++ b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/ApiTestModule.java
@@ -24,9 +24,6 @@ public class ApiTestModule implements Module {
       WxMpServiceImpl wxService = new WxMpServiceImpl();
       wxService.setWxMpConfigStorage(config);
       
-      WxMpKefuService kefuService = new WxMpKefuServiceImpl();
-      wxService.setKefuService(kefuService);
-
       binder.bind(WxMpServiceImpl.class).toInstance(wxService);
       binder.bind(WxMpConfigStorage.class).toInstance(config);
     } catch (IOException e) {