多媒体素材管理

chanjarster · chanjarster · commit e7922a9df094 · 2014-10-21T19:17:48.000+08:00
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
@@ -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
@@ -137,12 +137,12 @@ public WxMediaUploadResult mediaUpload(String mediaType, String fileType, InputS
   }
 
   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/WxCpMediaAPITest.java b/weixin-java-enterprise/src/test/java/me/chanjar/weixin/enterprise/api/WxCpMediaAPITest.java
@@ -20,9 +20,10 @@
  * @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 Object[][] uploadMedia() {
         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
@@ -7,7 +7,7 @@
 			<class name="me.chanjar.weixin.enterprise.api.WxCpMessageAPITest" />
 			<class name="me.chanjar.weixin.enterprise.api.WxCpMenuAPITest" />
 			<class name="me.chanjar.weixin.enterprise.api.WxGroupAPITest" />
-			<class name="me.chanjar.weixin.enterprise.api.WxMediaAPITest" />
+			<class name="me.chanjar.weixin.enterprise.api.WxCpMediaAPITest" />
 			<class name="me.chanjar.weixin.enterprise.api.WxCpMessageRouterTest" />
 		</classes>
 	</test>

Original file line number	Diff line number	Diff line change
`@@ -137,12 +137,12 @@ public WxMediaUploadResult mediaUpload(String mediaType, String fileType, InputS`
`137`	`137`	`}`
`138`	`138`
`139`	`139`	`public WxMediaUploadResult mediaUpload(String mediaType, File file) throws WxErrorException {`
`140`		`- String url = "http://file.api.weixin.qq.com/cgi-bin/media/upload?type=" + mediaType;`
	`140`	`+ String url = "https://qyapi.weixin.qq.com/cgi-bin/media/upload?type=" + mediaType;`
`141`	`141`	`return execute(new MediaUploadRequestExecutor(), url, file);`
`142`	`142`	`}`
`143`	`143`
`144`	`144`	`public File mediaDownload(String media_id) throws WxErrorException {`
`145`		`- String url = "http://file.api.weixin.qq.com/cgi-bin/media/get";`
	`145`	`+ String url = "https://qyapi.weixin.qq.com/cgi-bin/media/get";`
`146`	`146`	`return execute(new MediaDownloadRequestExecutor(), url, "media_id=" + media_id);`
`147`	`147`	`}`
`148`	`148`