diff --git a/weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/WeixinProxy.java b/weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/WeixinProxy.java index 626c2560..89fb8fa8 100644 --- a/weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/WeixinProxy.java +++ b/weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/WeixinProxy.java @@ -4,7 +4,7 @@ import java.io.InputStream; 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-qy/src/main/java/com/foxinmy/weixin4j/qy/api/AgentApi.java b/weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/api/AgentApi.java index 2b089a06..e46e52a1 100644 --- a/weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/api/AgentApi.java +++ b/weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/api/AgentApi.java @@ -6,7 +6,7 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.serializer.ValueFilter; 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.qy.model.AgentInfo; diff --git a/weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/api/ChatApi.java b/weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/api/ChatApi.java index 193ec1c2..4c2ccb98 100644 --- a/weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/api/ChatApi.java +++ b/weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/api/ChatApi.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.qy.message.ChatMessage; diff --git a/weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/api/MediaApi.java b/weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/api/MediaApi.java index 45cfd130..9d08347f 100644 --- a/weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/api/MediaApi.java +++ b/weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/api/MediaApi.java @@ -26,8 +26,8 @@ import com.foxinmy.weixin4j.http.MimeType; import com.foxinmy.weixin4j.http.apache.ByteArrayBody; 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.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-qy/src/main/java/com/foxinmy/weixin4j/qy/api/MenuApi.java b/weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/api/MenuApi.java index 98fa5a08..c23e22e5 100644 --- a/weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/api/MenuApi.java +++ b/weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/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-qy/src/main/java/com/foxinmy/weixin4j/qy/api/NotifyApi.java b/weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/api/NotifyApi.java index 84644eed..d3701e6c 100644 --- a/weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/api/NotifyApi.java +++ b/weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/api/NotifyApi.java @@ -8,7 +8,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.qy.message.CustomeMessage; diff --git a/weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/api/PartyApi.java b/weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/api/PartyApi.java index c0ec0c19..e07af40f 100644 --- a/weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/api/PartyApi.java +++ b/weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/api/PartyApi.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.qy.model.Party; diff --git a/weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/api/SuiteApi.java b/weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/api/SuiteApi.java index fdbfba24..f3b2ae66 100644 --- a/weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/api/SuiteApi.java +++ b/weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/api/SuiteApi.java @@ -3,7 +3,7 @@ package com.foxinmy.weixin4j.qy.api; 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.qy.model.AgentInfo; diff --git a/weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/api/TagApi.java b/weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/api/TagApi.java index 1333315d..9b588c9e 100644 --- a/weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/api/TagApi.java +++ b/weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/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.model.Token; import com.foxinmy.weixin4j.qy.model.Contacts; diff --git a/weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/api/UserApi.java b/weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/api/UserApi.java index a488e41a..9f4940f2 100644 --- a/weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/api/UserApi.java +++ b/weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/api/UserApi.java @@ -8,7 +8,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.qy.model.OUserInfo; diff --git a/weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/model/BatchResult.java b/weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/model/BatchResult.java index f10f9627..f7739760 100644 --- a/weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/model/BatchResult.java +++ b/weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/model/BatchResult.java @@ -2,7 +2,7 @@ package com.foxinmy.weixin4j.qy.model; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.annotation.JSONField; -import com.foxinmy.weixin4j.http.message.ApiResult; +import com.foxinmy.weixin4j.http.weixin.ApiResult; import com.foxinmy.weixin4j.qy.type.BatchStatus; import com.foxinmy.weixin4j.qy.type.BatchType; diff --git a/weixin4j-qy/src/test/java/com/foxinmy/weixin4j/qy/test/AgentTest.java b/weixin4j-qy/src/test/java/com/foxinmy/weixin4j/qy/test/AgentTest.java index c644c677..25a12c0a 100644 --- a/weixin4j-qy/src/test/java/com/foxinmy/weixin4j/qy/test/AgentTest.java +++ b/weixin4j-qy/src/test/java/com/foxinmy/weixin4j/qy/test/AgentTest.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.qy.api.AgentApi; import com.foxinmy.weixin4j.qy.model.AgentInfo; import com.foxinmy.weixin4j.qy.model.AgentOverview; diff --git a/weixin4j-qy/src/test/java/com/foxinmy/weixin4j/qy/test/MenuTest.java b/weixin4j-qy/src/test/java/com/foxinmy/weixin4j/qy/test/MenuTest.java index f82a52aa..cbc24a92 100644 --- a/weixin4j-qy/src/test/java/com/foxinmy/weixin4j/qy/test/MenuTest.java +++ b/weixin4j-qy/src/test/java/com/foxinmy/weixin4j/qy/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.qy.api.MenuApi; import com.foxinmy.weixin4j.type.ButtonType; @@ -43,7 +43,7 @@ public class MenuTest extends TokenTest { b = new Button("photo", "photo", ButtonType.pic_photo_or_album); btnList.add(b); ApiResult result = menuApi.createMenu(1, btnList); - Assert.assertEquals(0, result.getReturnCode()); + Assert.assertEquals("0", result.getReturnCode()); } @Test @@ -58,6 +58,6 @@ public class MenuTest extends TokenTest { @Test public void delete() throws WeixinException { ApiResult result = menuApi.deleteMenu(1); - Assert.assertEquals(0, result.getReturnCode()); + Assert.assertEquals("0", result.getReturnCode()); } } diff --git a/weixin4j-qy/src/test/java/com/foxinmy/weixin4j/qy/test/PartyTest.java b/weixin4j-qy/src/test/java/com/foxinmy/weixin4j/qy/test/PartyTest.java index 0a3d329a..6bcd71b6 100644 --- a/weixin4j-qy/src/test/java/com/foxinmy/weixin4j/qy/test/PartyTest.java +++ b/weixin4j-qy/src/test/java/com/foxinmy/weixin4j/qy/test/PartyTest.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.qy.api.PartyApi; import com.foxinmy.weixin4j.qy.model.Party; diff --git a/weixin4j-qy/src/test/java/com/foxinmy/weixin4j/qy/test/TagTest.java b/weixin4j-qy/src/test/java/com/foxinmy/weixin4j/qy/test/TagTest.java index e26b2d31..3e8c84fb 100644 --- a/weixin4j-qy/src/test/java/com/foxinmy/weixin4j/qy/test/TagTest.java +++ b/weixin4j-qy/src/test/java/com/foxinmy/weixin4j/qy/test/TagTest.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.qy.api.TagApi; import com.foxinmy.weixin4j.qy.model.Contacts; import com.foxinmy.weixin4j.qy.model.IdParameter; diff --git a/weixin4j-qy/src/test/java/com/foxinmy/weixin4j/qy/test/UserTest.java b/weixin4j-qy/src/test/java/com/foxinmy/weixin4j/qy/test/UserTest.java index 091fa124..457b5625 100644 --- a/weixin4j-qy/src/test/java/com/foxinmy/weixin4j/qy/test/UserTest.java +++ b/weixin4j-qy/src/test/java/com/foxinmy/weixin4j/qy/test/UserTest.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.qy.api.MediaApi; import com.foxinmy.weixin4j.qy.api.UserApi; import com.foxinmy.weixin4j.qy.model.User;