feat: JsonInclude.Include.NON_EMPTY 적용

mens-api/src/main/java/kr/xit/ens/support/nice/service/INiceCiService.java

@@ -25,7 +25,7 @@ public interface INiceCiService {
     // 기관용 Token
     //--------------------------------------------------------------------------------
     TokenResponse generateToken(final TokenRequest reqDTO);
-    TokenResponse revokeToken(final String token);
+    TokenResponse revokeToken();
     //--------------------------------------------------------------------------------
     // 기관용 Token
     //--------------------------------------------------------------------------------

mens-api/src/main/java/kr/xit/ens/support/nice/service/NiceCiDummyTestService.java

@@ -18,6 +18,8 @@ import kr.xit.biz.ens.model.nice.NiceCiDTO.ResponseDataHeader;
 import kr.xit.biz.ens.model.nice.NiceCiDTO.TokenRequest;
 import kr.xit.biz.ens.model.nice.NiceCiDTO.TokenResDataBody;
 import kr.xit.biz.ens.model.nice.NiceCiDTO.TokenResponse;
+import kr.xit.biz.ens.model.nice.NiceCiDTO.TokenRevokeResDataBody;
+import kr.xit.biz.ens.model.nice.NiceCiDTO.TokenRevokeResponse;
 import kr.xit.core.exception.BizRuntimeException;
 import kr.xit.core.spring.annotation.TraceLogging;
 import kr.xit.core.spring.util.ApiWebClientUtil;
@@ -110,18 +112,21 @@ public class NiceCiDummyTestService extends EgovAbstractServiceImpl {
      * - current_timestamp
      *   Date currentDate = new Date();
      *   long current_timestamp = currentDate.getTime() /1000
-     * @param token
      * @return
      * </pre>
      */
     @TraceLogging
-    public TokenResponse revokeToken(final String token){
+    public TokenRevokeResponse revokeToken(){
-        return webClient.exchange(
+
-            HOST + API_GENERATE_TOKEN,
+        return TokenRevokeResponse.builder()
-            HttpMethod.POST,
+            .dataHeader(ResponseDataHeader.builder()
-            null,
+                .gwRsltCd("1200")
-            TokenResponse.class,
+                .gwRsltMsg("오류없음")
-            getHeaderMap(MediaType.APPLICATION_FORM_URLENCODED_VALUE, AUTH_TYPE_BASIC));
+                .build())
+            .dataBody(TokenRevokeResDataBody.builder()
+                .result(true)
+                .build())
+            .build();
     }
     //--------------------------------------------------------------------------------
     // 기관용 Token

mens-api/src/main/java/kr/xit/ens/support/nice/service/NiceCiService.java

@@ -109,13 +109,12 @@ public class NiceCiService extends EgovAbstractServiceImpl implements INiceCiSer
      * - current_timestamp
      *   Date currentDate = new Date();
      *   long current_timestamp = currentDate.getTime() /1000
-     * @param token
      * @return
      * </pre>
      */
     @Override
     @TraceLogging
-    public TokenResponse revokeToken(final String token){
+    public TokenResponse revokeToken(){
         //validate(reqDTO, null);
 
         return webClient.exchange(

mens-api/src/main/java/kr/xit/ens/support/nice/web/NiceCiController.java

@@ -52,10 +52,8 @@ public class NiceCiController {
 
     @Operation(summary = "기관용 토큰 폐기", description = "기관용 토큰 폐기")
     @PostMapping(value = "/revokeToken", produces = MediaType.APPLICATION_JSON_VALUE)
-    public ApiResponseDTO<?> revokeToken(
+    public ApiResponseDTO<?> revokeToken() {
-        @RequestParam final String accessToken
+        return ApiResponseDTO.success(service.revokeToken());
-    ) {
-        return ApiResponseDTO.success(service.revokeToken(accessToken));
     }
     //--------------------------------------------------------------------------------
     // 기관용 Token

mens-api/src/main/java/kr/xit/ens/support/nice/web/NiceCiDummyTestController.java

@@ -68,10 +68,8 @@ public class NiceCiDummyTestController {
 
     @Operation(summary = "기관용 토큰 폐기", description = "기관용 토큰 폐기")
     @PostMapping(value = "/revokeToken", produces = MediaType.APPLICATION_JSON_VALUE)
-    public ApiResponseDTO<?> revokeToken(
+    public ApiResponseDTO<?> revokeToken() {
-        @RequestParam final String accessToken
+        return ApiResponseDTO.success(service.revokeToken());
-    ) {
-        return ApiResponseDTO.success(service.revokeToken(accessToken));
     }
     //--------------------------------------------------------------------------------
     // 기관용 Token

mens-batch/src/main/resources/config/application-app.yml

@@ -3,21 +3,28 @@
 #-----------------------------------------------------------------------
 
 app:
-  # request log
+  #---------------------------------------------------------------
-  param:
+  # log 설정
+  # request:
+  #   custom-enabled | common-enabled | filter-enabled 중 1개만 활성화
+  #   --> 운영: common-enabled, 개발: custom-enabled 사용 권장
+  # response-enabled : 호출 결과 출력 - 운영시 false
+  # mdc : api 호출(서비스) 로그 기록
+  #   uris : api 호출 로그 제외 패턴
+  #---------------------------------------------------------------
   log:
+    request:
       # exclude pattern : CommonsRequestLoggingFilter && LoggingFilter 적용
       exclude-patterns: '/swagger-ui/(.*), /api-docs/(.*)'
+      custom-enabled: false
       # CommonsRequestLoggingFilter 사용 parameter 로그 출력
-      enabled: true
+      common-enabled: false
-      # parameter custom 로그 출력(LoggerAspect)
+      # Filter를 사용한 로그 출력
-      custom.enabled: false
+      filter-enabled: false
-  # MDC logging trace 활성
+    response-enabled: false
     mdc:
-    log:
-      trace:
       enabled: false
-        uris: '/api/kakao/(.*), /api/v1/ens/sendBulks(.*)'
+      exclude-patterns: '/api/kakao/(.*), /api/v1/ens/sendBulks(.*)'
 
   # slack
   slack-webhook:

mens-batch/src/main/resources/config/application-dev.yml

@@ -51,14 +51,23 @@ app:
   data:
     root:
       path: /data
-  param:
+
+  #---------------------------------------------------------------
+  # log 설정
+  # request:
+  #   custom-enabled | common-enabled | filter-enabled 중 1개만 활성화
+  #   --> 운영: common-enabled, 개발: custom-enabled 사용 권장
+  # response-enabled : 호출 결과 출력 - 운영시 false
+  # mdc : api 호출(서비스) 로그 기록
+  #   uris : api 호출 로그 제외 패턴
+  #---------------------------------------------------------------
   log:
-      # CommonsRequestLoggingFilter 사용 parameter 로그 출력
+    request:
-      enabled: true
+      custom-enabled: true
-      # parameter custom 로그 출력(LoggerAspect)
+    response-enabled: true
-      custom.enabled: true
     # MDC logging trace 활성
-  mdc.log.trace.enabled: true
+    mdc:
+      enabled: true
 
   # slack
   slack-webhook:

mens-batch/src/main/resources/config/application-ens.yml

@@ -2,7 +2,6 @@
 #   application 설정 : batch -> api
 #-----------------------------------------------------------------------
 contract:
-  provider:
   # milisecond
   connection:
     timeout: 30000

mens-batch/src/main/resources/config/application-local.yml

@@ -73,14 +73,23 @@ app:
   data:
     root:
       path: D:/data
-  param:
+
+  #---------------------------------------------------------------
+  # log 설정
+  # request:
+  #   custom-enabled | common-enabled | filter-enabled 중 1개만 활성화
+  #   --> 운영: common-enabled, 개발: custom-enabled 사용 권장
+  # response-enabled : 호출 결과 출력 - 운영시 false
+  # mdc : api 호출(서비스) 로그 기록
+  #   uris : api 호출 로그 제외 패턴
+  #---------------------------------------------------------------
   log:
-      # CommonsRequestLoggingFilter 사용 parameter 로그 출력
+    request:
-      enabled: true
+      custom-enabled: true
-      # parameter custom 로그 출력(LoggerAspect)
+    response-enabled: true
-      custom.enabled: true
     # MDC logging trace 활성
-  mdc.log.trace.enabled: true
+    mdc:
+      enabled: false
 
   # slack
   slack-webhook:

mens-batch/src/main/resources/config/application-prod.yml

@@ -77,14 +77,22 @@ app:
   data:
     root:
       path: d:/data
-  param:
+
+  #---------------------------------------------------------------
+  # log 설정
+  # request:
+  #   custom-enabled | common-enabled | filter-enabled 중 1개만 활성화
+  #   --> 운영: common-enabled, 개발: custom-enabled 사용 권장
+  # response-enabled : 호출 결과 출력 - 운영시 false
+  # mdc : api 호출(서비스) 로그 기록
+  #   uris : api 호출 로그 제외 패턴
+  #---------------------------------------------------------------
   log:
-      # CommonsRequestLoggingFilter 사용 parameter 로그 출력
+    request:
-      enabled: true
+      common-enabled: true
-      # parameter custom 로그 출력(LoggerAspect)
-      custom.enabled: true
     # MDC logging trace 활성
-  mdc.log.trace.enabled: true
+    mdc:
+      enabled: true
 
   # slack
   slack-webhook:

mens-core/src/main/java/kr/xit/biz/ens/model/nice/NiceCiDTO.java

@@ -112,6 +112,10 @@ public class NiceCiDTO {
         @Schema(requiredMode = RequiredMode.REQUIRED)
         @Valid
         private ResponseDataHeader dataHeader;
+
+        @Schema(requiredMode = RequiredMode.REQUIRED)
+        @Valid
+        private TokenRevokeResDataBody dataBody;
     }
 
     /**
@@ -161,15 +165,26 @@ public class NiceCiDTO {
          */
         @Schema(requiredMode = RequiredMode.AUTO, title = "요청한 scope 값", example = "default")
         private String scope;
+    }
 
-        //-----------------------------------------------------------------------
-        // 토큰 폐기 요청시 필수값
-        //-----------------------------------------------------------------------
     /**
-         * token 폐기시 필수
+     * <pre>
+     * 기관용 토큰 폐기 응답 dataBody
+     * </pre>
+     */
+    @Schema(name = "TokenRevokeResDataBody", description = "기관용 토큰 폐기 요청 응답 dataBody DTO")
+    @Data
+    @NoArgsConstructor
+    @AllArgsConstructor
+    @SuperBuilder
+    public static class TokenRevokeResDataBody {
+        /**
+         * <pre>
+         * 토큰폐기결과
          * true or false
+         * </pre>
          */
-        @Schema(requiredMode = RequiredMode.AUTO)
+        @Schema(requiredMode = RequiredMode.REQUIRED, title = "토큰폐기결과", example = "true")
         private boolean result;
     }
     //--------------------------------------------------------------------------------