From 19d534aa0f60565ea0903e0a251ac640ca0c645c Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Fri, 17 Sep 2021 16:34:16 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E9=97=AE=E5=8D=B7=E6=97=B6?=
 =?UTF-8?q?=E5=A1=AB=E5=86=99=E7=94=A8=E6=88=B7id?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/web/controller/UserProjectResultController.java      | 5 +++--
 .../api/web/wrapper/BodyReaderHttpServletRequestWrapper.java | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/tduck-api/src/main/java/com/tduck/cloud/api/web/controller/UserProjectResultController.java b/tduck-api/src/main/java/com/tduck/cloud/api/web/controller/UserProjectResultController.java
index 0a210d2..9adfc2a 100644
--- a/tduck-api/src/main/java/com/tduck/cloud/api/web/controller/UserProjectResultController.java
+++ b/tduck-api/src/main/java/com/tduck/cloud/api/web/controller/UserProjectResultController.java
@@ -79,8 +79,9 @@ public class UserProjectResultController {
      */
     @NoRepeatSubmit
     @PostMapping("/create")
-    public Result createProjectResult(@RequestBody UserProjectResultEntity entity, HttpServletRequest request) {
+    public Result createProjectResult(@RequestBody UserProjectResultEntity entity, @RequestAttribute String userId, HttpServletRequest request) {
         ValidatorUtils.validateEntity(entity);
+        entity.setUserId(userId);
         entity.setSubmitRequestIp(HttpUtils.getIpAddr(request));
         Result<UserProjectSettingEntity> userProjectSettingStatus = userProjectSettingService.getUserProjectSettingStatus(entity.getProjectKey(), entity.getSubmitRequestIp(), entity.getWxOpenId());
         if (StrUtil.isNotBlank(userProjectSettingStatus.getMsg())) {
@@ -186,4 +187,4 @@ public class UserProjectResultController {
     }
 
 
-}
\ No newline at end of file
+}
diff --git a/tduck-api/src/main/java/com/tduck/cloud/api/web/wrapper/BodyReaderHttpServletRequestWrapper.java b/tduck-api/src/main/java/com/tduck/cloud/api/web/wrapper/BodyReaderHttpServletRequestWrapper.java
index 3ebabaf..8ae91d2 100644
--- a/tduck-api/src/main/java/com/tduck/cloud/api/web/wrapper/BodyReaderHttpServletRequestWrapper.java
+++ b/tduck-api/src/main/java/com/tduck/cloud/api/web/wrapper/BodyReaderHttpServletRequestWrapper.java
@@ -13,6 +13,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletRequestWrapper;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
+import java.nio.charset.StandardCharsets;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
@@ -51,9 +52,9 @@ public class BodyReaderHttpServletRequestWrapper extends HttpServletRequestWrapp
             return super.getInputStream();
         }
         if (StrUtil.isBlank(bodyJson)) {
-            bodyJson = IOUtils.toString(super.getInputStream(), "utf-8");
+            bodyJson = IOUtils.toString(super.getInputStream(), StandardCharsets.UTF_8);
         }
-        final ByteArrayInputStream bis = new ByteArrayInputStream(bodyJson.getBytes("utf-8"));
+        final ByteArrayInputStream bis = new ByteArrayInputStream(bodyJson.getBytes(StandardCharsets.UTF_8));
         return new ServletInputStream() {
             @Override
             public boolean isFinished() {