diff --git a/src/main/java/cokr/xit/ens/core/aop/AccessLogAspect.java b/src/main/java/cokr/xit/ens/core/aop/AccessLogAspect.java index 7f8d10a..6649b5d 100644 --- a/src/main/java/cokr/xit/ens/core/aop/AccessLogAspect.java +++ b/src/main/java/cokr/xit/ens/core/aop/AccessLogAspect.java @@ -129,12 +129,12 @@ public class AccessLogAspect { accessLog.setResponseFail(String.format("%s: %s", e.getErrCd(), e.getMessage())); accessLogRepository.save(accessLog); if (result == null) { - EnsResponseVO restResponseVO = EnsResponseVO + EnsResponseVO restResponseVO = EnsResponseVO .errBuilder() .errCode(e.getErrCd()) .errMsg(e.getMessage()) .build(); - result = new ResponseEntity(restResponseVO, HttpStatus.INTERNAL_SERVER_ERROR); + result = new ResponseEntity<>(restResponseVO, HttpStatus.INTERNAL_SERVER_ERROR); } } catch (Exception e) { @@ -142,12 +142,12 @@ public class AccessLogAspect { accessLog.setResponseFail(String.format("%s: %s", EnsErrCd.UNKNOWN, CmmnUtil.printStackTraceToString(e))); accessLogRepository.save(accessLog); if (result == null) { - EnsResponseVO restResponseVO = EnsResponseVO + EnsResponseVO restResponseVO = EnsResponseVO .errBuilder() .errCode(EnsErrCd.UNKNOWN) .errMsg("알수없는 오류 입니다. 시스템관리자에게 문의하시기 바랍니다.") .build(); - result = new ResponseEntity(restResponseVO, HttpStatus.INTERNAL_SERVER_ERROR); + result = new ResponseEntity<>(restResponseVO, HttpStatus.INTERNAL_SERVER_ERROR); applicationEventPublisher.publishEvent(MonitorEvent.builder() @@ -370,7 +370,6 @@ public class AccessLogAspect { } // FIXME: JPA 쿼리 로그 출력 코드 추가 - //@ConditionalOnProperty(value = "app.jpa.logging.enabled", havingValue = "true", matchIfMissing = false) @Around("execution(* org.springframework.data.repository.CrudRepository+.*(..))") public Object logJpaQuery(ProceedingJoinPoint joinPoint) throws Throwable { String methodName = joinPoint.getSignature().getDeclaringType().getSimpleName() + "." + joinPoint.getSignature().getName(); diff --git a/src/main/java/cokr/xit/ens/modules/nice/service/NiceCiCloseService.java b/src/main/java/cokr/xit/ens/modules/nice/service/NiceCiCloseService.java index db1601a..18de6cf 100644 --- a/src/main/java/cokr/xit/ens/modules/nice/service/NiceCiCloseService.java +++ b/src/main/java/cokr/xit/ens/modules/nice/service/NiceCiCloseService.java @@ -3,7 +3,6 @@ package cokr.xit.ens.modules.nice.service; import java.util.*; import org.apache.commons.lang3.*; -import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.*; import cokr.xit.ens.biz.iup.code.*; @@ -11,7 +10,6 @@ import cokr.xit.ens.core.aop.*; import cokr.xit.ens.core.exception.code.*; import cokr.xit.ens.modules.nice.mapper.*; import cokr.xit.ens.modules.nice.model.*; -import cokr.xit.ens.modules.nice.service.support.*; import lombok.*; import lombok.extern.slf4j.*; @@ -33,15 +31,6 @@ import lombok.extern.slf4j.*; @Service @RequiredArgsConstructor public class NiceCiCloseService { - @Value("${contract.niceCi.orgId}") - private String ORG_ID; - - @Value("${contract.niceCi.isStatusFail}") - private boolean IS_STATUS_FAIL; - - private final NiceCiApiService niceCiApiService; - private final NiceCiNewTransactionService niceCiNewTransactionService; - private final INiceCiMapper niceCiMapper; /** diff --git a/src/main/java/cokr/xit/ens/modules/nice/service/NiceCiStatBulkService.java b/src/main/java/cokr/xit/ens/modules/nice/service/NiceCiStatBulkService.java index 6c59581..d069eca 100644 --- a/src/main/java/cokr/xit/ens/modules/nice/service/NiceCiStatBulkService.java +++ b/src/main/java/cokr/xit/ens/modules/nice/service/NiceCiStatBulkService.java @@ -38,9 +38,6 @@ public class NiceCiStatBulkService { @Value("${contract.niceCi.orgId}") private String ORG_ID; - @Value("${contract.niceCi.isStatusFail}") - private boolean IS_STATUS_FAIL; - private final NiceCiApiService niceCiApiService; private final NiceCiNewTransactionService niceCiNewTransactionService; diff --git a/src/main/resources/application-local.yml b/src/main/resources/application-local.yml index 3590eca..f3f5e59 100644 --- a/src/main/resources/application-local.yml +++ b/src/main/resources/application-local.yml @@ -73,6 +73,7 @@ xit: payinf: host: ${xit.app.url}${xit.app.ctx} +# // FIXME: JPA 쿼리 로그 출력 - AccessLogAspect::logJpaQuery app: jpa: logging: diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml index 7b76b18..1f1cd94 100644 --- a/src/main/resources/application-prod.yml +++ b/src/main/resources/application-prod.yml @@ -1,5 +1,5 @@ server: - port: 18090 #port + port: 18090 #port @@ -137,8 +137,6 @@ contract: host: ${xit.middle.url} prepay: /bill/nv/ep/apply - - biz: iup: api: diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index f3cefab..7e17d6a 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -14,22 +14,15 @@ server: spring: profiles: - # active: local active: '@spring.profiles.active@' - # include: - # prodDB - # group: - # local: - # - localDB - # prod: - # - prodDB + config: import: classpath:config/conf-app.yml, classpath:config/conf-contract.yml, classpath:config/conf-log.yml, classpath:config/conf-mybatis.yml, classpath:config/conf-policy.yml, classpath:config/conf-slack.yml # main: # allow-bean-definition-overriding: true pid: - file: mdpost.pid + file: mens-iup.pid mvc: view: @@ -92,29 +85,6 @@ spring: repositories: enabled: false - - - - -# kafka: -# producer: -# bootstrap-servers: localhost:49092 -# key-serializer: org.apache.kafka.common.serialization.StringSerializer -# value-serializer: org.apache.kafka.common.serialization.StringSerializer -# consumer: -# bootstrap-servers: localhost:49092 -# key-deserializer: org.apache.kafka.common.serialization.StringDeserializer -# value-deserializer: org.apache.kafka.common.serialization.StringDeserializer -# group-id: group-id-ens -# auto-offset-reset: latest -# max-poll-records: 1 - - - - - - - xit: app: url: ${server.protocol:http}://${server.host:localhost}:${server.port} @@ -168,12 +138,3 @@ springdoc: display-query-params-without-oauth2: true csrf: enabled: false -# group-configs[0]: -# group: Examples... -# paths-to-match: /example/**, /kafka/sample/** -# group-configs[1]: -# group: 카카오페이-내문서함 -# paths-to-match: /kko/mydoc/** -# group-configs[2]: -# group: 카카오페이-청구서 -# paths-to-match: /kakao/** diff --git a/src/main/resources/config/conf-app.yml b/src/main/resources/config/conf-app.yml index f2c1331..5dedaeb 100644 --- a/src/main/resources/config/conf-app.yml +++ b/src/main/resources/config/conf-app.yml @@ -9,3 +9,9 @@ app: cnt: 5 bill: cnt: 2 + + # // FIXME: JPA 쿼리 로그 출력 - AccessLogAspect::logJpaQuery + jpa: + logging: + param: false + result: false diff --git a/src/main/resources/config/conf-contract.yml b/src/main/resources/config/conf-contract.yml index 0c240ae..1f5dc10 100644 --- a/src/main/resources/config/conf-contract.yml +++ b/src/main/resources/config/conf-contract.yml @@ -138,12 +138,10 @@ contract: host: 127.0.0.1 #host: 10.1.1.5 port: 10002 - # ms + # //FIXME: NICE CI Socket 통신 timeout 시간 설정 - 단위 ms timeout: 3000 orgId: Z755400 # 개발 - clientId: 0027370001 + #clientId: 0027370001 # 운영 #clientId: 0027370002 - # 상태조회중 에러 발생시 FAIL 처리 여부 - isStatusFail: false