diff --git a/README.md b/README.md index 899f8945..aa32d027 100644 --- a/README.md +++ b/README.md @@ -60,7 +60,7 @@ CPU 70 이상이 되면 Scale Out, 30이하면 Scale in이 되도록 Auto Scalin ## BE Trouble Shooting - [부하테스트 - 메시지 큐를 도입할 수 밖에 없었던 이유](https://www.canva.com/design/DAGfcRy6xGE/q6HvKo_qZ0ftXHH79zK6rg/edit?utm_content=DAGfcRy6xGE&utm_campaign=designshare&utm_medium=link2&utm_source=sharebutton) -- [메시지 큐 중에 Kafka를 도입한 이유](https://github.com/Kernel360/KDEV3_monicar_BE/blob/develop/img/Kafa도입이유.md) +- [메시지 큐 중에 Kafka를 도입한 이유 - 구체적으로 업로드 예정](https://github.com/Kernel360/KDEV3_monicar_BE/blob/develop/img/Kafa도입이유.md) - [Route53 동작이 제대로 안될 때가 있다.](https://github.com/Kernel360/blog/pull/131) - [SSE 응답이 계속 대기 중(Pending)으로 유지되는 문제](https://github.com/Kernel360/KDEV3_monicar_BE/wiki/SSE-%EC%9D%91%EB%8B%B5%EC%9D%B4-%EA%B3%84%EC%86%8D-%EB%8C%80%EA%B8%B0-%EC%A4%91(Pending)%EC%9C%BC%EB%A1%9C-%EC%9C%A0%EC%A7%80%EB%90%98%EB%8A%94-%EB%AC%B8%EC%A0%9C) diff --git a/monicar-collector/build.gradle b/monicar-collector/build.gradle index 5caa9cf5..4d52290e 100644 --- a/monicar-collector/build.gradle +++ b/monicar-collector/build.gradle @@ -4,7 +4,6 @@ dependencies { implementation "com.mysql:mysql-connector-j" implementation "org.springframework.kafka:spring-kafka:3.3.0" implementation "org.springframework.boot:spring-boot-starter-validation" - implementation project(':monicar-common') } tasks.bootJar { diff --git a/monicar-collector/src/main/java/org/collector/CollectorApplication.java b/monicar-collector/src/main/java/org/collector/CollectorApplication.java index e5ea2732..b7863ef0 100644 --- a/monicar-collector/src/main/java/org/collector/CollectorApplication.java +++ b/monicar-collector/src/main/java/org/collector/CollectorApplication.java @@ -1,23 +1,14 @@ package org.collector; -import org.common.TestBean; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -import jakarta.annotation.PostConstruct; import lombok.RequiredArgsConstructor; -@SpringBootApplication(scanBasePackages = {"org.collector", "org.common"}) +@SpringBootApplication @RequiredArgsConstructor public class CollectorApplication { - private final TestBean testBean; - - @PostConstruct - public void dependencyTest() { - testBean.dependencyTest(); - } - public static void main(String[] args) { SpringApplication.run(CollectorApplication.class, args); } diff --git a/monicar-collector/src/main/java/org/collector/consumer/CycleInfoConsumer.java b/monicar-collector/src/main/java/org/collector/consumer/CycleInfoConsumer.java index dc83157e..6bd3edbc 100644 --- a/monicar-collector/src/main/java/org/collector/consumer/CycleInfoConsumer.java +++ b/monicar-collector/src/main/java/org/collector/consumer/CycleInfoConsumer.java @@ -19,7 +19,7 @@ public class CycleInfoConsumer { @KafkaListener(topicPartitions = @TopicPartition(topic = "cycleInfo-json-topic", partitions = "#{@finder.partitions('cycleInfo-json-topic')}")) public void accept(ConsumerRecord message) { - System.out.println("[Main Consumer] Message arrived! - " + message.value()); cycleInfoService.cycleInfoSave(message.value()); + log.info("[Main Consumer] Message arrived! - " + message.key()); } } diff --git a/monicar-common/build.gradle b/monicar-common/build.gradle deleted file mode 100644 index 734a9307..00000000 --- a/monicar-common/build.gradle +++ /dev/null @@ -1,11 +0,0 @@ -tasks.bootJar { - enabled = false -} - -tasks.jar { - enabled = true -} - -dependencies { - implementation 'org.springframework.boot:spring-boot-starter-web' -} diff --git a/monicar-common/src/main/java/org/common/TestBean.java b/monicar-common/src/main/java/org/common/TestBean.java deleted file mode 100644 index 9a1c3eb5..00000000 --- a/monicar-common/src/main/java/org/common/TestBean.java +++ /dev/null @@ -1,11 +0,0 @@ -package org.common; - -import org.springframework.stereotype.Component; - -@Component -public class TestBean { - - public void dependencyTest() { - System.out.println("성공적으로 로딩됐습니다."); - } -} diff --git a/monicar-common/src/main/java/org/common/dto/CListRequest.java b/monicar-common/src/main/java/org/common/dto/CListRequest.java deleted file mode 100644 index 1337c48b..00000000 --- a/monicar-common/src/main/java/org/common/dto/CListRequest.java +++ /dev/null @@ -1,13 +0,0 @@ -package org.common.dto; - -public record CListRequest( - String sec, - GCD gcd, - String lat, - String lng, - String ang, - String spd, - String sum, - String bat -) { -} diff --git a/monicar-common/src/main/java/org/common/dto/CommonResponse.java b/monicar-common/src/main/java/org/common/dto/CommonResponse.java deleted file mode 100644 index 47c8cf6b..00000000 --- a/monicar-common/src/main/java/org/common/dto/CommonResponse.java +++ /dev/null @@ -1,8 +0,0 @@ -package org.common.dto; - -public record CommonResponse( - String rstCd, - String rstMsg, - String mdn -) { -} diff --git a/monicar-common/src/main/java/org/common/dto/CycleInfoRequest.java b/monicar-common/src/main/java/org/common/dto/CycleInfoRequest.java deleted file mode 100644 index bde9f890..00000000 --- a/monicar-common/src/main/java/org/common/dto/CycleInfoRequest.java +++ /dev/null @@ -1,15 +0,0 @@ -package org.common.dto; - -import java.util.List; - -public record CycleInfoRequest( - String mdn, - String tid, - String mid, - String pv, - String did, - String oTime, - String cCnt, - List cList -) { -} diff --git a/monicar-common/src/main/java/org/common/dto/GCD.java b/monicar-common/src/main/java/org/common/dto/GCD.java deleted file mode 100644 index f2c8f7da..00000000 --- a/monicar-common/src/main/java/org/common/dto/GCD.java +++ /dev/null @@ -1,5 +0,0 @@ -package org.common.dto; - -public enum GCD { - A, C, O -} diff --git a/monicar-common/src/main/java/org/common/dto/ResponseCode.java b/monicar-common/src/main/java/org/common/dto/ResponseCode.java deleted file mode 100644 index 0524195a..00000000 --- a/monicar-common/src/main/java/org/common/dto/ResponseCode.java +++ /dev/null @@ -1,36 +0,0 @@ -package org.common.dto; - -import lombok.Getter; - -@Getter -public enum ResponseCode { - SUCCESS("000"), - INVALID_ACCESS_PATH("100"), - WRONG_APPROACH("101"), - CONTENT_TYPE_ERROR("102"), - CONTENT_LENGTH_ERROR("103"), - ACCEPT_ERROR("104"), - CACHE_CONTROL_ERROR("105"), - ACCEPT_ENCODING_ERROR("106"), - TIMESTAMP_ERROR("107"), - TUID_ERROR("108"), - MISSING_KEY_VERSION("109"), - NOT_JSON_HEADER_TYPE("110"), - MISSING_TOKEN("200"), - INVALID_TOKEN("201"), - UNUSABLE_TOKEN("202"), - PROTOCOL_FORMAT_ERROR("300"), - REQUIRED_PARAMETER_ERROR("301"), - NO_SEARCH_RESULTS("302"), - DECRYPTION_ERROR("303"), - MISMATCHED_MDN("304"), - DATA_PROCESSING_ERROR("400"), - UNDEFINED_ERROR("500"); - - private final String code; - - ResponseCode(String code) { - this.code = code; - } - -} diff --git a/monicar-common/src/main/resources/application.yml b/monicar-common/src/main/resources/application.yml deleted file mode 100644 index 2d33fb73..00000000 --- a/monicar-common/src/main/resources/application.yml +++ /dev/null @@ -1,3 +0,0 @@ -spring: - application: - name: monicar-common diff --git a/monicar-emulator/build.gradle b/monicar-emulator/build.gradle index 23ba89e3..514d67ed 100644 --- a/monicar-emulator/build.gradle +++ b/monicar-emulator/build.gradle @@ -8,8 +8,6 @@ dependencies { implementation "org.springframework.kafka:spring-kafka:3.3.0" testImplementation 'org.mock-server:mockserver-netty:5.15.0' - - implementation project(':monicar-common') } tasks.bootJar { diff --git a/monicar-emulator/src/main/java/org/emulator/device/application/port/VehicleEventSender.java b/monicar-emulator/src/main/java/org/emulator/device/application/port/VehicleEventSender.java index 0ad7243a..d8b2c771 100644 --- a/monicar-emulator/src/main/java/org/emulator/device/application/port/VehicleEventSender.java +++ b/monicar-emulator/src/main/java/org/emulator/device/application/port/VehicleEventSender.java @@ -1,13 +1,12 @@ package org.emulator.device.application.port; -import org.common.dto.CommonResponse; +import java.util.List; + import org.emulator.device.common.response.BaseResponse; import org.emulator.device.domain.CycleInfo; import org.emulator.device.domain.OffInfo; import org.emulator.device.domain.OnInfo; -import java.util.List; - /** * 차량 서버에 명령을 보내는 역할을 선언한다. */ diff --git a/monicar-event-hub/build.gradle b/monicar-event-hub/build.gradle index a9b05221..c800bab5 100644 --- a/monicar-event-hub/build.gradle +++ b/monicar-event-hub/build.gradle @@ -17,8 +17,6 @@ dependencies { testImplementation 'org.testcontainers:testcontainers' testImplementation 'org.testcontainers:mysql' testImplementation 'org.testcontainers:junit-jupiter' - - implementation project(':monicar-common') } tasks.bootJar { diff --git a/settings.gradle b/settings.gradle index 1c15aa58..bf31ba2e 100644 --- a/settings.gradle +++ b/settings.gradle @@ -2,6 +2,5 @@ rootProject.name = 'monicar' include 'monicar-emulator' include 'monicar-control-center' include 'monicar-collector' -include 'monicar-common' include 'monicar-event-hub'