diff --git a/fw-valhalla-service/pom.xml b/fw-valhalla-service/pom.xml index 2c4f9cb..a7a3c45 100644 --- a/fw-valhalla-service/pom.xml +++ b/fw-valhalla-service/pom.xml @@ -66,8 +66,8 @@ fw-passport-sdk - cn.fw - fw-hermes-sdk + cn.fw.third + fw-push-sdk cn.fw diff --git a/fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/LeaveNeedDoBizService.java b/fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/LeaveNeedDoBizService.java index 4e63ecb..e93de06 100644 --- a/fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/LeaveNeedDoBizService.java +++ b/fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/LeaveNeedDoBizService.java @@ -5,8 +5,8 @@ import cn.fw.common.data.mybatis.pagination.PageData; import cn.fw.common.page.AppPage; import cn.fw.common.web.auth.LoginAuthBean; import cn.fw.data.base.domain.common.Message; -import cn.fw.hermes.sdk.api.ImSendMessage; -import cn.fw.hermes.sdk.api.para.MsgParamCondition; +import cn.fw.third.push.sdk.api.ImSendMessage; +import cn.fw.third.push.sdk.api.para.im.MsgPara; import cn.fw.valhalla.common.constant.RoleCode; import cn.fw.valhalla.common.utils.DateUtil; import cn.fw.valhalla.domain.db.LeaveNeedDo; @@ -357,9 +357,9 @@ public class LeaveNeedDoBizService { for (UserInfo info : list) { try { String text = String.format("%s通过资源分配给你%s台保有客", user.getUserName(), info.getCount()); - final MsgParamCondition msgPara = MsgParamCondition.getOfflineTxetPara(text, null, "保有客分配", + final MsgPara msgPara = MsgPara.getOfflineTxetPara(text, null, "保有客分配", "保有客分配", null, info.getUserId()).build(); - final Message msg = imSendMessage.synSendMsg(msgPara); + final Message msg = imSendMessage.sendMsg(msgPara); log.info("给[{}]推送im消息结果:[{}]", info, msg.getResult()); } catch (Exception e) { log.error("给[{}]推送im消息失败:]", info, e); diff --git a/fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/cust/AbstractCustomerService.java b/fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/cust/AbstractCustomerService.java index fedb3a6..e4e1bef 100644 --- a/fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/cust/AbstractCustomerService.java +++ b/fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/cust/AbstractCustomerService.java @@ -1,7 +1,7 @@ package cn.fw.valhalla.service.bus.cust; -import cn.fw.hermes.sdk.api.ImSendMessage; import cn.fw.oop.sdk.enums.BizTypeEnum; +import cn.fw.third.push.sdk.api.ImSendMessage; import cn.fw.valhalla.common.utils.DateUtil; import cn.fw.valhalla.component.CustomerChangeProducer; import cn.fw.valhalla.domain.db.customer.Customer; diff --git a/fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/cust/ContactBizService.java b/fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/cust/ContactBizService.java index 189236d..eb91e42 100644 --- a/fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/cust/ContactBizService.java +++ b/fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/cust/ContactBizService.java @@ -3,10 +3,10 @@ package cn.fw.valhalla.service.bus.cust; import cn.fw.common.exception.BusinessException; import cn.fw.common.web.auth.PassportAuthBean; import cn.fw.data.base.domain.common.Message; -import cn.fw.hermes.sdk.api.ImSendMessage; -import cn.fw.hermes.sdk.api.para.BusinessType; -import cn.fw.hermes.sdk.api.para.MessageBusinessType; -import cn.fw.hermes.sdk.api.para.MsgParamCondition; +import cn.fw.third.push.sdk.api.ImSendMessage; +import cn.fw.third.push.sdk.api.para.im.BusinessType; +import cn.fw.third.push.sdk.api.para.im.MessageBusinessType; +import cn.fw.third.push.sdk.api.para.im.MsgPara; import cn.fw.valhalla.common.utils.MobileUtil; import cn.fw.valhalla.common.utils.StringUtils; import cn.fw.valhalla.domain.db.customer.Customer; @@ -247,10 +247,10 @@ public class ContactBizService { Map ext = new HashMap<>(2); ext.put("type", MessageBusinessType.SENDER_NOTICE.getMsg()); ext.put("data", data); - final MsgParamCondition msgPara = MsgParamCondition.getCustomMsg(text, "", ext, 0, targetUserId, false) + final MsgPara msgPara = MsgPara.getCustomMsg(text, "", ext, 0, targetUserId, false) .setBusinessType(BusinessType.INTERNAL_NOTIFICATION) .build(); - final Message msg = imSendMessage.synSendMsg(msgPara); + final Message msg = imSendMessage.sendMsg(msgPara); log.info("给[{}]推送im消息结果:[{}]", targetUserId, msg.getResult()); } catch (Exception e) { e.printStackTrace(); diff --git a/fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/cust/CustomerChangeBizService.java b/fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/cust/CustomerChangeBizService.java index 176a315..534d136 100644 --- a/fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/cust/CustomerChangeBizService.java +++ b/fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/cust/CustomerChangeBizService.java @@ -4,12 +4,11 @@ import cn.fw.common.exception.BusinessException; import cn.fw.common.web.auth.LoginAuthBean; import cn.fw.common.web.auth.PassportAuthBean; import cn.fw.data.base.domain.common.Message; -import cn.fw.hermes.sdk.api.para.BusinessType; -import cn.fw.hermes.sdk.api.para.MessageBusinessType; -import cn.fw.hermes.sdk.api.para.MsgPara; -import cn.fw.hermes.sdk.api.para.MsgParamCondition; import cn.fw.passport.sdk.api.param.WxBCodeParam; import cn.fw.starter.redis.redis.RedisUtil; +import cn.fw.third.push.sdk.api.para.im.BusinessType; +import cn.fw.third.push.sdk.api.para.im.MessageBusinessType; +import cn.fw.third.push.sdk.api.para.im.MsgPara; import cn.fw.valhalla.common.constant.RoleCode; import cn.fw.valhalla.common.utils.DateUtil; import cn.fw.valhalla.common.utils.MessageFormatUtil; @@ -499,10 +498,9 @@ public class CustomerChangeBizService extends AbstractCustomerService { ext.put("type", MessageBusinessType.CUSTOMER_CHANGE_STATUS.getMsg()); ext.put("done", done); ext.put("key", key); - final MsgParamCondition condition = MsgParamCondition.getCustomMsg(text, "", ext, 0, targetUserId, false) - .setBusinessType(BusinessType.INTERNAL_NOTIFICATION) - .build(); - final Message msg = imSendMessage.synSendMsg(condition); + final MsgPara msgPara = MsgPara.getCustomMsg(text, "", ext, + 0, targetUserId, false).setBusinessType(BusinessType.INTERNAL_NOTIFICATION).build(); + final Message msg = imSendMessage.sendMsg(msgPara); log.info("给[{}]推送im消息结果:[{}]", targetUserId, msg.getResult()); } catch (Exception e) { e.printStackTrace(); diff --git a/pom.xml b/pom.xml index 46be464..62a6d5c 100644 --- a/pom.xml +++ b/pom.xml @@ -57,6 +57,7 @@ 2.1.6 1.0 1.0.0 + 2.1.7 1.1.3 @@ -132,10 +133,15 @@ fw-auth-client ${fw-auth-client.version} + + + + + - cn.fw - fw-hermes-sdk - ${fw.hermes.sdk} + cn.fw.third + fw-push-sdk + ${fw.push.sdk} cn.fw