From e091465e6002787a20ffd5de0c810ba5f1147ead Mon Sep 17 00:00:00 2001 From: test Date: Thu, 3 Jul 2025 13:13:44 +0500 Subject: [PATCH] https front --- FRONT/DEV/src/api/request.ts | 4 ++-- .../workSpace/modules/workModules/networkInterfaces.tsx | 2 +- .../src/components/workSpace/sideBar/toolSpace/devicesBar.tsx | 2 +- SRV/main.py | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/FRONT/DEV/src/api/request.ts b/FRONT/DEV/src/api/request.ts index 183a621..11f08de 100644 --- a/FRONT/DEV/src/api/request.ts +++ b/FRONT/DEV/src/api/request.ts @@ -1,13 +1,13 @@ import axios, { AxiosResponse } from "axios"; const axiosWithoutCredentials = axios.create({ - baseURL: `http://localhost:8001`, + baseURL: `https://localhost:8001`, }) export class NetworkService { static createAxiosInstance(ipAddress: string) { return axios.create({ - baseURL: `http://${ipAddress}:8001`, + baseURL: `https://${ipAddress}:8001`, }); } diff --git a/FRONT/DEV/src/components/workSpace/modules/workModules/networkInterfaces.tsx b/FRONT/DEV/src/components/workSpace/modules/workModules/networkInterfaces.tsx index d0325ef..1996ddd 100644 --- a/FRONT/DEV/src/components/workSpace/modules/workModules/networkInterfaces.tsx +++ b/FRONT/DEV/src/components/workSpace/modules/workModules/networkInterfaces.tsx @@ -76,7 +76,7 @@ export const NetworkInterfaces = ({ startConnection, ws }: Props) => { setHasInited(false) initializationAttempt.current = 0; - const newSocket = new WebSocket(`ws://${ws}:8001/api/v1`); + const newSocket = new WebSocket(`wss://${ws}:8001/api/v1`); let connectionTimeout; setSocket(newSocket); diff --git a/FRONT/DEV/src/components/workSpace/sideBar/toolSpace/devicesBar.tsx b/FRONT/DEV/src/components/workSpace/sideBar/toolSpace/devicesBar.tsx index dd5ca2b..8b919f4 100644 --- a/FRONT/DEV/src/components/workSpace/sideBar/toolSpace/devicesBar.tsx +++ b/FRONT/DEV/src/components/workSpace/sideBar/toolSpace/devicesBar.tsx @@ -115,7 +115,7 @@ export const DevicesBar = () => { const checkWebSocketAvailability = async (ip: string): Promise => { return new Promise((resolve) => { - const testSocket = new WebSocket(`ws://${ip}:8001/api/v1`); + const testSocket = new WebSocket(`wss://${ip}:8001/api/v1`); const timeout = setTimeout(() => { testSocket.close(); resolve(false); diff --git a/SRV/main.py b/SRV/main.py index 1f01b6b..3511099 100644 --- a/SRV/main.py +++ b/SRV/main.py @@ -18,5 +18,5 @@ app.include_router(router) network_service = NetworkService() if __name__ == "__main__": - #uvicorn.run("main:app", host='0.0.0.0', port=8001, reload=True, ssl_keyfile="/etc/gonets/certs/gonets.key", ssl_certfile="/etc/gonets/certs/gonets.crt") - uvicorn.run("main:app", host="0.0.0.0", port=8001, reload=True) + uvicorn.run("main:app", host='0.0.0.0', port=8001, reload=True, ssl_keyfile="/etc/gonets/certs/gonets.key", ssl_certfile="/etc/gonets/certs/gonets.crt") + #uvicorn.run("main:app", host="0.0.0.0", port=8001, reload=True)