From 862eeb27aed58fc89de2dd456af9d43b5720e7b1 Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 17 Sep 2021 16:08:36 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E9=94=99=E8=AF=AF=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tduck/cloud/project/request/QueryProjectItemRequest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tduck-project/src/main/java/com/tduck/cloud/project/request/QueryProjectItemRequest.java b/tduck-project/src/main/java/com/tduck/cloud/project/request/QueryProjectItemRequest.java index 8dd2fcc..a79d40c 100644 --- a/tduck-project/src/main/java/com/tduck/cloud/project/request/QueryProjectItemRequest.java +++ b/tduck-project/src/main/java/com/tduck/cloud/project/request/QueryProjectItemRequest.java @@ -15,7 +15,7 @@ public class QueryProjectItemRequest { /** * 项目key */ - @NotBlank + @NotBlank(message = "项目Key不能为空") private String key; /** * 是显示类型 From 20cf275529acf463e3f1e70eb99824e088b317c6 Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 17 Sep 2021 16:14:40 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tduck-api/src/main/resources/application-dev.yml | 8 ++++---- tduck-api/src/main/resources/application-prod.yml | 8 ++++---- tduck-api/src/main/resources/application-test.yml | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/tduck-api/src/main/resources/application-dev.yml b/tduck-api/src/main/resources/application-dev.yml index 24c6f5b..8e53abb 100644 --- a/tduck-api/src/main/resources/application-dev.yml +++ b/tduck-api/src/main/resources/application-dev.yml @@ -58,10 +58,10 @@ platform: domain: https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com sms: type: 0 # 短信平台类型 - secretId: LTAI4G5KMmkxpix924ddeVNM - secretKey: 92nB7g5L1JmBGSzZG5xsdGvfv9O8WX - sign: 党群e事通 - validateCodeTemplateId: SMS_150731394 + secretId: mpw:EvC1LR0eGdzeQzkuO7fhEazxGtmdue8FJDzSA1l+gICuOUEDXI8zcjK+VXB2aWKS + secretKey: mpw:W3kvWxvHdgUJPAwqR6mwpfMoQMerAYcxZGHwJc259lK3m+jzceGuu0Tgnx++02Bk + sign: smileyi知识分享 + validateCodeTemplateId: 808150 retrievePwdValidateCodeTemplateId: #腾讯云使用的 appId: #腾讯云使用的 front: diff --git a/tduck-api/src/main/resources/application-prod.yml b/tduck-api/src/main/resources/application-prod.yml index 39fac40..902c425 100644 --- a/tduck-api/src/main/resources/application-prod.yml +++ b/tduck-api/src/main/resources/application-prod.yml @@ -65,10 +65,10 @@ platform: access-path-pattern: /profile/** # 文件访问路径前缀 这里更改domain也需要更改 sms: type: 0 # 短信平台类型 - secretId: LTAI4G5KMmkxpix924ddeVNM - secretKey: 92nB7g5L1JmBGSzZG5xsdGvfv9O8WX - sign: 党群e事通 - validateCodeTemplateId: SMS_150731394 + secretId: mpw:EvC1LR0eGdzeQzkuO7fhEazxGtmdue8FJDzSA1l+gICuOUEDXI8zcjK+VXB2aWKS + secretKey: mpw:W3kvWxvHdgUJPAwqR6mwpfMoQMerAYcxZGHwJc259lK3m+jzceGuu0Tgnx++02Bk + sign: smileyi知识分享 + validateCodeTemplateId: 808150 retrievePwdValidateCodeTemplateId: #腾讯云使用的 appId: #腾讯云使用的 front: diff --git a/tduck-api/src/main/resources/application-test.yml b/tduck-api/src/main/resources/application-test.yml index 0f0a5ac..5d9f398 100644 --- a/tduck-api/src/main/resources/application-test.yml +++ b/tduck-api/src/main/resources/application-test.yml @@ -58,10 +58,10 @@ platform: domain: https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com sms: type: 0 # 短信平台类型 - secretId: LTAI4G5KMmkxpix924ddeVNM - secretKey: 92nB7g5L1JmBGSzZG5xsdGvfv9O8WX - sign: 党群e事通 - validateCodeTemplateId: SMS_150731394 + secretId: mpw:EvC1LR0eGdzeQzkuO7fhEazxGtmdue8FJDzSA1l+gICuOUEDXI8zcjK+VXB2aWKS + secretKey: mpw:W3kvWxvHdgUJPAwqR6mwpfMoQMerAYcxZGHwJc259lK3m+jzceGuu0Tgnx++02Bk + sign: smileyi知识分享 + validateCodeTemplateId: 808150 retrievePwdValidateCodeTemplateId: #腾讯云使用的 appId: #腾讯云使用的 front: From 19d534aa0f60565ea0903e0a251ac640ca0c645c Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 17 Sep 2021 16:34:16 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E9=97=AE=E5=8D=B7?= =?UTF-8?q?=E6=97=B6=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 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() {