WxCpService添加getWxMpConfigStorage方法，同时修改相关位置

ecoolper · ecoolper · commit f42b22f5c19f · 2017-04-27T20:24:42.000+08:00
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/WxCpService.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/WxCpService.java
@@ -556,4 +556,11 @@ WxMediaUploadResult mediaUpload(String mediaType, String fileType, InputStream i
    * 初始化http请求对象
    */
   void initHttp();
+
+  /**
+   * 获取WxMpConfigStorage 对象
+   *
+   * @return WxMpConfigStorage
+   */
+  WxCpConfigStorage getWxMpConfigStorage();
 }
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/apache/WxCpServiceImpl.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/apache/WxCpServiceImpl.java
@@ -6,6 +6,7 @@
 import me.chanjar.weixin.common.exception.WxErrorException;
 import me.chanjar.weixin.common.util.http.apache.ApacheHttpClientBuilder;
 import me.chanjar.weixin.common.util.http.apache.DefaultApacheHttpClientBuilder;
+import me.chanjar.weixin.cp.api.WxCpConfigStorage;
 import me.chanjar.weixin.cp.api.impl.AbstractWxCpService;
 
 import org.apache.http.HttpHost;
@@ -91,4 +92,9 @@ public void initHttp() {
 
     this.httpClient = apacheHttpClientBuilder.build();
   }
+
+  @Override
+  public WxCpConfigStorage getWxMpConfigStorage() {
+    return this.configStorage;
+  }
 }
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/jodd/WxCpServiceImpl.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/jodd/WxCpServiceImpl.java
@@ -4,6 +4,7 @@
 import me.chanjar.weixin.common.bean.WxAccessToken;
 import me.chanjar.weixin.common.bean.result.WxError;
 import me.chanjar.weixin.common.exception.WxErrorException;
+import me.chanjar.weixin.cp.api.WxCpConfigStorage;
 import me.chanjar.weixin.cp.api.impl.AbstractWxCpService;
 
 public class WxCpServiceImpl extends AbstractWxCpService<HttpConnectionProvider, ProxyInfo> {
@@ -62,4 +63,9 @@ public void initHttp() {
 
     httpClient = JoddHttp.httpConnectionProvider;
   }
+
+  @Override
+  public WxCpConfigStorage getWxMpConfigStorage() {
+    return this.configStorage;
+  }
 }
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/okhttp/WxCpServiceImpl.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/okhttp/WxCpServiceImpl.java
@@ -87,4 +87,9 @@ public void initHttp() {
 
     httpClient = new ConnectionPool();
   }
+
+  @Override
+  public WxCpConfigStorage getWxMpConfigStorage() {
+    return this.configStorage;
+  }
 }
diff --git a/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/api/impl/apache/WxCpMessageAPITest.java b/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/api/impl/apache/WxCpMessageAPITest.java
@@ -21,7 +21,7 @@ public class WxCpMessageAPITest {
   protected WxCpServiceImpl wxService;
 
   public void testSendCustomMessage() throws WxErrorException {
-    ApiTestModule.WxXmlCpInMemoryConfigStorage configStorage = (ApiTestModule.WxXmlCpInMemoryConfigStorage) this.wxService.configStorage;
+    ApiTestModule.WxXmlCpInMemoryConfigStorage configStorage = (ApiTestModule.WxXmlCpInMemoryConfigStorage) this.wxService.getWxMpConfigStorage();
     WxCpMessage message1 = new WxCpMessage();
     message1.setAgentId(configStorage.getAgentId());
     message1.setMsgType(WxConsts.CUSTOM_MSG_TEXT);

Original file line number	Diff line number	Diff line change
`@@ -87,4 +87,9 @@ public void initHttp() {`
`87`	`87`
`88`	`88`	`httpClient = new ConnectionPool();`
`89`	`89`	`}`
	`90`	`+`
	`91`	`+ @Override`
	`92`	`+ public WxCpConfigStorage getWxMpConfigStorage() {`
	`93`	`+ return this.configStorage;`
	`94`	`+ }`
`90`	`95`	`}`