diff --git a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/WeixinProxy.java b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/WeixinProxy.java index 061665b8..2f555904 100644 --- a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/WeixinProxy.java +++ b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/WeixinProxy.java @@ -5,7 +5,7 @@ import java.util.Date; import java.util.List; import com.foxinmy.weixin4j.exception.WeixinException; -import com.foxinmy.weixin4j.http.message.ApiResult; +import com.foxinmy.weixin4j.http.weixin.ApiResult; import com.foxinmy.weixin4j.model.Button; import com.foxinmy.weixin4j.model.MediaCounter; import com.foxinmy.weixin4j.model.MediaDownloadResult; diff --git a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/api/ComponentApi.java b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/api/ComponentApi.java index ab5b844d..9acbe93d 100644 --- a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/api/ComponentApi.java +++ b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/api/ComponentApi.java @@ -7,7 +7,7 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.foxinmy.weixin4j.exception.WeixinException; -import com.foxinmy.weixin4j.http.message.ApiResult; +import com.foxinmy.weixin4j.http.weixin.ApiResult; import com.foxinmy.weixin4j.http.weixin.WeixinResponse; import com.foxinmy.weixin4j.model.Token; import com.foxinmy.weixin4j.mp.component.WeixinComponentPreCodeCreator; diff --git a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/api/CustomApi.java b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/api/CustomApi.java index c5944ae5..8fc7a727 100644 --- a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/api/CustomApi.java +++ b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/api/CustomApi.java @@ -12,7 +12,7 @@ import com.foxinmy.weixin4j.exception.WeixinException; import com.foxinmy.weixin4j.http.MimeType; import com.foxinmy.weixin4j.http.apache.FormBodyPart; import com.foxinmy.weixin4j.http.apache.InputStreamBody; -import com.foxinmy.weixin4j.http.message.ApiResult; +import com.foxinmy.weixin4j.http.weixin.ApiResult; import com.foxinmy.weixin4j.http.weixin.WeixinResponse; import com.foxinmy.weixin4j.model.Pageable; import com.foxinmy.weixin4j.model.Token; diff --git a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/api/GroupApi.java b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/api/GroupApi.java index 355ae6e6..aaebbaab 100644 --- a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/api/GroupApi.java +++ b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/api/GroupApi.java @@ -5,7 +5,7 @@ import java.util.List; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.foxinmy.weixin4j.exception.WeixinException; -import com.foxinmy.weixin4j.http.message.ApiResult; +import com.foxinmy.weixin4j.http.weixin.ApiResult; import com.foxinmy.weixin4j.http.weixin.WeixinResponse; import com.foxinmy.weixin4j.model.Token; import com.foxinmy.weixin4j.mp.model.Group; diff --git a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/api/HelperApi.java b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/api/HelperApi.java index 14e20730..2746dcae 100644 --- a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/api/HelperApi.java +++ b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/api/HelperApi.java @@ -10,7 +10,7 @@ import com.alibaba.fastjson.JSONPath; import com.alibaba.fastjson.TypeReference; import com.alibaba.fastjson.parser.deserializer.ExtraProcessor; import com.foxinmy.weixin4j.exception.WeixinException; -import com.foxinmy.weixin4j.http.message.ApiResult; +import com.foxinmy.weixin4j.http.weixin.ApiResult; import com.foxinmy.weixin4j.http.weixin.WeixinResponse; import com.foxinmy.weixin4j.model.Button; import com.foxinmy.weixin4j.model.Token; @@ -95,7 +95,7 @@ public class HelperApi extends MpApi { public List getWechatServerIp() throws WeixinException { String getcallbackip_uri = getRequestUri("getcallbackip_uri"); Token token = tokenManager.getCache(); - WeixinResponse response = weixinExecutor.post(String.format( + WeixinResponse response = weixinExecutor.get(String.format( getcallbackip_uri, token.getAccessToken())); return JSON.parseArray(response.getAsJson().getString("ip_list"), String.class); diff --git a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/api/MassApi.java b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/api/MassApi.java index dae56fb8..6cd44b54 100644 --- a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/api/MassApi.java +++ b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/api/MassApi.java @@ -7,7 +7,7 @@ import java.util.Map; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.foxinmy.weixin4j.exception.WeixinException; -import com.foxinmy.weixin4j.http.message.ApiResult; +import com.foxinmy.weixin4j.http.weixin.ApiResult; import com.foxinmy.weixin4j.http.weixin.WeixinResponse; import com.foxinmy.weixin4j.model.Token; import com.foxinmy.weixin4j.token.TokenManager; diff --git a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/api/MediaApi.java b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/api/MediaApi.java index fabac4e8..ec18f7aa 100644 --- a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/api/MediaApi.java +++ b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/api/MediaApi.java @@ -25,8 +25,8 @@ import com.foxinmy.weixin4j.http.apache.FormBodyPart; import com.foxinmy.weixin4j.http.apache.InputStreamBody; import com.foxinmy.weixin4j.http.apache.StringBody; import com.foxinmy.weixin4j.http.entity.StringEntity; -import com.foxinmy.weixin4j.http.message.ApiResult; import com.foxinmy.weixin4j.http.message.JsonMessageConverter; +import com.foxinmy.weixin4j.http.weixin.ApiResult; import com.foxinmy.weixin4j.http.weixin.WeixinResponse; import com.foxinmy.weixin4j.model.Consts; import com.foxinmy.weixin4j.model.MediaCounter; diff --git a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/api/MenuApi.java b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/api/MenuApi.java index 28c9de4f..0e33a322 100644 --- a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/api/MenuApi.java +++ b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/api/MenuApi.java @@ -11,7 +11,7 @@ import com.alibaba.fastjson.parser.deserializer.ExtraProcessor; import com.alibaba.fastjson.parser.deserializer.ParseProcess; import com.alibaba.fastjson.serializer.NameFilter; import com.foxinmy.weixin4j.exception.WeixinException; -import com.foxinmy.weixin4j.http.message.ApiResult; +import com.foxinmy.weixin4j.http.weixin.ApiResult; import com.foxinmy.weixin4j.http.weixin.WeixinResponse; import com.foxinmy.weixin4j.model.Button; import com.foxinmy.weixin4j.model.Token; diff --git a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/api/NotifyApi.java b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/api/NotifyApi.java index 2b7955b8..411a62cc 100644 --- a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/api/NotifyApi.java +++ b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/api/NotifyApi.java @@ -4,7 +4,7 @@ import java.util.List; import com.alibaba.fastjson.JSONObject; import com.foxinmy.weixin4j.exception.WeixinException; -import com.foxinmy.weixin4j.http.message.ApiResult; +import com.foxinmy.weixin4j.http.weixin.ApiResult; import com.foxinmy.weixin4j.http.weixin.WeixinResponse; import com.foxinmy.weixin4j.model.Token; import com.foxinmy.weixin4j.mp.message.NotifyMessage; diff --git a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/api/PayOldApi.java b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/api/PayOldApi.java index 9821c711..e0847c6d 100644 --- a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/api/PayOldApi.java +++ b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/api/PayOldApi.java @@ -27,7 +27,7 @@ import com.alibaba.fastjson.TypeReference; import com.alibaba.fastjson.parser.Feature; import com.foxinmy.weixin4j.exception.WeixinException; import com.foxinmy.weixin4j.http.entity.FormUrlEntity; -import com.foxinmy.weixin4j.http.message.ApiResult; +import com.foxinmy.weixin4j.http.weixin.ApiResult; import com.foxinmy.weixin4j.http.weixin.WeixinResponse; import com.foxinmy.weixin4j.model.Consts; import com.foxinmy.weixin4j.model.Token; diff --git a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/api/TagApi.java b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/api/TagApi.java index cbc52286..64d151a3 100644 --- a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/api/TagApi.java +++ b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/api/TagApi.java @@ -6,7 +6,7 @@ import java.util.List; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.foxinmy.weixin4j.exception.WeixinException; -import com.foxinmy.weixin4j.http.message.ApiResult; +import com.foxinmy.weixin4j.http.weixin.ApiResult; import com.foxinmy.weixin4j.http.weixin.WeixinResponse; import com.foxinmy.weixin4j.mp.model.Following; import com.foxinmy.weixin4j.mp.model.Tag; diff --git a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/api/TmplApi.java b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/api/TmplApi.java index ca0ca75c..726176df 100644 --- a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/api/TmplApi.java +++ b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/api/TmplApi.java @@ -6,7 +6,7 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.serializer.NameFilter; import com.foxinmy.weixin4j.exception.WeixinException; -import com.foxinmy.weixin4j.http.message.ApiResult; +import com.foxinmy.weixin4j.http.weixin.ApiResult; import com.foxinmy.weixin4j.http.weixin.WeixinResponse; import com.foxinmy.weixin4j.model.Token; import com.foxinmy.weixin4j.mp.message.TemplateMessage; diff --git a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/api/UserApi.java b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/api/UserApi.java index feaeb366..5099aae7 100644 --- a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/api/UserApi.java +++ b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/api/UserApi.java @@ -7,7 +7,7 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.TypeReference; import com.foxinmy.weixin4j.exception.WeixinException; -import com.foxinmy.weixin4j.http.message.ApiResult; +import com.foxinmy.weixin4j.http.weixin.ApiResult; import com.foxinmy.weixin4j.http.weixin.WeixinResponse; import com.foxinmy.weixin4j.model.Token; import com.foxinmy.weixin4j.mp.model.Following; diff --git a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/model/SemResult.java b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/model/SemResult.java index 79979fb6..308fe82b 100644 --- a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/model/SemResult.java +++ b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/model/SemResult.java @@ -2,7 +2,7 @@ package com.foxinmy.weixin4j.mp.model; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -import com.foxinmy.weixin4j.http.message.ApiResult; +import com.foxinmy.weixin4j.http.weixin.ApiResult; /** * 语义理解结果 diff --git a/weixin4j-mp/src/test/java/com/foxinmy/weixin4j/mp/test/CustomTest.java b/weixin4j-mp/src/test/java/com/foxinmy/weixin4j/mp/test/CustomTest.java index 07bef2a4..81d8daf7 100644 --- a/weixin4j-mp/src/test/java/com/foxinmy/weixin4j/mp/test/CustomTest.java +++ b/weixin4j-mp/src/test/java/com/foxinmy/weixin4j/mp/test/CustomTest.java @@ -12,7 +12,7 @@ import org.junit.Before; import org.junit.Test; import com.foxinmy.weixin4j.exception.WeixinException; -import com.foxinmy.weixin4j.http.message.ApiResult; +import com.foxinmy.weixin4j.http.weixin.ApiResult; import com.foxinmy.weixin4j.model.Pageable; import com.foxinmy.weixin4j.mp.api.CustomApi; import com.foxinmy.weixin4j.mp.model.KfAccount; @@ -48,14 +48,17 @@ public class CustomTest extends TokenTest { Date endtime = calendar.getTime(); List recordList = customApi.getKfChatRecord(starttime, endtime, new Pageable(1, 70)); + Assert.assertFalse(recordList.isEmpty()); System.out.println(recordList); } @Test public void kfList() throws WeixinException { List kfList = customApi.listKfAccount(false); + Assert.assertFalse(kfList.isEmpty()); System.out.println(kfList); kfList = customApi.listKfAccount(true); + Assert.assertFalse(kfList.isEmpty()); System.out.println(kfList); } @@ -63,14 +66,14 @@ public class CustomTest extends TokenTest { public void createKfAccount() throws WeixinException { ApiResult result = customApi.createKfAccount("test@test", "test", "123456"); - Assert.assertEquals(0, result.getReturnCode()); + Assert.assertEquals("0", result.getReturnCode()); } @Test public void updateKfAccount() throws WeixinException { ApiResult result = customApi.updateKfAccount("temp1@canyidianzhang", "temp", "123456"); - Assert.assertEquals(0, result.getReturnCode()); + Assert.assertEquals("0", result.getReturnCode()); } @Test @@ -78,27 +81,27 @@ public class CustomTest extends TokenTest { ApiResult result = customApi.uploadKfAvatar("temp1@canyidianzhang", new FileInputStream(new File("/Users/jy/Music/简谱/风动草.jpg")), "风动草.jpg"); - Assert.assertEquals(0, result.getReturnCode()); + Assert.assertEquals("0", result.getReturnCode()); } @Test public void deleteKfAccount() throws WeixinException, IOException { ApiResult result = customApi.deleteKfAccount("temp@canyidianzhang"); - Assert.assertEquals(0, result.getReturnCode()); + Assert.assertEquals("0", result.getReturnCode()); } @Test public void createSession() throws WeixinException { ApiResult result = customApi.createKfSession( "opKwyt6IhrqPmTTZshyqH5W9gIVo", "kfAccount", "text"); - Assert.assertEquals(0, result.getReturnCode()); + Assert.assertEquals("0", result.getReturnCode()); } @Test public void closeSession() throws WeixinException { ApiResult result = customApi.closeKfSession( "opKwyt6IhrqPmTTZshyqH5W9gIVo", "kfAccount", "text"); - Assert.assertEquals(0, result.getReturnCode()); + Assert.assertEquals("0", result.getReturnCode()); } @Test @@ -111,6 +114,7 @@ public class CustomTest extends TokenTest { @Test public void getSessionList() throws WeixinException { List sessionList = customApi.listKfSession("kfAccount"); + Assert.assertFalse(sessionList.isEmpty()); System.err.println(sessionList); } diff --git a/weixin4j-mp/src/test/java/com/foxinmy/weixin4j/mp/test/DataApiTest.java b/weixin4j-mp/src/test/java/com/foxinmy/weixin4j/mp/test/DataApiTest.java index 9e503bf8..c7aa650a 100644 --- a/weixin4j-mp/src/test/java/com/foxinmy/weixin4j/mp/test/DataApiTest.java +++ b/weixin4j-mp/src/test/java/com/foxinmy/weixin4j/mp/test/DataApiTest.java @@ -3,6 +3,7 @@ package com.foxinmy.weixin4j.mp.test; import java.util.Calendar; import java.util.List; +import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -37,6 +38,7 @@ public class DataApiTest extends TokenTest { ca.add(Calendar.DAY_OF_MONTH, -7); List userSummaryList = dataApi.datacube( DatacubeType.GETUSERCUMULATE, ca.getTime(), 3); + Assert.assertFalse(userSummaryList.isEmpty()); System.err.println(userSummaryList); } @@ -46,6 +48,7 @@ public class DataApiTest extends TokenTest { ca.add(Calendar.DAY_OF_MONTH, -7); List userSummaryList = dataApi.datacube(DatacubeType.GETUSERSUMMARY, ca.getTime(), 3); + Assert.assertFalse(userSummaryList.isEmpty()); System.err.println(userSummaryList); } @@ -55,6 +58,7 @@ public class DataApiTest extends TokenTest { ca.add(Calendar.DAY_OF_MONTH, -7); List articleSummaryList = (List) dataApi .datacube(DatacubeType.GETARTICLESUMMARY, ca.getTime()); + Assert.assertFalse(articleSummaryList.isEmpty()); System.err.println(articleSummaryList); } @@ -64,6 +68,7 @@ public class DataApiTest extends TokenTest { ca.add(Calendar.DAY_OF_MONTH, -7); List articleTotalList = (List) dataApi .datacube(DatacubeType.GETARTICLETOTAL, ca.getTime()); + Assert.assertFalse(articleTotalList.isEmpty()); System.err.println(articleTotalList); } @@ -73,6 +78,7 @@ public class DataApiTest extends TokenTest { ca.add(Calendar.DAY_OF_MONTH, -7); List articleSummaryList = (List) dataApi .datacube(DatacubeType.GETUSERREADHOUR, ca.getTime()); + Assert.assertFalse(articleSummaryList.isEmpty()); System.err.println(articleSummaryList); } @@ -82,6 +88,7 @@ public class DataApiTest extends TokenTest { ca.add(Calendar.DAY_OF_MONTH, -7); List userShareList = (List) dataApi .datacube(DatacubeType.GETUSERSHAREHOUR, ca.getTime()); + Assert.assertFalse(userShareList.isEmpty()); System.err.println(userShareList); } @@ -91,6 +98,7 @@ public class DataApiTest extends TokenTest { ca.add(Calendar.DAY_OF_MONTH, -1); List datacuteList = dataApi.datacube(DatacubeType.GETUPSTREAMMSG, ca.getTime()); + Assert.assertFalse(datacuteList.isEmpty()); System.err.println(datacuteList); //dataApi.datacube(DatacubeType.GETUPSTREAMMSGMONTH, ca.getTime()); System.err.println(datacuteList); diff --git a/weixin4j-mp/src/test/java/com/foxinmy/weixin4j/mp/test/GroupTest.java b/weixin4j-mp/src/test/java/com/foxinmy/weixin4j/mp/test/GroupTest.java index 5db7c526..3e052c21 100644 --- a/weixin4j-mp/src/test/java/com/foxinmy/weixin4j/mp/test/GroupTest.java +++ b/weixin4j-mp/src/test/java/com/foxinmy/weixin4j/mp/test/GroupTest.java @@ -7,7 +7,7 @@ import org.junit.Before; import org.junit.Test; import com.foxinmy.weixin4j.exception.WeixinException; -import com.foxinmy.weixin4j.http.message.ApiResult; +import com.foxinmy.weixin4j.http.weixin.ApiResult; import com.foxinmy.weixin4j.mp.api.GroupApi; import com.foxinmy.weixin4j.mp.model.Group; @@ -49,26 +49,26 @@ public class GroupTest extends TokenTest { @Test public void modify() throws WeixinException { ApiResult result = groupApi.modifyGroup(100, "my1"); - Assert.assertEquals(0, result.getReturnCode()); + Assert.assertEquals("0", result.getReturnCode()); } @Test public void move() throws WeixinException { ApiResult result = groupApi.moveGroup(100, "owGBft_vbBbOaQOmpEUE4xDLeRSU"); - Assert.assertEquals(0, result.getReturnCode()); + Assert.assertEquals("0", result.getReturnCode()); } @Test public void batchMove() throws WeixinException { ApiResult result = groupApi.moveGroup(100, "owGBft_vbBbOaQOmpEUE4xDLeRSU"); - Assert.assertEquals(0, result.getReturnCode()); + Assert.assertEquals("0", result.getReturnCode()); } @Test public void delete() throws WeixinException { ApiResult result = groupApi.deleteGroup(100); - Assert.assertEquals(0, result.getReturnCode()); + Assert.assertEquals("0", result.getReturnCode()); } } diff --git a/weixin4j-mp/src/test/java/com/foxinmy/weixin4j/mp/test/MassTest.java b/weixin4j-mp/src/test/java/com/foxinmy/weixin4j/mp/test/MassTest.java index ad202a8c..c056ff45 100644 --- a/weixin4j-mp/src/test/java/com/foxinmy/weixin4j/mp/test/MassTest.java +++ b/weixin4j-mp/src/test/java/com/foxinmy/weixin4j/mp/test/MassTest.java @@ -11,7 +11,7 @@ import org.junit.Before; import org.junit.Test; import com.foxinmy.weixin4j.exception.WeixinException; -import com.foxinmy.weixin4j.http.message.ApiResult; +import com.foxinmy.weixin4j.http.weixin.ApiResult; import com.foxinmy.weixin4j.model.MediaUploadResult; import com.foxinmy.weixin4j.mp.api.MassApi; import com.foxinmy.weixin4j.mp.api.MediaApi; @@ -87,14 +87,14 @@ public class MassTest extends TokenTest { @Test public void deleteMass() throws WeixinException { ApiResult result = massApi.deleteMassNews("34182"); - Assert.assertEquals(0, result.getReturnCode()); + Assert.assertEquals("0", result.getReturnCode()); } @Test public void previewMass() throws WeixinException { ApiResult result = massApi.previewMassNews( "oyFLst1bqtuTcxK-ojF8hOGtLQao", null, new Text("test")); - Assert.assertEquals(0, result.getReturnCode()); + Assert.assertEquals("0", result.getReturnCode()); } @Test diff --git a/weixin4j-mp/src/test/java/com/foxinmy/weixin4j/mp/test/MediaTest.java b/weixin4j-mp/src/test/java/com/foxinmy/weixin4j/mp/test/MediaTest.java index 84ac458b..1552d40e 100644 --- a/weixin4j-mp/src/test/java/com/foxinmy/weixin4j/mp/test/MediaTest.java +++ b/weixin4j-mp/src/test/java/com/foxinmy/weixin4j/mp/test/MediaTest.java @@ -12,7 +12,7 @@ import org.junit.Before; import org.junit.Test; import com.foxinmy.weixin4j.exception.WeixinException; -import com.foxinmy.weixin4j.http.message.ApiResult; +import com.foxinmy.weixin4j.http.weixin.ApiResult; import com.foxinmy.weixin4j.model.MediaCounter; import com.foxinmy.weixin4j.model.MediaDownloadResult; import com.foxinmy.weixin4j.model.MediaItem; diff --git a/weixin4j-mp/src/test/java/com/foxinmy/weixin4j/mp/test/MenuTest.java b/weixin4j-mp/src/test/java/com/foxinmy/weixin4j/mp/test/MenuTest.java index e00b92bd..b5cd9d3b 100644 --- a/weixin4j-mp/src/test/java/com/foxinmy/weixin4j/mp/test/MenuTest.java +++ b/weixin4j-mp/src/test/java/com/foxinmy/weixin4j/mp/test/MenuTest.java @@ -8,7 +8,7 @@ import org.junit.Before; import org.junit.Test; import com.foxinmy.weixin4j.exception.WeixinException; -import com.foxinmy.weixin4j.http.message.ApiResult; +import com.foxinmy.weixin4j.http.weixin.ApiResult; import com.foxinmy.weixin4j.model.Button; import com.foxinmy.weixin4j.mp.api.MenuApi; import com.foxinmy.weixin4j.mp.model.Menu; @@ -55,7 +55,7 @@ public class MenuTest extends TokenTest { buttons.add(button); ApiResult result = menuApi.createMenu(buttons); - Assert.assertEquals(0, result.getReturnCode()); + Assert.assertEquals("0", result.getReturnCode()); } @Test @@ -70,7 +70,7 @@ public class MenuTest extends TokenTest { Button b3 = new Button("最新资讯", "NEWS", ButtonType.click); buttons.add(b3); ApiResult result = menuApi.createMenu(buttons); - Assert.assertEquals(0, result.getReturnCode()); + Assert.assertEquals("0", result.getReturnCode()); } @Test @@ -93,7 +93,7 @@ public class MenuTest extends TokenTest { @Test public void delete() throws WeixinException { ApiResult result = menuApi.deleteMenu(); - Assert.assertEquals(0, result.getReturnCode()); + Assert.assertEquals("0", result.getReturnCode()); } @Test diff --git a/weixin4j-mp/src/test/java/com/foxinmy/weixin4j/mp/test/NotifyTest.java b/weixin4j-mp/src/test/java/com/foxinmy/weixin4j/mp/test/NotifyTest.java index cb1696a7..b2d1a621 100644 --- a/weixin4j-mp/src/test/java/com/foxinmy/weixin4j/mp/test/NotifyTest.java +++ b/weixin4j-mp/src/test/java/com/foxinmy/weixin4j/mp/test/NotifyTest.java @@ -9,7 +9,7 @@ import org.junit.Before; import org.junit.Test; import com.foxinmy.weixin4j.exception.WeixinException; -import com.foxinmy.weixin4j.http.message.ApiResult; +import com.foxinmy.weixin4j.http.weixin.ApiResult; import com.foxinmy.weixin4j.model.MediaUploadResult; import com.foxinmy.weixin4j.mp.api.MediaApi; import com.foxinmy.weixin4j.mp.api.NotifyApi; @@ -88,7 +88,7 @@ public class NotifyTest extends TokenTest { "owGBft_vbBbOaQOmpEUE4xDLeRSU", new Text( "this is a notify message!")); ApiResult result = notifyApi.sendNotify(notify); - Assert.assertEquals(0, result.getReturnCode()); + Assert.assertEquals("0", result.getReturnCode()); } @Test diff --git a/weixin4j-mp/src/test/java/com/foxinmy/weixin4j/mp/test/TagTest.java b/weixin4j-mp/src/test/java/com/foxinmy/weixin4j/mp/test/TagTest.java index 0e7e72be..4b0bcbdf 100644 --- a/weixin4j-mp/src/test/java/com/foxinmy/weixin4j/mp/test/TagTest.java +++ b/weixin4j-mp/src/test/java/com/foxinmy/weixin4j/mp/test/TagTest.java @@ -7,7 +7,7 @@ import org.junit.Before; import org.junit.Test; import com.foxinmy.weixin4j.exception.WeixinException; -import com.foxinmy.weixin4j.http.message.ApiResult; +import com.foxinmy.weixin4j.http.weixin.ApiResult; import com.foxinmy.weixin4j.mp.api.TagApi; import com.foxinmy.weixin4j.mp.model.Tag; import com.foxinmy.weixin4j.mp.model.User; diff --git a/weixin4j-mp/src/test/java/com/foxinmy/weixin4j/mp/test/TemplateTest.java b/weixin4j-mp/src/test/java/com/foxinmy/weixin4j/mp/test/TemplateTest.java index 48b85d00..51c6743e 100644 --- a/weixin4j-mp/src/test/java/com/foxinmy/weixin4j/mp/test/TemplateTest.java +++ b/weixin4j-mp/src/test/java/com/foxinmy/weixin4j/mp/test/TemplateTest.java @@ -5,7 +5,7 @@ import org.junit.Before; import org.junit.Test; import com.foxinmy.weixin4j.exception.WeixinException; -import com.foxinmy.weixin4j.http.message.ApiResult; +import com.foxinmy.weixin4j.http.weixin.ApiResult; import com.foxinmy.weixin4j.mp.api.TmplApi; import com.foxinmy.weixin4j.mp.message.TemplateMessage; import com.foxinmy.weixin4j.mp.type.IndustryType; @@ -40,6 +40,6 @@ public class TemplateTest extends TokenTest { "template_id", "url"); tplMessage.pushHead("head").pushTail("tail").pushItem("key1", "text1"); ApiResult result = tmplApi.sendTmplMessage(tplMessage); - Assert.assertEquals(0, result.getReturnCode()); + Assert.assertEquals("0", result.getReturnCode()); } } diff --git a/weixin4j-mp/src/test/java/com/foxinmy/weixin4j/mp/test/UserTest.java b/weixin4j-mp/src/test/java/com/foxinmy/weixin4j/mp/test/UserTest.java index 009a35d8..123a06fe 100644 --- a/weixin4j-mp/src/test/java/com/foxinmy/weixin4j/mp/test/UserTest.java +++ b/weixin4j-mp/src/test/java/com/foxinmy/weixin4j/mp/test/UserTest.java @@ -7,7 +7,7 @@ import org.junit.Before; import org.junit.Test; import com.foxinmy.weixin4j.exception.WeixinException; -import com.foxinmy.weixin4j.http.message.ApiResult; +import com.foxinmy.weixin4j.http.weixin.ApiResult; import com.foxinmy.weixin4j.mp.api.UserApi; import com.foxinmy.weixin4j.mp.model.User; @@ -48,6 +48,6 @@ public class UserTest extends TokenTest { public void remark() throws WeixinException { ApiResult result = userApi.remarkUserName( "owGBft_vbBbOaQOmpEUE4xDLeRSU", "foo"); - Assert.assertEquals(0, result.getReturnCode()); + Assert.assertEquals("0", result.getReturnCode()); } }