dev

src/main/java/com/aip/gateway/api/controller/ApiAipController.java

@@ -73,8 +73,8 @@ public class ApiAipController extends  BaseController {
             List<AipLabel> response = this.service.getLabels();
             return ResponseEntity.ok().body(ApiResponseModel.builder()
                     .success(true)
-                    .statusCode(HttpStatus.OK.value())
-                    .message(GlobalConstants.API_RESULT_SUCCESS)
+                    .errorCode(HttpStatus.OK.value())
+                    .errorMessage(GlobalConstants.API_RESULT_SUCCESS)
                     .result(response)
                     .build());
         }
@@ -101,8 +101,8 @@ public class ApiAipController extends  BaseController {
             List<AipLabel> response = this.service.getPolicies();
             return ResponseEntity.ok().body(ApiResponseModel.builder()
                     .success(true)
-                    .statusCode(HttpStatus.OK.value())
-                    .message(GlobalConstants.API_RESULT_SUCCESS)
+                    .errorCode(HttpStatus.OK.value())
+                    .errorMessage(GlobalConstants.API_RESULT_SUCCESS)
                     .result(response)
                     .build());
         }
@@ -129,8 +129,8 @@ public class ApiAipController extends  BaseController {
             List<AipTemplate> response = this.service.getProtections();
             return ResponseEntity.ok().body(ApiResponseModel.builder()
                     .success(true)
-                    .statusCode(HttpStatus.OK.value())
-                    .message(GlobalConstants.API_RESULT_SUCCESS)
+                    .errorCode(HttpStatus.OK.value())
+                    .errorMessage(GlobalConstants.API_RESULT_SUCCESS)
                     .result(response)
                     .build());
         }

src/main/java/com/aip/gateway/api/controller/ApiDbController.java

@@ -75,8 +75,8 @@ public class ApiDbController extends  BaseController {
             List<LinkedSystemDto> response = this.service.getLinkedSystems();
             return ResponseEntity.ok().body(ApiResponseModel.builder()
                     .success(true)
-                    .statusCode(HttpStatus.OK.value())
-                    .message(GlobalConstants.API_RESULT_SUCCESS)
+                    .errorCode(HttpStatus.OK.value())
+                    .errorMessage(GlobalConstants.API_RESULT_SUCCESS)
                     .result(response)
                     .build());
         }
@@ -103,8 +103,8 @@ public class ApiDbController extends  BaseController {
             List<LinkedServerDto> response = this.service.getLinkedServers();
             return ResponseEntity.ok().body(ApiResponseModel.builder()
                     .success(true)
-                    .statusCode(HttpStatus.OK.value())
-                    .message(GlobalConstants.API_RESULT_SUCCESS)
+                    .errorCode(HttpStatus.OK.value())
+                    .errorMessage(GlobalConstants.API_RESULT_SUCCESS)
                     .result(response)
                     .build());
         }
@@ -131,8 +131,8 @@ public class ApiDbController extends  BaseController {
             List<LinkedApiKeyDto> response = this.service.getLinkedApiKeys();
             return ResponseEntity.ok().body(ApiResponseModel.builder()
                     .success(true)
-                    .statusCode(HttpStatus.OK.value())
-                    .message(GlobalConstants.API_RESULT_SUCCESS)
+                    .errorCode(HttpStatus.OK.value())
+                    .errorMessage(GlobalConstants.API_RESULT_SUCCESS)
                     .result(response)
                     .build());
         }
@@ -159,8 +159,8 @@ public class ApiDbController extends  BaseController {
             List<LinkedDecryptKeyDto> response = this.service.getLinkedDecryptKeys();
             return ResponseEntity.ok().body(ApiResponseModel.builder()
                     .success(true)
-                    .statusCode(HttpStatus.OK.value())
-                    .message(GlobalConstants.API_RESULT_SUCCESS)
+                    .errorCode(HttpStatus.OK.value())
+                    .errorMessage(GlobalConstants.API_RESULT_SUCCESS)
                     .result(response)
                     .build());
         }

src/main/java/com/aip/gateway/api/controller/BaseController.java

@@ -3,7 +3,6 @@ package com.aip.gateway.api.controller;
 import com.aip.gateway.api.model.response.*;
 import com.aip.gateway.api.repository.GlobalConstants;
 import jakarta.servlet.http.HttpServletRequest;
