Skip to content

Commit 780c24b

Browse files
CopilotCopilot
authored
🆕 #3871 【微信支付】增加视频上传接口
1 parent dec6792 commit 780c24b

5 files changed

Lines changed: 150 additions & 4 deletions

File tree

‎weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/media/VideoUploadResult.java‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
package com.github.binarywang.wxpay.bean.media;
2+
3+
import com.google.gson.annotations.SerializedName;
4+
import lombok.Data;
5+
import lombok.NoArgsConstructor;
6+
import me.chanjar.weixin.common.util.json.WxGsonBuilder;
7+
8+
/**
9+
* 视频文件上传返回结果对象
10+
*
11+
* @author copilot
12+
*/
13+
@NoArgsConstructor
14+
@Data
15+
public class VideoUploadResult {
16+
17+
public static VideoUploadResult fromJson(String json) {
18+
return WxGsonBuilder.create().fromJson(json, VideoUploadResult.class);
19+
}
20+
21+
/**
22+
* 媒体文件标识 Id
23+
* <p>
24+
* 微信返回的媒体文件标识Id。
25+
* 示例值：6uqyGjGrCf2GtyXP8bxrbuH9-aAoTjH-rKeSl3Lf4_So6kdkQu4w8BYVP3bzLtvR38lxt4PjtCDXsQpzqge_hQEovHzOhsLleGFQVRF-U_0
26+
*/
27+
@SerializedName("media_id")
28+
private String mediaId;
29+
}

‎weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/MerchantMediaService.java‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.github.binarywang.wxpay.service;
22

33
import com.github.binarywang.wxpay.bean.media.ImageUploadResult;
4+
import com.github.binarywang.wxpay.bean.media.VideoUploadResult;
45
import com.github.binarywang.wxpay.exception.WxPayException;
56

67
import java.io.File;
@@ -42,5 +43,34 @@ public interface MerchantMediaService {
4243
*/
4344
ImageUploadResult imageUploadV3(InputStream inputStream, String fileName) throws WxPayException, IOException;
4445

46+
/**
47+
* <pre>
48+
* 通用接口-视频上传API
49+
* 文档详见: https://pay.weixin.qq.com/wiki/doc/apiv3/wxpay/tool/chapter3_2.shtml
50+
* 接口链接：https://api.mch.weixin.qq.com/v3/merchant/media/video_upload
51+
* </pre>
52+
*
53+
* @param videoFile 需要上传的视频文件
54+
* @return VideoUploadResult 微信返回的媒体文件标识Id。示例值：6uqyGjGrCf2GtyXP8bxrbuH9-aAoTjH-rKeSl3Lf4_So6kdkQu4w8BYVP3bzLtvR38lxt4PjtCDXsQpzqge_hQEovHzOhsLleGFQVRF-U_0
55+
* @throws WxPayException the wx pay exception
56+
* @throws IOException the io exception
57+
*/
58+
VideoUploadResult videoUploadV3(File videoFile) throws WxPayException, IOException;
59+
60+
/**
61+
* <pre>
62+
* 通用接口-视频上传API
63+
* 文档详见: https://pay.weixin.qq.com/wiki/doc/apiv3/wxpay/tool/chapter3_2.shtml
64+
* 接口链接：https://api.mch.weixin.qq.com/v3/merchant/media/video_upload
65+
* 注意：此方法会将整个视频流读入内存计算SHA256后再上传，大文件可能导致OOM，建议大文件使用File方式上传
66+
* </pre>
67+
*
68+
* @param inputStream 需要上传的视频文件流
69+
* @param fileName 需要上传的视频文件名
70+
* @return VideoUploadResult 微信返回的媒体文件标识Id。示例值：6uqyGjGrCf2GtyXP8bxrbuH9-aAoTjH-rKeSl3Lf4_So6kdkQu4w8BYVP3bzLtvR38lxt4PjtCDXsQpzqge_hQEovHzOhsLleGFQVRF-U_0
71+
* @throws WxPayException the wx pay exception
72+
* @throws IOException the io exception
73+
*/
74+
VideoUploadResult videoUploadV3(InputStream inputStream, String fileName) throws WxPayException, IOException;
4575

4676
}

‎weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/MerchantMediaServiceImpl.java‎

Lines changed: 38 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.github.binarywang.wxpay.service.impl;
22

