From fb10acf6fd815599db07264acb09f8e12f28fdda Mon Sep 17 00:00:00 2001
From: Daniel Qian <chanjarster@gmail.com>
Date: Wed, 25 Feb 2015 14:37:15 +0800
Subject: [PATCH] =?UTF-8?q?issue=20#101=20=E8=8E=B7=E5=8F=96=E5=BE=AE?=
 =?UTF-8?q?=E4=BF=A1=E6=9C=8D=E5=8A=A1=E5=99=A8IP=E5=9C=B0=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../me/chanjar/weixin/mp/api/WxMpService.java | 10 +++++
 .../weixin/mp/api/WxMpServiceImpl.java        | 14 +++++++
 .../weixin/mp/api/WxMpMiscAPITest.java        | 42 +++++++++++++++++++
 weixin-java-mp/src/test/resources/testng.xml  |  1 +
 4 files changed, 67 insertions(+)
 create mode 100644 weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/WxMpMiscAPITest.java

diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpService.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpService.java
index b27508713..862f854b5 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpService.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpService.java
@@ -421,6 +421,16 @@ public interface WxMpService {
    */
   public boolean oauth2validateAccessToken(WxMpOAuth2AccessToken oAuth2AccessToken);
 
+  /**
+   * <pre>
+   * 获取微信服务器IP地址
+   * http://mp.weixin.qq.com/wiki/0/2ad4b6bfd29f30f71d39616c2a0fcedc.html
+   * </pre>
+   * @return
+   * @throws WxErrorException
+   */
+  String[] getCallbackIP() throws WxErrorException;
+
   /**
    * 当本Service没有实现某个API的时候，可以用这个，针对所有微信API中的GET请求
    * @param url
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 92d31318c..74268b9e0 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
@@ -1,5 +1,6 @@
 package me.chanjar.weixin.mp.api;
 
+import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.internal.Streams;
@@ -451,6 +452,19 @@ public class WxMpServiceImpl implements WxMpService {
     return true;
   }
 
+  @Override
+  public String[] getCallbackIP() throws WxErrorException {
+    String url = "https://api.weixin.qq.com/cgi-bin/getcallbackip";
+    String responseContent = get(url, null);
+    JsonElement tmpJsonElement = Streams.parse(new JsonReader(new StringReader(responseContent)));
+    JsonArray ipList = tmpJsonElement.getAsJsonObject().get("ip_list").getAsJsonArray();
+    String[] ipArray = new String[ipList.size()];
+    for (int i = 0; i < ipList.size(); i++) {
+      ipArray[i] = ipList.get(i).getAsString();
+    }
+    return ipArray;
+  }
+
   public String get(String url, String queryParam) throws WxErrorException {
     return execute(new SimpleGetRequestExecutor(), url, queryParam);
   }
diff --git a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/WxMpMiscAPITest.java b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/WxMpMiscAPITest.java
new file mode 100644
index 000000000..0b160306a
--- /dev/null
+++ b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/WxMpMiscAPITest.java
@@ -0,0 +1,42 @@
+package me.chanjar.weixin.mp.api;
+
+import com.google.inject.Inject;
+import me.chanjar.weixin.common.api.WxConsts;
+import me.chanjar.weixin.common.bean.result.WxMediaUploadResult;
+import me.chanjar.weixin.common.exception.WxErrorException;
+import me.chanjar.weixin.mp.bean.WxMpMassGroupMessage;
+import me.chanjar.weixin.mp.bean.WxMpMassNews;
+import me.chanjar.weixin.mp.bean.WxMpMassOpenIdsMessage;
+import me.chanjar.weixin.mp.bean.WxMpMassVideo;
+import me.chanjar.weixin.mp.bean.result.WxMpMassSendResult;
+import me.chanjar.weixin.mp.bean.result.WxMpMassUploadResult;
+import org.testng.Assert;
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Guice;
+import org.testng.annotations.Test;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Arrays;
+
+/**
+ *
+ * @author chanjarster
+ *
+ */
+@Test(groups = "miscAPI", dependsOnGroups = { "baseAPI"})
+@Guice(modules = ApiTestModule.class)
+public class WxMpMiscAPITest {
+
+  @Inject
+  protected WxMpServiceImpl wxService;
+
+  @Test
+  public void getCallbackIP() throws WxErrorException {
+    String[] ipArray = wxService.getCallbackIP();
+    System.out.println(Arrays.toString(ipArray));
+    Assert.assertNotNull(ipArray);
+    Assert.assertNotEquals(ipArray.length, 0);
+  }
+
+}
diff --git a/weixin-java-mp/src/test/resources/testng.xml b/weixin-java-mp/src/test/resources/testng.xml
index cf9c2d641..cb1263d31 100644
--- a/weixin-java-mp/src/test/resources/testng.xml
+++ b/weixin-java-mp/src/test/resources/testng.xml
@@ -15,6 +15,7 @@
 			<class name="me.chanjar.weixin.mp.api.WxMpShortUrlAPITest" />
 			<class name="me.chanjar.weixin.mp.api.WxMpMessageRouterTest" />
       <class name="me.chanjar.weixin.mp.api.WxMpJsAPITest" />
+      <class name="me.chanjar.weixin.mp.api.WxMpMiscAPITest" />
 		</classes>
 	</test>