From 3525cecf509bdce9b4498de0439d003f281d5adc Mon Sep 17 00:00:00 2001 From: su080915 Date: Thu, 16 Jan 2025 20:24:18 +0900 Subject: [PATCH] fix: change folder websocket --- .../domain/problem/service/impl/ProblemSubmitServiceImpl.kt | 2 +- src/main/kotlin/com/solve/domain/run/service/RunService.kt | 2 +- .../com/solve/global/config/websocket/WebSocketConfig.kt | 4 ++-- .../websocket/handler/ProgressWebSocketHandler.kt | 2 +- .../{config => }/websocket/handler/RunWebSocketHandler.kt | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) rename src/main/kotlin/com/solve/global/{config => }/websocket/handler/ProgressWebSocketHandler.kt (97%) rename src/main/kotlin/com/solve/global/{config => }/websocket/handler/RunWebSocketHandler.kt (97%) diff --git a/src/main/kotlin/com/solve/domain/problem/service/impl/ProblemSubmitServiceImpl.kt b/src/main/kotlin/com/solve/domain/problem/service/impl/ProblemSubmitServiceImpl.kt index 32d5a8f..9ac0155 100644 --- a/src/main/kotlin/com/solve/domain/problem/service/impl/ProblemSubmitServiceImpl.kt +++ b/src/main/kotlin/com/solve/domain/problem/service/impl/ProblemSubmitServiceImpl.kt @@ -15,7 +15,7 @@ import com.solve.domain.problem.util.CodeExecutor import com.solve.domain.user.domain.entity.UserSolved import com.solve.domain.user.repository.UserRepository import com.solve.global.config.file.FileProperties -import com.solve.global.config.websocket.handler.ProgressWebSocketHandler +import com.solve.global.websocket.handler.ProgressWebSocketHandler import com.solve.global.error.CustomException import com.solve.global.security.holder.SecurityHolder import org.springframework.data.repository.findByIdOrNull diff --git a/src/main/kotlin/com/solve/domain/run/service/RunService.kt b/src/main/kotlin/com/solve/domain/run/service/RunService.kt index 2eb257d..128a82d 100644 --- a/src/main/kotlin/com/solve/domain/run/service/RunService.kt +++ b/src/main/kotlin/com/solve/domain/run/service/RunService.kt @@ -95,7 +95,7 @@ class RunService( private fun sendOutput(session: WebSocketSession, output: String) { if (session.isOpen) { - session.sendMessage(TextMessage("""{"type":"output","content":"$output"}""")) + session.sendMessage(TextMessage("""{"type":"output","content":"${output.replace("\"", "\\\"")}"}""")) } } } \ No newline at end of file diff --git a/src/main/kotlin/com/solve/global/config/websocket/WebSocketConfig.kt b/src/main/kotlin/com/solve/global/config/websocket/WebSocketConfig.kt index eb518e5..6206d29 100644 --- a/src/main/kotlin/com/solve/global/config/websocket/WebSocketConfig.kt +++ b/src/main/kotlin/com/solve/global/config/websocket/WebSocketConfig.kt @@ -1,7 +1,7 @@ package com.solve.global.config.websocket -import com.solve.global.config.websocket.handler.ProgressWebSocketHandler -import com.solve.global.config.websocket.handler.RunWebSocketHandler +import com.solve.global.websocket.handler.ProgressWebSocketHandler +import com.solve.global.websocket.handler.RunWebSocketHandler import org.springframework.context.annotation.Configuration import org.springframework.web.socket.config.annotation.EnableWebSocket import org.springframework.web.socket.config.annotation.WebSocketConfigurer diff --git a/src/main/kotlin/com/solve/global/config/websocket/handler/ProgressWebSocketHandler.kt b/src/main/kotlin/com/solve/global/websocket/handler/ProgressWebSocketHandler.kt similarity index 97% rename from src/main/kotlin/com/solve/global/config/websocket/handler/ProgressWebSocketHandler.kt rename to src/main/kotlin/com/solve/global/websocket/handler/ProgressWebSocketHandler.kt index d9f520d..45a530e 100644 --- a/src/main/kotlin/com/solve/global/config/websocket/handler/ProgressWebSocketHandler.kt +++ b/src/main/kotlin/com/solve/global/websocket/handler/ProgressWebSocketHandler.kt @@ -1,4 +1,4 @@ -package com.solve.global.config.websocket.handler +package com.solve.global.websocket.handler import com.fasterxml.jackson.databind.ObjectMapper import com.solve.domain.problem.domain.enums.ProblemSubmitState diff --git a/src/main/kotlin/com/solve/global/config/websocket/handler/RunWebSocketHandler.kt b/src/main/kotlin/com/solve/global/websocket/handler/RunWebSocketHandler.kt similarity index 97% rename from src/main/kotlin/com/solve/global/config/websocket/handler/RunWebSocketHandler.kt rename to src/main/kotlin/com/solve/global/websocket/handler/RunWebSocketHandler.kt index 77b85d9..0208bca 100644 --- a/src/main/kotlin/com/solve/global/config/websocket/handler/RunWebSocketHandler.kt +++ b/src/main/kotlin/com/solve/global/websocket/handler/RunWebSocketHandler.kt @@ -1,4 +1,4 @@ -package com.solve.global.config.websocket.handler +package com.solve.global.websocket.handler import com.fasterxml.jackson.databind.ObjectMapper import com.solve.domain.run.dto.request.RunWebSocketMessage