From eb049860c34ab92e9a181c0c6a2f78108693a867 Mon Sep 17 00:00:00 2001 From: wxc <191104855@qq.com> Date: Mon, 16 Dec 2024 16:57:00 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9F=AD=E4=BF=A1=E5=9B=9E=E5=A4=8D=E7=8A=B6?= =?UTF-8?q?=E6=80=81BUG=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/biutag/lan/controller/ApiV1Controller.java | 4 ++-- .../src/main/java/com/biutag/lan/service/MailService.java | 2 +- mailbox-outer/src/main/java/com/biutag/outer/job/Job.java | 7 +++++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/mailbox-lan/src/main/java/com/biutag/lan/controller/ApiV1Controller.java b/mailbox-lan/src/main/java/com/biutag/lan/controller/ApiV1Controller.java index 94969d3..d064526 100644 --- a/mailbox-lan/src/main/java/com/biutag/lan/controller/ApiV1Controller.java +++ b/mailbox-lan/src/main/java/com/biutag/lan/controller/ApiV1Controller.java @@ -91,7 +91,7 @@ public class ApiV1Controller { return AjaxResult.success(); } - @PutMapping("mail/evaluate") + @PostMapping("mail/evaluate") public AjaxResult updateMail(@RequestBody @Valid MailEvaluateApiV1Req req, HttpServletRequest request) { log.info("更新信件信件（网络）评价：{}", JSON.toJSONString(req)); validAuth(request); @@ -104,7 +104,7 @@ public class ApiV1Controller { return AjaxResult.success(); } - @PutMapping("mail/sms/evaluate") + @PostMapping("mail/sms/evaluate") @Transactional(rollbackFor = Exception.class) public AjaxResult updateSmsMail(@RequestBody @Valid MailEvaluateApiV1Req req, HttpServletRequest request) { log.info("更新信件信件(短信)评价：{}", JSON.toJSONString(req)); diff --git a/mailbox-lan/src/main/java/com/biutag/lan/service/MailService.java b/mailbox-lan/src/main/java/com/biutag/lan/service/MailService.java index 3487c0d..c18ffa5 100644 --- a/mailbox-lan/src/main/java/com/biutag/lan/service/MailService.java +++ b/mailbox-lan/src/main/java/com/biutag/lan/service/MailService.java @@ -173,7 +173,7 @@ public class MailService extends ServiceImpl { int limitedTime = flowNode.getLimitedTime().intValue(); // 剩余时间 long flowRemainingTime = holidayService.getFlowRemainingTimeByNow(limitedTime, - FlowNodeEnum.lessInterviewWriter(mail.getFlowKey()) ? mail.getFlowLimitedLastHandlerTime(): mail.getMailTime(), + FlowNodeEnum.lessInterviewWriter(mail.getFlowKey()) ? mail.getFlowLimitedLastHandlerTime(): mail.getCreateTime(), mail.getExtensionFlag(), mail.getExtensionDays()); if (Objects.nonNull(mail.getExtensionFlag()) && mail.getExtensionFlag()) { diff --git a/mailbox-outer/src/main/java/com/biutag/outer/job/Job.java b/mailbox-outer/src/main/java/com/biutag/outer/job/Job.java index e5c336e..b747059 100644 --- a/mailbox-outer/src/main/java/com/biutag/outer/job/Job.java +++ b/mailbox-outer/src/main/java/com/biutag/outer/job/Job.java @@ -125,7 +125,7 @@ public class Job { for (Mail mail : mails) { try { long timestamp = new Date().getTime(); - HttpResponse httpResponse = HttpUtil.createRequest(Method.PUT, mailboxUrl + "mail/evaluate") + HttpResponse httpResponse = HttpUtil.createRequest(Method.POST, mailboxUrl + "mail/evaluate") .header("timestamp", String.valueOf(timestamp)) .auth(MD5.create().digestHex(key + timestamp)) .body(JSONObject.of("id", mail.getId(), "satisfaction", mail.getSatisfaction()).toJSONString()) @@ -158,11 +158,14 @@ public class Job { for (SmsSend smsSend : mails) { try { long timestamp = new Date().getTime(); - HttpResponse httpResponse = HttpUtil.createRequest(Method.PUT, mailboxUrl + "mail/sms/evaluate") + String url = mailboxUrl + "mail/sms/evaluate"; + log.info(url); + HttpResponse httpResponse = HttpUtil.createRequest(Method.POST, url) .header("timestamp", String.valueOf(timestamp)) .auth(MD5.create().digestHex(key + timestamp)) .body(JSONObject.of("id", smsSend.getMailId(), "satisfaction", smsSend.getSatisfactionSms()).toJSONString()) .execute(); + log.info(httpResponse.body()); if (!httpResponse.isOk()) { throw new RuntimeException(String.format("httpCode: %s", httpResponse.getStatus())); }