paradizelost/paperless-ngx
1
0
Fork 0
mirror of https://github.com/paperless-ngx/paperless-ngx.git synced 2025-04-09 09:58:20 -05:00
Code Issues Packages Projects Releases Wiki Activity

use baseURI for websocket and api calls

Browse Source
This commit is contained in:
puuu 2021-05-11 17:28:06 +09:00
parent 6b6862705e
commit 5bf725546b
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src-ui/src/app/services/consumer-status.service.ts
View File

@ -125,7 +125,7 @@ export class ConsumerStatusService {
connect() { connect() {
this.disconnect() this.disconnect()
this.statusWebSocket = new WebSocket(`${environment.webSocketProtocol}//${environment.webSocketHost}/ws/status/`); this.statusWebSocket = new WebSocket(`${environment.webSocketProtocol}//${environment.webSocketHost}${environment.webSocketBaseUrl}status/`);
this.statusWebSocket.onmessage = (ev) => { this.statusWebSocket.onmessage = (ev) => {
let statusMessage: WebsocketConsumerStatusMessage = JSON.parse(ev['data']) let statusMessage: WebsocketConsumerStatusMessage = JSON.parse(ev['data'])

7
src-ui/src/environments/environment.prod.ts
View File

@ -1,9 +1,12 @@
const base_url = new URL(document.baseURI)
export const environment = { export const environment = {
production: true, production: true,
apiBaseUrl: "/api/", apiBaseUrl: document.baseURI + "api/",
apiVersion: "2", apiVersion: "2",
appTitle: "Paperless-ng", appTitle: "Paperless-ng",
version: "1.4.2", version: "1.4.2",
webSocketHost: window.location.host, webSocketHost: window.location.host,
webSocketProtocol: (window.location.protocol == "https:" ? "wss:" : "ws:") webSocketProtocol: (window.location.protocol == "https:" ? "wss:" : "ws:"),
webSocketBaseUrl: base_url.pathname + "ws/",
}; };

3
src-ui/src/environments/environment.ts
View File

@ -9,7 +9,8 @@ export const environment = {
appTitle: "Paperless-ng", appTitle: "Paperless-ng",
version: "DEVELOPMENT", version: "DEVELOPMENT",
webSocketHost: "localhost:8000", webSocketHost: "localhost:8000",
webSocketProtocol: "ws:" webSocketProtocol: "ws:",
webSocketBaseUrl: "/ws/",
}; };
/* /*