chore(prod): sync with main #4

Merged
dylan merged 67 commits from master into prod 2026-06-25 23:28:52 +01:00
4 changed files with 12 additions and 16 deletions
Showing only changes of commit 7d8a62d331 - Show all commits

View File

@@ -4,7 +4,7 @@ meta {
seq: 3 seq: 3
} }
get { post {
url: {{base_url}}/media/clip url: {{base_url}}/media/clip
body: json body: json
auth: inherit auth: inherit
@@ -12,6 +12,10 @@ get {
body:json { body:json {
{ {
"duration": 60 "duration": 60.0
} }
} }
script:post-response {
bru.setEnvVar("uuid", res.getBody().data.uuid);
}

View File

@@ -4,7 +4,7 @@ meta {
seq: 2 seq: 2
} }
get { post {
url: {{base_url}}/media/save url: {{base_url}}/media/save
body: json body: json
auth: inherit auth: inherit
@@ -16,3 +16,7 @@ body:json {
"endTime": "2026-06-21T17:28:00Z" "endTime": "2026-06-21T17:28:00Z"
} }
} }
script:post-response {
bru.setEnvVar("uuid", res.getBody().data.uuid);
}

View File

@@ -33,6 +33,7 @@ public class SecurityConfig {
.requestMatchers("/api/v1/media/**").authenticated() .requestMatchers("/api/v1/media/**").authenticated()
.requestMatchers("/api/v1/jobs/**").authenticated() .requestMatchers("/api/v1/jobs/**").authenticated()
.requestMatchers("/api/v1/users/me", "/api/v1/users/logout").authenticated() .requestMatchers("/api/v1/users/me", "/api/v1/users/logout").authenticated()
.requestMatchers("/api/v1/users/login").permitAll()
.requestMatchers("/api/v1/stream/start", "/api/v1/stream/stop", "/api/v1/stream/heartbeat").permitAll() .requestMatchers("/api/v1/stream/start", "/api/v1/stream/stop", "/api/v1/stream/heartbeat").permitAll()
.anyRequest().authenticated() .anyRequest().authenticated()
) )

View File

@@ -1,13 +0,0 @@
package com.ddf.vodsystem.dto;
import lombok.Data;
@Data
public class JobStatus {
private ProgressTracker process = new ProgressTracker();
private ProgressTracker conversion = new ProgressTracker();
private boolean failed = false;
private String failedReason;
}