diff --git a/build.gradle b/build.gradle index b1de61f..2629020 100644 --- a/build.gradle +++ b/build.gradle @@ -5,6 +5,9 @@ plugins { id 'war' } +bootJar.enabled = true +jar.enabled = false + // WAS, 톰캣에 배포 시 BOOT 실행 요소 제거 배포 bootWar.enabled = false war.enabled = true @@ -14,7 +17,7 @@ group = 'com.eactive' version = '1.0.1' sourceCompatibility = '1.8' -compileJava.options.encoding = 'MS949' +compileJava.options.encoding = 'UTF-8' repositories { mavenCentral() diff --git a/src/main/java/com/eactive/httpmockserver/ApiController.java b/src/main/java/com/eactive/httpmockserver/ApiController.java index 37c1073..7fc1cc2 100644 --- a/src/main/java/com/eactive/httpmockserver/ApiController.java +++ b/src/main/java/com/eactive/httpmockserver/ApiController.java @@ -88,7 +88,7 @@ public class ApiController { } } - // sleep + // sleep 적용 if (api.getSleepSeconds() != null) { int sleepSeconds = api.getSleepSeconds().intValue(); if (sleepSeconds > 0) { @@ -115,7 +115,7 @@ public class ApiController { assignResponseHeaders(responseHeaders, api.getResponseHeaders()); - // status code + // status code 적용 int responseStatusCode = 200; if (api.getResponseStatusCode() != null) { responseStatusCode = api.getResponseStatusCode().intValue(); diff --git a/src/main/java/com/eactive/httpmockserver/script/Script.java b/src/main/java/com/eactive/httpmockserver/script/Script.java index de5e835..87a4fb7 100644 --- a/src/main/java/com/eactive/httpmockserver/script/Script.java +++ b/src/main/java/com/eactive/httpmockserver/script/Script.java @@ -4,9 +4,9 @@ public interface Script { /** * Script Process Function - * @param requestMessage û ޽ - * @param responseMessage ǵ ޽ - * @return ũƮ ޽ + * @param requestMessage 수신 받은 요청 메시지 + * @param responseMessage 정의된 응답 메시지 + * @return 스크립트 수행 후 응답 할 메시지 * @throws Exception */ public String postProcess(String requestMessage, String responseMessage) throws Exception; diff --git a/src/main/java/com/eactive/httpmockserver/script/ScriptController.java b/src/main/java/com/eactive/httpmockserver/script/ScriptController.java index d26f06b..9cb8036 100644 --- a/src/main/java/com/eactive/httpmockserver/script/ScriptController.java +++ b/src/main/java/com/eactive/httpmockserver/script/ScriptController.java @@ -74,7 +74,7 @@ public class ScriptController { } if (BooleanUtils.toBoolean(spec.getUseYn())) { - // useYn=N + // 기존설정 useYn=N으로 수정 scriptInfoService.setUnuseOthers(spec.getId()); } diff --git a/src/main/java/com/eactive/httpmockserver/script/ScriptLoader.java b/src/main/java/com/eactive/httpmockserver/script/ScriptLoader.java index d8e19f2..18e8fc5 100644 --- a/src/main/java/com/eactive/httpmockserver/script/ScriptLoader.java +++ b/src/main/java/com/eactive/httpmockserver/script/ScriptLoader.java @@ -28,9 +28,9 @@ public class ScriptLoader{ private String classPath = null; /** - * BOOT JAR Class BOOT-INF  Ͻ ȵǴ - * ӽ÷ /tmp Ͽ ش θ ϰ Ͽ ޸ ɰų jar ִ ãƺ - * Groovy ũƮ 浵 + * BOOT 일 경우 JAR 내의 Class 목록이 BOOT-INF로 들어가서 컴파일시 참조가 안되는 문제가 있음 + * 임시로 /tmp 폴더에 압축해제하여 해당 경로를 참조하게 하였으나 메모리 내에서 참조가능거나 jar파일을 직접 참조 할 수 있는 방안을 찾아볼 예정임 + * Groovy 스크립트로 변경도 검토 중 */ private ScriptLoader(){ this.loadedClass = new HashMap<>(); diff --git a/src/main/java/com/eactive/httpmockserver/socket/EchoSocketServerHandler.java b/src/main/java/com/eactive/httpmockserver/socket/EchoSocketServerHandler.java index 0cbf209..8dc8540 100644 --- a/src/main/java/com/eactive/httpmockserver/socket/EchoSocketServerHandler.java +++ b/src/main/java/com/eactive/httpmockserver/socket/EchoSocketServerHandler.java @@ -56,7 +56,7 @@ public class EchoSocketServerHandler extends ChannelInboundHandlerAdapter { logger.info("Response Message=" + responseMsg); logger.info("=================================================="); - // sleep + // sleep if (spec.getSleepSeconds() != null) { int sleepSeconds = spec.getSleepSeconds().intValue(); if (sleepSeconds > 0) { diff --git a/src/main/java/com/eactive/httpmockserver/socket/SocketServerManageController.java b/src/main/java/com/eactive/httpmockserver/socket/SocketServerManageController.java index 5ae00e1..cdb06b7 100644 --- a/src/main/java/com/eactive/httpmockserver/socket/SocketServerManageController.java +++ b/src/main/java/com/eactive/httpmockserver/socket/SocketServerManageController.java @@ -74,13 +74,13 @@ public class SocketServerManageController { } if (BooleanUtils.toBoolean(spec.getUseYn())) { - // + // 기존서버 중지 stop(); - // useYn=N + // 기존설정 useYn=N으로 수정 specService.setUnuseOthers(spec.getId()); - // ⵿ + // 서버 기동 start(); }