diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/video/VideoController.java b/mallinkAdmin/src/main/java/com/iformall/controller/video/VideoController.java index f0b8b115a..72a284c40 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/video/VideoController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/video/VideoController.java @@ -84,6 +84,7 @@ public class VideoController extends BaseController { @ApiOperation("上传视频") public ResultData upload(@RequestParam("file") MultipartFile multiReq,@RequestParam Map param) { try { + long size = multiReq.getSize(); String title = param.get("title"); int dot = multiReq.getOriginalFilename().lastIndexOf('.'); String fileFormat = ""; @@ -97,6 +98,7 @@ public class VideoController extends BaseController { return new ResultData(ErrorCode.PICTURE_ENDWIDTH_ERROR); } VideUploadResult result = videoFactory.getExcutor(videoType).uploadVideoStream(title, multiReq.getInputStream(),fileFormat); + result.setSize(String.valueOf(size)); return new ResultData(result); } catch (Exception e) { logger.error(e.getMessage()); diff --git a/mallinkVideo/src/main/java/com/iformall/video/aliyun/sdk/server/AliyunVedioServer.java b/mallinkVideo/src/main/java/com/iformall/video/aliyun/sdk/server/AliyunVedioServer.java index 337dd54ca..55a7bacab 100644 --- a/mallinkVideo/src/main/java/com/iformall/video/aliyun/sdk/server/AliyunVedioServer.java +++ b/mallinkVideo/src/main/java/com/iformall/video/aliyun/sdk/server/AliyunVedioServer.java @@ -73,6 +73,9 @@ public class AliyunVedioServer { return client.getAcsResponse(request); } + private static String toLanEndpoint(String bucket) { + return bucket.replace(".aliyuncs.com", "-internal.aliyuncs.com"); + } private static OssUploadClient initOssClient(CreateUploadVideoResponse response) throws UnsupportedEncodingException { final Base64.Decoder decoder = Base64.getDecoder(); String uploadAddressStr = new String(decoder.decode(response.getUploadAddress().getBytes("UTF-8"))); @@ -85,8 +88,8 @@ public class AliyunVedioServer { String accessKeyId = uploadAuth.getString("AccessKeyId"); String accessKeySecret = uploadAuth.getString("AccessKeySecret"); String securityToken = uploadAuth.getString("SecurityToken"); - OSS client = new OSSClientBuilder().build(endpoint, accessKeyId, accessKeySecret,securityToken); - return new OssUploadClient(bucket, endpoint, fileName, client); + OSS client = new OSSClientBuilder().build(toLanEndpoint(endpoint), accessKeyId, accessKeySecret,securityToken); + return new OssUploadClient(bucket, toLanEndpoint(endpoint), fileName, client); } private static OssUploadClient initOssClient(RefreshUploadVideoResponse response) throws UnsupportedEncodingException { @@ -101,8 +104,8 @@ public class AliyunVedioServer { String accessKeyId = uploadAuth.getString("AccessKeyId"); String accessKeySecret = uploadAuth.getString("AccessKeySecret"); String securityToken = uploadAuth.getString("SecurityToken"); - OSS client = new OSSClientBuilder().build(endpoint, accessKeyId, accessKeySecret,securityToken); - return new OssUploadClient(bucket, endpoint, fileName, client); + OSS client = new OSSClientBuilder().build(toLanEndpoint(endpoint), accessKeyId, accessKeySecret,securityToken); + return new OssUploadClient(bucket, toLanEndpoint(endpoint), fileName, client); } public static void uploadVideo(AliyunVideoConfig config,CreateUploadVideoResponse response,String localFile,RedisTemplate redisTemplate) throws UnsupportedEncodingException { diff --git a/mallinkVideo/src/main/java/com/iformall/video/entity/VideUploadResult.java b/mallinkVideo/src/main/java/com/iformall/video/entity/VideUploadResult.java index 70ae1d469..b5ba17004 100644 --- a/mallinkVideo/src/main/java/com/iformall/video/entity/VideUploadResult.java +++ b/mallinkVideo/src/main/java/com/iformall/video/entity/VideUploadResult.java @@ -9,6 +9,7 @@ public class VideUploadResult { private String coverURL;//视频封面 private String duration;//视频时长 private String title;//视频标题 + private String size;//视频大小 private boolean success = false; private String msg; }