From 961c16af7709fa98d1062c801937d48671a04ed6 Mon Sep 17 00:00:00 2001 From: xhxu Date: Fri, 10 Feb 2023 15:28:16 +0800 Subject: [PATCH] //vodeo --- .../java/com/iformall/controller/video/VideoController.java | 6 +++--- .../src/main/java/com/iformall/common/ErrorCode.java | 2 +- .../src/main/java/com/iformall/sm/AiVideoHelper.java | 2 +- .../iformall/video/aliyun/sdk/server/AliyunVedioServer.java | 1 + 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/suimangAdmin/src/main/java/com/iformall/controller/video/VideoController.java b/suimangAdmin/src/main/java/com/iformall/controller/video/VideoController.java index 402dcda..0c6beff 100644 --- a/suimangAdmin/src/main/java/com/iformall/controller/video/VideoController.java +++ b/suimangAdmin/src/main/java/com/iformall/controller/video/VideoController.java @@ -94,9 +94,9 @@ public class VideoController extends BaseController { title = multiReq.getOriginalFilename().substring(0,dot); } } -// if(!fileFormat.endsWith("mp4") || !fileFormat.endsWith("mp3")){ -// return new ResultData(ErrorCode.PICTURE_ENDWIDTH_ERROR); -// } + if(!fileFormat.endsWith("mp4") && !fileFormat.endsWith("mp3")){ + return new ResultData(ErrorCode.PICTURE_ENDWIDTH_ERROR); + } VideUploadResult result = videoFactory.getExcutor(videoType).uploadVideoStream(title, multiReq.getInputStream(),fileFormat); result.setSize(size); return new ResultData(result); diff --git a/suimangService/src/main/java/com/iformall/common/ErrorCode.java b/suimangService/src/main/java/com/iformall/common/ErrorCode.java index 5430214..b776ee6 100644 --- a/suimangService/src/main/java/com/iformall/common/ErrorCode.java +++ b/suimangService/src/main/java/com/iformall/common/ErrorCode.java @@ -604,7 +604,7 @@ public enum ErrorCode{ PICTURE_ANALYZING_ERROR(40002, "您上传的图片无法解析,请检查"), PICTURE_SIZE_CUSTOMIZE(40003, "图片超过大小限制"), PICTURE_W_H_CUSTOMIZE(40004, "图片不符合宽高限制"), - PICTURE_ENDWIDTH_ERROR(40005, "格式不正确"), + PICTURE_ENDWIDTH_ERROR(40005, "格式只支持.mp3,.mp4"), /** * 电费生成配置 diff --git a/suimangService/src/main/java/com/iformall/sm/AiVideoHelper.java b/suimangService/src/main/java/com/iformall/sm/AiVideoHelper.java index 8df4810..2da2c93 100644 --- a/suimangService/src/main/java/com/iformall/sm/AiVideoHelper.java +++ b/suimangService/src/main/java/com/iformall/sm/AiVideoHelper.java @@ -40,7 +40,7 @@ public class AiVideoHelper { params.put("gen_txt",gen_txt); String response = doPost(uri+"/gen_dh_video", params); - log.info("生成视频 request:"+params.toString()+" response:"+response); + log.info("生成视频 request:" + JSONObject.toJSONString(params) + " response:"+response); AiVideoResult result = new AiVideoResult(); diff --git a/suimangVideo/src/main/java/com/iformall/video/aliyun/sdk/server/AliyunVedioServer.java b/suimangVideo/src/main/java/com/iformall/video/aliyun/sdk/server/AliyunVedioServer.java index e9bd9e1..14f4a91 100644 --- a/suimangVideo/src/main/java/com/iformall/video/aliyun/sdk/server/AliyunVedioServer.java +++ b/suimangVideo/src/main/java/com/iformall/video/aliyun/sdk/server/AliyunVedioServer.java @@ -80,6 +80,7 @@ public class AliyunVedioServer { } private static String toLanEndpoint(String bucket) { +// return bucket; return bucket.replace(".aliyuncs.com", "-internal.aliyuncs.com"); } private static OssUploadClient initOssClient(CreateUploadVideoResponse response) throws UnsupportedEncodingException {