-import jakarta.xml.bind.annotation.XmlElementDecl;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 
@@ -37,9 +36,9 @@ public class BaseController {
 
     protected ResponseEntity<ApiResponseModel> responseSuccess(HttpServletRequest request, GeneralResponse response) {
         return ResponseEntity.ok().body(ApiResponseModel.builder()
-                .success(true)
-                .statusCode(HttpStatus.OK.value())
-                .message(GlobalConstants.API_RESULT_SUCCESS)
+                .success(response.getErrorCode() == 0)
+                .errorCode(HttpStatus.OK.value())
+                .errorMessage(response.getErrorCode() == 0 ? GlobalConstants.API_RESULT_SUCCESS : response.getErrorMessage())
                 .result(response)
                 .build());
     }
@@ -47,9 +46,9 @@ public class BaseController {
     protected ResponseEntity<ApiResponseModel> responseSuccess(HttpServletRequest request, ResponseInfo response) {
         request.setAttribute(GlobalConstants.API_RESULT, (ResponseBase)response);
         return ResponseEntity.ok().body(ApiResponseModel.builder()
-                .success(true)
-                .statusCode(HttpStatus.OK.value())
-                .message(GlobalConstants.API_RESULT_SUCCESS)
+                .success(response.getErrorCode() == 0)
+                .errorCode(HttpStatus.OK.value())
+                .errorMessage(response.getErrorCode() == 0 ? GlobalConstants.API_RESULT_SUCCESS : response.getErrorMessage())
                 .result(response)
                 .build());
     }
@@ -57,9 +56,9 @@ public class BaseController {
     protected ResponseEntity<ApiResponseModel> responseSuccess(HttpServletRequest request, ResponseFile response) {
         request.setAttribute(GlobalConstants.API_RESULT, (ResponseBase)response);
         return ResponseEntity.ok().body(ApiResponseModel.builder()
-                .success(true)
-                .statusCode(HttpStatus.OK.value())
-                .message(GlobalConstants.API_RESULT_SUCCESS)
+                .success(response.getErrorCode() == 0)
+                .errorCode(HttpStatus.OK.value())
+                .errorMessage(response.getErrorCode() == 0 ? GlobalConstants.API_RESULT_SUCCESS : response.getErrorMessage())
                 .result(response)
                 .build());
     }
@@ -67,9 +66,9 @@ public class BaseController {
     protected  ResponseEntity<ApiResponseModel> responseSuccess(HttpServletRequest request, ResponseStream response) {
         request.setAttribute(GlobalConstants.API_RESULT, (ResponseBase)response);
         return ResponseEntity.ok().body(ApiResponseModel.builder()
-                .success(true)
-                .statusCode(HttpStatus.OK.value())
-                .message(GlobalConstants.API_RESULT_SUCCESS)
+                .success(response.getErrorCode() == 0)
+                .errorCode(HttpStatus.OK.value())
+                .errorMessage(response.getErrorCode() == 0 ? GlobalConstants.API_RESULT_SUCCESS : response.getErrorMessage())
                 .result(response)
                 .build());
     }
@@ -79,8 +78,8 @@ public class BaseController {
         request.setAttribute(GlobalConstants.API_RESULT_MESSAGE, ex.getMessage());
         return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(ApiResponseModel.builder()
                 .success(false)
-                .statusCode(HttpStatus.INTERNAL_SERVER_ERROR.value())
-                .message(ex.getMessage())
+                .errorCode(HttpStatus.INTERNAL_SERVER_ERROR.value())
+                .errorMessage(ex.getMessage())
                 .result(null)
                 .build());
     }
@@ -106,8 +105,8 @@ public class BaseController {
         request.setAttribute(GlobalConstants.API_RESULT_MESSAGE, errorMessage);
         return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(ApiResponseModel.builder()
                 .success(false)
-                .statusCode(HttpStatus.BAD_REQUEST.value())
-                .message(errorMessage)
+                .errorCode(HttpStatus.BAD_REQUEST.value())
+                .errorMessage(errorMessage)
                 .result(ResponseError.builder().errorCode(error).errorMessage(errorMessage).build())
                 .build());
     }

src/main/java/com/aip/gateway/api/model/response/ApiResponseModel.java

@@ -12,10 +12,10 @@ public class ApiResponseModel {
 
     @ApiModelProperty("API 호출 결과(true: 성공, false: 실패")
     private boolean success;
+    @ApiModelProperty("API 오류 코드")
+    private int errorCode;
     @ApiModelProperty("API 호출 결과 메지지")
-    private String message;
-    @ApiModelProperty("HttpStatusCode")
-    private int statusCode;
+    private String errorMessage;
 
     @ApiModelProperty("API 호출 결과 데이터")
     private Object result;

src/main/java/com/aip/gateway/api/model/response/ResponseBase.java

@@ -14,7 +14,9 @@ public class ResponseBase implements Serializable {
     //@Serial
     private static final long serialVersionUID = 1L;
 
+    @JsonIgnore
     private int errorCode;
+    @JsonIgnore
     private String errorMessage;
 
     private String dispFileName;