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 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() {