From e8ae45307e932166c156df11d0c3e69c7bd4e931 Mon Sep 17 00:00:00 2001
From: luoxiaoyun <hw.luoxiaoyun@huawei.com>
Date: Fri, 18 Feb 2022 15:10:53 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90I4SSEJ=E3=80=91=E3=80=90Appstore?=
 =?UTF-8?q?=E3=80=91Appstore=E6=94=AF=E6=8C=81=E4=B8=8B=E8=BD=BD=E5=A4=A7?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=20=20---=20gateway=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E6=97=A5=E5=BF=97=E8=BF=87=E6=BB=A4=E5=99=A8=20https://e.gitee?=
 =?UTF-8?q?.com/OSDT/issues/list=3Fissue=3DI4SSEJ?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../website/log/HttpTraceLogFilter.java       | 35 ++++---------------
 .../i18n/en_US/appstore/errorCode.properties  |  8 +++--
 .../i18n/zh_CN/appstore/errorCode.properties  |  5 +++
 3 files changed, 18 insertions(+), 30 deletions(-)

diff --git a/src/main/java/org/edgegallery/website/log/HttpTraceLogFilter.java b/src/main/java/org/edgegallery/website/log/HttpTraceLogFilter.java
index 5f65388..af11558 100644
--- a/src/main/java/org/edgegallery/website/log/HttpTraceLogFilter.java
+++ b/src/main/java/org/edgegallery/website/log/HttpTraceLogFilter.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2020 Huawei Technologies Co., Ltd.
+ *  Copyright 2020-2022 Huawei Technologies Co., Ltd.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -31,9 +31,6 @@ import org.slf4j.LoggerFactory;
 import org.springframework.core.Ordered;
 import org.springframework.stereotype.Component;
 import org.springframework.web.filter.OncePerRequestFilter;
-import org.springframework.web.util.ContentCachingRequestWrapper;
-import org.springframework.web.util.ContentCachingResponseWrapper;
-import org.springframework.web.util.WebUtils;
 
 @Component
 public class HttpTraceLogFilter extends OncePerRequestFilter implements Ordered {
@@ -58,21 +55,13 @@ public class HttpTraceLogFilter extends OncePerRequestFilter implements Ordered
             filterChain.doFilter(request, response);
             return;
         }
-        if (!(request instanceof ContentCachingRequestWrapper)) {
-            request = new ContentCachingRequestWrapper(request);
-        }
-        if (!(response instanceof ContentCachingResponseWrapper)) {
-            response = new ContentCachingResponseWrapper(response);
-        }
-
-        HttpRequestLog logs = new HttpRequestLog();
+        HttpRequestLog requestLog = new HttpRequestLog();
         try {
-            logs.setRequest(logForRequest(request));
+            requestLog.setRequestLog(logForRequest(request));
             filterChain.doFilter(request, response);
         } finally {
-            logs.setResponse(logForResponse(response));
-            updateResponse(response);
-            LOGGER.info("Http Request log: {}", new Gson().toJson(logs));
+            requestLog.setResponseLog(logForResponse(response));
+            LOGGER.info("Http trace log: {}", new Gson().toJson(requestLog));
         }
     }
 
@@ -110,20 +99,12 @@ public class HttpTraceLogFilter extends OncePerRequestFilter implements Ordered
         return ip;
     }
 
-    private void updateResponse(HttpServletResponse response) throws IOException {
-        ContentCachingResponseWrapper responseWrapper = WebUtils
-            .getNativeResponse(response, ContentCachingResponseWrapper.class);
-        if (responseWrapper != null) {
-            responseWrapper.copyBodyToResponse();
-        }
-    }
-
     @Setter
     @Getter
     private static class HttpRequestLog {
-        HttpRequestTraceLog request;
+        HttpRequestTraceLog requestLog;
 
-        HttpResponseTraceLog response;
+        HttpResponseTraceLog responseLog;
     }
 
     @Setter
@@ -148,7 +129,5 @@ public class HttpTraceLogFilter extends OncePerRequestFilter implements Ordered
         private Integer status;
 
         private String time;
-
-        private String body;
     }
 }
diff --git a/src/main/resources/i18n/en_US/appstore/errorCode.properties b/src/main/resources/i18n/en_US/appstore/errorCode.properties
index 2e571c3..035700b 100644
--- a/src/main/resources/i18n/en_US/appstore/errorCode.properties
+++ b/src/main/resources/i18n/en_US/appstore/errorCode.properties
@@ -91,10 +91,14 @@
 18005=User (%s) can not modify others' application package.
 18006=User (%s) can not take others' application package off shelf.
 19001=Database operation failed.
-19002=Failed to create a folder.
+19002=Failed to create a directory.
 19003=Failed to create a file.
 19004=Failed to copy a file.
 19005=File is outside extraction target directory.
 19006=The file path is invalid.
-
+19007=Failed to delete the directory.
+19008=Failed to delete the directory or move a file to the directory.
+19009=Failed to delete the file.
+19010=Failed to move the directory.
+19011=Failed to copy the directory.
 
diff --git a/src/main/resources/i18n/zh_CN/appstore/errorCode.properties b/src/main/resources/i18n/zh_CN/appstore/errorCode.properties
index d299d0a..fff08e3 100644
--- a/src/main/resources/i18n/zh_CN/appstore/errorCode.properties
+++ b/src/main/resources/i18n/zh_CN/appstore/errorCode.properties
@@ -96,3 +96,8 @@
 19004=\u62f7\u8d1d\u6587\u4ef6\u5931\u8d25\u3002
 19005=\u6587\u4ef6\u5728\u63d0\u53d6\u76ee\u6807\u76ee\u5f55\u4e4b\u5916\u3002
 19006=\u6587\u4ef6\u8def\u5f84\u65e0\u6548\u3002
+19007=\u5220\u9664\u76ee\u5f55\u5931\u8d25\u3002
+19008=\u5220\u9664\u76ee\u5f55\u6216\u8005\u79fb\u52a8\u6587\u4ef6\u5230\u76ee\u5f55\u4e0b\u5931\u8d25\u3002
+19009=\u5220\u9664\u6587\u4ef6\u5931\u8d25\u3002
+19010=\u79fb\u52a8\u76ee\u5f55\u5931\u8d25\u3002
+19011=\u62f7\u8d1d\u76ee\u5f55\u5931\u8d25\u3002
-- 
Gitee