Просмотр исходного кода

Merge branch 'release_real_202103' of https://git.malls.iformall.com/server/formallProject into release_real_202103

release_toaliyun_real
xhxu 5 лет назад
Родитель
Сommit
20a047e402
3 измененных файлов: 10 добавлений и 4 удалений
  1. +2
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/video/VideoController.java
  2. +7
    -4
      mallinkVideo/src/main/java/com/iformall/video/aliyun/sdk/server/AliyunVedioServer.java
  3. +1
    -0
      mallinkVideo/src/main/java/com/iformall/video/entity/VideUploadResult.java

+ 2
- 0
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<String, String> 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());


+ 7
- 4
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<String, Object> redisTemplate) throws UnsupportedEncodingException {


+ 1
- 0
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;
}

Загрузка…
Отмена
Сохранить