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 2176af578..000000000 --- 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 8220a6733..ec9b7af36 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 7273642d7..2260f48dd 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 fc49e4ae7..91afb7319 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 7dc042f7e..154b06b67 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) {