33
import com.github.binarywang.wxpay.bean.media.ImageUploadResult;
4+
import com.github.binarywang.wxpay.bean.media.VideoUploadResult;
45
import com.github.binarywang.wxpay.exception.WxPayException;
56
import com.github.binarywang.wxpay.service.MerchantMediaService;
67
import com.github.binarywang.wxpay.service.WxPayService;
@@ -40,7 +41,7 @@ public ImageUploadResult imageUploadV3(File imageFile) throws WxPayException,IOE
4041
@Override
4142
public ImageUploadResult imageUploadV3(InputStream inputStream, String fileName) throws WxPayException, IOException {
4243
String url = String.format("%s/v3/merchant/media/upload", this.payService.getPayBaseUrl());
43-
try(ByteArrayOutputStream bos = new ByteArrayOutputStream()) {
44+
try (ByteArrayOutputStream bos = new ByteArrayOutputStream()) {
4445
byte[] buffer = new byte[2048];
4546
int len;
4647
while ((len = inputStream.read(buffer)) > -1) {
@@ -57,4 +58,40 @@ public ImageUploadResult imageUploadV3(InputStream inputStream, String fileName)
5758
}
5859
}
5960

61+
@Override
62+
public VideoUploadResult videoUploadV3(File videoFile) throws WxPayException, IOException {
63+
String url = String.format("%s/v3/merchant/media/video_upload", this.payService.getPayBaseUrl());
64+
65+
try (FileInputStream s1 = new FileInputStream(videoFile)) {
66+
String sha256 = DigestUtils.sha256Hex(s1);
67+
try (InputStream s2 = new FileInputStream(videoFile)) {
68+
WechatPayUploadHttpPost request = new WechatPayUploadHttpPost.Builder(URI.create(url))
69+
.withVideo(videoFile.getName(), sha256, s2)
70+
.build();
71+
String result = this.payService.postV3(url, request);
72+
return VideoUploadResult.fromJson(result);
73+
}
74+
}
75+
}
76+
77+
@Override
78+
public VideoUploadResult videoUploadV3(InputStream inputStream, String fileName) throws WxPayException, IOException {
79+
String url = String.format("%s/v3/merchant/media/video_upload", this.payService.getPayBaseUrl());
80+
try (ByteArrayOutputStream bos = new ByteArrayOutputStream()) {
81+
byte[] buffer = new byte[2048];
82+
int len;
83+
while ((len = inputStream.read(buffer)) > -1) {
84+
bos.write(buffer, 0, len);
85+
}
86+
bos.flush();
87+
byte[] data = bos.toByteArray();
88+
String sha256 = DigestUtils.sha256Hex(data);
89+
WechatPayUploadHttpPost request = new WechatPayUploadHttpPost.Builder(URI.create(url))
90+
.withVideo(fileName, sha256, new ByteArrayInputStream(data))
91+
.build();
92+
String result = this.payService.postV3(url, request);
93+
return VideoUploadResult.fromJson(result);
94+
}
95+
}
96+
6097
}

‎weixin-java-pay/src/main/java/com/github/binarywang/wxpay/v3/WechatPayUploadHttpPost.java‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public Builder(URI uri) {
3535
this.uri = uri;
3636
}
3737

38-
public Builder withImage(String fileName, String fileSha256, InputStream inputStream) {
38+
private Builder withMedia(String fileName, String fileSha256, InputStream inputStream) {
3939
this.fileName = fileName;
4040
this.fileSha256 = fileSha256;
4141
this.fileInputStream = inputStream;
@@ -50,13 +50,21 @@ public Builder withImage(String fileName, String fileSha256, InputStream inputSt
5050
return this;
5151
}
5252

53+
public Builder withImage(String fileName, String fileSha256, InputStream inputStream) {
54+
return withMedia(fileName, fileSha256, inputStream);
55+
}
56+
57+
public Builder withVideo(String fileName, String fileSha256, InputStream inputStream) {
58+
return withMedia(fileName, fileSha256, inputStream);
59+
}
60+
5361
public WechatPayUploadHttpPost build() {
5462
if (fileName == null || fileSha256 == null || fileInputStream == null) {
55-
throw new IllegalArgumentException("缺少待上传图片文件信息");
63+
throw new IllegalArgumentException("缺少待上传文件信息");
5664
}
5765

5866
if (uri == null) {
59-
throw new IllegalArgumentException("缺少上传图片接口URL");
67+
throw new IllegalArgumentException("缺少上传文件接口URL");
6068
}
6169

6270
String meta = String.format("{\"filename\":\"%s\",\"sha256\":\"%s\"}", fileName, fileSha256);

‎weixin-java-pay/src/test/java/com/github/binarywang/wxpay/service/impl/MerchantMediaServiceImplTest.java‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.github.binarywang.wxpay.service.impl;
22

33
import com.github.binarywang.wxpay.bean.media.ImageUploadResult;
4+
import com.github.binarywang.wxpay.bean.media.VideoUploadResult;
45
import com.github.binarywang.wxpay.exception.WxPayException;
56
import com.github.binarywang.wxpay.service.MerchantMediaService;
67
import com.github.binarywang.wxpay.service.WxPayService;
@@ -51,4 +52,45 @@ public void testImageUploadV3() throws WxPayException, IOException {
5152
log.info("mediaId2：[{}]",mediaId2);
5253

5354
}
55+
56+
@Test
57+
public void testVideoUploadV3() throws WxPayException, IOException {
58+
59+
MerchantMediaService merchantMediaService = new MerchantMediaServiceImpl(wxPayService);
60+
61+
String filePath = "你的视频文件的路径地址";
62+
// String filePath = "WxJava/test-video.mp4";
63+
64+
File file = new File(filePath);
65+
66+
VideoUploadResult videoUploadResult = merchantMediaService.videoUploadV3(file);
67+
String mediaId = videoUploadResult.getMediaId();
68+
69+
log.info("视频上传成功，mediaId：[{}]", mediaId);
70+
71+
VideoUploadResult videoUploadResult2 = merchantMediaService.videoUploadV3(file);
72+
String mediaId2 = videoUploadResult2.getMediaId();
73+
74+
log.info("视频上传成功2，mediaId2：[{}]", mediaId2);
75+
76+
}
77+
78+
@Test
79+
public void testVideoUploadV3WithInputStream() throws WxPayException, IOException {
80+
81+
MerchantMediaService merchantMediaService = new MerchantMediaServiceImpl(wxPayService);
82+
83+
String filePath = "你的视频文件的路径地址";
84+
// String filePath = "WxJava/test-video.mp4";
85+
86+
File file = new File(filePath);
87+
88+
try (java.io.FileInputStream inputStream = new java.io.FileInputStream(file)) {
89+
VideoUploadResult videoUploadResult = merchantMediaService.videoUploadV3(inputStream, file.getName());
90+
String mediaId = videoUploadResult.getMediaId();
91+
92+
log.info("通过InputStream上传视频成功，mediaId：[{}]", mediaId);
93+
}
94+
95+
}
5496
}

0 commit comments

Comments
 (0)