Browse Source

短信回复状态BUG修复

master
wxc 12 months ago
parent
commit
eb049860c3
  1. 4
      mailbox-lan/src/main/java/com/biutag/lan/controller/ApiV1Controller.java
  2. 2
      mailbox-lan/src/main/java/com/biutag/lan/service/MailService.java
  3. 7
      mailbox-outer/src/main/java/com/biutag/outer/job/Job.java

4
mailbox-lan/src/main/java/com/biutag/lan/controller/ApiV1Controller.java

@ -91,7 +91,7 @@ public class ApiV1Controller {
return AjaxResult.success(); return AjaxResult.success();
} }
@PutMapping("mail/evaluate") @PostMapping("mail/evaluate")
public AjaxResult<Void> updateMail(@RequestBody @Valid MailEvaluateApiV1Req req, HttpServletRequest request) { public AjaxResult<Void> updateMail(@RequestBody @Valid MailEvaluateApiV1Req req, HttpServletRequest request) {
log.info("更新信件信件(网络)评价:{}", JSON.toJSONString(req)); log.info("更新信件信件(网络)评价:{}", JSON.toJSONString(req));
validAuth(request); validAuth(request);
@ -104,7 +104,7 @@ public class ApiV1Controller {
return AjaxResult.success(); return AjaxResult.success();
} }
@PutMapping("mail/sms/evaluate") @PostMapping("mail/sms/evaluate")
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public AjaxResult<Void> updateSmsMail(@RequestBody @Valid MailEvaluateApiV1Req req, HttpServletRequest request) { public AjaxResult<Void> updateSmsMail(@RequestBody @Valid MailEvaluateApiV1Req req, HttpServletRequest request) {
log.info("更新信件信件(短信)评价:{}", JSON.toJSONString(req)); log.info("更新信件信件(短信)评价:{}", JSON.toJSONString(req));

2
mailbox-lan/src/main/java/com/biutag/lan/service/MailService.java

@ -173,7 +173,7 @@ public class MailService extends ServiceImpl<MailMapper, Mail> {
int limitedTime = flowNode.getLimitedTime().intValue(); int limitedTime = flowNode.getLimitedTime().intValue();
// 剩余时间 // 剩余时间
long flowRemainingTime = holidayService.getFlowRemainingTimeByNow(limitedTime, long flowRemainingTime = holidayService.getFlowRemainingTimeByNow(limitedTime,
FlowNodeEnum.lessInterviewWriter(mail.getFlowKey()) ? mail.getFlowLimitedLastHandlerTime(): mail.getMailTime(), FlowNodeEnum.lessInterviewWriter(mail.getFlowKey()) ? mail.getFlowLimitedLastHandlerTime(): mail.getCreateTime(),
mail.getExtensionFlag(), mail.getExtensionFlag(),
mail.getExtensionDays()); mail.getExtensionDays());
if (Objects.nonNull(mail.getExtensionFlag()) && mail.getExtensionFlag()) { if (Objects.nonNull(mail.getExtensionFlag()) && mail.getExtensionFlag()) {

7
mailbox-outer/src/main/java/com/biutag/outer/job/Job.java

@ -125,7 +125,7 @@ public class Job {
for (Mail mail : mails) { for (Mail mail : mails) {
try { try {
long timestamp = new Date().getTime(); 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)) .header("timestamp", String.valueOf(timestamp))
.auth(MD5.create().digestHex(key + timestamp)) .auth(MD5.create().digestHex(key + timestamp))
.body(JSONObject.of("id", mail.getId(), "satisfaction", mail.getSatisfaction()).toJSONString()) .body(JSONObject.of("id", mail.getId(), "satisfaction", mail.getSatisfaction()).toJSONString())
@ -158,11 +158,14 @@ public class Job {
for (SmsSend smsSend : mails) { for (SmsSend smsSend : mails) {
try { try {
long timestamp = new Date().getTime(); 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)) .header("timestamp", String.valueOf(timestamp))
.auth(MD5.create().digestHex(key + timestamp)) .auth(MD5.create().digestHex(key + timestamp))
.body(JSONObject.of("id", smsSend.getMailId(), "satisfaction", smsSend.getSatisfactionSms()).toJSONString()) .body(JSONObject.of("id", smsSend.getMailId(), "satisfaction", smsSend.getSatisfactionSms()).toJSONString())
.execute(); .execute();
log.info(httpResponse.body());
if (!httpResponse.isOk()) { if (!httpResponse.isOk()) {
throw new RuntimeException(String.format("httpCode: %s", httpResponse.getStatus())); throw new RuntimeException(String.format("httpCode: %s", httpResponse.getStatus()));
} }

Loading…
Cancel
Save