diff --git a/src/main/java/com/yuyou/openapi/openapi/service/ABMessageService.java b/src/main/java/com/yuyou/openapi/openapi/service/ABMessageService.java index 87d18fe..21e58fd 100644 --- a/src/main/java/com/yuyou/openapi/openapi/service/ABMessageService.java +++ b/src/main/java/com/yuyou/openapi/openapi/service/ABMessageService.java @@ -41,6 +41,11 @@ public interface ABMessageService { */ boolean updateSendPDSatus(Long recId, boolean sucess); + /** + * 更新河小象发送记录 - 单条更新 + */ + boolean updateSendHeXXSatus(Long recId, boolean sucess); + /** * 更新罗什发送记录 - 单条更新 diff --git a/src/main/java/com/yuyou/openapi/openapi/service/impl/ABMessageServiceImpl.java b/src/main/java/com/yuyou/openapi/openapi/service/impl/ABMessageServiceImpl.java index 4db1233..06a7fd4 100644 --- a/src/main/java/com/yuyou/openapi/openapi/service/impl/ABMessageServiceImpl.java +++ b/src/main/java/com/yuyou/openapi/openapi/service/impl/ABMessageServiceImpl.java @@ -35,6 +35,8 @@ public class ABMessageServiceImpl implements ABMessageService { private PandaMessageRepository pandaMessageRepository; @Autowired private WxFansMessageRepository wxFansMessageRepository; + @Autowired + private HeXiaoXiangMessageRepository heXiaoXiangMessageRepository; @Override @Transactional(readOnly = false, propagation = Propagation.REQUIRES_NEW) @@ -106,6 +108,20 @@ public class ABMessageServiceImpl implements ABMessageService { return Boolean.TRUE; } + @Override + @Transactional(readOnly = false, propagation = Propagation.REQUIRES_NEW) + public boolean updateSendHeXXSatus(Long recId, boolean sucess) { + if (recId == null) { + return Boolean.FALSE; + } + if (sucess) { + heXiaoXiangMessageRepository.updateSendStatus(1, recId); + }else { + heXiaoXiangMessageRepository.updateSendStatus(0, recId); + } + return Boolean.TRUE; + } + @Override @Transactional(readOnly = false, propagation = Propagation.REQUIRES_NEW) public boolean updateSendWxFansSatus(Long recId, boolean sucess) { diff --git a/src/main/java/com/yuyou/openapi/openapi/task/ABDownTask.java b/src/main/java/com/yuyou/openapi/openapi/task/ABDownTask.java index 9a384e0..4ed5b5a 100644 --- a/src/main/java/com/yuyou/openapi/openapi/task/ABDownTask.java +++ b/src/main/java/com/yuyou/openapi/openapi/task/ABDownTask.java @@ -114,6 +114,18 @@ public class ABDownTask { @Value("${ab.wxfans.secret}") private String wxSecretKey; + /** + * 配置文件中加载配置信息 - 河小象 + */ + @Value("${ab.hexx.appId}") + private String hexxAppId; + + @Value("${ab.hexx.url}") + private String hexxUrl; + + @Value("${ab.hexx.secretKey}") + private String hexxSecretKey; + /** * 任务处理入口,主要用于时间记录 * @@ -504,8 +516,8 @@ public class ABDownTask { // 补充其他的下游请求字段 long time = System.currentTimeMillis() / 1000; heXXMessageCovDTO.setTimestamp(time); - heXXMessageCovDTO.setAppId(panDaAppId); - heXXMessageCovDTO.setSignature(SecureUtil.sha1("app_id="+ panDaAppId +"×tamp="+ time + "&secret=" + panDaSecretKey)); + heXXMessageCovDTO.setAppId(hexxAppId); + heXXMessageCovDTO.setSignature(SecureUtil.sha1("app_id="+ hexxAppId +"×tamp="+ time + "&secret=" + hexxSecretKey)); // 数据实体转成Json 不忽略空kv 有序 String jsonStr = JSON.toJSONString(heXXMessageCovDTO); log.info("========== [ready send json is {} ] =============", jsonStr); @@ -513,7 +525,7 @@ public class ABDownTask { // todo 失败重发请求3次 while (count <= 3){ // 调用HTTP请求发送数据 - HttpResponse httpResponse = sendPandaReq(jsonStr); + HttpResponse httpResponse = sendHXXReq(jsonStr); if (httpResponse.isOk() && httpResponse.body().contains("success")){ log.info("========== [request success, response is {} ] ==========", httpResponse.body()); break; @@ -742,6 +754,20 @@ public class ABDownTask { return httpResponse; } + /** + * 调用HTTP请求发送数据 + * + * @param json 请求的body内容 + * @return + */ + private HttpResponse sendHXXReq(String json){ + HttpResponse httpResponse = HttpRequest + .post(hexxUrl) + .body(json) + .execute(); + return httpResponse; + } + /** * 调用HTTP请求发送数据 * diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 1296280..59d39e2 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -48,6 +48,10 @@ ab: appId: 10671792 url: https://pre-api.aircourses.com/common/open/n/stuClue/add/callback secretKey: fee2824fb2e0d1f166084cb66fc9d391 + hexx: + appId: 9067cf8713cb5518 + url: https://apitest.hexiaoxiang.com/managerportal/clue + secretKey: c0990e72836828ab wxfans: url: https://api.wooxin.cn/tketong/ taskid: @@ -92,6 +96,10 @@ ab: appId: 10671792 url: https://api.aircourses.com/common/open/n/stuClue/add/callback secretKey: fee2824fb2e0d1f166084cb66fc9d391 + hexx: + appId: 9067cf8713cb5518 + url: https://api.hexiaoxiang.com/managerportal/clue + secretKey: c0990e72836828ab wxfans: url: https://api.wooxin.cn/tketong/ taskid: @@ -138,6 +146,10 @@ ab: appId: Hangzhouyunuo url: https://data.hzluoshi.cn/index/phoneapi secretKey: fee2824fb2e0d1f166084cb66fc9d391 + hexx: + appId: 9067cf8713cb5518 + url: https://api.hexiaoxiang.com/managerportal/clue + secretKey: c0990e72836828ab wxfans: url: https://api.wooxin.cn/tketong/ taskid: