Merge branch 'develop'

SIT-DigiCre · Jul 1, 2021 · 135dcf5 · 135dcf5
2 parents 429c4f6 + 77da593
commit 135dcf5
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/bolide_front/Connection.cs b/bolide_front/Connection.cs
@@ -58,6 +58,7 @@ private async void StartWebSocket()
     {
         if (webSocket.State == WebSocketState.Open) return;
         if (testMode) baseWebSocketUri = "ws://localhost:5000/";
+        else baseWebSocketUri += "api/";
         string uri = baseWebSocketUri + "v1/room/" + roomName;
         await webSocket.ConnectAsync(new Uri(uri), disposalTokenSource.Token);
         _ = ReceiveLoop();

diff --git a/bolide_front/Pages/Index.razor b/bolide_front/Pages/Index.razor
@@ -37,7 +37,7 @@ else
             StateHasChanged();
             return;
         }
-        connection = new Connection(false, roomName, "", "");
+        connection = new Connection(false, roomName, "https://bolide.digicre.net/","wss://bolide.digicre.net/");
         connection.ConnectionStartHandler += (sender, e) =>
         {
             state = "接続済";

diff --git a/desktop_app_win/bolide/Connection.cs b/desktop_app_win/bolide/Connection.cs
@@ -58,6 +58,7 @@ private async void StartWebSocket()
     {
         if (webSocket.State == WebSocketState.Open) return;
         if (testMode) baseWebSocketUri = "ws://localhost:5000/";
+        else baseWebSocketUri += "api/";
         string uri = baseWebSocketUri + "v1/room/" + roomName;
         await webSocket.ConnectAsync(new Uri(uri), disposalTokenSource.Token);
         _ = ReceiveLoop();