[Bug修复](master): Bug- 相关的代码修复

相关的代码修复
master^2
土豆兄弟 3 years ago
parent 7fd9979421
commit abe4e66ad7

@ -3,24 +3,20 @@ package com.yuyou.openapi.openapi.task;
import cn.hutool.core.codec.Base64; import cn.hutool.core.codec.Base64;
import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.RandomUtil; import cn.hutool.core.util.RandomUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import cn.hutool.crypto.SecureUtil; import cn.hutool.crypto.SecureUtil;
import cn.hutool.http.HttpRequest; import cn.hutool.http.HttpRequest;
import cn.hutool.http.HttpResponse; import cn.hutool.http.HttpResponse;
import cn.hutool.json.JSONUtil;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.yuyou.openapi.openapi.api.enums.LuoShiAppIDEnum; import com.yuyou.openapi.openapi.api.enums.LuoShiAppIDEnum;
import com.yuyou.openapi.openapi.common.enums.IntentionEnum; import com.yuyou.openapi.openapi.common.enums.IntentionEnum;
import com.yuyou.openapi.openapi.common.enums.SourceEnum; import com.yuyou.openapi.openapi.common.enums.SourceEnum;
import com.yuyou.openapi.openapi.consts.SmsConstant;
import com.yuyou.openapi.openapi.consts.SpecialCityConst; import com.yuyou.openapi.openapi.consts.SpecialCityConst;
import com.yuyou.openapi.openapi.dao.PhonesRepository; import com.yuyou.openapi.openapi.dao.PhonesRepository;
import com.yuyou.openapi.openapi.model.dto.*; import com.yuyou.openapi.openapi.model.dto.*;
import com.yuyou.openapi.openapi.model.pojo.BlackJsonContent;
import com.yuyou.openapi.openapi.model.pojo.QiZhuangDTO; import com.yuyou.openapi.openapi.model.pojo.QiZhuangDTO;
import com.yuyou.openapi.openapi.model.pojo.token.QiZhuangTokenResponse; import com.yuyou.openapi.openapi.model.pojo.token.QiZhuangTokenResponse;
import com.yuyou.openapi.openapi.model.vo.ABClientXMJMessageVO; import com.yuyou.openapi.openapi.model.vo.ABClientXMJMessageVO;
@ -263,10 +259,10 @@ public class ABDownTask {
@Async(value = "abTaskExecutor") @Async(value = "abTaskExecutor")
public void doRunTaskTuboShu(List<ABMessageDTO> messageDTOList){ public void doRunTaskTuboShu(List<ABMessageDTO> messageDTOList){
Long satrtMilliSecond = LocalDateTime.now().toInstant(ZoneOffset.of("+8")).toEpochMilli(); Long satrtMilliSecond = LocalDateTime.now().toInstant(ZoneOffset.of("+8")).toEpochMilli();
log.info("====== [ task start running, task name is {} ] ======", "ABDownTask"); log.info("====== [ task start running, task name is {} ] ======", "doRunTaskTuboShu");
runTaskTuboShu(messageDTOList); runTaskTuboShu(messageDTOList);
Long endMilliSecond = LocalDateTime.now().toInstant(ZoneOffset.of("+8")).toEpochMilli(); Long endMilliSecond = LocalDateTime.now().toInstant(ZoneOffset.of("+8")).toEpochMilli();
log.info("====== [ task start end, task name is {},cost milliSecond is {} ] ======", "ABDownTask", (endMilliSecond-satrtMilliSecond)); log.info("====== [ task start end, task name is {},cost milliSecond is {} ] ======", "doRunTaskTuboShu", (endMilliSecond-satrtMilliSecond));
} }
/** /**
* *
@ -298,13 +294,13 @@ public class ABDownTask {
// 重新发送前休眠3秒 // 重新发送前休眠3秒
Thread.sleep(3_0000); Thread.sleep(3_0000);
} catch (InterruptedException e) { } catch (InterruptedException e) {
log.error("ABDownTask|runTaskTuboShu sleep ERROR. message is", e.getMessage(), e); log.error("ABDownTask|runTaskTuboShu sleep ERROR. message is {} , {}", e.getMessage(), e);
} }
log.error("========== [SaveToFileTask|batchSendToEncrypt request fail, response is {} ] ==========", jsonObject.toJSONString()); log.error("========== [ABDownTask|runTaskTuboShu request fail, response is {} ] ==========", jsonObject.toJSONString());
} }
} }
if (countToken >= 3 || "".equals(tokenT)) { if (countToken >= 3 || "".equals(tokenT)) {
log.error("========== [ABDownTask|runTaskTuboShu update send status fail, url is {} ] =========="); log.error("========== [ABDownTask|runTaskTuboShu update send status fail, url is {} ] ==========", tuBoShuUrl);
return Boolean.FALSE; return Boolean.FALSE;
} }
@ -333,6 +329,8 @@ public class ABDownTask {
formMapT.put("channel", channelT); formMapT.put("channel", channelT);
formMapT.put("real_order", Integer.parseInt(realOrder)); formMapT.put("real_order", Integer.parseInt(realOrder));
formMapT.put("coop_orderid", coopOrderid); formMapT.put("coop_orderid", coopOrderid);
log.info("========== [ABDownTask|runTaskTuboShu request content is {} ] ==========", formMapT.toString());
int count = 0; int count = 0;
while (count < 3) { while (count < 3) {
// 调用HTTP请求发送数据 // 调用HTTP请求发送数据
@ -347,13 +345,13 @@ public class ABDownTask {
// 重新发送前休眠3秒 // 重新发送前休眠3秒
Thread.sleep(3_0000); Thread.sleep(3_0000);
} catch (InterruptedException e) { } catch (InterruptedException e) {
log.error("ABDownTask|runTaskTuboShu sleep ERROR. message is", e.getMessage(), e); log.error("ABDownTask|runTaskTuboShu sleep ERROR. message is {} {}", e.getMessage(), e);
} }
log.error("========== [ABDownTask|runTaskTuboShu request fail, response is {} ] ==========", jsonObject.toJSONString()); log.error("========== [ABDownTask|runTaskTuboShu request fail, response is {} ] ==========", jsonObject.toJSONString());
} }
} }
if (count >= 3) { if (count >= 3) {
log.error("========== [ABDownTask|runTaskTuboShu update send status fail, url is {} ] =========="); log.error("========== [ABDownTask|runTaskTuboShu update send status fail, url is {} ] ==========", tuBoShuUrl);
}else { }else {
abMessageService.updateSendStatus(Long.valueOf(list.getRecId()), Boolean.TRUE); abMessageService.updateSendStatus(Long.valueOf(list.getRecId()), Boolean.TRUE);
} }

Loading…
Cancel
Save