diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml index 46b7292..7c72ef4 100644 --- a/.gitea/workflows/deploy.yml +++ b/.gitea/workflows/deploy.yml @@ -65,6 +65,8 @@ jobs: -e SPRING_DATA_MONGODB_URI=mongodb://jambotron_admin:jambo_mongo_secret@jambo-mongo:27017/jambotron?authSource=admin \ -l "caddy=$CADDY_LABELS" \ -l "caddy.reverse_proxy={{upstreams 8081}}" \ + -l "caddy.reverse_proxy.header_up.Upgrade={{.RawHeader \"Upgrade\"}}" \ + -l "caddy.reverse_proxy.header_up.Connection={{.RawHeader \"Connection\"}}" \ jambotron-app:$D_TAG echo "Созидание $D_NAME успешно завершено. Система активна и доступна по сети." diff --git a/src/main/java/com/jambotronGroup/jambotron/WebSocket/WebSocketConfig.java b/src/main/java/com/jambotronGroup/jambotron/WebSocket/WebSocketConfig.java index 9644f5f..d68a777 100644 --- a/src/main/java/com/jambotronGroup/jambotron/WebSocket/WebSocketConfig.java +++ b/src/main/java/com/jambotronGroup/jambotron/WebSocket/WebSocketConfig.java @@ -20,6 +20,7 @@ public class WebSocketConfig implements WebSocketConfigurer { registry.addHandler(dockerLogsHandler, "/api/ws-jambotron/{projectId}") // Поскольку есть proxy.conf.json, запросы приходят как Same-Origin. // Но для стабильности разработки лучше явно указать localhost. + .setAllowedOriginPatterns("https://*.jambotron.com", "https://jambotron.com") .setAllowedOrigins("http://localhost:8082", "http://localhost:4200"); } } \ No newline at end of file