xx

src/main/java/com/tuoheng/steam/controller/StreamRecordController.java

@@ -34,6 +34,9 @@ public class StreamRecordController {
     @Autowired
     IRecordService iRecordService;
 
+
+
+
     @GetMapping("start")
     public Response<StreamTask> startRecording(@RequestParam String streamUrl) {
         System.out.println("启动录制 :"+streamUrl);

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 {
+
+
+}

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);
+//        try {
 //            uploadFile2OSS(inputStream,"text.txt",file.length());
-
-        getCredentials();
+//        }catch (Exception e) {
+//            logger.error(e.getMessage());
+//        }
+//
+//
+//        getCredentials();
     }
 
 
@@ -143,6 +148,7 @@ public class Scheduler {
 
         String contentType = getContentType(fileName.substring(fileName.lastIndexOf("."))); // 获取文件类型
 
+        try {
             minioClient.putObject(
                     PutObjectArgs.builder()
                             .bucket(bucketName) // 存储桶名称
@@ -151,6 +157,10 @@ public class Scheduler {
                             .contentType(contentType) // 文件类型
                             .build()
             );
+        }catch (Exception e) {
+            logger.error(e.getMessage());
+        }
+
     }