diff --git a/src/main/java/com/tuoheng/steam/controller/StreamRecordController.java b/src/main/java/com/tuoheng/steam/controller/StreamRecordController.java index 2f12947..ca19618 100644 --- a/src/main/java/com/tuoheng/steam/controller/StreamRecordController.java +++ b/src/main/java/com/tuoheng/steam/controller/StreamRecordController.java @@ -34,6 +34,9 @@ public class StreamRecordController { @Autowired IRecordService iRecordService; + + + @GetMapping("start") public Response startRecording(@RequestParam String streamUrl) { System.out.println("启动录制 :"+streamUrl); diff --git a/src/main/java/com/tuoheng/steam/controller/TestController.java b/src/main/java/com/tuoheng/steam/controller/TestController.java new file mode 100644 index 0000000..0f902b7 --- /dev/null +++ b/src/main/java/com/tuoheng/steam/controller/TestController.java @@ -0,0 +1,11 @@ +package com.tuoheng.steam.controller; + +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController() +@RequestMapping("/test") +public class TestController { + + +} diff --git a/src/main/java/com/tuoheng/steam/schedule/Scheduler.java b/src/main/java/com/tuoheng/steam/schedule/Scheduler.java index a0351af..942a521 100644 --- a/src/main/java/com/tuoheng/steam/schedule/Scheduler.java +++ b/src/main/java/com/tuoheng/steam/schedule/Scheduler.java @@ -72,9 +72,14 @@ public class Scheduler { public void mergeTask() throws Exception { // File file = new File("/Users/sunpeng/workspace/text.txt"); // InputStream inputStream = new FileInputStream(file); -// uploadFile2OSS(inputStream,"text.txt",file.length()); - - getCredentials(); +// try { +// uploadFile2OSS(inputStream,"text.txt",file.length()); +// }catch (Exception e) { +// logger.error(e.getMessage()); +// } +// +// +// getCredentials(); } @@ -143,14 +148,19 @@ public class Scheduler { String contentType = getContentType(fileName.substring(fileName.lastIndexOf("."))); // 获取文件类型 - minioClient.putObject( - PutObjectArgs.builder() - .bucket(bucketName) // 存储桶名称 - .object(filedir + "/" + fileName) // 对象名称(路径) - .stream(inputStream, streamSize, -1) // 输入流、文件大小(-1 表示未知大小) - .contentType(contentType) // 文件类型 - .build() - ); + try { + minioClient.putObject( + PutObjectArgs.builder() + .bucket(bucketName) // 存储桶名称 + .object(filedir + "/" + fileName) // 对象名称(路径) + .stream(inputStream, streamSize, -1) // 输入流、文件大小(-1 表示未知大小) + .contentType(contentType) // 文件类型 + .build() + ); + }catch (Exception e) { + logger.error(e.getMessage()); + } + }