dev

conf/AipGatewayApi.pid

@@ -1 +0,0 @@
-8928

src/main/java/com/aip/gateway/api/aip/model/SetFileInfo.java

@@ -1,5 +1,7 @@
 package com.aip.gateway.api.aip.model;
 
+import com.aip.gateway.api.repository.GlobalConstants;
+
 public class SetFileInfo {
 
     public int errorNo;
@@ -18,7 +20,7 @@ public class SetFileInfo {
 
     public SetFileInfo() {
         this.errorNo = 0;
-        this.errorMsg = "Success";
+        this.errorMsg = GlobalConstants.API_RESULT_SUCCESS;
         this.labelGuid = "";
         this.templateGuid = "";
         this.fileOwner = "";

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

@@ -74,7 +74,7 @@ public class ApiAipController extends  BaseController {
             return ResponseEntity.ok().body(ApiResponseModel.builder()
                     .success(true)
                     .statusCode(HttpStatus.OK.value())
-                    .message("Success")
+                    .message(GlobalConstants.API_RESULT_SUCCESS)
                     .result(response)
                     .build());
         }
@@ -102,7 +102,7 @@ public class ApiAipController extends  BaseController {
             return ResponseEntity.ok().body(ApiResponseModel.builder()
                     .success(true)
                     .statusCode(HttpStatus.OK.value())
-                    .message("Success")
+                    .message(GlobalConstants.API_RESULT_SUCCESS)
                     .result(response)
                     .build());
         }
@@ -130,7 +130,7 @@ public class ApiAipController extends  BaseController {
             return ResponseEntity.ok().body(ApiResponseModel.builder()
                     .success(true)
                     .statusCode(HttpStatus.OK.value())
-                    .message("Success")
+                    .message(GlobalConstants.API_RESULT_SUCCESS)
                     .result(response)
                     .build());
         }

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

@@ -76,7 +76,7 @@ public class ApiDbController extends  BaseController {
             return ResponseEntity.ok().body(ApiResponseModel.builder()
                     .success(true)
                     .statusCode(HttpStatus.OK.value())
-                    .message("Success")
+                    .message(GlobalConstants.API_RESULT_SUCCESS)
                     .result(response)
                     .build());
         }
@@ -104,7 +104,7 @@ public class ApiDbController extends  BaseController {
             return ResponseEntity.ok().body(ApiResponseModel.builder()
                     .success(true)
                     .statusCode(HttpStatus.OK.value())
-                    .message("Success")
+                    .message(GlobalConstants.API_RESULT_SUCCESS)
                     .result(response)
                     .build());
         }
@@ -132,7 +132,7 @@ public class ApiDbController extends  BaseController {
             return ResponseEntity.ok().body(ApiResponseModel.builder()
                     .success(true)
                     .statusCode(HttpStatus.OK.value())
-                    .message("Success")
+                    .message(GlobalConstants.API_RESULT_SUCCESS)
                     .result(response)
                     .build());
         }
@@ -160,7 +160,7 @@ public class ApiDbController extends  BaseController {
             return ResponseEntity.ok().body(ApiResponseModel.builder()
                     .success(true)
                     .statusCode(HttpStatus.OK.value())
-                    .message("Success")
+                    .message(GlobalConstants.API_RESULT_SUCCESS)
                     .result(response)
                     .build());
         }

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

@@ -3,6 +3,7 @@ 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;
 
@@ -38,7 +39,7 @@ public class BaseController {
         return ResponseEntity.ok().body(ApiResponseModel.builder()
                 .success(true)
                 .statusCode(HttpStatus.OK.value())
-                .message("Success")
+                .message(GlobalConstants.API_RESULT_SUCCESS)
                 .result(response)
                 .build());
     }
@@ -48,7 +49,7 @@ public class BaseController {
         return ResponseEntity.ok().body(ApiResponseModel.builder()
                 .success(true)
                 .statusCode(HttpStatus.OK.value())
-                .message("Success")
+                .message(GlobalConstants.API_RESULT_SUCCESS)
                 .result(response)
                 .build());
     }
@@ -58,7 +59,7 @@ public class BaseController {
         return ResponseEntity.ok().body(ApiResponseModel.builder()
                 .success(true)
                 .statusCode(HttpStatus.OK.value())
-                .message("Success")
+                .message(GlobalConstants.API_RESULT_SUCCESS)
                 .result(response)
                 .build());
     }
@@ -68,7 +69,7 @@ public class BaseController {
         return ResponseEntity.ok().body(ApiResponseModel.builder()
                 .success(true)
                 .statusCode(HttpStatus.OK.value())
-                .message("Success")
+                .message(GlobalConstants.API_RESULT_SUCCESS)
                 .result(response)
                 .build());
     }

src/main/java/com/aip/gateway/api/repository/AipFileRepository.java

@@ -229,7 +229,7 @@ public class AipFileRepository {
         return GeneralResponse.builder()
                 .errorCode(0)
                 .effectCount(labels + policies + templates)
-                .errorMessage("Success")
+                .errorMessage(GlobalConstants.API_RESULT_SUCCESS)
                 .build();
     }
 }

src/main/java/com/aip/gateway/api/repository/GlobalConstants.java

@@ -59,9 +59,9 @@ public class GlobalConstants {
     public static final int API_STREAM_DECRYPT = 39;
     public static final int API_DUMMY = 99;
 
-    public static final String API_RESULT_SUCCESS = "성공";
-    public static final String API_RESULT_FAIL = "실패";
-    public static final String API_RESULT_ERROR = "오류";
+    public static final String API_RESULT_SUCCESS = "Success";
+    public static final String API_RESULT_FAIL = "Fail";
+    public static final String API_RESULT_ERROR = "Error";
 
 
     public static String getApiGuid(HttpServletRequest request)

src/main/java/com/aip/gateway/api/service/impl/AbstractAipService.java

@@ -11,6 +11,7 @@ import com.aip.gateway.api.model.response.ResponseInfo;
 import com.aip.gateway.api.model.response.ResponseStream;
 import com.aip.gateway.api.repository.AipFileRepository;
 import com.aip.gateway.api.repository.AppRepository;
+import com.aip.gateway.api.repository.GlobalConstants;
 import com.aip.gateway.api.utils.TimeUtils;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -36,6 +37,9 @@ abstract class AbstractAipService {
     protected String getActualFileName(String fileName) {
         return this.repo.getSettings().getTargetFileDir() + fileName;
     }
+    protected String getDispFileName(String dispFileName, String outputFileName) {
+        return AipFileUtils.getFileNameWithoutExtension(dispFileName) + AipFileUtils.getExtension(outputFileName);
+    }
     protected String getSupportedFileExt(String reqFileName) {
         return this.repo.getSupportedFileExt(reqFileName);
     }
@@ -82,7 +86,7 @@ abstract class AbstractAipService {
             return new CheckAip(102, "지원하지 않는 파일형식 입니다.", dispFileName);
         }
 
-        CheckAip result = new CheckAip(0, "Success", dispFileName);
+        CheckAip result = new CheckAip(0, GlobalConstants.API_RESULT_SUCCESS, dispFileName);
         result.setReqFileName(reqFileName);
         result.setNewFileExt(newFileExt);
         if (isStream) {
@@ -122,14 +126,16 @@ abstract class AbstractAipService {
     protected ResponseFile responseSetFile(SetFileInfo fileInfo, String displayFileName, String actualFileName) {
         ResponseBase baseResponse = responseBase(fileInfo, displayFileName, actualFileName);
         ResponseFile result = new ResponseFile(baseResponse);
+        result.setDispFileName(getDispFileName(displayFileName, actualFileName));
         result.setOutputFileName(AipFileUtils.getFileName(actualFileName));
         return result;
     }
     protected ResponseStream responseSetStream(SetFileInfo fileInfo, String displayFileName, String actualFileName) {
         ResponseBase baseResponse = responseBase(fileInfo, displayFileName, actualFileName);
         ResponseStream result = new ResponseStream(baseResponse);
+        result.setDispFileName(getDispFileName(displayFileName, actualFileName));
         result.setOutputFileName(AipFileUtils.getFileName(actualFileName));
-        result.setFileData(AipFileUtils.getFileDataString(actualFileName));
+        result.setFileData(AipFileUtils.getFileDataString(getActualFileName(actualFileName)));
         return result;
     }
 
@@ -173,7 +179,7 @@ abstract class AbstractAipService {
                 }
             }
         }
-        ResponseInfo result = new ResponseInfo(0, "Success");
+        ResponseInfo result = new ResponseInfo(0, GlobalConstants.API_RESULT_SUCCESS);
         result.setLabeled(isLabled);
         result.setProtected(isProtected);
         result.setCreationTime(creationTime);

src/main/java/com/aip/gateway/api/service/impl/ApiDbService.java

@@ -10,6 +10,7 @@ import com.aip.gateway.api.entity.*;
 import com.aip.gateway.api.model.app.AipSettings;
 import com.aip.gateway.api.model.response.GeneralResponse;
 import com.aip.gateway.api.repository.AppRepository;
+import com.aip.gateway.api.repository.GlobalConstants;
 import com.aip.gateway.api.service.IApiDbService;
 import com.aip.gateway.api.utils.StringUtils;
 import jakarta.annotation.PostConstruct;
@@ -171,7 +172,7 @@ public class ApiDbService implements IApiDbService {
         initLinkedDecryptKeys();
         return GeneralResponse.builder()
                 .errorCode(0)
-                .errorMessage("Success")
+                .errorMessage(GlobalConstants.API_RESULT_SUCCESS)
                 .effectCount(this.appRepo.getApiKeyMap().size() + this.appRepo.getDecryptKeyMap().size())
                 .build();
     }