From e7922a9df094c0fca40977bab2a638f9854283dc Mon Sep 17 00:00:00 2001 From: Daniel Qian Date: Tue, 21 Oct 2014 19:17:48 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=9A=E5=AA=92=E4=BD=93=E7=B4=A0=E6=9D=90?= =?UTF-8?q?=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/me/chanjar/weixin/enterprise/api/WxCpConsts.java | 2 +- .../me/chanjar/weixin/enterprise/api/WxCpServiceImpl.java | 4 ++-- .../api/{WxMediaAPITest.java => WxCpMediaAPITest.java} | 7 ++++--- weixin-java-enterprise/src/test/resources/testng.xml | 2 +- 4 files changed, 8 insertions(+), 7 deletions(-) rename weixin-java-enterprise/src/test/java/me/chanjar/weixin/enterprise/api/{WxMediaAPITest.java => WxCpMediaAPITest.java} (92%) diff --git a/weixin-java-enterprise/src/main/java/me/chanjar/weixin/enterprise/api/WxCpConsts.java b/weixin-java-enterprise/src/main/java/me/chanjar/weixin/enterprise/api/WxCpConsts.java index 3c8e0dc1..0938e2de 100644 --- a/weixin-java-enterprise/src/main/java/me/chanjar/weixin/enterprise/api/WxCpConsts.java +++ b/weixin-java-enterprise/src/main/java/me/chanjar/weixin/enterprise/api/WxCpConsts.java @@ -50,7 +50,7 @@ public class WxCpConsts { public static final String MEDIA_IMAGE = "image"; public static final String MEDIA_VOICE = "voice"; public static final String MEDIA_VIDEO = "video"; - public static final String MEDIA_THUMB = "thumb"; + public static final String MEDIA_FILE = "file"; /////////////////////// // 文件类型 diff --git a/weixin-java-enterprise/src/main/java/me/chanjar/weixin/enterprise/api/WxCpServiceImpl.java b/weixin-java-enterprise/src/main/java/me/chanjar/weixin/enterprise/api/WxCpServiceImpl.java index fec2715a..bd0b45e4 100644 --- a/weixin-java-enterprise/src/main/java/me/chanjar/weixin/enterprise/api/WxCpServiceImpl.java +++ b/weixin-java-enterprise/src/main/java/me/chanjar/weixin/enterprise/api/WxCpServiceImpl.java @@ -137,12 +137,12 @@ public class WxCpServiceImpl implements WxCpService { } public WxMediaUploadResult mediaUpload(String mediaType, File file) throws WxErrorException { - String url = "http://file.api.weixin.qq.com/cgi-bin/media/upload?type=" + mediaType; + String url = "https://qyapi.weixin.qq.com/cgi-bin/media/upload?type=" + mediaType; return execute(new MediaUploadRequestExecutor(), url, file); } public File mediaDownload(String media_id) throws WxErrorException { - String url = "http://file.api.weixin.qq.com/cgi-bin/media/get"; + String url = "https://qyapi.weixin.qq.com/cgi-bin/media/get"; return execute(new MediaDownloadRequestExecutor(), url, "media_id=" + media_id); } diff --git a/weixin-java-enterprise/src/test/java/me/chanjar/weixin/enterprise/api/WxMediaAPITest.java b/weixin-java-enterprise/src/test/java/me/chanjar/weixin/enterprise/api/WxCpMediaAPITest.java similarity index 92% rename from weixin-java-enterprise/src/test/java/me/chanjar/weixin/enterprise/api/WxMediaAPITest.java rename to weixin-java-enterprise/src/test/java/me/chanjar/weixin/enterprise/api/WxCpMediaAPITest.java index 0995fd66..26e16210 100644 --- a/weixin-java-enterprise/src/test/java/me/chanjar/weixin/enterprise/api/WxMediaAPITest.java +++ b/weixin-java-enterprise/src/test/java/me/chanjar/weixin/enterprise/api/WxCpMediaAPITest.java @@ -20,9 +20,10 @@ import com.google.inject.Inject; * @author Daniel Qian * */ -@Test(groups="mediaAPI", dependsOnGroups="baseAPI") +//@Test(groups="mediaAPI", dependsOnGroups="baseAPI") +@Test @Guice(modules = ApiTestModule.class) -public class WxMediaAPITest { +public class WxCpMediaAPITest { @Inject protected WxCpServiceImpl wxService; @@ -51,7 +52,7 @@ public class WxMediaAPITest { new Object[] { WxCpConsts.MEDIA_IMAGE, WxCpConsts.FILE_JPG, "mm.jpeg" }, new Object[] { WxCpConsts.MEDIA_VOICE, WxCpConsts.FILE_MP3, "mm.mp3" }, new Object[] { WxCpConsts.MEDIA_VIDEO, WxCpConsts.FILE_MP4, "mm.mp4" }, - new Object[] { WxCpConsts.MEDIA_THUMB, WxCpConsts.FILE_JPG, "mm.jpeg" } + new Object[] { WxCpConsts.MEDIA_FILE, WxCpConsts.FILE_JPG, "mm.jpeg" } }; } diff --git a/weixin-java-enterprise/src/test/resources/testng.xml b/weixin-java-enterprise/src/test/resources/testng.xml index cae049fe..894de90b 100644 --- a/weixin-java-enterprise/src/test/resources/testng.xml +++ b/weixin-java-enterprise/src/test/resources/testng.xml @@ -7,7 +7,7 @@ - +